mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 12:40:16 +02:00
6c242e52a8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30345 3c298f89-4303-0410-b956-a3cf2f4a3e73
314 lines
12 KiB
Diff
314 lines
12 KiB
Diff
--- a/drivers/ssb/b43_pci_bridge.c
|
|
+++ b/drivers/ssb/b43_pci_bridge.c
|
|
@@ -11,6 +11,7 @@
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
+#include <linux/module.h>
|
|
#include <linux/ssb/ssb.h>
|
|
|
|
#include "ssb_private.h"
|
|
--- a/drivers/ssb/main.c
|
|
+++ b/drivers/ssb/main.c
|
|
@@ -12,6 +12,7 @@
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
+#include <linux/module.h>
|
|
#include <linux/ssb/ssb.h>
|
|
#include <linux/ssb/ssb_regs.h>
|
|
#include <linux/ssb/ssb_driver_gige.h>
|
|
@@ -1260,16 +1261,34 @@ void ssb_device_disable(struct ssb_devic
|
|
}
|
|
EXPORT_SYMBOL(ssb_device_disable);
|
|
|
|
+/* Some chipsets need routing known for PCIe and 64-bit DMA */
|
|
+static bool ssb_dma_translation_special_bit(struct ssb_device *dev)
|
|
+{
|
|
+ u16 chip_id = dev->bus->chip_id;
|
|
+
|
|
+ if (dev->id.coreid == SSB_DEV_80211) {
|
|
+ return (chip_id == 0x4322 || chip_id == 43221 ||
|
|
+ chip_id == 43231 || chip_id == 43222);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
u32 ssb_dma_translation(struct ssb_device *dev)
|
|
{
|
|
switch (dev->bus->bustype) {
|
|
case SSB_BUSTYPE_SSB:
|
|
return 0;
|
|
case SSB_BUSTYPE_PCI:
|
|
- if (ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64)
|
|
+ if (pci_is_pcie(dev->bus->host_pci) &&
|
|
+ ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64) {
|
|
return SSB_PCIE_DMA_H32;
|
|
- else
|
|
- return SSB_PCI_DMA;
|
|
+ } else {
|
|
+ if (ssb_dma_translation_special_bit(dev))
|
|
+ return SSB_PCIE_DMA_H32;
|
|
+ else
|
|
+ return SSB_PCI_DMA;
|
|
+ }
|
|
default:
|
|
__ssb_dma_not_implemented(dev);
|
|
}
|
|
--- a/drivers/ssb/pci.c
|
|
+++ b/drivers/ssb/pci.c
|
|
@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
|
|
static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
|
|
{
|
|
int i;
|
|
- u16 v;
|
|
+ u16 v, o;
|
|
+ u16 pwr_info_offset[] = {
|
|
+ SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
|
|
+ SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
|
|
+ };
|
|
+ BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
|
|
+ ARRAY_SIZE(out->core_pwr_info));
|
|
|
|
/* extract the MAC address */
|
|
for (i = 0; i < 3; i++) {
|
|
@@ -607,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
|
|
memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
|
|
sizeof(out->antenna_gain.ghz5));
|
|
|
|
+ /* Extract cores power info info */
|
|
+ for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
|
|
+ o = pwr_info_offset[i];
|
|
+ SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_2G_MAXP, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_5G_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
|
|
+ SSB_SPROM8_5GH_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
|
|
+ SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
|
|
+ }
|
|
+
|
|
+ /* Extract FEM info */
|
|
+ SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
|
|
+ SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
|
|
+ SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G,
|
|
+ SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
|
|
+ SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G,
|
|
+ SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
|
|
+ SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G,
|
|
+ SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
|
|
+ SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G,
|
|
+ SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
|
|
+
|
|
+ SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G,
|
|
+ SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
|
|
+ SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G,
|
|
+ SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
|
|
+ SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G,
|
|
+ SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
|
|
+ SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G,
|
|
+ SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
|
|
+ SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
|
|
+ SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
|
|
+
|
|
sprom_extract_r458(out, in);
|
|
|
|
/* TODO - get remaining rev 8 stuff needed */
|
|
--- a/include/linux/ssb/ssb.h
|
|
+++ b/include/linux/ssb/ssb.h
|
|
@@ -16,6 +16,12 @@ struct pcmcia_device;
|
|
struct ssb_bus;
|
|
struct ssb_driver;
|
|
|
|
+struct ssb_sprom_core_pwr_info {
|
|
+ u8 itssi_2g, itssi_5g;
|
|
+ u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
|
|
+ u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
|
|
+};
|
|
+
|
|
struct ssb_sprom {
|
|
u8 revision;
|
|
u8 il0mac[6]; /* MAC address for 802.11b/g */
|
|
@@ -25,7 +31,7 @@ struct ssb_sprom {
|
|
u8 et1phyaddr; /* MII address for enet1 */
|
|
u8 et0mdcport; /* MDIO for enet0 */
|
|
u8 et1mdcport; /* MDIO for enet1 */
|
|
- u8 board_rev; /* Board revision number from SPROM. */
|
|
+ u16 board_rev; /* Board revision number from SPROM. */
|
|
u8 country_code; /* Country Code */
|
|
u16 leddc_on_time; /* LED Powersave Duty Cycle On Count */
|
|
u16 leddc_off_time; /* LED Powersave Duty Cycle Off Count */
|
|
@@ -82,6 +88,8 @@ struct ssb_sprom {
|
|
u16 boardflags2_hi; /* Board flags (bits 48-63) */
|
|
/* TODO store board flags in a single u64 */
|
|
|
|
+ struct ssb_sprom_core_pwr_info core_pwr_info[4];
|
|
+
|
|
/* Antenna gain values for up to 4 antennas
|
|
* on each band. Values in dBm/4 (Q5.2). Negative gain means the
|
|
* loss in the connectors is bigger than the gain. */
|
|
@@ -94,6 +102,15 @@ struct ssb_sprom {
|
|
} ghz5; /* 5GHz band */
|
|
} antenna_gain;
|
|
|
|
+ struct {
|
|
+ struct {
|
|
+ u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
|
|
+ } ghz2;
|
|
+ struct {
|
|
+ u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
|
|
+ } ghz5;
|
|
+ } fem;
|
|
+
|
|
/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
|
|
};
|
|
|
|
@@ -231,10 +248,9 @@ struct ssb_driver {
|
|
#define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
|
|
|
|
extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
|
|
-static inline int ssb_driver_register(struct ssb_driver *drv)
|
|
-{
|
|
- return __ssb_driver_register(drv, THIS_MODULE);
|
|
-}
|
|
+#define ssb_driver_register(drv) \
|
|
+ __ssb_driver_register(drv, THIS_MODULE)
|
|
+
|
|
extern void ssb_driver_unregister(struct ssb_driver *drv);
|
|
|
|
|
|
--- a/include/linux/ssb/ssb_regs.h
|
|
+++ b/include/linux/ssb/ssb_regs.h
|
|
@@ -432,6 +432,56 @@
|
|
#define SSB_SPROM8_RXPO2G 0x00FF /* 2GHz RX power offset */
|
|
#define SSB_SPROM8_RXPO5G 0xFF00 /* 5GHz RX power offset */
|
|
#define SSB_SPROM8_RXPO5G_SHIFT 8
|
|
+#define SSB_SPROM8_FEM2G 0x00AE
|
|
+#define SSB_SPROM8_FEM5G 0x00B0
|
|
+#define SSB_SROM8_FEM_TSSIPOS 0x0001
|
|
+#define SSB_SROM8_FEM_TSSIPOS_SHIFT 0
|
|
+#define SSB_SROM8_FEM_EXTPA_GAIN 0x0006
|
|
+#define SSB_SROM8_FEM_EXTPA_GAIN_SHIFT 1
|
|
+#define SSB_SROM8_FEM_PDET_RANGE 0x00F8
|
|
+#define SSB_SROM8_FEM_PDET_RANGE_SHIFT 3
|
|
+#define SSB_SROM8_FEM_TR_ISO 0x0700
|
|
+#define SSB_SROM8_FEM_TR_ISO_SHIFT 8
|
|
+#define SSB_SROM8_FEM_ANTSWLUT 0xF800
|
|
+#define SSB_SROM8_FEM_ANTSWLUT_SHIFT 11
|
|
+#define SSB_SPROM8_THERMAL 0x00B2
|
|
+#define SSB_SPROM8_MPWR_RAWTS 0x00B4
|
|
+#define SSB_SPROM8_TS_SLP_OPT_CORRX 0x00B6
|
|
+#define SSB_SPROM8_FOC_HWIQ_IQSWP 0x00B8
|
|
+#define SSB_SPROM8_PHYCAL_TEMPDELTA 0x00BA
|
|
+
|
|
+/* There are 4 blocks with power info sharing the same layout */
|
|
+#define SSB_SROM8_PWR_INFO_CORE0 0x00C0
|
|
+#define SSB_SROM8_PWR_INFO_CORE1 0x00E0
|
|
+#define SSB_SROM8_PWR_INFO_CORE2 0x0100
|
|
+#define SSB_SROM8_PWR_INFO_CORE3 0x0120
|
|
+
|
|
+#define SSB_SROM8_2G_MAXP_ITSSI 0x00
|
|
+#define SSB_SPROM8_2G_MAXP 0x00FF
|
|
+#define SSB_SPROM8_2G_ITSSI 0xFF00
|
|
+#define SSB_SPROM8_2G_ITSSI_SHIFT 8
|
|
+#define SSB_SROM8_2G_PA_0 0x02 /* 2GHz power amp settings */
|
|
+#define SSB_SROM8_2G_PA_1 0x04
|
|
+#define SSB_SROM8_2G_PA_2 0x06
|
|
+#define SSB_SROM8_5G_MAXP_ITSSI 0x08 /* 5GHz ITSSI and 5.3GHz Max Power */
|
|
+#define SSB_SPROM8_5G_MAXP 0x00FF
|
|
+#define SSB_SPROM8_5G_ITSSI 0xFF00
|
|
+#define SSB_SPROM8_5G_ITSSI_SHIFT 8
|
|
+#define SSB_SPROM8_5GHL_MAXP 0x0A /* 5.2GHz and 5.8GHz Max Power */
|
|
+#define SSB_SPROM8_5GH_MAXP 0x00FF
|
|
+#define SSB_SPROM8_5GL_MAXP 0xFF00
|
|
+#define SSB_SPROM8_5GL_MAXP_SHIFT 8
|
|
+#define SSB_SROM8_5G_PA_0 0x0C /* 5.3GHz power amp settings */
|
|
+#define SSB_SROM8_5G_PA_1 0x0E
|
|
+#define SSB_SROM8_5G_PA_2 0x10
|
|
+#define SSB_SROM8_5GL_PA_0 0x12 /* 5.2GHz power amp settings */
|
|
+#define SSB_SROM8_5GL_PA_1 0x14
|
|
+#define SSB_SROM8_5GL_PA_2 0x16
|
|
+#define SSB_SROM8_5GH_PA_0 0x18 /* 5.8GHz power amp settings */
|
|
+#define SSB_SROM8_5GH_PA_1 0x1A
|
|
+#define SSB_SROM8_5GH_PA_2 0x1C
|
|
+
|
|
+/* TODO: Make it deprecated */
|
|
#define SSB_SPROM8_MAXP_BG 0x00C0 /* Max Power 2GHz in path 1 */
|
|
#define SSB_SPROM8_MAXP_BG_MASK 0x00FF /* Mask for Max Power 2GHz */
|
|
#define SSB_SPROM8_ITSSI_BG 0xFF00 /* Mask for path 1 itssi_bg */
|
|
@@ -456,12 +506,53 @@
|
|
#define SSB_SPROM8_PA1HIB0 0x00D8 /* 5.8GHz power amp settings */
|
|
#define SSB_SPROM8_PA1HIB1 0x00DA
|
|
#define SSB_SPROM8_PA1HIB2 0x00DC
|
|
+
|
|
#define SSB_SPROM8_CCK2GPO 0x0140 /* CCK power offset */
|
|
#define SSB_SPROM8_OFDM2GPO 0x0142 /* 2.4GHz OFDM power offset */
|
|
#define SSB_SPROM8_OFDM5GPO 0x0146 /* 5.3GHz OFDM power offset */
|
|
#define SSB_SPROM8_OFDM5GLPO 0x014A /* 5.2GHz OFDM power offset */
|
|
#define SSB_SPROM8_OFDM5GHPO 0x014E /* 5.8GHz OFDM power offset */
|
|
|
|
+/* Values for boardflags_lo read from SPROM */
|
|
+#define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */
|
|
+#define SSB_BFL_PACTRL 0x0002 /* GPIO 9 controlling the PA */
|
|
+#define SSB_BFL_AIRLINEMODE 0x0004 /* implements GPIO 13 radio disable indication */
|
|
+#define SSB_BFL_RSSI 0x0008 /* software calculates nrssi slope. */
|
|
+#define SSB_BFL_ENETSPI 0x0010 /* has ephy roboswitch spi */
|
|
+#define SSB_BFL_XTAL_NOSLOW 0x0020 /* no slow clock available */
|
|
+#define SSB_BFL_CCKHIPWR 0x0040 /* can do high power CCK transmission */
|
|
+#define SSB_BFL_ENETADM 0x0080 /* has ADMtek switch */
|
|
+#define SSB_BFL_ENETVLAN 0x0100 /* can do vlan */
|
|
+#define SSB_BFL_AFTERBURNER 0x0200 /* supports Afterburner mode */
|
|
+#define SSB_BFL_NOPCI 0x0400 /* board leaves PCI floating */
|
|
+#define SSB_BFL_FEM 0x0800 /* supports the Front End Module */
|
|
+#define SSB_BFL_EXTLNA 0x1000 /* has an external LNA */
|
|
+#define SSB_BFL_HGPA 0x2000 /* had high gain PA */
|
|
+#define SSB_BFL_BTCMOD 0x4000 /* BFL_BTCOEXIST is given in alternate GPIOs */
|
|
+#define SSB_BFL_ALTIQ 0x8000 /* alternate I/Q settings */
|
|
+
|
|
+/* Values for boardflags_hi read from SPROM */
|
|
+#define SSB_BFH_NOPA 0x0001 /* has no PA */
|
|
+#define SSB_BFH_RSSIINV 0x0002 /* RSSI uses positive slope (not TSSI) */
|
|
+#define SSB_BFH_PAREF 0x0004 /* uses the PARef LDO */
|
|
+#define SSB_BFH_3TSWITCH 0x0008 /* uses a triple throw switch shared with bluetooth */
|
|
+#define SSB_BFH_PHASESHIFT 0x0010 /* can support phase shifter */
|
|
+#define SSB_BFH_BUCKBOOST 0x0020 /* has buck/booster */
|
|
+#define SSB_BFH_FEM_BT 0x0040 /* has FEM and switch to share antenna with bluetooth */
|
|
+
|
|
+/* Values for boardflags2_lo read from SPROM */
|
|
+#define SSB_BFL2_RXBB_INT_REG_DIS 0x0001 /* external RX BB regulator present */
|
|
+#define SSB_BFL2_APLL_WAR 0x0002 /* alternative A-band PLL settings implemented */
|
|
+#define SSB_BFL2_TXPWRCTRL_EN 0x0004 /* permits enabling TX Power Control */
|
|
+#define SSB_BFL2_2X4_DIV 0x0008 /* 2x4 diversity switch */
|
|
+#define SSB_BFL2_5G_PWRGAIN 0x0010 /* supports 5G band power gain */
|
|
+#define SSB_BFL2_PCIEWAR_OVR 0x0020 /* overrides ASPM and Clkreq settings */
|
|
+#define SSB_BFL2_CAESERS_BRD 0x0040 /* is Caesers board (unused) */
|
|
+#define SSB_BFL2_BTC3WIRE 0x0080 /* used 3-wire bluetooth coexist */
|
|
+#define SSB_BFL2_SKWRKFEM_BRD 0x0100 /* 4321mcm93 uses Skyworks FEM */
|
|
+#define SSB_BFL2_SPUR_WAR 0x0200 /* has a workaround for clock-harmonic spurs */
|
|
+#define SSB_BFL2_GPLL_WAR 0x0400 /* altenative G-band PLL settings implemented */
|
|
+
|
|
/* Values for SSB_SPROM1_BINF_CCODE */
|
|
enum {
|
|
SSB_SPROM1CCODE_WORLD = 0,
|