Commit 702131e2 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

bcma: move PCI IRQ control function to host specific code 



This function isn't really related to any bus core. It touches PCI
device config registers only, so move it to the (PCI) host file.

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

drivers/bcma/driver_pci.c

+0 −33
Original line number Diff line number Diff line
@@ -282,39 +282,6 @@ void bcma_core_pci_power_save(struct bcma_bus *bus, bool up) 
}

EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);



int bcma_core_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,

			  bool enable)

{

	struct pci_dev *pdev;

	u32 coremask, tmp;

	int err = 0;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI) {

		/* This bcma device is not on a PCI host-bus. So the IRQs are

		 * not routed through the PCI core.

		 * So we must not enable routing through the PCI core. */

		goto out;

	}



	pdev = bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)

		goto out;



	coremask = BIT(core->core_index) << 8;

	if (enable)

		tmp |= coremask;

	else

		tmp &= ~coremask;



	err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);



out:

	return err;

}

EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);



static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)

{

	u32 w;

drivers/bcma/host_pci.c

+34 −0
Original line number Diff line number Diff line
@@ -351,3 +351,37 @@ void bcma_host_pci_down(struct bcma_bus *bus) 
		bcma_core_pci_down(&bus->drv_pci[0]);

}

EXPORT_SYMBOL_GPL(bcma_host_pci_down);



/* See also si_pci_setup */

int bcma_host_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,

			  bool enable)

{

	struct pci_dev *pdev;

	u32 coremask, tmp;

	int err = 0;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI) {

		/* This bcma device is not on a PCI host-bus. So the IRQs are

		 * not routed through the PCI core.

		 * So we must not enable routing through the PCI core. */

		goto out;

	}



	pdev = bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)

		goto out;



	coremask = BIT(core->core_index) << 8;

	if (enable)

		tmp |= coremask;

	else

		tmp &= ~coremask;



	err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);



out:

	return err;

}

EXPORT_SYMBOL_GPL(bcma_host_pci_irq_ctl);

drivers/net/wireless/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4866,7 +4866,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev) 
	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		bcma_core_pci_irq_ctl(dev->dev->bdev->bus,

		bcma_host_pci_irq_ctl(dev->dev->bdev->bus,

				      dev->dev->bdev, true);

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

		break;

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

+1 −1
Original line number Diff line number Diff line
@@ -4959,7 +4959,7 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) 
	 * Configure pci/pcmcia here instead of in brcms_c_attach()

	 * to allow mfg hotswap:  down, hotswap (chip power cycle), up.

	 */

	bcma_core_pci_irq_ctl(wlc_hw->d11core->bus, wlc_hw->d11core,

	bcma_host_pci_irq_ctl(wlc_hw->d11core->bus, wlc_hw->d11core,

			      true);



	/*

include/linux/bcma/bcma.h

+9 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ static inline struct bcma_device *bcma_find_core(struct bcma_bus *bus, 
#ifdef CONFIG_BCMA_HOST_PCI

extern void bcma_host_pci_up(struct bcma_bus *bus);

extern void bcma_host_pci_down(struct bcma_bus *bus);

extern int bcma_host_pci_irq_ctl(struct bcma_bus *bus,

				 struct bcma_device *core, bool enable);

#else

static inline void bcma_host_pci_up(struct bcma_bus *bus)

{
@@ -444,6 +446,13 @@ static inline void bcma_host_pci_up(struct bcma_bus *bus) 
static inline void bcma_host_pci_down(struct bcma_bus *bus)

{

}

static inline int bcma_host_pci_irq_ctl(struct bcma_bus *bus,

					struct bcma_device *core, bool enable)

{

	if (bus->hosttype == BCMA_HOSTTYPE_PCI)

		return -ENOTSUPP;

	return 0;

}

#endif



extern bool bcma_core_is_enabled(struct bcma_device *core);