libertas: make lbs_cmd() usage nicer

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / libertas / if_usb.c

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a17371fe2fe400d5a15ec7493b94b45540b6123e..8ff57a6f251fb75d307069d66ae2151463b9db11 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -13,6 +13,7 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
+#include "cmd.h"
 #include "if_usb.h"
 
 #define MESSAGE_HEADER_LEN     4
@@ -104,15 +105,12 @@ static void if_usb_free(struct usb_card_rec *cardp)
 static void if_usb_set_boot2_ver(struct lbs_private *priv)
 {
        struct cmd_ds_set_boot2_ver b2_cmd;
-       int rsp_len = sizeof(b2_cmd);
 
        b2_cmd.action = 0;
        b2_cmd.version = priv->boot2_version;
 
-       if (lbs_cmd(priv, CMD_SET_BOOT2_VER, &b2_cmd, sizeof(b2_cmd),
-                   &b2_cmd, &rsp_len)) {
+       if (lbs_cmd(priv, CMD_SET_BOOT2_VER, b2_cmd, NULL, 0))
                lbs_deb_usb("Setting boot2 version failed\n");
-       }
 }
 
 
@@ -232,7 +230,7 @@ static int if_usb_probe(struct usb_interface *intf,
        /* Delay 200 ms to waiting for the FW ready */
        if_usb_submit_rx_urb(cardp);
        msleep_interruptible(200);
-       priv->adapter->fw_ready = 1;
+       priv->fw_ready = 1;
 
        if (lbs_start_card(priv))
                goto err_start_card;
@@ -273,9 +271,8 @@ static void if_usb_disconnect(struct usb_interface *intf)
        cardp->surprise_removed = 1;
 
        if (priv) {
-               struct lbs_adapter *adapter = priv->adapter;
 
-               adapter->surpriseremoved = 1;
+               priv->surpriseremoved = 1;
                lbs_stop_card(priv);
                lbs_remove_mesh(priv);
                lbs_remove_card(priv);
@@ -378,20 +375,23 @@ static int if_prog_firmware(struct usb_card_rec *cardp)
 
 static int if_usb_reset_device(struct usb_card_rec *cardp)
 {
+       struct cmd_ds_command *cmd = (void *)&cardp->bulk_out_buffer[4];
        int ret;
-       struct lbs_private *priv = cardp->priv;
 
        lbs_deb_enter(LBS_DEB_USB);
 
-       /* Try a USB port reset first, if that fails send the reset
-        * command to the firmware.
-        */
+       *(__le32 *)cardp->bulk_out_buffer = cpu_to_le32(CMD_TYPE_REQUEST);
+
+       cmd->command = cpu_to_le16(CMD_802_11_RESET);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_reset) + S_DS_GEN);
+       cmd->result = cpu_to_le16(0);
+       cmd->seqnum = cpu_to_le16(0x5a5a);
+       cmd->params.reset.action = cpu_to_le16(CMD_ACT_HALT);
+       usb_tx_block(cardp, cardp->bulk_out_buffer, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset));
+
+       msleep(10);
        ret = usb_reset_device(cardp->udev);
-       if (!ret && priv) {
-               msleep(10);
-               ret = lbs_reset_device(priv);
-               msleep(10);
-       }
+       msleep(10);
 
        lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
 
@@ -512,9 +512,15 @@ static void if_usb_receive_fwload(struct urb *urb)
                        return;
                }
                if (bootcmdresp.u32magicnumber != cpu_to_le32(BOOT_CMD_MAGIC_NUMBER)) {
-                       lbs_pr_info(
-                               "boot cmd response wrong magic number (0x%x)\n",
-                               le32_to_cpu(bootcmdresp.u32magicnumber));
+                       if (bootcmdresp.u32magicnumber == cpu_to_le32(CMD_TYPE_REQUEST) ||
+                           bootcmdresp.u32magicnumber == cpu_to_le32(CMD_TYPE_DATA) ||
+                           bootcmdresp.u32magicnumber == cpu_to_le32(CMD_TYPE_INDICATION)) {
+                               lbs_pr_info("Firmware already seems alive; resetting\n");
+                               cardp->bootcmdresp = -1;
+                       } else {
+                               lbs_pr_info("boot cmd response wrong magic number (0x%x)\n",
+                                           le32_to_cpu(bootcmdresp.u32magicnumber));
+                       }
                } else if (bootcmdresp.u8cmd_tag != BOOT_CMD_FW_BY_USB) {
                        lbs_pr_info(
                                "boot cmd response cmd_tag error (%d)\n",
@@ -612,14 +618,14 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
        if (!in_interrupt())
                BUG();
 
-       spin_lock(&priv->adapter->driver_lock);
+       spin_lock(&priv->driver_lock);
        /* take care of cur_cmd = NULL case by reading the
         * data to clear the interrupt */
-       if (!priv->adapter->cur_cmd) {
+       if (!priv->cur_cmd) {
                cmdbuf = priv->upld_buf;
-               priv->adapter->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY;
+               priv->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY;
        } else
-               cmdbuf = priv->adapter->cur_cmd->bufvirtualaddr;
+               cmdbuf = priv->cur_cmd->bufvirtualaddr;
 
        cardp->usb_int_cause |= MRVDRV_CMD_UPLD_RDY;
        priv->upld_len = (recvlength - MESSAGE_HEADER_LEN);
@@ -627,8 +633,8 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
               priv->upld_len);
 
        kfree_skb(skb);
-       lbs_interrupt(priv->dev);
-       spin_unlock(&priv->adapter->driver_lock);
+       lbs_interrupt(priv);
+       spin_unlock(&priv->driver_lock);
 
        lbs_deb_usbd(&cardp->udev->dev,
                    "Wake up main thread to handle cmd response\n");
@@ -688,20 +694,20 @@ static void if_usb_receive(struct urb *urb)
 
        case CMD_TYPE_INDICATION:
                /* Event cause handling */
-               spin_lock(&priv->adapter->driver_lock);
+               spin_lock(&priv->driver_lock);
                cardp->usb_event_cause = le32_to_cpu(*(__le32 *) (recvbuff + MESSAGE_HEADER_LEN));
                lbs_deb_usbd(&cardp->udev->dev,"**EVENT** 0x%X\n",
                            cardp->usb_event_cause);
                if (cardp->usb_event_cause & 0xffff0000) {
                        lbs_send_tx_feedback(priv);
-                       spin_unlock(&priv->adapter->driver_lock);
+                       spin_unlock(&priv->driver_lock);
                        break;
                }
                cardp->usb_event_cause <<= 3;
                cardp->usb_int_cause |= MRVDRV_CARDEVENT;
                kfree_skb(skb);
-               lbs_interrupt(priv->dev);
-               spin_unlock(&priv->adapter->driver_lock);
+               lbs_interrupt(priv);
+               spin_unlock(&priv->driver_lock);
                goto rx_exit;
        default:
                lbs_deb_usbd(&cardp->udev->dev, "Unknown command type 0x%X\n",
@@ -753,7 +759,7 @@ static int if_usb_host_to_card(struct lbs_private *priv,
                            nb + MESSAGE_HEADER_LEN);
 }
 
-/* called with adapter->driver_lock held */
+/* called with priv->driver_lock held */
 static int if_usb_get_int_status(struct lbs_private *priv, u8 *ireg)
 {
        struct usb_card_rec *cardp = priv->card;
@@ -770,7 +776,7 @@ static int if_usb_read_event_cause(struct lbs_private *priv)
 {
        struct usb_card_rec *cardp = priv->card;
 
-       priv->adapter->eventcause = cardp->usb_event_cause;
+       priv->eventcause = cardp->usb_event_cause;
        /* Re-submit rx urb here to avoid event lost issue */
        if_usb_submit_rx_urb(cardp);
        return 0;
@@ -887,7 +893,7 @@ restart:
                } while (cardp->bootcmdresp == 0 && j < 10);
        } while (cardp->bootcmdresp == 0 && i < 5);
 
-       if (cardp->bootcmdresp == 0) {
+       if (cardp->bootcmdresp <= 0) {
                if (--reset_count >= 0) {
                        if_usb_reset_device(cardp);
                        goto restart;
@@ -945,7 +951,7 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 
        lbs_deb_enter(LBS_DEB_USB);
 
-       if (priv->adapter->psstate != PS_STATE_FULL_POWER)
+       if (priv->psstate != PS_STATE_FULL_POWER)
                return -1;
 
        if (priv->mesh_dev && !priv->mesh_autostart_enabled) {