Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1303dcfd authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 924d6356

drivers/net/wireless/iwlwifi/iwl-core.c

+5 −5
Original line number Diff line number Diff line
@@ -1901,10 +1901,10 @@ 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]);

				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);

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -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;