You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
322 lines
12 KiB
Diff
322 lines
12 KiB
Diff
--- a/drivers/ssb/b43_pci_bridge.c
|
|
+++ b/drivers/ssb/b43_pci_bridge.c
|
|
@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pc
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
|
|
{ 0, },
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
|
|
--- a/drivers/ssb/driver_gpio.c
|
|
+++ b/drivers/ssb/driver_gpio.c
|
|
@@ -475,7 +475,8 @@ int ssb_gpio_unregister(struct ssb_bus *
|
|
{
|
|
if (ssb_chipco_available(&bus->chipco) ||
|
|
ssb_extif_available(&bus->extif)) {
|
|
- return gpiochip_remove(&bus->gpio);
|
|
+ gpiochip_remove(&bus->gpio);
|
|
+ return 0;
|
|
} else {
|
|
SSB_WARN_ON(1);
|
|
}
|
|
--- a/drivers/ssb/pci.c
|
|
+++ b/drivers/ssb/pci.c
|
|
@@ -326,13 +326,13 @@ err_ctlreg:
|
|
return err;
|
|
}
|
|
|
|
-static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in,
|
|
- u16 mask, u16 shift)
|
|
+static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
|
|
+ u16 mask, u16 shift)
|
|
{
|
|
u16 v;
|
|
u8 gain;
|
|
|
|
- v = in[SPOFF(SSB_SPROM1_AGAIN)];
|
|
+ v = in[SPOFF(offset)];
|
|
gain = (v & mask) >> shift;
|
|
if (gain == 0xFF)
|
|
gain = 2; /* If unset use 2dBm */
|
|
@@ -416,12 +416,14 @@ static void sprom_extract_r123(struct ss
|
|
SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
|
|
|
|
/* Extract the antenna gain values. */
|
|
- out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
|
|
- SSB_SPROM1_AGAIN_BG,
|
|
- SSB_SPROM1_AGAIN_BG_SHIFT);
|
|
- out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
|
|
- SSB_SPROM1_AGAIN_A,
|
|
- SSB_SPROM1_AGAIN_A_SHIFT);
|
|
+ out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM1_AGAIN,
|
|
+ SSB_SPROM1_AGAIN_BG,
|
|
+ SSB_SPROM1_AGAIN_BG_SHIFT);
|
|
+ out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM1_AGAIN,
|
|
+ SSB_SPROM1_AGAIN_A,
|
|
+ SSB_SPROM1_AGAIN_A_SHIFT);
|
|
if (out->revision >= 2)
|
|
sprom_extract_r23(out, in);
|
|
}
|
|
@@ -468,7 +470,15 @@ static void sprom_extract_r458(struct ss
|
|
|
|
static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
|
|
{
|
|
+ static const u16 pwr_info_offset[] = {
|
|
+ SSB_SPROM4_PWR_INFO_CORE0, SSB_SPROM4_PWR_INFO_CORE1,
|
|
+ SSB_SPROM4_PWR_INFO_CORE2, SSB_SPROM4_PWR_INFO_CORE3
|
|
+ };
|
|
u16 il0mac_offset;
|
|
+ int i;
|
|
+
|
|
+ BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
|
|
+ ARRAY_SIZE(out->core_pwr_info));
|
|
|
|
if (out->revision == 4)
|
|
il0mac_offset = SSB_SPROM4_IL0MAC;
|
|
@@ -524,14 +534,59 @@ static void sprom_extract_r45(struct ssb
|
|
}
|
|
|
|
/* Extract the antenna gain values. */
|
|
- SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
|
|
- SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
|
|
- SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
|
|
- SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
|
|
- SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
|
|
- SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
|
|
- SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
|
|
- SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
|
|
+ out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM4_AGAIN01,
|
|
+ SSB_SPROM4_AGAIN0,
|
|
+ SSB_SPROM4_AGAIN0_SHIFT);
|
|
+ out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM4_AGAIN01,
|
|
+ SSB_SPROM4_AGAIN1,
|
|
+ SSB_SPROM4_AGAIN1_SHIFT);
|
|
+ out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM4_AGAIN23,
|
|
+ SSB_SPROM4_AGAIN2,
|
|
+ SSB_SPROM4_AGAIN2_SHIFT);
|
|
+ out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM4_AGAIN23,
|
|
+ SSB_SPROM4_AGAIN3,
|
|
+ SSB_SPROM4_AGAIN3_SHIFT);
|
|
+
|
|
+ /* Extract cores power info info */
|
|
+ for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
|
|
+ u16 o = pwr_info_offset[i];
|
|
+
|
|
+ SPEX(core_pwr_info[i].itssi_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM4_2G_ITSSI, SSB_SPROM4_2G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM4_2G_MAXP, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SPROM4_2G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SPROM4_2G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SPROM4_2G_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[3], o + SSB_SPROM4_2G_PA_3, ~0, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].itssi_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM4_5G_ITSSI, SSB_SPROM4_5G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM4_5G_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM4_5GHL_MAXP,
|
|
+ SSB_SPROM4_5GH_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM4_5GHL_MAXP,
|
|
+ SSB_SPROM4_5GL_MAXP, SSB_SPROM4_5GL_MAXP_SHIFT);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SPROM4_5GL_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SPROM4_5GL_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SPROM4_5GL_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[3], o + SSB_SPROM4_5GL_PA_3, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SPROM4_5G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SPROM4_5G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SPROM4_5G_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[3], o + SSB_SPROM4_5G_PA_3, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SPROM4_5GH_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SPROM4_5GH_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SPROM4_5GH_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[3], o + SSB_SPROM4_5GH_PA_3, ~0, 0);
|
|
+ }
|
|
|
|
sprom_extract_r458(out, in);
|
|
|
|
@@ -621,14 +676,22 @@ static void sprom_extract_r8(struct ssb_
|
|
SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
|
|
|
|
/* Extract the antenna gain values. */
|
|
- SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
|
|
- SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
|
|
- SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
|
|
- SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
|
|
- SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
|
|
- SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
|
|
- SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
|
|
- SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
|
|
+ out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM8_AGAIN01,
|
|
+ SSB_SPROM8_AGAIN0,
|
|
+ SSB_SPROM8_AGAIN0_SHIFT);
|
|
+ out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM8_AGAIN01,
|
|
+ SSB_SPROM8_AGAIN1,
|
|
+ SSB_SPROM8_AGAIN1_SHIFT);
|
|
+ out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM8_AGAIN23,
|
|
+ SSB_SPROM8_AGAIN2,
|
|
+ SSB_SPROM8_AGAIN2_SHIFT);
|
|
+ out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
|
|
+ SSB_SPROM8_AGAIN23,
|
|
+ SSB_SPROM8_AGAIN3,
|
|
+ SSB_SPROM8_AGAIN3_SHIFT);
|
|
|
|
/* Extract cores power info info */
|
|
for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
|
|
--- a/drivers/ssb/pcihost_wrapper.c
|
|
+++ b/drivers/ssb/pcihost_wrapper.c
|
|
@@ -11,15 +11,17 @@
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
|
|
+#include <linux/pm.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/export.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/ssb/ssb.h>
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
-static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
+static int ssb_pcihost_suspend(struct device *d)
|
|
{
|
|
+ struct pci_dev *dev = to_pci_dev(d);
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
@@ -28,17 +30,23 @@ static int ssb_pcihost_suspend(struct pc
|
|
return err;
|
|
pci_save_state(dev);
|
|
pci_disable_device(dev);
|
|
- pci_set_power_state(dev, pci_choose_state(dev, state));
|
|
+
|
|
+ /* if there is a wakeup enabled child device on ssb bus,
|
|
+ enable pci wakeup posibility. */
|
|
+ device_set_wakeup_enable(d, d->power.wakeup_path);
|
|
+
|
|
+ pci_prepare_to_sleep(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
-static int ssb_pcihost_resume(struct pci_dev *dev)
|
|
+static int ssb_pcihost_resume(struct device *d)
|
|
{
|
|
+ struct pci_dev *dev = to_pci_dev(d);
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
- pci_set_power_state(dev, PCI_D0);
|
|
+ pci_back_from_sleep(dev);
|
|
err = pci_enable_device(dev);
|
|
if (err)
|
|
return err;
|
|
@@ -49,10 +57,12 @@ static int ssb_pcihost_resume(struct pci
|
|
|
|
return 0;
|
|
}
|
|
-#else /* CONFIG_PM */
|
|
-# define ssb_pcihost_suspend NULL
|
|
-# define ssb_pcihost_resume NULL
|
|
-#endif /* CONFIG_PM */
|
|
+
|
|
+static const struct dev_pm_ops ssb_pcihost_pm_ops = {
|
|
+ SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume)
|
|
+};
|
|
+
|
|
+#endif /* CONFIG_PM_SLEEP */
|
|
|
|
static int ssb_pcihost_probe(struct pci_dev *dev,
|
|
const struct pci_device_id *id)
|
|
@@ -115,8 +125,9 @@ int ssb_pcihost_register(struct pci_driv
|
|
{
|
|
driver->probe = ssb_pcihost_probe;
|
|
driver->remove = ssb_pcihost_remove;
|
|
- driver->suspend = ssb_pcihost_suspend;
|
|
- driver->resume = ssb_pcihost_resume;
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
+ driver->driver.pm = &ssb_pcihost_pm_ops;
|
|
+#endif
|
|
|
|
return pci_register_driver(driver);
|
|
}
|
|
--- a/include/linux/ssb/ssb.h
|
|
+++ b/include/linux/ssb/ssb.h
|
|
@@ -33,6 +33,7 @@ struct ssb_sprom {
|
|
u8 et1phyaddr; /* MII address for enet1 */
|
|
u8 et0mdcport; /* MDIO for enet0 */
|
|
u8 et1mdcport; /* MDIO for enet1 */
|
|
+ u16 dev_id; /* Device ID overriding e.g. PCI ID */
|
|
u16 board_rev; /* Board revision number from SPROM. */
|
|
u16 board_num; /* Board number from SPROM. */
|
|
u16 board_type; /* Board type from SPROM. */
|
|
--- a/include/linux/ssb/ssb_regs.h
|
|
+++ b/include/linux/ssb/ssb_regs.h
|
|
@@ -345,6 +345,43 @@
|
|
#define SSB_SPROM4_TXPID5GH2_SHIFT 0
|
|
#define SSB_SPROM4_TXPID5GH3 0xFF00
|
|
#define SSB_SPROM4_TXPID5GH3_SHIFT 8
|
|
+
|
|
+/* There are 4 blocks with power info sharing the same layout */
|
|
+#define SSB_SPROM4_PWR_INFO_CORE0 0x0080
|
|
+#define SSB_SPROM4_PWR_INFO_CORE1 0x00AE
|
|
+#define SSB_SPROM4_PWR_INFO_CORE2 0x00DC
|
|
+#define SSB_SPROM4_PWR_INFO_CORE3 0x010A
|
|
+
|
|
+#define SSB_SPROM4_2G_MAXP_ITSSI 0x00 /* 2 GHz ITSSI and 2 GHz Max Power */
|
|
+#define SSB_SPROM4_2G_MAXP 0x00FF
|
|
+#define SSB_SPROM4_2G_ITSSI 0xFF00
|
|
+#define SSB_SPROM4_2G_ITSSI_SHIFT 8
|
|
+#define SSB_SPROM4_2G_PA_0 0x02 /* 2 GHz power amp */
|
|
+#define SSB_SPROM4_2G_PA_1 0x04
|
|
+#define SSB_SPROM4_2G_PA_2 0x06
|
|
+#define SSB_SPROM4_2G_PA_3 0x08
|
|
+#define SSB_SPROM4_5G_MAXP_ITSSI 0x0A /* 5 GHz ITSSI and 5.3 GHz Max Power */
|
|
+#define SSB_SPROM4_5G_MAXP 0x00FF
|
|
+#define SSB_SPROM4_5G_ITSSI 0xFF00
|
|
+#define SSB_SPROM4_5G_ITSSI_SHIFT 8
|
|
+#define SSB_SPROM4_5GHL_MAXP 0x0C /* 5.2 GHz and 5.8 GHz Max Power */
|
|
+#define SSB_SPROM4_5GH_MAXP 0x00FF
|
|
+#define SSB_SPROM4_5GL_MAXP 0xFF00
|
|
+#define SSB_SPROM4_5GL_MAXP_SHIFT 8
|
|
+#define SSB_SPROM4_5G_PA_0 0x0E /* 5.3 GHz power amp */
|
|
+#define SSB_SPROM4_5G_PA_1 0x10
|
|
+#define SSB_SPROM4_5G_PA_2 0x12
|
|
+#define SSB_SPROM4_5G_PA_3 0x14
|
|
+#define SSB_SPROM4_5GL_PA_0 0x16 /* 5.2 GHz power amp */
|
|
+#define SSB_SPROM4_5GL_PA_1 0x18
|
|
+#define SSB_SPROM4_5GL_PA_2 0x1A
|
|
+#define SSB_SPROM4_5GL_PA_3 0x1C
|
|
+#define SSB_SPROM4_5GH_PA_0 0x1E /* 5.8 GHz power amp */
|
|
+#define SSB_SPROM4_5GH_PA_1 0x20
|
|
+#define SSB_SPROM4_5GH_PA_2 0x22
|
|
+#define SSB_SPROM4_5GH_PA_3 0x24
|
|
+
|
|
+/* TODO: Make it deprecated */
|
|
#define SSB_SPROM4_MAXP_BG 0x0080 /* Max Power BG in path 1 */
|
|
#define SSB_SPROM4_MAXP_BG_MASK 0x00FF /* Mask for Max Power BG */
|
|
#define SSB_SPROM4_ITSSI_BG 0xFF00 /* Mask for path 1 itssi_bg */
|
|
--- a/arch/mips/bcm47xx/sprom.c
|
|
+++ b/arch/mips/bcm47xx/sprom.c
|
|
@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char
|
|
static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
|
|
const char *prefix, bool fallback)
|
|
{
|
|
+ nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
|
|
nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
|
|
nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
|
|
nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
|