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

Commit 4186721d authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

bcma: add helpers bringing PCIe hosted bus up / down 



Bringing PCIe hosted bus up requires operating on host-related core.
Since we plan to support PCIe Gen 2 devices we should provide a helper
picking the correct one (PCIE or PCIE2).

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ba8b6ae6

drivers/bcma/bcma_private.h

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ static inline void __exit bcma_host_soc_unregister_driver(void) 


/* driver_pci.c */

u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);

void bcma_core_pci_up(struct bcma_drv_pci *pc);

void bcma_core_pci_down(struct bcma_drv_pci *pc);



extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);

drivers/bcma/driver_pci.c

+2 −18
Original line number Diff line number Diff line
@@ -328,28 +328,12 @@ static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend) 
	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);

}



void bcma_core_pci_up(struct bcma_bus *bus)

void bcma_core_pci_up(struct bcma_drv_pci *pc)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_extend_L1timer(pc, true);

}

EXPORT_SYMBOL_GPL(bcma_core_pci_up);



void bcma_core_pci_down(struct bcma_bus *bus)

void bcma_core_pci_down(struct bcma_drv_pci *pc)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_extend_L1timer(pc, false);

}
 
EXPORT_SYMBOL_GPL(bcma_core_pci_down);

drivers/bcma/host_pci.c

+28 −0
Original line number Diff line number Diff line
@@ -310,3 +310,31 @@ void __exit bcma_host_pci_exit(void) 
{

	pci_unregister_driver(&bcma_pci_bridge_driver);

}



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

 * Runtime ops for drivers.

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



/* See also pcicore_up */

void bcma_host_pci_up(struct bcma_bus *bus)

{

	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	if (bus->host_is_pcie2)

		pr_warn("Bringing up bus with PCIe Gen 2 host is unsupported yet\n");

	else

		bcma_core_pci_up(&bus->drv_pci[0]);

}

EXPORT_SYMBOL_GPL(bcma_host_pci_up);



/* See also pcicore_down */

void bcma_host_pci_down(struct bcma_bus *bus)

{

	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	if (!bus->host_is_pcie2)

		bcma_core_pci_down(&bus->drv_pci[0]);

}

EXPORT_SYMBOL_GPL(bcma_host_pci_down);

drivers/net/wireless/b43/main.c

+2 −2
Original line number Diff line number Diff line
@@ -4819,7 +4819,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev) 
	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		bcma_core_pci_down(dev->dev->bdev->bus);

		bcma_host_pci_down(dev->dev->bdev->bus);

		break;

#endif

#ifdef CONFIG_B43_SSB
@@ -4868,7 +4868,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev) 
	case B43_BUS_BCMA:

		bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],

				      dev->dev->bdev, true);

		bcma_core_pci_up(dev->dev->bdev->bus);

		bcma_host_pci_up(dev->dev->bdev->bus);

		break;

#endif

#ifdef CONFIG_B43_SSB

drivers/net/wireless/brcm80211/brcmsmac/main.c

+4 −4
Original line number Diff line number Diff line
@@ -4668,7 +4668,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
	brcms_c_coredisable(wlc_hw);



	/* Match driver "down" state */

	bcma_core_pci_down(wlc_hw->d11core->bus);

	bcma_host_pci_down(wlc_hw->d11core->bus);



	/* turn off pll and xtal to match driver "down" state */

	brcms_b_xtal(wlc_hw, OFF);
@@ -4969,12 +4969,12 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) 
	 */

	if (brcms_b_radio_read_hwdisabled(wlc_hw)) {

		/* put SB PCI in down state again */

		bcma_core_pci_down(wlc_hw->d11core->bus);

		bcma_host_pci_down(wlc_hw->d11core->bus);

		brcms_b_xtal(wlc_hw, OFF);

		return -ENOMEDIUM;

	}



	bcma_core_pci_up(wlc_hw->d11core->bus);

	bcma_host_pci_up(wlc_hw->d11core->bus);



	/* reset the d11 core */

	brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
@@ -5171,7 +5171,7 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw) 


		/* turn off primary xtal and pll */

		if (!wlc_hw->noreset) {

			bcma_core_pci_down(wlc_hw->d11core->bus);

			bcma_host_pci_down(wlc_hw->d11core->bus);

			brcms_b_xtal(wlc_hw, OFF);

		}

	}