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

Commit 9352f69c authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

bcma: detect PCI core working in hostmode 



We must not init it like clientmode one, it would break device (tested
by Hauke on BCM4718). Add stub hostmode driver for now.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0c717e6

drivers/bcma/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,12 @@ config BCMA_HOST_PCI 
	bool "Support for BCMA on PCI-host bus"

	bool "Support for BCMA on PCI-host bus"

	depends on BCMA_HOST_PCI_POSSIBLE

	depends on BCMA_HOST_PCI_POSSIBLE





config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on BCMA && MIPS

	help

	  PCI core hostmode operation (external PCI bus).



config BCMA_DEBUG

config BCMA_DEBUG

	bool "BCMA debugging"

	bool "BCMA debugging"

	depends on BCMA

	depends on BCMA

drivers/bcma/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_pci.o

bcma-y					+= driver_pci.o

bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o

bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o

bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o

obj-$(CONFIG_BCMA)			+= bcma.o

obj-$(CONFIG_BCMA)			+= bcma.o

drivers/bcma/bcma_private.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -28,4 +28,8 @@ extern int __init bcma_host_pci_init(void); 
extern void __exit bcma_host_pci_exit(void);

extern void __exit bcma_host_pci_exit(void);

#endif /* CONFIG_BCMA_HOST_PCI */

#endif /* CONFIG_BCMA_HOST_PCI */





#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */



#endif
 
#endif

drivers/bcma/driver_pci.c

+37 −1
Original line number Original line Diff line number Diff line
@@ -157,11 +157,47 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc) 
 * Init.

 * Init.

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

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





void bcma_core_pci_init(struct bcma_drv_pci *pc)

static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)

{

{

	bcma_pcicore_serdes_workaround(pc);

	bcma_pcicore_serdes_workaround(pc);

}

}





static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)

{

	struct bcma_bus *bus = pc->core->bus;

	u16 chipid_top;



	chipid_top = (bus->chipinfo.id & 0xFF00);

	if (chipid_top != 0x4700 &&

	    chipid_top != 0x5300)

		return false;



	if (bus->sprom.boardflags_lo & SSB_PCICORE_BFL_NOPCI)

		return false;



#if 0

	/* TODO: on BCMA we use address from EROM instead of magic formula */

	u32 tmp;

	return !mips_busprobe32(tmp, (bus->mmio +

		(pc->core->core_index * BCMA_CORE_SIZE)));

#endif



	return true;

}



void bcma_core_pci_init(struct bcma_drv_pci *pc)

{

	if (bcma_core_pci_is_in_hostmode(pc)) {

#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

		bcma_core_pci_hostmode_init(pc);

#else

		pr_err("Driver compiled without support for hostmode PCI\n");

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */

	} else {

		bcma_core_pci_clientmode_init(pc);

	}

}



int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

			  bool enable)

			  bool enable)

{

{

drivers/bcma/driver_pci_host.c

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
/*

 * Broadcom specific AMBA

 * PCI Core in hostmode

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"

#include <linux/bcma/bcma.h>



void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)

{

	pr_err("No support for PCI core in hostmode yet\n");

}