2009-08-26 20:15:50

by Johannes Berg

Subject: [PATCH] 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 <[email protected]>
---
Oddly, the __le32 pointer doesn't help one bit, sparse
doesn't warn. Oh well. This makes lots of things work
better for me :)

drivers/net/wireless/iwlwifi/iwl-core.c | 10 +++++-----
drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)

--- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-08-26 20:37:01.000000000 +0200
+++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-08-26 20:37:06.000000000 +0200
@@ -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;
--- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-core.c 2009-08-26 20:39:14.000000000 +0200
+++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-core.c 2009-08-26 20:40:36.000000000 +0200
@@ -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 *d
/* 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);

}

2009-08-26 20:25:57

by Reinette Chatre

Subject: Re: [PATCH] iwlwifi: fix ICT irq table endianness

On Wed, 2009-08-26 at 13:15 -0700, Johannes Berg wrote:
> 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 <[email protected]>

Thank you very much

Acked-by: Reinette Chatre <[email protected]>

Reinette