Re: [PATCH] move consistent_dma_mask to the generic device

Re: [PATCH] move consistent_dma_mask to the generic device

[Bjorn Helgaas]

The patch that moved and renamed consistent_dma_mask neglected
to fix up arch/ia64/hp/common/sba_iommu.c.  I think we need the
attached patch (booted, but not otherwise tested):

=== arch/ia64/hp/common/sba_iommu.c 1.38 vs edited ==--- 1.38/arch/ia64/hp/common/sba_iommu.c	Fri Feb 27 03:16:24 2004
+++ edited/arch/ia64/hp/common/sba_iommu.c	Mon Mar 15 14:29:15 2004
@@ -1055,13 +1055,13 @@
 	*dma_handle = virt_to_phys(addr);
 
 #ifdef ALLOW_IOV_BYPASS
-	ASSERT(to_pci_dev(dev)->consistent_dma_mask);
+	ASSERT(to_pci_dev(dev)->dev.coherent_dma_mask);
 	/*
  	** Check if the PCI device can DMA to ptr... if so, just return ptr
  	*/
-	if (likely((*dma_handle & ~to_pci_dev(dev)->consistent_dma_mask) = 0)) {
+	if (likely((*dma_handle & ~to_pci_dev(dev)->dev.coherent_dma_mask) = 0)) {
 		DBG_BYPASS("sba_alloc_coherent() bypass mask/addr: 0x%lx/0x%lx\n",
-		           to_pci_dev(dev)->consistent_dma_mask, *dma_handle);
+		           to_pci_dev(dev)->dev.coherent_dma_mask, *dma_handle);
 
 		return addr;
 	}

Re: [PATCH] move consistent_dma_mask to the generic device

[James Bottomley]

On Mon, 2004-03-15 at 16:39, Bjorn Helgaas wrote:
> The patch that moved and renamed consistent_dma_mask neglected
> to fix up arch/ia64/hp/common/sba_iommu.c.  I think we need the
> attached patch (booted, but not otherwise tested):

How did that happen?  I thought I fixed up all of sba_iommu, oh well.

erm, the patch is a bit redundant isn't it?

&to_pci_dev(dev)->dev = dev

James

Re: [PATCH] move consistent_dma_mask to the generic device

[Bjorn Helgaas]

On Monday 15 March 2004 2:48 pm, James Bottomley wrote:
> erm, the patch is a bit redundant isn't it?
> 
> &to_pci_dev(dev)->dev = dev

Ah, ok, how about this:

=== arch/ia64/hp/common/sba_iommu.c 1.38 vs edited ==--- 1.38/arch/ia64/hp/common/sba_iommu.c	Fri Feb 27 03:16:24 2004
+++ edited/arch/ia64/hp/common/sba_iommu.c	Mon Mar 15 14:51:33 2004
@@ -1055,13 +1055,13 @@
 	*dma_handle = virt_to_phys(addr);
 
 #ifdef ALLOW_IOV_BYPASS
-	ASSERT(to_pci_dev(dev)->consistent_dma_mask);
+	ASSERT(dev->coherent_dma_mask);
 	/*
  	** Check if the PCI device can DMA to ptr... if so, just return ptr
  	*/
-	if (likely((*dma_handle & ~to_pci_dev(dev)->consistent_dma_mask) = 0)) {
+	if (likely((*dma_handle & ~dev->coherent_dma_mask) = 0)) {
 		DBG_BYPASS("sba_alloc_coherent() bypass mask/addr: 0x%lx/0x%lx\n",
-		           to_pci_dev(dev)->consistent_dma_mask, *dma_handle);
+		           dev->coherent_dma_mask, *dma_handle);
 
 		return addr;
 	}