Commit f679056b authored by Gábor Stefanik's avatar Gábor Stefanik Committed by John W. Linville
Browse files

ssb: Implement the remaining rev.8 SPROM vars needed for LP-PHY 



Also add a "SPEX32" macro for extracting 32-bit SPROM variables.

Signed-off-by: default avatarGábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 18889231

drivers/ssb/pci.c

+52 −1
Original line number Diff line number Diff line
@@ -169,8 +169,14 @@ int ssb_pci_xtal(struct ssb_bus *bus, u32 what, int turn_on) 
/* Get the word-offset for a SSB_SPROM_XXX define. */

#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))

/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */

#define SPEX(_outvar, _offset, _mask, _shift)	\

#define SPEX16(_outvar, _offset, _mask, _shift)	\

	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))

#define SPEX32(_outvar, _offset, _mask, _shift)	\

	out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \

			   in[SPOFF(_offset)]) & (_mask)) >> (_shift))

#define SPEX(_outvar, _offset, _mask, _shift) \

	SPEX16(_outvar, _offset, _mask, _shift)





static inline u8 ssb_crc8(u8 crc, u8 data)

{
@@ -480,6 +486,8 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in) 
	SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);

	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);

	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);

	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);

	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);

	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,

	     SSB_SPROM8_ANTAVAIL_A_SHIFT);

	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
@@ -490,12 +498,55 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in) 
	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);

	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,

	     SSB_SPROM8_ITSSI_A_SHIFT);

	SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);

	SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,

	     SSB_SPROM8_MAXP_AL_SHIFT);

	SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);

	SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,

	     SSB_SPROM8_GPIOA_P1_SHIFT);

	SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);

	SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,

	     SSB_SPROM8_GPIOB_P3_SHIFT);

	SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);

	SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,

	     SSB_SPROM8_TRI5G_SHIFT);

	SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);

	SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,

	     SSB_SPROM8_TRI5GH_SHIFT);

	SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);

	SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,

	     SSB_SPROM8_RXPO5G_SHIFT);

	SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);

	SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,

	     SSB_SPROM8_RSSISMC2G_SHIFT);

	SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,

	     SSB_SPROM8_RSSISAV2G_SHIFT);

	SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,

	     SSB_SPROM8_BXA2G_SHIFT);

	SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);

	SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,

	     SSB_SPROM8_RSSISMC5G_SHIFT);

	SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,

	     SSB_SPROM8_RSSISAV5G_SHIFT);

	SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,

	     SSB_SPROM8_BXA5G_SHIFT);

	SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);

	SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);

	SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);

	SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);

	SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);

	SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);

	SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);

	SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);

	SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);

	SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);

	SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);

	SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);

	SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);

	SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);

	SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);

	SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);

	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);



	/* Extract the antenna gain values. */

	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,

include/linux/ssb/ssb.h

+37 −7
Original line number Diff line number Diff line
@@ -27,24 +27,54 @@ struct ssb_sprom { 
	u8 et1mdcport;		/* MDIO for enet1 */

	u8 board_rev;		/* Board revision number from SPROM. */

	u8 country_code;	/* Country Code */

	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */

	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */

	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */

	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */

	u16 pa0b0;

	u16 pa0b1;

	u16 pa0b2;

	u16 pa1b0;

	u16 pa1b1;

	u16 pa1b2;

	u16 pa1lob0;

	u16 pa1lob1;

	u16 pa1lob2;

	u16 pa1hib0;

	u16 pa1hib1;

	u16 pa1hib2;

	u8 gpio0;		/* GPIO pin 0 */

	u8 gpio1;		/* GPIO pin 1 */

	u8 gpio2;		/* GPIO pin 2 */

	u8 gpio3;		/* GPIO pin 3 */

	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */

	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */

	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */

	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */

	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */

	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */

	u8 itssi_a;		/* Idle TSSI Target for A-PHY */

	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */

	u16 boardflags_lo;	/* Boardflags (low 16 bits) */

	u16 boardflags_hi;	/* Boardflags (high 16 bits) */

	u8 tri2g;		/* 2.4GHz TX isolation */

	u8 tri5gl;		/* 5.2GHz TX isolation */

	u8 tri5g;		/* 5.3GHz TX isolation */

	u8 tri5gh;		/* 5.8GHz TX isolation */

	u8 rxpo2g;		/* 2GHz RX power offset */

	u8 rxpo5g;		/* 5GHz RX power offset */

	u8 rssisav2g;		/* 2GHz RSSI params */

	u8 rssismc2g;

	u8 rssismf2g;

	u8 bxa2g;		/* 2GHz BX arch */

	u8 rssisav5g;		/* 5GHz RSSI params */

	u8 rssismc5g;

	u8 rssismf5g;

	u8 bxa5g;		/* 5GHz BX arch */

	u16 cck2gpo;		/* CCK power offset */

	u32 ofdm2gpo;		/* 2.4GHz OFDM power offset */

	u32 ofdm5glpo;		/* 5.2GHz OFDM power offset */

	u32 ofdm5gpo;		/* 5.3GHz OFDM power offset */

	u32 ofdm5ghpo;		/* 5.8GHz OFDM power offset */

	u16 boardflags_lo;	/* Board flags (bits 0-15) */

	u16 boardflags_hi;	/* Board flags (bits 16-31) */

	u16 boardflags2_lo;	/* Board flags (bits 32-47) */

	u16 boardflags2_hi;	/* Board flags (bits 48-63) */

	/* TODO store board flags in a single u64 */



	/* Antenna gain values for up to 4 antennas

	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
@@ -58,7 +88,7 @@ struct ssb_sprom { 
		} ghz5;		/* 5GHz band */

	} antenna_gain;



	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */

	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */

};



/* Information about the PCB the circuitry is soldered on. */

include/linux/ssb/ssb_regs.h

+59 −7
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ 


/* SPROM shadow area. If not otherwise noted, fields are

 * two bytes wide. Note that the SPROM can _only_ be read

 * in two-byte quantinies.

 * in two-byte quantities.

 */

#define SSB_SPROMSIZE_WORDS		64

#define SSB_SPROMSIZE_BYTES		(SSB_SPROMSIZE_WORDS * sizeof(u16))
@@ -327,8 +327,11 @@ 
#define  SSB_SPROM5_GPIOB_P3_SHIFT	8



/* SPROM Revision 8 */

#define SSB_SPROM8_BFLLO		0x1084	/* Boardflags (low 16 bits) */

#define SSB_SPROM8_BFLHI		0x1086	/* Boardflags Hi */

#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */

#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */

#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */

#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */

#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */

#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */

#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */

#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
@@ -354,14 +357,63 @@ 
#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */

#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */

#define  SSB_SPROM8_GPIOB_P3_SHIFT	8

#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power BG in path 1 */

#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */

#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */

#define  SSB_SPROM8_RSSISMF2G		0x000F

#define  SSB_SPROM8_RSSISMC2G		0x00F0

#define  SSB_SPROM8_RSSISMC2G_SHIFT	4

#define  SSB_SPROM8_RSSISAV2G		0x0700

#define  SSB_SPROM8_RSSISAV2G_SHIFT	8

#define  SSB_SPROM8_BXA2G		0x1800

#define  SSB_SPROM8_BXA2G_SHIFT		11

#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */

#define  SSB_SPROM8_RSSISMF5G		0x000F

#define  SSB_SPROM8_RSSISMC5G		0x00F0

#define  SSB_SPROM8_RSSISMC5G_SHIFT	4

#define  SSB_SPROM8_RSSISAV5G		0x0700

#define  SSB_SPROM8_RSSISAV5G_SHIFT	8

#define  SSB_SPROM8_BXA5G		0x1800

#define  SSB_SPROM8_BXA5G_SHIFT		11

#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */

#define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */

#define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */

#define  SSB_SPROM8_TRI5G_SHIFT		8

#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */

#define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */

#define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */

#define  SSB_SPROM8_TRI5GH_SHIFT	8

#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */

#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_MAXP_BG		0x10C0  /* 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 */

#define  SSB_SPROM8_ITSSI_BG_SHIFT	8

#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power A in path 1 */

#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */

#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */

#define SSB_SPROM8_PA0B1		0x10C4

#define SSB_SPROM8_PA0B2		0x10C6

#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */

#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */

#define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */

#define  SSB_SPROM8_ITSSI_A_SHIFT	8

#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */

#define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */

#define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */

#define  SSB_SPROM8_MAXP_AL_SHIFT	8

#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */

#define SSB_SPROM8_PA1B1		0x10CE

#define SSB_SPROM8_PA1B2		0x10D0

#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */

#define SSB_SPROM8_PA1LOB1		0x10D4

#define SSB_SPROM8_PA1LOB2		0x10D6

#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */

#define SSB_SPROM8_PA1HIB1		0x10DA

#define SSB_SPROM8_PA1HIB2		0x10DC

#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */

#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */

#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */

#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */

#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */



/* Values for SSB_SPROM1_BINF_CCODE */

enum {