Skip to contentSkip to conversation

init dma masks in pnp_dev

PATCH New David Brownell 1 participant 1 message Feb 28, 2007 Pnp support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 init dma masks in pnp_dev

PNP now initializes device dma masks, which prevents oopses when generic dma calls are made using pnp device nodes.

This assumes PNP only uses ISA DMA, with 24 bit addresses; and that it's safe to init those masks for all devices (rather than finding out which devices have been assigned DMA channels, and handling only those).

include/linux/pnp.h +1 -0
Index: g26/include/linux/pnp.h
===================================================================
@@ -177,6 +177,7 @@ static inline void pnp_set_card_drvdata 
 
 struct pnp_dev {
 	struct device dev;		/* Driver Model device interface */
+	u64 dma_mask;
 	unsigned char number;		/* used as an index, must be unique */
 	int status;
 
drivers/pnp/core.c +3 -0
Index: g26/drivers/pnp/core.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/dma-mapping.h>
 
 #include "base.h"
 
@@ -114,6 +115,8 @@ int __pnp_add_device(struct pnp_dev *dev
 	int ret;
 	pnp_fixup_device(dev);
 	dev->dev.bus = &pnp_bus_type;
+	dev->dev.dma_mask = &dev->dma_mask;
+	dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
 	dev->dev.release = &pnp_release_device;
 	dev->status = PNP_READY;
 	spin_lock(&pnp_lock);