mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

mac80211: support minimal EHT rate reporting on RX

Browse source 
Add minimal support for RX EHT rate reporting, not yet
adding (modifying) any radiotap headers, just statistics
for cfg80211.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2023-01-09 13:07:21 +02:00
parent b1b3297df7
commit f66c48af7a
5 changed files with 64 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/net/mac80211.h
View file

@ -1462,6 +1462,7 @@ enum mac80211_rx_encoding {
RX_ENC_HT,
RX_ENC_VHT,
RX_ENC_HE,
RX_ENC_EHT,
};
/**
@ -1495,7 +1496,7 @@ enum mac80211_rx_encoding {
* @antenna: antenna used
* @rate_idx: index of data rate into band's supported rates or MCS index if
* HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
* @nss: number of streams (VHT and HE only)
* @nss: number of streams (VHT, HE and EHT only)
* @flag: %RX_FLAG_\*
* @encoding: &enum mac80211_rx_encoding
* @bw: &enum rate_info_bw
@ -1503,6 +1504,8 @@ enum mac80211_rx_encoding {
* @he_ru: HE RU, from &enum nl80211_he_ru_alloc
* @he_gi: HE GI, from &enum nl80211_he_gi
* @he_dcm: HE DCM value
* @eht.ru: EHT RU, from &enum nl80211_eht_ru_alloc
* @eht.gi: EHT GI, from &enum nl80211_eht_gi
* @rx_flags: internal RX flags for mac80211
* @ampdu_reference: A-MPDU reference number, must be a different value for
* each A-MPDU but the same for each subframe within one A-MPDU
@ -1524,8 +1527,18 @@ struct ieee80211_rx_status {
u32 flag;
u16 freq: 13, freq_offset: 1;
u8 enc_flags;
u8 encoding:2, bw:3, he_ru:3;
u8 he_gi:2, he_dcm:1;
u8 encoding:3, bw:4;
union {
struct {
u8 he_ru:3;
u8 he_gi:2;
u8 he_dcm:1;
};
struct {
u8 ru:4;
u8 gi:2;
} eht;
};
u8 rate_idx;
u8 nss;
u8 rx_flags;

9
net/mac80211/rx.c
View file

@ -5194,6 +5194,15 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
status->rate_idx, status->nss))
goto drop;
break;
case RX_ENC_EHT:
if (WARN_ONCE(status->rate_idx > 15 ||
!status->nss ||
status->nss > 8 ||
status->eht.gi > NL80211_RATE_INFO_EHT_GI_3_2,
"Rate marked as an EHT rate but data is invalid: MCS:%d, NSS:%d, GI:%d\n",
status->rate_idx, status->nss, status->eht.gi))
goto drop;
break;
default:
WARN_ON_ONCE(1);
fallthrough;

9
net/mac80211/sta_info.c
View file

@ -4,7 +4,7 @@
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
* Copyright 2013-2014 Intel Mobile Communications GmbH
* Copyright (C) 2015 - 2017 Intel Deutschland GmbH
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*/
#include <linux/module.h>
@ -2406,6 +2406,13 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate,
rinfo->he_ru_alloc = STA_STATS_GET(HE_RU, rate);
rinfo->he_dcm = STA_STATS_GET(HE_DCM, rate);
break;
case STA_STATS_RATE_TYPE_EHT:
rinfo->flags = RATE_INFO_FLAGS_EHT_MCS;
rinfo->mcs = STA_STATS_GET(EHT_MCS, rate);
rinfo->nss = STA_STATS_GET(EHT_NSS, rate);
rinfo->eht_gi = STA_STATS_GET(EHT_GI, rate);
rinfo->eht_ru_alloc = STA_STATS_GET(EHT_RU, rate);
break;
}
}

24
net/mac80211/sta_info.h
View file

@ -936,6 +936,7 @@ enum sta_stats_type {
STA_STATS_RATE_TYPE_VHT,
STA_STATS_RATE_TYPE_HE,
STA_STATS_RATE_TYPE_S1G,
STA_STATS_RATE_TYPE_EHT,
};
#define STA_STATS_FIELD_HT_MCS GENMASK( 7, 0)
@ -945,12 +946,16 @@ enum sta_stats_type {
#define STA_STATS_FIELD_VHT_NSS GENMASK( 7, 4)
#define STA_STATS_FIELD_HE_MCS GENMASK( 3, 0)
#define STA_STATS_FIELD_HE_NSS GENMASK( 7, 4)
#define STA_STATS_FIELD_BW GENMASK(11, 8)
#define STA_STATS_FIELD_SGI GENMASK(12, 12)
#define STA_STATS_FIELD_TYPE GENMASK(15, 13)
#define STA_STATS_FIELD_HE_RU GENMASK(18, 16)
#define STA_STATS_FIELD_HE_GI GENMASK(20, 19)
#define STA_STATS_FIELD_HE_DCM GENMASK(21, 21)
#define STA_STATS_FIELD_EHT_MCS GENMASK( 3, 0)
#define STA_STATS_FIELD_EHT_NSS GENMASK( 7, 4)
#define STA_STATS_FIELD_BW GENMASK(12, 8)
#define STA_STATS_FIELD_SGI GENMASK(13, 13)
#define STA_STATS_FIELD_TYPE GENMASK(16, 14)
#define STA_STATS_FIELD_HE_RU GENMASK(19, 17)
#define STA_STATS_FIELD_HE_GI GENMASK(21, 20)
#define STA_STATS_FIELD_HE_DCM GENMASK(22, 22)
#define STA_STATS_FIELD_EHT_RU GENMASK(20, 17)
#define STA_STATS_FIELD_EHT_GI GENMASK(22, 21)
#define STA_STATS_FIELD(_n, _v) FIELD_PREP(STA_STATS_FIELD_ ## _n, _v)
#define STA_STATS_GET(_n, _v) FIELD_GET(STA_STATS_FIELD_ ## _n, _v)
@ -989,6 +994,13 @@ static inline u32 sta_stats_encode_rate(struct ieee80211_rx_status *s)
r |= STA_STATS_FIELD(HE_RU, s->he_ru);
r |= STA_STATS_FIELD(HE_DCM, s->he_dcm);
break;
case RX_ENC_EHT:
r |= STA_STATS_FIELD(TYPE, STA_STATS_RATE_TYPE_EHT);
r |= STA_STATS_FIELD(EHT_NSS, s->nss);
r |= STA_STATS_FIELD(EHT_MCS, s->rate_idx);
r |= STA_STATS_FIELD(EHT_GI, s->eht.gi);
r |= STA_STATS_FIELD(EHT_RU, s->eht.ru);
break;
default:
WARN_ON(1);
return STA_STATS_RATE_INVALID;

13
net/mac80211/util.c
View file

@ -4020,6 +4020,19 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
/* Fill cfg80211 rate info */
switch (status->encoding) {
case RX_ENC_EHT:
ri.flags |= RATE_INFO_FLAGS_EHT_MCS;
ri.mcs = status->rate_idx;
ri.nss = status->nss;
ri.eht_ru_alloc = status->eht.ru;
if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)
ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
/* TODO/FIXME: is this right? handle other PPDUs */
if (status->flag & RX_FLAG_MACTIME_PLCP_START) {
mpdu_offset += 2;
ts += 36;
}
break;
case RX_ENC_HE:
ri.flags |= RATE_INFO_FLAGS_HE_MCS;
ri.mcs = status->rate_idx;