diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-04-02 13:23:47 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-04-02 13:23:47 +0000 |
| commit | c7bc3bcd1edc826014464668a02b62254e373768 (patch) | |
| tree | 9008044e950d4e0ab508f70f615aece2708f39d8 | |
| parent | 0559b80afd4044595940a49c63bb5f4ad6695d4a (diff) | |
Return EFBIG in case not enough segments are present to load a DMA request
instead of ENOMEM and remove/shortcut the additional debug printfs.
Some network drivers will try to load the mbuf chain and linearize the mbufs
if EFBIG is returned.
OK miod@ kettenis@
| -rw-r--r-- | sys/arch/sparc64/dev/iommu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c index 2fc6003883e..b4ea80e7204 100644 --- a/sys/arch/sparc64/dev/iommu.c +++ b/sys/arch/sparc64/dev/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.44 2007/01/26 16:53:28 tsi Exp $ */ +/* $OpenBSD: iommu.c,v 1.45 2007/04/02 13:23:46 claudio Exp $ */ /* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */ /* @@ -790,6 +790,8 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map, err = iommu_dvmamap_append_range(t, map, pgstart, pglen, flags, boundary); + if (err == EFBIG) + return (err); if (err) { printf("iomap load seg page: %d for " "va 0x%llx pa %lx (%llx - %llx) " @@ -1096,10 +1098,8 @@ iommu_dvmamap_append_range(bus_dma_tag_t t, bus_dmamap_t map, paddr_t pa, if (seg == NULL) { seg = &map->dm_segs[i]; if (++i > map->_dm_segcnt) { - printf("append range, out of segments (%d)\n", i); - iommu_dvmamap_print_map(t, NULL, map); map->dm_nsegs = 0; - return (ENOMEM); + return (EFBIG); } } @@ -1130,8 +1130,6 @@ iommu_dvmamap_append_range(bus_dma_tag_t t, bus_dmamap_t map, paddr_t pa, seg = &map->dm_segs[i]; if (++i > map->_dm_segcnt) { - printf("append range, out of segments\n"); - iommu_dvmamap_print_map(t, NULL, map); map->dm_nsegs = 0; return (EFBIG); } @@ -1207,6 +1205,8 @@ iommu_dvmamap_load_seg(bus_dma_tag_t t, struct iommu_state *is, err = iommu_dvmamap_append_range(t, map, pgstart, pglen, flags, boundary); + if (err == EFBIG) + return (err); if (err) { printf("iomap load seg page: %d for " "pa 0x%llx (%llx - %llx for %d/%x\n", @@ -1243,6 +1243,8 @@ iommu_dvmamap_load_mlist(bus_dma_tag_t t, struct iommu_state *is, err = iommu_dvmamap_append_range(t, map, pa, PAGE_SIZE, flags, boundary); + if (err == EFBIG) + return (err); if (err) { printf("iomap load seg page: %d for pa 0x%lx " "(%lx - %lx for %d/%x\n", err, pa, pa, |