ath9k_hw: prevent writes to const data on AR9160 (9bbb8168) · Commits · 戴 / test

drivers/net/wireless/ath/ath9k/ar5008_phy.c

+1 −24

Original line number	Diff line number	Diff line
		@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
		ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
		ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
		ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
		ATH_ALLOC_BANK(ah->addac5416_21,
		ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);
		ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);

		return 0;
		@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
		ATH_FREE_BANK(ah->analogBank6Data);
		ATH_FREE_BANK(ah->analogBank6TPCData);
		ATH_FREE_BANK(ah->analogBank7Data);
		ATH_FREE_BANK(ah->addac5416_21);
		ATH_FREE_BANK(ah->bank6Temp);

		#undef ATH_FREE_BANK
		@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
		if (ah->eep_ops->set_addac)
		ah->eep_ops->set_addac(ah, chan);

		if (AR_SREV_5416_22_OR_LATER(ah)) {
		REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
		} else {
		struct ar5416IniArray temp;
		u32 addacSize =
		sizeof(u32) * ah->iniAddac.ia_rows *
		ah->iniAddac.ia_columns;

		/* For AR5416 2.0/2.1 */
		memcpy(ah->addac5416_21,
		ah->iniAddac.ia_array, addacSize);

		/* override CLKDRV value at [row, column] = [31, 1] */
		(ah->addac5416_21)[31 * ah->iniAddac.ia_columns + 1] = 0;

		temp.ia_array = ah->addac5416_21;
		temp.ia_columns = ah->iniAddac.ia_columns;
		temp.ia_rows = ah->iniAddac.ia_rows;
		REG_WRITE_ARRAY(&temp, 1, regWrites);
		}

		REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_INTERNAL_ADDAC);

		ENABLE_REGWRITE_BUFFER(ah);

+19 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
		INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
		ARRAY_SIZE(ar5416Addac), 2);
		}

		/* iniAddac needs to be modified for these chips */
		if (AR_SREV_9160(ah) \|\| !AR_SREV_5416_22_OR_LATER(ah)) {
		struct ar5416IniArray *addac = &ah->iniAddac;
		u32 size = sizeof(u32) * addac->ia_rows * addac->ia_columns;
		u32 *data;

		data = kmalloc(size, GFP_KERNEL);
		if (!data)
		return;

		memcpy(data, addac->ia_array, size);
		addac->ia_array = data;

		if (!AR_SREV_5416_22_OR_LATER(ah)) {
		/* override CLKDRV value */
		INI_RA(addac, 31,1) = 0;
		}
		}
		}

		/* Support for Japan ch.14 (2484) spread */

+0 −1