mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 14:49:22 +02:00
26205d18e8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26846 3c298f89-4303-0410-b956-a3cf2f4a3e73
147 lines
4.9 KiB
Diff
147 lines
4.9 KiB
Diff
--- 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
|
|
}
|
|
--- a/drivers/ssb/pci.c
|
|
+++ b/drivers/ssb/pci.c
|
|
@@ -662,7 +662,6 @@ static int sprom_extract(struct ssb_bus
|
|
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_
|
|
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 */
|
|
+ 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;
|
|
}
|
|
--- 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.
|
|
*
|
|
- * 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
|
|
+ * 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 */
|
|
--- a/drivers/ssb/ssb_private.h
|
|
+++ b/drivers/ssb/ssb_private.h
|
|
@@ -171,7 +171,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
|
|
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 */
|
|
--- a/include/linux/ssb/ssb.h
|
|
+++ b/include/linux/ssb/ssb.h
|
|
@@ -404,7 +404,9 @@ extern bool ssb_is_sprom_available(struc
|
|
|
|
/* 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. */
|