From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Buesch Subject: [PATCH] ssb: Fix coherent DMA mask for PCI devices Date: Thu, 12 Jun 2008 15:33:13 +0200 Message-ID: <200806121533.14435.mb@bu3sch.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, "linux-kernel" , "Kirill A. Shutemov" , Glauber Costa To: John Linville Return-path: Received: from vs166246.vserver.de ([62.75.166.246]:46197 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757769AbYFLNgW (ORCPT ); Thu, 12 Jun 2008 09:36:22 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: This fixes setting the coherent DMA mask for PCI devices. Signed-off-by: Michael Buesch --- John, please queue this bugfix for 2.6.26 The whole SSB DMA API should be rewritten, as it makes too many bad assumptions about the other subsytems. I will do that soon. But let's apply this patch for now, as it fixes this particular bug. Index: wireless-testing/drivers/ssb/main.c =================================================================== --- wireless-testing.orig/drivers/ssb/main.c 2008-05-17 18:44:32.000000000 +0200 +++ wireless-testing/drivers/ssb/main.c 2008-06-12 15:24:04.000000000 +0200 @@ -1165,21 +1165,27 @@ u32 ssb_dma_translation(struct ssb_devic } EXPORT_SYMBOL(ssb_dma_translation); int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask) { struct device *dma_dev = ssb_dev->dma_dev; + int err = 0; #ifdef CONFIG_SSB_PCIHOST - if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) - return dma_set_mask(dma_dev, mask); + if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) { + err = pci_set_dma_mask(ssb_dev->bus->host_pci, mask); + if (err) + return err; + err = pci_set_consistent_dma_mask(ssb_dev->bus->host_pci, mask); + return err; + } #endif dma_dev->coherent_dma_mask = mask; dma_dev->dma_mask = &dma_dev->coherent_dma_mask; - return 0; + return err; } EXPORT_SYMBOL(ssb_dma_set_mask); int ssb_bus_may_powerdown(struct ssb_bus *bus) { struct ssb_chipcommon *cc;