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

Commit b9f192b8 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: add mt76x02_phy_set_txpower utility routine 



Add mt76x02_phy_set_txpower utility routine in mt76x02_phy.c
in order to be reused in mt76x0 tx power management code.
Moreover move following routines in mt76x02-lib module:
- mt76x02_tx_power_mask
- mt76x02_get_max_rate_power
- mt76x02_limit_rate_power
- mt76x02_add_rate_power_offset

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b6862eff

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CFLAGS_trace.o := -I$(src) 
CFLAGS_usb_trace.o := -I$(src)



mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \

		 mt76x02_eeprom.o

		 mt76x02_eeprom.o mt76x02_phy.o



mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o

drivers/net/wireless/mediatek/mt76/mt76x02_phy.c

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 * Copyright (C) 2018 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <linux/kernel.h>



#include "mt76.h"

#include "mt76x02_phy.h"



static u32

mt76x02_tx_power_mask(u8 v1, u8 v2, u8 v3, u8 v4)

{

	u32 val = 0;



	val |= (v1 & (BIT(6) - 1)) << 0;

	val |= (v2 & (BIT(6) - 1)) << 8;

	val |= (v3 & (BIT(6) - 1)) << 16;

	val |= (v4 & (BIT(6) - 1)) << 24;

	return val;

}



int mt76x02_get_max_rate_power(struct mt76_rate_power *r)

{

	s8 ret = 0;

	int i;



	for (i = 0; i < sizeof(r->all); i++)

		ret = max(ret, r->all[i]);



	return ret;

}

EXPORT_SYMBOL_GPL(mt76x02_get_max_rate_power);



void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit)

{

	int i;



	for (i = 0; i < sizeof(r->all); i++)

		if (r->all[i] > limit)

			r->all[i] = limit;

}

EXPORT_SYMBOL_GPL(mt76x02_limit_rate_power);



void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset)

{

	int i;



	for (i = 0; i < sizeof(r->all); i++)

		r->all[i] += offset;

}

EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);



void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_1)

{

	struct mt76_rate_power *t = &dev->rate_power;



	__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0,

			 txp_0);

	__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1,

			 txp_1);



	__mt76_wr(dev, MT_TX_PWR_CFG_0,

		  mt76x02_tx_power_mask(t->cck[0], t->cck[2], t->ofdm[0],

					t->ofdm[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_1,

		  mt76x02_tx_power_mask(t->ofdm[4], t->ofdm[6], t->ht[0],

					t->ht[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_2,

		  mt76x02_tx_power_mask(t->ht[4], t->ht[6], t->ht[8],

					t->ht[10]));

	__mt76_wr(dev, MT_TX_PWR_CFG_3,

		  mt76x02_tx_power_mask(t->ht[12], t->ht[14], t->stbc[0],

					t->stbc[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_4,

		  mt76x02_tx_power_mask(t->stbc[4], t->stbc[6], 0, 0));

	__mt76_wr(dev, MT_TX_PWR_CFG_7,

		  mt76x02_tx_power_mask(t->ofdm[7], t->vht[8], t->ht[7],

					t->vht[9]));

	__mt76_wr(dev, MT_TX_PWR_CFG_8,

		  mt76x02_tx_power_mask(t->ht[14], 0, t->vht[8], t->vht[9]));

	__mt76_wr(dev, MT_TX_PWR_CFG_9,

		  mt76x02_tx_power_mask(t->ht[7], 0, t->stbc[8], t->stbc[9]));

}

EXPORT_SYMBOL_GPL(mt76x02_phy_set_txpower);

drivers/net/wireless/mediatek/mt76/mt76x02_phy.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef __MT76x02_PHY_H

#define __MT76x02_PHY_H



#include "mt76x02_regs.h"



void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset);

void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_2);

void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit);

int mt76x02_get_max_rate_power(struct mt76_rate_power *r);



#endif /* __MT76x02_PHY_H */

drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c

+0 −12
Original line number Diff line number Diff line
@@ -381,18 +381,6 @@ void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t, 
}

EXPORT_SYMBOL_GPL(mt76x2_get_rate_power);



int mt76x2_get_max_rate_power(struct mt76_rate_power *r)

{

	int i;

	s8 ret = 0;



	for (i = 0; i < sizeof(r->all); i++)

		ret = max(ret, r->all[i]);



	return ret;

}

EXPORT_SYMBOL_GPL(mt76x2_get_max_rate_power);



static void

mt76x2_get_power_info_2g(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t,

		         struct ieee80211_channel *chan, int chain, int offset)

drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct mt76x2_temp_comp { 


void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t,

			   struct ieee80211_channel *chan);

int mt76x2_get_max_rate_power(struct mt76_rate_power *r);

void mt76x2_get_power_info(struct mt76x2_dev *dev,

			   struct mt76x2_tx_power_info *t,

			   struct ieee80211_channel *chan);