bcma: add ext PA workaround for BCM4331 and BCM43431 (69aaedd3) · Commits · 戴 / test

MacBook Pro models with BCM4331 wireless have been found to have the ext PA lines disabled after resuming from S3 without external power attach. This causes them to be unable to transmit. Add a workaround to ensure that the ext PA lines are enabled on BCM4331. Also extend all handling of ext PA line muxing to BCM43431 as is done in the Broadcom SDK. BugLink: http://bugs.launchpad.net/bugs/925577 Cc: Arend van Spriel <arend@broadcom.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Cc: stable@vger.kernel.org Signed-off-by:

Seth Forshee <seth.forshee@canonical.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/bcma/driver_chipcommon_pmu.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,9 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
		bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);
		break;
		case 0x4331:
		/* BCM4331 workaround is SPROM-related, we put it in sprom.c */
		case 43431:
		/* Ext PA lines must be enabled for tx on BCM4331 */
		bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true);
		break;
		case 43224:
		if (bus->chipinfo.rev == 0) {

drivers/bcma/sprom.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus)
		if (!sprom)
		return -ENOMEM;

		if (bus->chipinfo.id == 0x4331)
		if (bus->chipinfo.id == 0x4331 \|\| bus->chipinfo.id == 43431)
		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);

		pr_debug("SPROM offset 0x%x\n", offset);
		bcma_sprom_read(bus, offset, sprom);

		if (bus->chipinfo.id == 0x4331)
		if (bus->chipinfo.id == 0x4331 \|\| bus->chipinfo.id == 43431)
		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);

		err = bcma_sprom_valid(sprom);

Admin message