Skip to contentSkip to conversation

ssb: Fix coherent DMA mask for PCI devices

PATCH In review Michael Buesch 2 participants 3 messages Jun 12, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ssb: Fix coherent DMA mask for PCI devices

This fixes setting the coherent DMA mask for PCI devices.

---

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.

drivers/ssb/main.c +9 -3
Index: wireless-testing/drivers/ssb/main.c
===================================================================
@@ -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;
#1 lore raw
Quoted 11 lines · Michael Buesch

This fixes setting the coherent DMA mask for PCI devices.

---

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.

Hmm. Does the patch have anything to do with this bug report?

http://bugzilla.kernel.org/show_bug.cgi?id=10819
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 9 lines · On Thursday 12 June 2008 23:44:13 Pekka Enberg wrote:
Quoted 8 lines · Michael Buesch

This fixes setting the coherent DMA mask for PCI devices.

---

John, please queue this bugfix for 2.6.26

Quoted 9 lines
Quoted 3 lines

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.

Hmm. Does the patch have anything to do with this bug report?

http://bugzilla.kernel.org/show_bug.cgi?id=10819

Sorry. Magic crystal ball is broken. :)
Can you please try?

Signature · 5 lines
Greetings Michael.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html