Hi,
just some small small spelling nit-picks:
On 7 May 2011 14:27, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote:
> Some embedded devices like the Netgear WNDR3300 have two SSB based
> cards without an own sprom on the pci bus. We have to provide two
> different fallback sproms for these and this was not possible with the
> old solution. In the bcm47xx architecture the sprom data is stored in
> the nvram in the main flash storage. The architecture code will be able
> to fill the sprom with the stored data based on the bus where the
> device was found.
>
> The bcm63xx code should to the same thing as before, just using the new
to -> do
> API.
>
> CC: Michael Buesch <mb@xxxxxxxxx>
> CC: netdev@xxxxxxxxxxxxxxx
> CC: Florian Fainelli <florian@xxxxxxxxxxx>
> Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
> ---
> Âarch/mips/bcm63xx/boards/board_bcm963xx.c | Â 16 ++++++++++++++--
> Âdrivers/ssb/pci.c             |  16 +++++++++++-----
> Âdrivers/ssb/sprom.c            |  26 +++++++++++++++-----------
> Âdrivers/ssb/ssb_private.h         |  Â2 +-
> Âinclude/linux/ssb/ssb.h          |  Â4 +++-
> Â5 files changed, 44 insertions(+), 20 deletions(-)
>
> diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> index 8dba8cf..40b223b 100644
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> @@ -643,6 +643,17 @@ static struct ssb_sprom bcm63xx_sprom = {
>    Â.boardflags_lo     Â= 0x2848,
>    Â.boardflags_hi     Â= 0x0000,
> Â};
> +
> +int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
> +{
> + Â Â Â if (bus->bustype == SSB_BUSTYPE_PCI) {
> + Â Â Â Â Â Â Â memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
> + Â Â Â Â Â Â Â return 0;
> + Â Â Â } else {
> + Â Â Â Â Â Â Â printk(KERN_ERR PFX "unable to fill SPROM for given bustype.\n");
> + Â Â Â Â Â Â Â return -EINVAL;
> + Â Â Â }
> +}
> Â#endif
>
> Â/*
> @@ -793,8 +804,9 @@ void __init board_prom_init(void)
> Â Â Â Âif (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
> Â Â Â Â Â Â Â Âmemcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> Â Â Â Â Â Â Â Âmemcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> - Â Â Â Â Â Â Â if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
> - Â Â Â Â Â Â Â Â Â Â Â printk(KERN_ERR "failed to register fallback SPROM\n");
> + Â Â Â Â Â Â Â if (ssb_arch_register_fallback_sprom(
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &bcm63xx_get_fallback_sprom) < 0)
> + Â Â Â Â Â Â Â Â Â Â Â printk(KERN_ERR PFX "failed to register fallback SPROM\n");
> Â Â Â Â}
> Â#endif
> Â}
> diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
> index 6f34963..34955d1 100644
> --- a/drivers/ssb/pci.c
> +++ b/drivers/ssb/pci.c
> @@ -662,7 +662,6 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
> Âstatic int ssb_pci_sprom_get(struct ssb_bus *bus,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct ssb_sprom *sprom)
> Â{
> - Â Â Â const struct ssb_sprom *fallback;
> Â Â Â Âint err;
> Â Â Â Âu16 *buf;
>
> @@ -707,10 +706,17 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
> Â Â Â Â Â Â Â Âif (err) {
> Â Â Â Â Â Â Â Â Â Â Â Â/* All CRC attempts failed.
> Â Â Â Â Â Â Â Â Â Â Â Â * Maybe there is no SPROM on the device?
> - Â Â Â Â Â Â Â Â Â Â Â Â* If we have a fallback, use that. */
> - Â Â Â Â Â Â Â Â Â Â Â fallback = ssb_get_fallback_sprom();
> - Â Â Â Â Â Â Â Â Â Â Â if (fallback) {
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â memcpy(sprom, fallback, sizeof(*sprom));
> + Â Â Â Â Â Â Â Â Â Â Â Â* Now we ask the arch code if there is some sprom
> + Â Â Â Â Â Â Â Â Â Â Â Â* avaliable for this device in some other storage */
avaliable -> available
> + Â Â Â Â Â Â Â Â Â Â Â err = ssb_fill_sprom_with_fallback(bus, sprom);
> + Â Â Â Â Â Â Â Â Â Â Â if (err) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ssb_printk(KERN_WARNING PFX "WARNING: Using"
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â" fallback SPROM failed (err %d)\n",
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âerr);
> + Â Â Â Â Â Â Â Â Â Â Â } else {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â " revision %d provided by"
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â " platform.\n", sprom->revision);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âerr = 0;
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âgoto out_free;
> Â Â Â Â Â Â Â Â Â Â Â Â}
> diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
> index 5f34d7a..20cd139 100644
> --- a/drivers/ssb/sprom.c
> +++ b/drivers/ssb/sprom.c
> @@ -17,7 +17,7 @@
> Â#include <linux/slab.h>
>
>
> -static const struct ssb_sprom *fallback_sprom;
> +static int(*get_fallback_sprom)(struct ssb_bus *dev, struct ssb_sprom *out);
>
>
> Âstatic int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
> @@ -145,13 +145,14 @@ out:
> Â}
>
> Â/**
> - * ssb_arch_set_fallback_sprom - Set a fallback SPROM for use if no SPROM is found.
> + * ssb_arch_register_fallback_sprom - Registers a method providing a fallback
> + * SPROM if no SPROM is found.
> Â*
> - * @sprom: The SPROM data structure to register.
> + * @sprom_callback: The callbcak function.
callbcak -> callback
> Â*
> - * With this function the architecture implementation may register a fallback
> - * SPROM data structure. The fallback is only used for PCI based SSB devices,
> - * where no valid SPROM can be found in the shadow registers.
> + * With this function the architecture implementation may register a callback
> + * handler which wills the SPROM data structure. The fallback is only used for
wills -> fills
> + * PCI based SSB devices, where no valid SPROM can be found in the shadow registers.
> Â*
> Â* This function is useful for weird architectures that have a half-assed SSB device
> Â* hardwired to their PCI bus.
> @@ -163,18 +164,21 @@ out:
> Â*
> Â* This function is available for architecture code, only. So it is not exported.
> Â*/
> -int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom)
> +int ssb_arch_register_fallback_sprom(int (*sprom_callback)(struct ssb_bus *bus, struct ssb_sprom *out))
> Â{
> - Â Â Â if (fallback_sprom)
> + Â Â Â if (get_fallback_sprom)
> Â Â Â Â Â Â Â Âreturn -EEXIST;
> - Â Â Â fallback_sprom = sprom;
> + Â Â Â get_fallback_sprom = sprom_callback;
>
> Â Â Â Âreturn 0;
> Â}
>
> -const struct ssb_sprom *ssb_get_fallback_sprom(void)
> +int ssb_fill_sprom_with_fallback(struct ssb_bus *bus, struct ssb_sprom *out)
> Â{
> - Â Â Â return fallback_sprom;
> + Â Â Â if (!get_fallback_sprom)
> + Â Â Â Â Â Â Â return -ENOENT;
> +
> + Â Â Â return get_fallback_sprom(bus, out);
> Â}
>
> Â/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
> diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
> index 0331139..1a32f58 100644
> --- a/drivers/ssb/ssb_private.h
> +++ b/drivers/ssb/ssb_private.h
> @@ -171,7 +171,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â const char *buf, size_t count,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â int (*sprom_check_crc)(const u16 *sprom, size_t size),
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom));
> -extern const struct ssb_sprom *ssb_get_fallback_sprom(void);
> +extern int ssb_fill_sprom_with_fallback(struct ssb_bus *bus, struct ssb_sprom *out);
>
>
> Â/* core.c */
> diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
> index 9659eff..045f72a 100644
> --- a/include/linux/ssb/ssb.h
> +++ b/include/linux/ssb/ssb.h
> @@ -404,7 +404,9 @@ extern bool ssb_is_sprom_available(struct ssb_bus *bus);
>
> Â/* Set a fallback SPROM.
> Â* See kdoc at the function definition for complete documentation. */
> -extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
> +extern int ssb_arch_register_fallback_sprom(
> + Â Â Â Â Â Â Â int (*sprom_callback)(struct ssb_bus *bus,
> + Â Â Â Â Â Â Â struct ssb_sprom *out));
>
> Â/* Suspend a SSB bus.
> Â* Call this from the parent bus suspend routine. */
> --
> 1.7.4.1
>
>
>
