Commit 541c9a84 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

ssb: pick SoC invariants code from MIPS BCM47xx arch 



There is code in ssb fetching "invariants" that is basically a set of
board specific data. Every host requires its own implementation of
reading function. In ssb we have support for PCI, PCMCIA & SDIO.
For some (historical?) reason code reading "invariants" for SoC was
placed in arch code and provided by a callback. This is not needed
nowadays, so lets move that into ssb. This way we keep all "invariants"
functions in a single module making code cleaner.

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

arch/mips/bcm47xx/setup.c

+1 −38
Original line number Diff line number Diff line
@@ -101,50 +101,13 @@ static void bcm47xx_machine_halt(void) 
}



#ifdef CONFIG_BCM47XX_SSB

static int bcm47xx_get_invariants(struct ssb_bus *bus,

				  struct ssb_init_invariants *iv)

{

	char buf[20];

	int len, err;



	/* Fill boardinfo structure */

	memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));



	len = bcm47xx_nvram_getenv("boardvendor", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.vendor);

		if (err)

			pr_warn("Couldn't parse nvram board vendor entry with value \"%s\"\n",

				buf);

	}

	if (!iv->boardinfo.vendor)

		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;



	len = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.type);

		if (err)

			pr_warn("Couldn't parse nvram board type entry with value \"%s\"\n",

				buf);

	}



	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));

	bcm47xx_fill_sprom(&iv->sprom, NULL, false);



	if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);



	return 0;

}



static void __init bcm47xx_register_ssb(void)

{

	int err;

	char buf[100];

	struct ssb_mipscore *mcore;



	err = ssb_bus_ssbbus_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE,

				      bcm47xx_get_invariants);

	err = ssb_bus_host_soc_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE);

	if (err)

		panic("Failed to initialize SSB bus (err %d)", err);

drivers/ssb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ config SSB_SDIOHOST 


config SSB_HOST_SOC

	bool "Support for SSB bus on SoC"

	depends on SSB

	depends on SSB && BCM47XX_NVRAM

	help

	  Host interface for a SSB directly mapped into memory. This is

	  for some Broadcom SoCs from the BCM47xx and BCM53xx lines.

drivers/ssb/host_soc.c

+37 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include <linux/bcm47xx_nvram.h>

#include <linux/ssb/ssb.h>



#include "ssb_private.h"
@@ -171,3 +172,39 @@ const struct ssb_bus_ops ssb_host_soc_ops = { 
	.block_write	= ssb_host_soc_block_write,

#endif

};



int ssb_host_soc_get_invariants(struct ssb_bus *bus,

				struct ssb_init_invariants *iv)

{

	char buf[20];

	int len, err;



	/* Fill boardinfo structure */

	memset(&iv->boardinfo, 0, sizeof(struct ssb_boardinfo));



	len = bcm47xx_nvram_getenv("boardvendor", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.vendor);

		if (err)

			pr_warn("Couldn't parse nvram board vendor entry with value \"%s\"\n",

				buf);

	}

	if (!iv->boardinfo.vendor)

		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;



	len = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.type);

		if (err)

			pr_warn("Couldn't parse nvram board type entry with value \"%s\"\n",

				buf);

	}



	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));

	ssb_fill_sprom_with_fallback(bus, &iv->sprom);



	if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);



	return 0;

}

drivers/ssb/main.c

+2 −3
Original line number Diff line number Diff line
@@ -762,15 +762,14 @@ EXPORT_SYMBOL(ssb_bus_sdiobus_register); 
#endif /* CONFIG_SSB_PCMCIAHOST */



#ifdef CONFIG_SSB_HOST_SOC

int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,

			    ssb_invariants_func_t get_invariants)

int ssb_bus_host_soc_register(struct ssb_bus *bus, unsigned long baseaddr)

{

	int err;



	bus->bustype = SSB_BUSTYPE_SSB;

	bus->ops = &ssb_host_soc_ops;



	err = ssb_bus_register(bus, get_invariants, baseaddr);

	err = ssb_bus_register(bus, ssb_host_soc_get_invariants, baseaddr);

	if (!err) {

		ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",

			 baseaddr);

drivers/ssb/ssb_private.h

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ static inline int ssb_sdio_init(struct ssb_bus *bus) 


#ifdef CONFIG_SSB_HOST_SOC

extern const struct ssb_bus_ops ssb_host_soc_ops;



extern int ssb_host_soc_get_invariants(struct ssb_bus *bus,

				       struct ssb_init_invariants *iv);

#endif



/* scan.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE