libertas: fix IEEE PS mode in GSPI driver

The card firmware does not set the Command Download Ready interrupt bit
when IEEE PS mode is enabled, preventing the driver from sending
commands (such as the command to exit IEEE PS mode) since there is no
indication that the card is ready to accept commands.

This patch works around the problem by using the the TX Download Ready
bit in place of the Command Download Ready Bit while in IEEE PS mode.
TX Download Ready is set in IEEE PS mode.

Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index f8c2898d82b05b305e69c566e52e8291b5118348..dc2a1f6ee36cebf383098c3dfdc2293f9f59641f 100644 (file)
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -875,7 +875,12 @@ static int lbs_spi_thread(void *data)
                        err = if_spi_c2h_data(card);
                        if (err)
                                goto err;
-               if (hiStatus & IF_SPI_HIST_CMD_DOWNLOAD_RDY) {
+
+               /* workaround: in PS mode, the card does not set the Command
+                * Download Ready bit, but it sets TX Download Ready. */
+               if (hiStatus & IF_SPI_HIST_CMD_DOWNLOAD_RDY ||
+                  (card->priv->psstate != PS_STATE_FULL_POWER &&
+                   (hiStatus & IF_SPI_HIST_TX_DOWNLOAD_RDY))) {
                        /* This means two things. First of all,
                         * if there was a previous command sent, the card has
                         * successfully received it.