AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

b43: bus: abstract bus and core operations

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2011-05-18 02:06:43 +02:00 committed by John W. Linville
parent 79d2232fed
commit 24ca39d679
5 changed files with 77 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/b43/b43.h
View File

@ -881,6 +881,29 @@ static inline enum ieee80211_band b43_current_band(struct b43_wl *wl)
return wl->hw->conf.channel->band; return wl->hw->conf.channel->band;
} }
static inline int b43_bus_may_powerdown(struct b43_wldev *wldev)
{
return wldev->dev->bus_may_powerdown(wldev->dev);
}
static inline int b43_bus_powerup(struct b43_wldev *wldev, bool dynamic_pctl)
{
return wldev->dev->bus_powerup(wldev->dev, dynamic_pctl);
}
static inline int b43_device_is_enabled(struct b43_wldev *wldev)
{
return wldev->dev->device_is_enabled(wldev->dev);
}
static inline void b43_device_enable(struct b43_wldev *wldev,
u32 core_specific_flags)
{
wldev->dev->device_enable(wldev->dev, core_specific_flags);
}
static inline void b43_device_disable(struct b43_wldev *wldev,
u32 core_specific_flags)
{
wldev->dev->device_disable(wldev->dev, core_specific_flags);
}
static inline u16 b43_read16(struct b43_wldev *dev, u16 offset) static inline u16 b43_read16(struct b43_wldev *dev, u16 offset)
{ {
return dev->dev->read16(dev->dev, offset); return dev->dev->read16(dev->dev, offset);

31
drivers/net/wireless/b43/bus.c
View File

@ -25,6 +25,31 @@
/* SSB */ /* SSB */
static inline int b43_bus_ssb_bus_may_powerdown(struct b43_bus_dev *dev)
{
return ssb_bus_may_powerdown(dev->sdev->bus);
}
static inline int b43_bus_ssb_bus_powerup(struct b43_bus_dev *dev,
bool dynamic_pctl)
{
return ssb_bus_powerup(dev->sdev->bus, dynamic_pctl);
}
static inline int b43_bus_ssb_device_is_enabled(struct b43_bus_dev *dev)
{
return ssb_device_is_enabled(dev->sdev);
}
static inline void b43_bus_ssb_device_enable(struct b43_bus_dev *dev,
u32 core_specific_flags)
{
ssb_device_enable(dev->sdev, core_specific_flags);
}
static inline void b43_bus_ssb_device_disable(struct b43_bus_dev *dev,
u32 core_specific_flags)
{
ssb_device_disable(dev->sdev, core_specific_flags);
}
static inline u16 b43_bus_ssb_read16(struct b43_bus_dev *dev, u16 offset) static inline u16 b43_bus_ssb_read16(struct b43_bus_dev *dev, u16 offset)
{ {
return ssb_read16(dev->sdev, offset); return ssb_read16(dev->sdev, offset);
@ -63,6 +88,12 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
dev->bus_type = B43_BUS_SSB; dev->bus_type = B43_BUS_SSB;
dev->sdev = sdev; dev->sdev = sdev;
dev->bus_may_powerdown = b43_bus_ssb_bus_may_powerdown;
dev->bus_powerup = b43_bus_ssb_bus_powerup;
dev->device_is_enabled = b43_bus_ssb_device_is_enabled;
dev->device_enable = b43_bus_ssb_device_enable;
dev->device_disable = b43_bus_ssb_device_disable;
dev->read16 = b43_bus_ssb_read16; dev->read16 = b43_bus_ssb_read16;
dev->read32 = b43_bus_ssb_read32; dev->read32 = b43_bus_ssb_read32;
dev->write16 = b43_bus_ssb_write16; dev->write16 = b43_bus_ssb_write16;

8
drivers/net/wireless/b43/bus.h
View File

@ -11,6 +11,14 @@ struct b43_bus_dev {
struct ssb_device *sdev; struct ssb_device *sdev;
}; };
int (*bus_may_powerdown)(struct b43_bus_dev *dev);
int (*bus_powerup)(struct b43_bus_dev *dev, bool dynamic_pctl);
int (*device_is_enabled)(struct b43_bus_dev *dev);
void (*device_enable)(struct b43_bus_dev *dev,
u32 core_specific_flags);
void (*device_disable)(struct b43_bus_dev *dev,
u32 core_specific_flags);
u16 (*read16)(struct b43_bus_dev *dev, u16 offset); u16 (*read16)(struct b43_bus_dev *dev, u16 offset);
u32 (*read32)(struct b43_bus_dev *dev, u16 offset); u32 (*read32)(struct b43_bus_dev *dev, u16 offset);
void (*write16)(struct b43_bus_dev *dev, u16 offset, u16 value); void (*write16)(struct b43_bus_dev *dev, u16 offset, u16 value);

22
drivers/net/wireless/b43/main.c
View File

@ -1152,7 +1152,7 @@ static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags)
flags |= B43_TMSLOW_PHYRESET; flags |= B43_TMSLOW_PHYRESET;
if (dev->phy.type == B43_PHYTYPE_N) if (dev->phy.type == B43_PHYTYPE_N)
flags |= B43_TMSLOW_PHY_BANDWIDTH_20MHZ; /* Make 20 MHz def */ flags |= B43_TMSLOW_PHY_BANDWIDTH_20MHZ; /* Make 20 MHz def */
ssb_device_enable(dev->sdev, flags); b43_device_enable(dev, flags);
msleep(2); /* Wait for the PLL to turn on. */ msleep(2); /* Wait for the PLL to turn on. */
/* Now take the PHY out of Reset again */ /* Now take the PHY out of Reset again */
@ -4310,8 +4310,8 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
dev->wl->current_beacon = NULL; dev->wl->current_beacon = NULL;
} }
ssb_device_disable(dev->sdev, 0); b43_device_disable(dev, 0);
ssb_bus_may_powerdown(dev->sdev->bus); b43_bus_may_powerdown(dev);
} }
/* Initialize a wireless core */ /* Initialize a wireless core */
@ -4326,10 +4326,10 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT); B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT);
err = ssb_bus_powerup(bus, 0); err = b43_bus_powerup(dev, 0);
if (err) if (err)
goto out; goto out;
if (!ssb_device_is_enabled(dev->sdev)) { if (!b43_device_is_enabled(dev)) {
tmp = phy->gmode ? B43_TMSLOW_GMODE : 0; tmp = phy->gmode ? B43_TMSLOW_GMODE : 0;
b43_wireless_core_reset(dev, tmp); b43_wireless_core_reset(dev, tmp);
} }
@ -4414,7 +4414,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
b43_set_synth_pu_delay(dev, 1); b43_set_synth_pu_delay(dev, 1);
b43_bluetooth_coext_enable(dev); b43_bluetooth_coext_enable(dev);
ssb_bus_powerup(bus, !(sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)); b43_bus_powerup(dev, !(sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW));
b43_upload_card_macaddress(dev); b43_upload_card_macaddress(dev);
b43_security_init(dev); b43_security_init(dev);
@ -4431,7 +4431,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
err_chip_exit: err_chip_exit:
b43_chip_exit(dev); b43_chip_exit(dev);
err_busdown: err_busdown:
ssb_bus_may_powerdown(bus); b43_bus_may_powerdown(dev);
B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT); B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT);
return err; return err;
} }
@ -4750,7 +4750,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
* that in core_init(), too. * that in core_init(), too.
*/ */
err = ssb_bus_powerup(bus, 0); err = b43_bus_powerup(dev, 0);
if (err) { if (err) {
b43err(wl, "Bus powerup failed\n"); b43err(wl, "Bus powerup failed\n");
goto out; goto out;
@ -4832,8 +4832,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
INIT_WORK(&dev->restart_work, b43_chip_reset); INIT_WORK(&dev->restart_work, b43_chip_reset);
dev->phy.ops->switch_analog(dev, 0); dev->phy.ops->switch_analog(dev, 0);
ssb_device_disable(dev->sdev, 0); b43_device_disable(dev, 0);
ssb_bus_may_powerdown(bus); b43_bus_may_powerdown(dev);
out: out:
return err; return err;
@ -4841,7 +4841,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
err_phy_free: err_phy_free:
b43_phy_free(dev); b43_phy_free(dev);
err_powerdown: err_powerdown:
ssb_bus_may_powerdown(bus); b43_bus_may_powerdown(dev);
return err; return err;
} }

9
drivers/net/wireless/b43/rfkill.c
View File

@ -37,17 +37,16 @@ void b43_rfkill_poll(struct ieee80211_hw *hw)
{ {
struct b43_wl *wl = hw_to_b43_wl(hw); struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev; struct b43_wldev *dev = wl->current_dev;
struct ssb_bus *bus = dev->sdev->bus;
bool enabled; bool enabled;
bool brought_up = false; bool brought_up = false;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) { if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
if (ssb_bus_powerup(bus, 0)) { if (b43_bus_powerup(dev, 0)) {
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
return; return;
} }
ssb_device_enable(dev->sdev, 0); b43_device_enable(dev, 0);
brought_up = true; brought_up = true;
} }
@ -63,8 +62,8 @@ void b43_rfkill_poll(struct ieee80211_hw *hw)
} }
if (brought_up) { if (brought_up) {
ssb_device_disable(dev->sdev, 0); b43_device_disable(dev, 0);
ssb_bus_may_powerdown(bus); b43_bus_may_powerdown(dev);
} }
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);