iwlwifi: fix ICT irq table endianness

The ICT IRQ table is a set of __le32 values, not u32 values,
so when reading it we need to take into account that it has
to be converted to CPU endianness. This was causing a lot of
trouble on my powerpc box where various things would simply
not work for no apparent reason with 5xxx cards, but worked
with 4965 -- which doesn't use the ICT table.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c62c081cfbb7cf7df3bb08a9fb0c22becefe9596..0bfd4e9181395f8539938e4452be0209e40befcb 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1823,7 +1823,7 @@ int iwl_reset_ict(struct iwl_priv *priv)
        spin_lock_irqsave(&priv->lock, flags);
        iwl_disable_interrupts(priv);
 
-       memset(&priv->ict_tbl[0],0, sizeof(u32) * ICT_COUNT);
+       memset(&priv->ict_tbl[0], 0, sizeof(u32) * ICT_COUNT);
 
        val = priv->aligned_ict_tbl_dma >> PAGE_SHIFT;
 
@@ -1901,13 +1901,13 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
        /* read all entries that not 0 start with ict_index */
        while (priv->ict_tbl[priv->ict_index]) {
 
-               val |= priv->ict_tbl[priv->ict_index];
+               val |= le32_to_cpu(priv->ict_tbl[priv->ict_index]);
                IWL_DEBUG_ISR(priv, "ICT index %d value 0x%08X\n",
-                                       priv->ict_index,
-                                       priv->ict_tbl[priv->ict_index]);
+                               priv->ict_index,
+                               le32_to_cpu(priv->ict_tbl[priv->ict_index]));
                priv->ict_tbl[priv->ict_index] = 0;
                priv->ict_index = iwl_queue_inc_wrap(priv->ict_index,
-                                                               ICT_COUNT);
+                                                    ICT_COUNT);
 
        }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index ccea2e4ab45a46496daef53d298e610cca4d6ef1..028d50599550127f0effe21beacd5442fed0a0af 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1170,7 +1170,7 @@ struct iwl_priv {
        struct iwl_hw_params hw_params;
 
        /* INT ICT Table */
-       u32 *ict_tbl;
+       __le32 *ict_tbl;
        dma_addr_t ict_tbl_dma;
        dma_addr_t aligned_ict_tbl_dma;
        int ict_index;