Commit 8248bb58 authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

mt76: testmode: switch ib and wb rssi to array type for per-antenna report 



Change ib_rssi and wb_rssi into array type, since they could be reported
by per-antenna.

Reviewed-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9daf27e6

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ static void mt7615_mac_fill_tm_rx(struct mt7615_dev *dev, __le32 *rxv) 
	dev->test.last_rcpi[1] = FIELD_GET(MT_RXV4_RCPI1, rxv4);

	dev->test.last_rcpi[2] = FIELD_GET(MT_RXV4_RCPI2, rxv4);

	dev->test.last_rcpi[3] = FIELD_GET(MT_RXV4_RCPI3, rxv4);

	dev->test.last_ib_rssi = FIELD_GET(MT_RXV3_IB_RSSI, rxv3);

	dev->test.last_wb_rssi = FIELD_GET(MT_RXV3_WB_RSSI, rxv3);

	dev->test.last_ib_rssi[0] = FIELD_GET(MT_RXV3_IB_RSSI, rxv3);

	dev->test.last_wb_rssi[0] = FIELD_GET(MT_RXV3_WB_RSSI, rxv3);

#endif

}

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

+2 −2
Original line number Diff line number Diff line
@@ -295,8 +295,8 @@ struct mt7615_dev { 


		s16 last_freq_offset;

		u8 last_rcpi[4];

		s8 last_ib_rssi;

		s8 last_wb_rssi;

		s8 last_ib_rssi[4];

		s8 last_wb_rssi[4];

	} test;

#endif

drivers/net/wireless/mediatek/mt76/mt7615/testmode.c

+21 −3
Original line number Diff line number Diff line
@@ -335,9 +335,7 @@ mt7615_tm_dump_stats(struct mt76_dev *mdev, struct sk_buff *msg) 
	if (!rx)

		return -ENOMEM;



	if (nla_put_s32(msg, MT76_TM_RX_ATTR_FREQ_OFFSET, dev->test.last_freq_offset) ||

	    nla_put_s32(msg, MT76_TM_RX_ATTR_IB_RSSI, dev->test.last_ib_rssi) ||

	    nla_put_s32(msg, MT76_TM_RX_ATTR_WB_RSSI, dev->test.last_wb_rssi))

	if (nla_put_s32(msg, MT76_TM_RX_ATTR_FREQ_OFFSET, dev->test.last_freq_offset))

		return -ENOMEM;



	rssi = nla_nest_start(msg, MT76_TM_RX_ATTR_RCPI);
@@ -350,6 +348,26 @@ mt7615_tm_dump_stats(struct mt76_dev *mdev, struct sk_buff *msg) 


	nla_nest_end(msg, rssi);



	rssi = nla_nest_start(msg, MT76_TM_RX_ATTR_IB_RSSI);

	if (!rssi)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(dev->test.last_ib_rssi); i++)

		if (nla_put_s8(msg, i, dev->test.last_ib_rssi[i]))

			return -ENOMEM;



	nla_nest_end(msg, rssi);



	rssi = nla_nest_start(msg, MT76_TM_RX_ATTR_WB_RSSI);

	if (!rssi)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(dev->test.last_wb_rssi); i++)

		if (nla_put_s8(msg, i, dev->test.last_wb_rssi[i]))

			return -ENOMEM;



	nla_nest_end(msg, rssi);



	nla_nest_end(msg, rx);



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ enum mt76_testmode_stats_attr { 
 *

 * @MT76_TM_RX_ATTR_FREQ_OFFSET: frequency offset (s32)

 * @MT76_TM_RX_ATTR_RCPI: received channel power indicator (array, u8)

 * @MT76_TM_RX_ATTR_IB_RSSI: internal inband RSSI (s8)

 * @MT76_TM_RX_ATTR_WB_RSSI: internal wideband RSSI (s8)

 * @MT76_TM_RX_ATTR_IB_RSSI: internal inband RSSI (array, s8)

 * @MT76_TM_RX_ATTR_WB_RSSI: internal wideband RSSI (array, s8)

 */

enum mt76_testmode_rx_attr {

	MT76_TM_RX_ATTR_UNSPEC,