Commit 5eb3645e authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

b43: tell the ucode the mac capabilities 



This is based on code form brcmsmac.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a43b5142

drivers/net/wireless/b43/b43.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define B43_MMIO_RAM_DATA		0x134

#define B43_MMIO_PS_STATUS		0x140

#define B43_MMIO_RADIO_HWENABLED_HI	0x158

#define B43_MMIO_MAC_HW_CAP		0x15C	/* MAC capabilities (corerev >= 13) */

#define B43_MMIO_SHM_CONTROL		0x160

#define B43_MMIO_SHM_DATA		0x164

#define B43_MMIO_SHM_DATA_UNALIGNED	0x166
@@ -253,6 +254,8 @@ enum { 
#define B43_SHM_SH_CHAN			0x00A0	/* Current channel (low 8bit only) */

#define  B43_SHM_SH_CHAN_5GHZ		0x0100	/* Bit set, if 5 Ghz channel */

#define  B43_SHM_SH_CHAN_40MHZ		0x0200	/* Bit set, if 40 Mhz channel width */

#define B43_SHM_SH_MACHW_L		0x00C0	/* Location where the ucode expects the MAC capabilities */

#define B43_SHM_SH_MACHW_H		0x00C2	/* Location where the ucode expects the MAC capabilities */

#define B43_SHM_SH_HOSTF5		0x00D4	/* Hostflags 5 for ucode options */

#define B43_SHM_SH_BCMCFIFOID		0x0108	/* Last posted cookie to the bcast/mcast FIFO */

/* TSSI information */

drivers/net/wireless/b43/main.c

+10 −0
Original line number Diff line number Diff line
@@ -4857,6 +4857,16 @@ static int b43_wireless_core_init(struct b43_wldev *dev) 
	hf &= ~B43_HF_SKCFPUP;

	b43_hf_write(dev, hf);



	/* tell the ucode MAC capabilities */

	if (dev->dev->core_rev >= 13) {

		u32 mac_hw_cap = b43_read32(dev, B43_MMIO_MAC_HW_CAP);



		b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_MACHW_L,

				mac_hw_cap & 0xffff);

		b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_MACHW_H,

				(mac_hw_cap >> 16) & 0xffff);

	}



	b43_set_retry_limits(dev, B43_DEFAULT_SHORT_RETRY_LIMIT,

			     B43_DEFAULT_LONG_RETRY_LIMIT);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SFFBLIM, 3);

CRA Git | Maintained and supported by SUSTech CRA and CCSE