diff --git a/include/dma.h b/include/dma.h
index 5fdcb17..7f95782 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -35,11 +35,21 @@
 void dma_unmap_single(struct device_d *dev, dma_addr_t addr, size_t size,
 		      enum dma_data_direction dir);
 
+#define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+
+#define DMA_MASK_NONE	0x0ULL
+
+static inline void dma_set_mask(struct device_d *dev, u64 dma_mask)
+{
+	dev->dma_mask = dma_mask;
+}
+
 #define DMA_ERROR_CODE  (~(dma_addr_t)0)
 
 static inline int dma_mapping_error(struct device_d *dev, dma_addr_t dma_addr)
 {
-	return dma_addr == DMA_ERROR_CODE;
+	return dma_addr == DMA_ERROR_CODE ||
+		(dev->dma_mask && dma_addr > dev->dma_mask);
 }
 
 /* streaming DMA - implement the below calls to support HAS_DMA */
diff --git a/include/driver.h b/include/driver.h
index 91653b7..1b61f20 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -82,6 +82,8 @@
 
 	const struct of_device_id *of_id_entry;
 
+	u64 dma_mask;
+
 	void    (*info) (struct device_d *);
 	/*
 	 * For devices which take longer to probe this is called