Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b2715b8 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: add bcma_core_pci_config_fixup() 



This code is based on code from pcie_misc_config_fixup() in brcmsmac.
This patch is part of the move of pci specific code from brcmsmac to
bcma.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Tested-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ec00f373

drivers/bcma/driver_pci.c

+18 −0
Original line number Diff line number Diff line
@@ -186,6 +186,23 @@ static void bcma_core_pci_fixcfg(struct bcma_drv_pci *pc) 
	}

}



/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */

/* Needs to happen when coming out of 'standby'/'hibernate' */

static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc)

{

	u16 val16;

	uint regoff;



	regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_MISC_CONFIG);



	val16 = pcicore_read16(pc, regoff);



	if (!(val16 & BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST)) {

		val16 |= BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST;

		pcicore_write16(pc, regoff, val16);

	}

}



/**************************************************

 * Init.

 **************************************************/
@@ -194,6 +211,7 @@ static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc) 
{

	bcma_core_pci_fixcfg(pc);

	bcma_pcicore_serdes_workaround(pc);

	bcma_core_pci_config_fixup(pc);

}



void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)

include/linux/bcma/bcma_driver_pci.h

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ struct pci_dev; 
#define  BCMA_CORE_PCI_SPROM_PI_OFFSET		0	/* first word */

#define   BCMA_CORE_PCI_SPROM_PI_MASK		0xf000	/* bit 15:12 */

#define   BCMA_CORE_PCI_SPROM_PI_SHIFT		12	/* bit 15:12 */

#define  BCMA_CORE_PCI_SPROM_MISC_CONFIG	5	/* word 5 */

#define   BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST	0x8000	/* bit 15 */

#define   BCMA_CORE_PCI_SPROM_CLKREQ_OFFSET_REV5	20	/* word 20 for srom rev <= 5 */

#define   BCMA_CORE_PCI_SPROM_CLKREQ_ENB	0x0800	/* bit 11 */



/* SBtoPCIx */

#define BCMA_CORE_PCI_SBTOPCI_MEM		0x00000000