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

Commit 992a36a6 authored Oct 14, 2014 by Lorenzo Bianconi Committed by John W. Linville Oct 27, 2014

ath9k: do not overwrite AR_PHY_RADAR_1 MSB

Do not overwrite AR_PHY_RADAR_1 most significant byte default value

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 9fdc723a

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1190,7 +1190,7 @@ static void ar5008_hw_set_nf_limits(struct ath_hw *ah)
	static void ar5008_hw_set_radar_params(struct ath_hw *ah,		static void ar5008_hw_set_radar_params(struct ath_hw *ah,
	struct ath_hw_radar_conf *conf)		struct ath_hw_radar_conf *conf)
	{		{
	u32 radar_0 = 0, radar_1 = 0;		u32 radar_0 = 0, radar_1;

	if (!conf) {		if (!conf) {
	REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);		REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);
	@@ -1204,6 +1204,9 @@ static void ar5008_hw_set_radar_params(struct ath_hw *ah,
	radar_0 \|= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);		radar_0 \|= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);
	radar_0 \|= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);		radar_0 \|= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);

			radar_1 = REG_READ(ah, AR_PHY_RADAR_1);
			radar_1 &= ~(AR_PHY_RADAR_1_MAXLEN \| AR_PHY_RADAR_1_RELSTEP_THRESH \|
			AR_PHY_RADAR_1_RELPWR_THRESH);
	radar_1 \|= AR_PHY_RADAR_1_MAX_RRSSI;		radar_1 \|= AR_PHY_RADAR_1_MAX_RRSSI;
	radar_1 \|= AR_PHY_RADAR_1_BLOCK_CHECK;		radar_1 \|= AR_PHY_RADAR_1_BLOCK_CHECK;
	radar_1 \|= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);		radar_1 \|= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1348,7 +1348,7 @@ static void ar9003_hw_set_radar_params(struct ath_hw *ah,
	struct ath_hw_radar_conf *conf)		struct ath_hw_radar_conf *conf)
	{		{
	unsigned int regWrites = 0;		unsigned int regWrites = 0;
	u32 radar_0 = 0, radar_1 = 0;		u32 radar_0 = 0, radar_1;

	if (!conf) {		if (!conf) {
	REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);		REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);
	@@ -1362,6 +1362,9 @@ static void ar9003_hw_set_radar_params(struct ath_hw *ah,
	radar_0 \|= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);		radar_0 \|= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);
	radar_0 \|= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);		radar_0 \|= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);

			radar_1 = REG_READ(ah, AR_PHY_RADAR_1);
			radar_1 &= ~(AR_PHY_RADAR_1_MAXLEN \| AR_PHY_RADAR_1_RELSTEP_THRESH \|
			AR_PHY_RADAR_1_RELPWR_THRESH);
	radar_1 \|= AR_PHY_RADAR_1_MAX_RRSSI;		radar_1 \|= AR_PHY_RADAR_1_MAX_RRSSI;
	radar_1 \|= AR_PHY_RADAR_1_BLOCK_CHECK;		radar_1 \|= AR_PHY_RADAR_1_BLOCK_CHECK;
	radar_1 \|= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);		radar_1 \|= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);