b43: Changes to enable BCM4311 rev 02 with wireless core revision 13

PATCH Superseded Larry Finger 2 participants 3 messages Nov 26, 2007 1 message not in the archive Networking drivers (wireless)

lore

Share & tools

lore

Larry Finger

author

2007-11-26 14:38 UTC #0 lore raw

PATCH v3 1/1 b43: Changes to enable BCM4311 rev 02 with wireless core revision 13

The BCM94311MCG rev 02 chip has an 802.11 core with revision 13 and has not been supported until now. The changes include the following:

(1) Add the 802.11 rev 13 device to the ssb_device_id table to load b43= =2E
(2) Add PHY revision 9 to the supported list.
(3) Change the 2-bit routing code for address extensions to 0b10 rather than the 0b01 used for the 32-bit case.
(4) Remove some magic numbers in the DMA setup.

The DMA implementation for this chip supports full 64-bit addressing wi= th
one exception. Whenever the Descriptor Ring Buffer is in high memory, a fatal DMA error occurs. This problem was not present in 2.6.24-rc2 due to code to "Bias the placement of kernel pages at lower PFNs". When commit 44048d70 reverted that code, the DMA error appeared. As a "fix", use the GFP_DMA flag when allocating the buffer for 64-bit DMA. At pres= ent,
this problem is thought to arise from a hardware error.

This patch has been tested on my system, and by C=C3=A9dric Caumont <[email protected]> and by Matthieu PATOU <[email protected]> on a BCM431= 2.

Signed-off-by Larry Finger <[email protected]>

---

John,

This patch is intended for the everything branch of wireless-2.6.

Larry
---

 dma.c  |   30 ++++++++++++++++++++++--------
 main.c |    3 ++-
 wa.c   |    1 +
 3 files changed, 25 insertions(+), 9 deletions(-)

Index: wireless-2.6/drivers/net/wireless/b43/dma.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

drivers/net/wireless/b43/dma.c +5 -1

@@ -165,7 +165,7 @@ static void op64_fill_descriptor(struct
 	addrhi =3D (((u64) dmaaddr >> 32) & ~SSB_DMA_TRANSLATION_MASK);
 	addrext =3D (((u64) dmaaddr >> 32) & SSB_DMA_TRANSLATION_MASK)
 	    >> SSB_DMA_TRANSLATION_SHIFT;
-	addrhi |=3D ssb_dma_translation(ring->dev->dev);
+	addrhi |=3D (ssb_dma_translation(ring->dev->dev) << 1);
 	if (slot =3D=3D ring->nr_slots - 1)
 		ctl0 |=3D B43_DMA64_DCTL0_DTABLEEND;
 	if (start)

@@ -426,9 +426,21 @@ static inline
 static int alloc_ringmemory(struct b43_dmaring *ring)
 {
 	struct device *dev =3D ring->dev->dev->dev;
+	gfp_t flags =3D GFP_KERNEL;
 
+	/* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
+	 * alignment and 8K buffers for 64-bit DMA with 8K alignment. Testing
+	 * has shown that 4K is sufficient for the latter as long as the buff=

er
+ * does not cross an 8K boundary.
+ *
+ * For unknown reasons - possibly a hardware error - the BCM4311 rev
+ * 02, which uses 64-bit DMA, needs the ring buffer in very low memor=
y,
+ * which accounts for the GFP_DMA flag below.
+ */
+ if (ring->dma64)
+ flags =3D GFP_DMA;
ring->descbase =3D dma_alloc_coherent(dev, B43_DMA_RINGMEMSIZE,
- &(ring->dmabase), GFP_KERNEL);
+ &(ring->dmabase), flags);
if (!ring->descbase) {
b43err(ring->dev->wl, "DMA ringmemory allocation failed\n"); return -ENOMEM;
@@ -483,7 +495,7 @@ int b43_dmacontroller_rx_reset(struct b4
return 0;
}

-/* Reset the RX DMA channel */
+/* Reset the TX DMA channel */
int b43_dmacontroller_tx_reset(struct b43_wldev *dev, u16 mmio_base, i=
nt dma64)
{
int i;
@@ -647,7 +659,7 @@ static int dmacontroller_setup(struct b4
b43_dma_write(ring, B43_DMA64_TXRINGHI,
((ringbase >> 32) &
~SSB_DMA_TRANSLATION_MASK)
- | trans);
+ | (trans << 1));
} else {
u32 ringbase =3D (u32) (ring->dmabase);

@@ -680,8 +692,9 @@ static int dmacontroller_setup(struct b4
b43_dma_write(ring, B43_DMA64_RXRINGHI,
((ringbase >> 32) &
~SSB_DMA_TRANSLATION_MASK)
- | trans);
- b43_dma_write(ring, B43_DMA64_RXINDEX, 200);
+ | (trans << 1));
+ b43_dma_write(ring, B43_DMA64_RXINDEX, ring->nr_slots *
+ sizeof(struct b43_dmadesc64));
} else {
u32 ringbase =3D (u32) (ring->dmabase);

@@ -695,11 +708,12 @@ static int dmacontroller_setup(struct b4
b43_dma_write(ring, B43_DMA32_RXRING,
(ringbase & ~SSB_DMA_TRANSLATION_MASK) | trans);
- b43_dma_write(ring, B43_DMA32_RXINDEX, 200);
+ b43_dma_write(ring, B43_DMA32_RXINDEX, ring->nr_slots *
+ sizeof(struct b43_dmadesc32));
}
}

- out:
+out:
return err;
}

Index: wireless-2.6/drivers/net/wireless/b43/main.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

drivers/net/wireless/b43/main.c +2 -1

@@ -93,6 +93,7 @@ static const struct ssb_device_id b43_ss
 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 7),
 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9),
 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10),
+	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13),
 	SSB_DEVTABLE_END
 };

@@ -3064,7 +3065,7 @@ static int b43_phy_versioning(struct b43
 			unsupported =3D 1;
 		break;
 	case B43_PHYTYPE_G:
-		if (phy_rev > 8)
+		if (phy_rev > 9)
 			unsupported =3D 1;
 		break;
 	default:

Index: wireless-2.6/drivers/net/wireless/b43/wa.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

drivers/net/wireless/b43/wa.c +1 -0

@@ -642,6 +642,7 @@ void b43_wa_all(struct b43_wldev *dev)
 		case 6:
 		case 7:
 		case 8:
+		case 9:
 			b43_wa_tr_ltov(dev);
 			b43_wa_crs_ed(dev);
 			b43_wa_rssi_lt(dev);

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Michael Buesch

2007-11-26 15:13 UTC #1 lore raw

Quoted 4 lines · On Monday 26 November 2007 15:38:11 Larry Finger wrote:

The BCM94311MCG rev 02 chip has an 802.11 core with revision 13 and has not been supported until now. The changes include the following:
=20
(1) Add the 802.11 rev 13 device to the ssb_device_id table to load b=

43.

Quoted 2 lines

(2) Add PHY revision 9 to the supported list.
(3) Change the 2-bit routing code for address extensions to 0b10 rath=

Quoted 4 lines

than the 0b01 used for the 32-bit case.
(4) Remove some magic numbers in the DMA setup.
=20
The DMA implementation for this chip supports full 64-bit addressing =

with

Quoted 1 line

one exception. Whenever the Descriptor Ring Buffer is in high memory,=

Quoted 1 line

fatal DMA error occurs. This problem was not present in 2.6.24-rc2 du=

Quoted 2 lines

to code to "Bias the placement of kernel pages at lower PFNs". When commit 44048d70 reverted that code, the DMA error appeared. As a "fix=

Quoted 1 line

use the GFP_DMA flag when allocating the buffer for 64-bit DMA. At pr=

esent,

Quoted 4 lines

this problem is thought to arise from a hardware error.
=20
This patch has been tested on my system, and by C=C3=A9dric Caumont <[email protected]> and by Matthieu PATOU <[email protected]> on a BCM4=

312.

Review

Quoted 11 lines

=20
Signed-off-by Larry Finger <[email protected]>
static int alloc_ringmemory(struct b43_dmaring *ring) {
drivers/net/wireless/b43/dma.c +1 -0
 	struct device *dev =3D ring->dev->dev->dev;
+	gfp_t flags =3D GFP_KERNEL;
=20
(quoted diff) +2 -0
+	/* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
+	 * alignment and 8K buffers for 64-bit DMA with 8K alignment. Testi=

Review

Quoted 1 line

(quoted diff) +1 -0

+	 * has shown that 4K is sufficient for the latter as long as the bu=

ffer

Review

Quoted 3 lines

(quoted diff) +3 -0

+	 * does not cross an 8K boundary.
+	 *
+	 * For unknown reasons - possibly a hardware error - the BCM4311 re=

Review

Quoted 1 line

(quoted diff) +1 -0

+	 * 02, which uses 64-bit DMA, needs the ring buffer in very low mem=

ory,

Review

Quoted 4 lines

(quoted diff) +4 -0

+	 * which accounts for the GFP_DMA flag below.
+	 */
+	if (ring->dma64)
+		flags =3D GFP_DMA;

Whoops, didn't notice this before. This needs to be

	flags |=3D GFP_DMA;

Review

Quoted 6 lines

(quoted diff) +1 -1

 	ring->descbase =3D dma_alloc_coherent(dev, B43_DMA_RINGMEMSIZE,
-					    &(ring->dmabase), GFP_KERNEL);
+					    &(ring->dmabase), flags);
 	if (!ring->descbase) {
 		b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
 		return -ENOMEM;

The rest is acked.

--=20
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Larry Finger

author

2007-11-26 16:18 UTC #3 lore raw

Quoted 4 lines · C=E9dric Caumont wrote:

Hello everyone
=20
I have just one question!
=20

Quoted 8 lines

I downloaded linux-2.6.24-rc3
=20
cd /usr/src/
ln -sfn linux-2.6.24-rc3 linux
cd linux
patch -p1 < patch_v3.patch
=20
*********************************************************************=

************************

Quoted 5 lines

can't find file to patch at input line 112 Perhaps you used the wrong -p or --strip option? The text leading up to this was:
--------------------------
|Index: wireless-2.6/drivers/net/wireless/b43/wa.c

The patch is for the wireless-2.6 git tree. To use 2.6.24-rc3 from main= line, there are some
additional patches needed. I will generate that patch and send it to yo= u privately.

Larry

-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html