Commit bdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e
Committed by
Rafael J. Wysocki
1 parent
c7788792a5
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
pnp: restore automatic resolution of DMA conflicts
To fix a 5-year-old regression, reverse changes made by commit 7ef3639 (PNP: don't fail device init if no DMA channel available). As an example to show the problem, my sound card provides a prioritized list of PnP "dependent sets" of requested resources: dependent set 0 (preferred) wants DMA 5. dependent set 1 (acceptable) will take DMA 5, 6, or 7. ... dependent set 4 (acceptable) doesn't request a high DMA. If DMA 5 is not available, pnp_assign_dma has to fail on set 0 so that pnp_auto_config_dev will move on to set 1 and get DMA 6 or 7. Instead, pnp_assign_dma adds the resource with flags |= IORESOURCE_DISABLED and returns success. pnp_auto_config_dev just sees success and therefore chooses set 0 with a disabled DMA and never tries the sets that would have resolved the conflict. Furthermore, this mode of "success" is unexpected and unhandled in sound/isa/sb and probably other drivers. sb assumes that the returned DMA is enabled and obliviously uses the invalid DMA number. Observed consequences were sb successfully grabbing a DMA that was expressly forbidden by the kernel parameter pnp_reserve_dma. The only upside to the original change would be as a kludge for devices that can operate in degraded mode without a DMA but that don't provide the corresponding non-preferred dependent set. The right workaround for those devices is to synthesize the missing set in quirks.c; otherwise, you're reinventing PnP fallback functionality at the driver level for that device and all others. Signed-off-by: David Flater <dave@flaterco.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Showing 1 changed file with 9 additions and 5 deletions Side-by-side Diff
drivers/pnp/manager.c
... | ... | @@ -211,6 +211,12 @@ |
211 | 211 | res->start = -1; |
212 | 212 | res->end = -1; |
213 | 213 | |
214 | + if (!rule->map) { | |
215 | + res->flags |= IORESOURCE_DISABLED; | |
216 | + pnp_dbg(&dev->dev, " dma %d disabled\n", idx); | |
217 | + goto __add; | |
218 | + } | |
219 | + | |
214 | 220 | for (i = 0; i < 8; i++) { |
215 | 221 | if (rule->map & (1 << xtab[i])) { |
216 | 222 | res->start = res->end = xtab[i]; |
... | ... | @@ -218,11 +224,9 @@ |
218 | 224 | goto __add; |
219 | 225 | } |
220 | 226 | } |
221 | -#ifdef MAX_DMA_CHANNELS | |
222 | - res->start = res->end = MAX_DMA_CHANNELS; | |
223 | -#endif | |
224 | - res->flags |= IORESOURCE_DISABLED; | |
225 | - pnp_dbg(&dev->dev, " disable dma %d\n", idx); | |
227 | + | |
228 | + pnp_dbg(&dev->dev, " couldn't assign dma %d\n", idx); | |
229 | + return -EBUSY; | |
226 | 230 | |
227 | 231 | __add: |
228 | 232 | pnp_add_dma_resource(dev, res->start, res->flags); |