tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ssb: read additional sprom v2 and v3 attributes.

These attributes should be in the sprom for rev 2 and 3, but they were
not read out.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Hauke Mehrtens and committed by
John W. Linville 7e4235ac 12bef78f

+18 -2
+18 -2
drivers/ssb/pci.c
··· 347 347 return (s8)gain; 348 348 } 349 349 350 + static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in) 351 + { 352 + SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0); 353 + SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0); 354 + SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0); 355 + SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0); 356 + SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0); 357 + SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0); 358 + SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0); 359 + SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0); 360 + SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0); 361 + SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO, 362 + SSB_SPROM2_MAXP_A_LO_SHIFT); 363 + } 364 + 350 365 static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) 351 366 { 352 367 u16 loc[3]; ··· 411 396 SSB_SPROM1_ITSSI_A_SHIFT); 412 397 SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0); 413 398 SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0); 414 - if (out->revision >= 2) 415 - SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0); 399 + 416 400 SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8); 417 401 SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0); 418 402 ··· 422 408 out->antenna_gain.a1 = r123_extract_antgain(out->revision, in, 423 409 SSB_SPROM1_AGAIN_A, 424 410 SSB_SPROM1_AGAIN_A_SHIFT); 411 + if (out->revision >= 2) 412 + sprom_extract_r23(out, in); 425 413 } 426 414 427 415 /* Revs 4 5 and 8 have partially shared layout */