libertas: prioritize usb8388_olpc.bin firmware on OLPC machines

Normally, the v9 firmware will be loaded if it's available.  However, on
OLPC XO-1 machines, the olpc-specific firmware supports extra functionality.
This makes the libertas driver attempt to load the custom firmware first
if the machine is an OLPC machine; if that fails (or it's not an OLPC
machine), fall back to attempting to load the other firmwares.

usb8388_olpc.bin is currently found in the linux-firmware repository.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 0c846f5a646ab9859bb2451c7a1d4c9970c0aecd..8147f1e2a0b0d4a15521f66a82369450bb58af05 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -973,6 +973,23 @@ static const struct {
        { MODEL_8682, "libertas/usb8682.bin" }
 };
 
+#ifdef CONFIG_OLPC
+
+static int try_olpc_fw(struct if_usb_card *cardp)
+{
+       int retval = -ENOENT;
+
+       /* try the OLPC firmware first; fall back to fw_table list */
+       if (machine_is_olpc() && cardp->model == MODEL_8388)
+               retval = request_firmware(&cardp->fw,
+                               "libertas/usb8388_olpc.bin", &cardp->udev->dev);
+       return retval;
+}
+
+#else
+static int try_olpc_fw(struct if_usb_card *cardp) { return -ENOENT; }
+#endif /* !CONFIG_OLPC */
+
 static int get_fw(struct if_usb_card *cardp, const char *fwname)
 {
        int i;
@@ -981,6 +998,10 @@ static int get_fw(struct if_usb_card *cardp, const char *fwname)
        if (fwname)
                return request_firmware(&cardp->fw, fwname, &cardp->udev->dev);
 
+       /* Handle OLPC firmware */
+       if (try_olpc_fw(cardp) == 0)
+               return 0;
+
        /* Otherwise search for firmware to use */
        for (i = 0; i < ARRAY_SIZE(fw_table); i++) {
                if (fw_table[i].model != cardp->model)