Skip to content

L
linux
Commit 5056635c authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files
Options

b43: add maskset helpers 

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 507f9a71
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 57 deletions
drivers/net/wireless/b43/b43.h
View file @ 5056635c
...@@ -999,6 +999,12 @@ static inline void b43_write16(struct b43_wldev *dev, u16 offset, u16 value) ...@@ -999,6 +999,12 @@ static inline void b43_write16(struct b43_wldev *dev, u16 offset, u16 value)
dev->dev->write16(dev->dev, offset, value); dev->dev->write16(dev->dev, offset, value);
} }
static inline void b43_maskset16(struct b43_wldev *dev, u16 offset, u16 mask,
u16 set)
{
b43_write16(dev, offset, (b43_read16(dev, offset) & mask) | set);
}
static inline u32 b43_read32(struct b43_wldev *dev, u16 offset) static inline u32 b43_read32(struct b43_wldev *dev, u16 offset)
{ {
return dev->dev->read32(dev->dev, offset); return dev->dev->read32(dev->dev, offset);
...@@ -1009,6 +1015,12 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value) ...@@ -1009,6 +1015,12 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value)
dev->dev->write32(dev->dev, offset, value); dev->dev->write32(dev->dev, offset, value);
} }
static inline void b43_maskset32(struct b43_wldev *dev, u16 offset, u32 mask,
u32 set)
{
b43_write32(dev, offset, (b43_read32(dev, offset) & mask) | set);
}
static inline void b43_block_read(struct b43_wldev *dev, void *buffer, static inline void b43_block_read(struct b43_wldev *dev, void *buffer,
size_t count, u16 offset, u8 reg_width) size_t count, u16 offset, u8 reg_width)
{ {
......
drivers/net/wireless/b43/main.c
View file @ 5056635c
...@@ -578,22 +578,14 @@ void b43_tsf_read(struct b43_wldev *dev, u64 *tsf) ...@@ -578,22 +578,14 @@ void b43_tsf_read(struct b43_wldev *dev, u64 *tsf)
static void b43_time_lock(struct b43_wldev *dev) static void b43_time_lock(struct b43_wldev *dev)
{ {
u32 macctl; b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_TBTTHOLD);
macctl = b43_read32(dev, B43_MMIO_MACCTL);
macctl |= B43_MACCTL_TBTTHOLD;
b43_write32(dev, B43_MMIO_MACCTL, macctl);
/* Commit the write */ /* Commit the write */
b43_read32(dev, B43_MMIO_MACCTL); b43_read32(dev, B43_MMIO_MACCTL);
} }
static void b43_time_unlock(struct b43_wldev *dev) static void b43_time_unlock(struct b43_wldev *dev)
{ {
u32 macctl; b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_TBTTHOLD, 0);
macctl = b43_read32(dev, B43_MMIO_MACCTL);
macctl &= ~B43_MACCTL_TBTTHOLD;
b43_write32(dev, B43_MMIO_MACCTL, macctl);
/* Commit the write */ /* Commit the write */
b43_read32(dev, B43_MMIO_MACCTL); b43_read32(dev, B43_MMIO_MACCTL);
} }
...@@ -2485,10 +2477,8 @@ static int b43_upload_microcode(struct b43_wldev *dev) ...@@ -2485,10 +2477,8 @@ static int b43_upload_microcode(struct b43_wldev *dev)
b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_ALL); b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_ALL);
/* Start the microcode PSM */ /* Start the microcode PSM */
macctl = b43_read32(dev, B43_MMIO_MACCTL); b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_JMP0,
macctl &= ~B43_MACCTL_PSM_JMP0; B43_MACCTL_PSM_RUN);
macctl |= B43_MACCTL_PSM_RUN;
b43_write32(dev, B43_MMIO_MACCTL, macctl);
/* Wait for the microcode to load and respond */ /* Wait for the microcode to load and respond */
i = 0; i = 0;
...@@ -2588,10 +2578,9 @@ static int b43_upload_microcode(struct b43_wldev *dev) ...@@ -2588,10 +2578,9 @@ static int b43_upload_microcode(struct b43_wldev *dev)
return 0; return 0;
error: error:
macctl = b43_read32(dev, B43_MMIO_MACCTL); /* Stop the microcode PSM. */
macctl &= ~B43_MACCTL_PSM_RUN; b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
macctl |= B43_MACCTL_PSM_JMP0; B43_MACCTL_PSM_JMP0);
b43_write32(dev, B43_MMIO_MACCTL, macctl);
return err; return err;
} }
...@@ -2706,11 +2695,8 @@ static int b43_gpio_init(struct b43_wldev *dev) ...@@ -2706,11 +2695,8 @@ static int b43_gpio_init(struct b43_wldev *dev)
struct ssb_device *gpiodev; struct ssb_device *gpiodev;
u32 mask, set; u32 mask, set;
b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL) b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
& ~B43_MACCTL_GPOUTSMSK); b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
| 0x000F);
mask = 0x0000001F; mask = 0x0000001F;
set = 0x0000000F; set = 0x0000000F;
...@@ -2798,9 +2784,7 @@ void b43_mac_enable(struct b43_wldev *dev) ...@@ -2798,9 +2784,7 @@ void b43_mac_enable(struct b43_wldev *dev)
dev->mac_suspended--; dev->mac_suspended--;
B43_WARN_ON(dev->mac_suspended < 0); B43_WARN_ON(dev->mac_suspended < 0);
if (dev->mac_suspended == 0) { if (dev->mac_suspended == 0) {
b43_write32(dev, B43_MMIO_MACCTL, b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_ENABLED);
b43_read32(dev, B43_MMIO_MACCTL)
| B43_MACCTL_ENABLED);
b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, b43_write32(dev, B43_MMIO_GEN_IRQ_REASON,
B43_IRQ_MAC_SUSPENDED); B43_IRQ_MAC_SUSPENDED);
/* Commit writes */ /* Commit writes */
...@@ -2821,9 +2805,7 @@ void b43_mac_suspend(struct b43_wldev *dev) ...@@ -2821,9 +2805,7 @@ void b43_mac_suspend(struct b43_wldev *dev)
if (dev->mac_suspended == 0) { if (dev->mac_suspended == 0) {
b43_power_saving_ctl_bits(dev, B43_PS_AWAKE); b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);
b43_write32(dev, B43_MMIO_MACCTL, b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_ENABLED, 0);
b43_read32(dev, B43_MMIO_MACCTL)
& ~B43_MACCTL_ENABLED);
/* force pci to flush the write */ /* force pci to flush the write */
b43_read32(dev, B43_MMIO_MACCTL); b43_read32(dev, B43_MMIO_MACCTL);
for (i = 35; i; i--) { for (i = 35; i; i--) {
...@@ -2929,15 +2911,10 @@ static void b43_adjust_opmode(struct b43_wldev *dev) ...@@ -2929,15 +2911,10 @@ static void b43_adjust_opmode(struct b43_wldev *dev)
* so always disable it. If we want to implement PMQ, * so always disable it. If we want to implement PMQ,
* we need to enable it here (clear DISCPMQ) in AP mode. * we need to enable it here (clear DISCPMQ) in AP mode.
*/ */
if (0 /* ctl & B43_MACCTL_AP */) { if (0 /* ctl & B43_MACCTL_AP */)
b43_write32(dev, B43_MMIO_MACCTL, b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_DISCPMQ, 0);
b43_read32(dev, B43_MMIO_MACCTL) else
& ~B43_MACCTL_DISCPMQ); b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_DISCPMQ);
} else {
b43_write32(dev, B43_MMIO_MACCTL,
b43_read32(dev, B43_MMIO_MACCTL)
| B43_MACCTL_DISCPMQ);
}
} }
static void b43_rate_memory_write(struct b43_wldev *dev, u16 rate, int is_ofdm) static void b43_rate_memory_write(struct b43_wldev *dev, u16 rate, int is_ofdm)
...@@ -3081,10 +3058,8 @@ static int b43_chip_init(struct b43_wldev *dev) ...@@ -3081,10 +3058,8 @@ static int b43_chip_init(struct b43_wldev *dev)
if (dev->dev->core_rev < 5) if (dev->dev->core_rev < 5)
b43_write32(dev, 0x010C, 0x01000000); b43_write32(dev, 0x010C, 0x01000000);
b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL) b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_INFRA, 0);
& ~B43_MACCTL_INFRA); b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_INFRA);
b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
| B43_MACCTL_INFRA);
/* Probe Response Timeout value */ /* Probe Response Timeout value */
/* FIXME: Default to 0, has to be set by ioctl probably... :-/ */ /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
...@@ -4562,8 +4537,6 @@ static void b43_set_pretbtt(struct b43_wldev *dev) ...@@ -4562,8 +4537,6 @@ static void b43_set_pretbtt(struct b43_wldev *dev)
/* Locking: wl->mutex */ /* Locking: wl->mutex */
static void b43_wireless_core_exit(struct b43_wldev *dev) static void b43_wireless_core_exit(struct b43_wldev *dev)
{ {
u32 macctl;
B43_WARN_ON(dev && b43_status(dev) > B43_STAT_INITIALIZED); B43_WARN_ON(dev && b43_status(dev) > B43_STAT_INITIALIZED);
if (!dev || b43_status(dev) != B43_STAT_INITIALIZED) if (!dev || b43_status(dev) != B43_STAT_INITIALIZED)
return; return;
...@@ -4574,10 +4547,8 @@ static void b43_wireless_core_exit(struct b43_wldev *dev) ...@@ -4574,10 +4547,8 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
b43_set_status(dev, B43_STAT_UNINIT); b43_set_status(dev, B43_STAT_UNINIT);
/* Stop the microcode PSM. */ /* Stop the microcode PSM. */
macctl = b43_read32(dev, B43_MMIO_MACCTL); b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
macctl &= ~B43_MACCTL_PSM_RUN; B43_MACCTL_PSM_JMP0);
macctl |= B43_MACCTL_PSM_JMP0;
b43_write32(dev, B43_MMIO_MACCTL, macctl);
b43_dma_free(dev); b43_dma_free(dev);
b43_pio_free(dev); b43_pio_free(dev);
......
drivers/net/wireless/b43/phy_n.c
View file @ 5056635c
...@@ -3968,13 +3968,10 @@ static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init) ...@@ -3968,13 +3968,10 @@ static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)
#endif #endif
} }
b43_write32(dev, B43_MMIO_MACCTL, b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
b43_read32(dev, B43_MMIO_MACCTL) & b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xFC00);
~B43_MACCTL_GPOUTSMSK); b43_maskset16(dev, B43_MMIO_GPIO_CONTROL, (~0xFC00 & 0xFFFF),
b43_write16(dev, B43_MMIO_GPIO_MASK, 0);
b43_read16(dev, B43_MMIO_GPIO_MASK) | 0xFC00);
b43_write16(dev, B43_MMIO_GPIO_CONTROL,
b43_read16(dev, B43_MMIO_GPIO_CONTROL) & ~0xFC00);
if (init) { if (init) {
b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8); b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);
...@@ -4530,8 +4527,7 @@ static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask, ...@@ -4530,8 +4527,7 @@ static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
{ {
check_phyreg(dev, reg); check_phyreg(dev, reg);
b43_write16(dev, B43_MMIO_PHY_CONTROL, reg); b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
b43_write16(dev, B43_MMIO_PHY_DATA, b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
(b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
} }
static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg) static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7