DF-5519 / fix.diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | --- a/sys/bus/isa/x86_64/isa_dma.c 2026-10-06 20:51:42.700616456 +0000 +++ b/sys/bus/isa/x86_64/isa_dma.c 2026-10-06 20:52:25.716057367 +0000 @@ -95,13 +95,13 @@ { void *buf; -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dma_init: channel out of range"); + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dma_init: channel %d out of range\n", chan); + return (EINVAL); + } if (dma_bouncebuf[chan] != NULL) panic("isa_dma_init: impossible request"); -#endif /* Try malloc() first. It works better if it works. */ buf = kmalloc(bouncebufsize, M_DEVBUF, flags); @@ -137,10 +137,10 @@ int isa_dma_acquire(int chan) { -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dma_acquire: channel out of range"); -#endif + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dma_acquire: channel %d out of range\n", chan); + return (EINVAL); + } if (dma_inuse & (1 << chan)) { kprintf("isa_dma_acquire: channel %d already in use\n", chan); @@ -159,10 +159,12 @@ void isa_dma_release(int chan) { -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dma_release: channel out of range"); + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dma_release: channel %d out of range\n", chan); + return; + } +#ifdef DIAGNOSTIC if ((dma_inuse & (1 << chan)) == 0) kprintf("isa_dma_release: channel %d not in use\n", chan); #endif @@ -188,10 +190,10 @@ void isa_dmacascade(int chan) { -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dmacascade: channel out of range"); -#endif + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dmacascade: channel %d out of range\n", chan); + return; + } /* set dma channel mode, and set dma channel mode */ if ((chan & 4) == 0) { @@ -214,10 +216,12 @@ int waport; caddr_t newaddr; -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dmastart: channel out of range"); + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dmastart: channel %d out of range\n", chan); + return; + } +#ifdef DIAGNOSTIC if ((chan < 4 && nbytes > (1<<16)) || (chan >= 4 && (nbytes > (1<<17) || (u_int)(uintptr_t)addr & 1))) panic("isa_dmastart: impossible request"); @@ -333,10 +337,12 @@ void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan) { -#ifdef DIAGNOSTIC - if (chan & ~VALID_DMA_MASK) - panic("isa_dmadone: channel out of range"); + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dmadone: channel %d out of range\n", chan); + return; + } +#ifdef DIAGNOSTIC if ((dma_inuse & (1 << chan)) == 0) kprintf("isa_dmadone: channel %d not acquired\n", chan); #endif @@ -431,6 +437,11 @@ int ffport, waport; u_long low1, high1, low2, high2; + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dmastatus: channel %d out of range\n", chan); + return (-1); + } + /* channel active? */ if ((dma_inuse & (1 << chan)) == 0) { kprintf("isa_dmastatus: channel %d not active\n", chan); @@ -482,6 +493,11 @@ int isa_dmastop(int chan) { + if (chan & ~VALID_DMA_MASK) { + kprintf("isa_dmastop: channel %d out of range\n", chan); + return (-1); + } + if ((dma_inuse & (1 << chan)) == 0) kprintf("isa_dmastop: channel %d not acquired\n", chan); |