b43: HT-PHY: define regs for power estimation
PATCH 1/2 b43: HT-PHY: define regs for power estimation
In MMIO dumps of ndiswrapper there are following PHY ops:phy_read(0x0118) -> 0x013dphy_read(0x01ed) -> 0x993dphy_read(0x0119) -> 0x012fphy_read(0x01ee) -> 0x992fphy_read(0x011a) -> 0x0139phy_read(0x0969) -> 0x9939
It matches the code of wlc_phy_txpower_est_power_nphy (from brcm80211), so we know the registers meaning.
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/b43/phy_ht.h +6 -0
@@ -23,6 +23,9 @@#define B43_PHY_HT_SAMP_WAIT_CNT 0x0C5/* Sample wait count */ #define B43_PHY_HT_SAMP_DEP_CNT 0x0C6/* Sample depth count */ #define B43_PHY_HT_SAMP_STAT 0x0C7/* Sample status */ +#define B43_PHY_HT_EST_PWR_C1 0x118 +#define B43_PHY_HT_EST_PWR_C2 0x119 +#define B43_PHY_HT_EST_PWR_C3 0x11A#define B43_PHY_HT_TSSIMODE 0x122/* TSSI mode */ #define B43_PHY_HT_TSSIMODE_EN 0x0001/* TSSI enable */ #define B43_PHY_HT_TSSIMODE_PDEN 0x0002/* Power det enable */
@@ -53,6 +56,8 @@#define B43_PHY_HT_TXPCTL_TARG_PWR_C1_SHIFT 0#define B43_PHY_HT_TXPCTL_TARG_PWR_C2 0xFF00/* Power 1 */ #define B43_PHY_HT_TXPCTL_TARG_PWR_C2_SHIFT 8 +#define B43_PHY_HT_TX_PCTL_STATUS_C1 0x1ED +#define B43_PHY_HT_TX_PCTL_STATUS_C2 0x1EE#define B43_PHY_HT_TXPCTL_CMD_C2 0x222#define B43_PHY_HT_TXPCTL_CMD_C2_INIT 0x007F#define B43_PHY_HT_RSSI_C1 0x219
@@ -97,6 +102,7 @@#define B43_PHY_HT_TXPCTL_TARG_PWR2 B43_PHY_EXTG(0x166)/* TX power control target power */ #define B43_PHY_HT_TXPCTL_TARG_PWR2_C3 0x00FF#define B43_PHY_HT_TXPCTL_TARG_PWR2_C3_SHIFT 0 +#define B43_PHY_HT_TX_PCTL_STATUS_C3 B43_PHY_EXTG(0x169)#define B43_PHY_HT_TEST B43_PHY_N_BMODE(0x00A)
Signature · 1 line
1.7.10.4
PATCH 2/2 b43: HT-PHY: store TX power state before disabling it
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/b43/phy_ht.c +6 -4
@@ -497,15 +497,17 @@ static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable)static const u16 cmd_regs[3 ] = {B43_PHY_HT_TXPCTL_CMD_C1 ,B43_PHY_HT_TXPCTL_CMD_C2 ,B43_PHY_HT_TXPCTL_CMD_C3 }; +static const u16 status_regs[3 ] = {B43_PHY_HT_TX_PCTL_STATUS_C1 , +B43_PHY_HT_TX_PCTL_STATUS_C2 , +B43_PHY_HT_TX_PCTL_STATUS_C3 };int i;if (!enable) {if (b43_phy_read (dev,B43_PHY_HT_TXPCTL_CMD_C1 ) & en_bits) {/* We disable enabled TX pwr ctl, save it's state */ -/* -* TODO: find the registers. On N-PHY they were 0x1ed -* and 0x1ee, we need 3 such a registers for HT-PHY -*/ +for (i =0 ; i <3 ; i++) + phy_ht->tx_pwr_idx[i] = +b43_phy_read (dev, status_regs[i]); }b43_phy_mask (dev,B43_PHY_HT_TXPCTL_CMD_C1 , ~en_bits); }else {
Signature · 1 line
1.7.10.4