patch staging-slicoss-use-pci_set_consistent_dma_mask.patch added to gregkh-2.6 tree
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
Subject: staging: slicoss Use pci_set_consistent_dma_mask.
to my gregkh-2.6 tree. Its filename is
staging-slicoss-use-pci_set_consistent_dma_mask.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Fri Dec 18 10:34:29 2009
From: "Denis Kirjanov <[email protected]" <[email protected]>
Date: Fri, 18 Dec 2009 11:02:09 +0300
Subject: staging: slicoss Use pci_set_consistent_dma_mask.
To: [email protected], [email protected], [email protected]
Cc: [email protected]
Message-ID: <20091218080209.GA4549@coldcone>
Content-Disposition: inline
Use pci_set_consistent_dma_mask() in the case of 64-bit consistent allocations.
--- drivers/staging/slicoss/slicoss.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/staging/slicoss/slicoss.c +18 -5
@@ -366,6 +366,7 @@ static int __devinit slic_entry_probe(stulong mmio_start =0 ;ulong mmio_len =0 ;struct sliccard *card =NULL ; +int pci_using_dac =0 ; slic_global.dynamic_intagg = dynamic_intagg;
@@ -379,16 +380,26 @@ static int __devinit slic_entry_probe(stprintk (KERN_DEBUG "%s\n" , slic_proc_version); } - err =pci_set_dma_mask (pcidev,DMA_BIT_MASK (64 )); -if (err) { - err =pci_set_dma_mask (pcidev,DMA_BIT_MASK (32 )); -if (err) +if (!pci_set_dma_mask (pcidev,DMA_BIT_MASK (64 ))) { + pci_using_dac =1 ; +if (pci_set_consistent_dma_mask (pcidev,DMA_BIT_MASK (64 ))) { +dev_err (&pcidev->dev,"unable to obtain 64-bit DMA for " +"consistent allocations\n" ); goto err_out_disable_pci; + } + }else if (pci_set_dma_mask (pcidev,DMA_BIT_MASK (32 ))) { + pci_using_dac =0 ; +pci_set_consistent_dma_mask (pcidev,DMA_BIT_MASK (32 )); + }else { +dev_err (&pcidev->dev,"no usable DMA configuration\n" ); + goto err_out_disable_pci; } err =pci_request_regions (pcidev,DRV_NAME ); -if (err) +if (err) { +dev_err (&pcidev->dev,"can't obtain PCI resources\n" ); goto err_out_disable_pci; + }pci_set_master (pcidev);
@@ -404,6 +415,8 @@ static int __devinit slic_entry_probe(st adapter =netdev_priv (netdev); adapter->netdev = netdev; adapter->pcidev = pcidev; +if (pci_using_dac) + netdev->features |=NETIF_F_HIGHDMA ; mmio_start =pci_resource_start (pcidev,0 ); mmio_len =pci_resource_len (pcidev,0 );