| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182 |
- From e4d708702e6c98f2111e33201a264d6788564cb2 Mon Sep 17 00:00:00 2001
- From: OpenWrt community <[email protected]>
- Date: Fri, 12 May 2023 11:08:43 +0200
- Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom Fallback SPROMs
- ---
- drivers/bcma/Kconfig | 4 ++++
- drivers/bcma/Makefile | 1 +
- drivers/bcma/bcma_private.h | 1 +
- drivers/bcma/main.c | 8 ++++++++
- drivers/bcma/sprom.c | 23 ++++++++++++++---------
- drivers/ssb/Kconfig | 5 +++++
- drivers/ssb/Makefile | 1 +
- drivers/ssb/main.c | 8 ++++++++
- drivers/ssb/sprom.c | 12 +++++++++++-
- drivers/ssb/ssb_private.h | 2 +-
- 10 files changed, 54 insertions(+), 11 deletions(-)
- --- a/drivers/bcma/Kconfig
- +++ b/drivers/bcma/Kconfig
- @@ -18,6 +18,10 @@ config BCMA_BLOCKIO
- bool
- default y
-
- +config BCMA_FALLBACK_SPROM
- + bool
- + default y
- +
- config BCMA_HOST_PCI_POSSIBLE
- bool
- depends on PCI = y
- --- a/drivers/bcma/Makefile
- +++ b/drivers/bcma/Makefile
- @@ -11,6 +11,7 @@ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)
- bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o
- bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN) += driver_gmac_cmn.o
- bcma-$(CONFIG_BCMA_DRIVER_GPIO) += driver_gpio.o
- +bcma-$(CONFIG_BCMA_FALLBACK_SPROM) += fallback-sprom.o
- bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o
- bcma-$(CONFIG_BCMA_HOST_SOC) += host_soc.o
- obj-$(CONFIG_BCMA) += bcma.o
- --- a/drivers/bcma/bcma_private.h
- +++ b/drivers/bcma/bcma_private.h
- @@ -8,6 +8,7 @@
-
- #include <linux/bcma/bcma.h>
- #include <linux/delay.h>
- +#include "fallback-sprom.h"
-
- #define bcma_err(bus, fmt, ...) \
- dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- --- a/drivers/bcma/main.c
- +++ b/drivers/bcma/main.c
- @@ -671,6 +671,14 @@ static int __init bcma_modinit(void)
- {
- int err;
-
- +#ifdef CONFIG_BCMA_FALLBACK_SPROM
- + err = bcma_fbs_register();
- + if (err) {
- + pr_err("Fallback SPROM initialization failed\n");
- + err = 0;
- + }
- +#endif /* CONFIG_BCMA_FALLBACK_SPROM */
- +
- err = bcma_init_bus_register();
- if (err)
- return err;
- --- a/drivers/bcma/sprom.c
- +++ b/drivers/bcma/sprom.c
- @@ -51,21 +51,26 @@ static int bcma_fill_sprom_with_fallback
- {
- int err;
-
- - if (!get_fallback_sprom) {
- + if (get_fallback_sprom)
- + err = get_fallback_sprom(bus, out);
- +
- +#ifdef CONFIG_BCMA_FALLBACK_SPROM
- + if (!get_fallback_sprom || err)
- + err = bcma_get_fallback_sprom(bus, out);
- +#else
- + if (!get_fallback_sprom)
- err = -ENOENT;
- - goto fail;
- - }
- +#endif /* CONFIG_BCMA_FALLBACK_SPROM */
-
- - err = get_fallback_sprom(bus, out);
- - if (err)
- - goto fail;
- + if (err) {
- + bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
- + return err;
- + }
-
- bcma_debug(bus, "Using SPROM revision %d provided by platform.\n",
- bus->sprom.revision);
- +
- return 0;
- -fail:
- - bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
- - return err;
- }
-
- /**************************************************
- --- a/drivers/ssb/Kconfig
- +++ b/drivers/ssb/Kconfig
- @@ -25,6 +25,11 @@ if SSB
- config SSB_SPROM
- bool
-
- +config SSB_FALLBACK_SPROM
- + bool
- + depends on SSB_PCIHOST
- + default y
- +
- # Support for Block-I/O. SELECT this from the driver that needs it.
- config SSB_BLOCKIO
- bool
- --- a/drivers/ssb/Makefile
- +++ b/drivers/ssb/Makefile
- @@ -2,6 +2,7 @@
- # core
- ssb-y += main.o scan.o
- ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
- +ssb-$(CONFIG_SSB_FALLBACK_SPROM) += fallback-sprom.o
- ssb-$(CONFIG_SSB_SPROM) += sprom.o
-
- # host support
- --- a/drivers/ssb/main.c
- +++ b/drivers/ssb/main.c
- @@ -1289,6 +1289,14 @@ static int __init ssb_modinit(void)
- {
- int err;
-
- +#ifdef CONFIG_SSB_FALLBACK_SPROM
- + err = ssb_fbs_register();
- + if (err) {
- + pr_err("Fallback SPROM initialization failed\n");
- + err = 0;
- + }
- +#endif /* CONFIG_SSB_FALLBACK_SPROM */
- +
- /* See the comment at the ssb_is_early_boot definition */
- ssb_is_early_boot = 0;
- err = bus_register(&ssb_bustype);
- --- a/drivers/ssb/sprom.c
- +++ b/drivers/ssb/sprom.c
- @@ -180,10 +180,20 @@ int ssb_arch_register_fallback_sprom(int
-
- int ssb_fill_sprom_with_fallback(struct ssb_bus *bus, struct ssb_sprom *out)
- {
- + int err;
- +
- + if (get_fallback_sprom)
- + err = get_fallback_sprom(bus, out);
- +
- +#ifdef CONFIG_SSB_FALLBACK_SPROM
- + if (!get_fallback_sprom || err)
- + err = ssb_get_fallback_sprom(bus, out);
- +#else
- if (!get_fallback_sprom)
- return -ENOENT;
- +#endif /* CONFIG_SSB_FALLBACK_SPROM */
-
- - return get_fallback_sprom(bus, out);
- + return err;
- }
-
- /* https://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
- --- a/drivers/ssb/ssb_private.h
- +++ b/drivers/ssb/ssb_private.h
- @@ -8,7 +8,7 @@
- #include <linux/ssb/ssb.h>
- #include <linux/types.h>
- #include <linux/bcm47xx_wdt.h>
- -
- +#include "fallback-sprom.h"
-
- /* pci.c */
- #ifdef CONFIG_SSB_PCIHOST
|
