Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c95b74d authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43legacy: dma: cache translation (routing bits) 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bb78c71d

drivers/net/wireless/b43legacy/b43legacy.h

+2 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ struct b43legacy_dma { 


	struct b43legacy_dmaring *rx_ring0;

	struct b43legacy_dmaring *rx_ring3; /* only on core.rev < 5 */



	u32 translation; /* Routing bits */

};



/* Data structures for PIO transmission, per 80211 core. */

drivers/net/wireless/b43legacy/dma.c

+4 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void op32_fill_descriptor(struct b43legacy_dmaring *ring, 
	addr = (u32)(dmaaddr & ~SSB_DMA_TRANSLATION_MASK);

	addrext = (u32)(dmaaddr & SSB_DMA_TRANSLATION_MASK)

		   >> SSB_DMA_TRANSLATION_SHIFT;

	addr |= ssb_dma_translation(ring->dev->dev);

	addr |= ring->dev->dma.translation;

	ctl = (bufsize - ring->frameoffset)

	      & B43legacy_DMA32_DCTL_BYTECNT;

	if (slot == ring->nr_slots - 1)
@@ -175,7 +175,7 @@ static void op64_fill_descriptor(struct b43legacy_dmaring *ring, 
	addrhi = (((u64)dmaaddr >> 32) & ~SSB_DMA_TRANSLATION_MASK);

	addrext = (((u64)dmaaddr >> 32) & SSB_DMA_TRANSLATION_MASK)

		  >> SSB_DMA_TRANSLATION_SHIFT;

	addrhi |= ssb_dma_translation(ring->dev->dev);

	addrhi |= ring->dev->dma.translation;

	if (slot == ring->nr_slots - 1)

		ctl0 |= B43legacy_DMA64_DCTL0_DTABLEEND;

	if (start)
@@ -709,7 +709,7 @@ static int dmacontroller_setup(struct b43legacy_dmaring *ring) 
	int err = 0;

	u32 value;

	u32 addrext;

	u32 trans = ssb_dma_translation(ring->dev->dev);

	u32 trans = ring->dev->dma.translation;



	if (ring->tx) {

		if (ring->type == B43legacy_DMA_64BIT) {
@@ -1093,6 +1093,7 @@ int b43legacy_dma_init(struct b43legacy_wldev *dev) 
		return -EOPNOTSUPP;

#endif

	}

	dma->translation = ssb_dma_translation(dev->dev);



	err = -ENOMEM;

	/* setup TX DMA channels. */