From patchwork Thu Jan 14 16:36:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alvin_=C5=A0ipraga?= X-Patchwork-Id: 12020301 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A5E6C433DB for ; Thu, 14 Jan 2021 16:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD2C723A05 for ; Thu, 14 Jan 2021 16:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726602AbhANQhj (ORCPT ); Thu, 14 Jan 2021 11:37:39 -0500 Received: from mail-eopbgr60109.outbound.protection.outlook.com ([40.107.6.109]:14051 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725918AbhANQhi (ORCPT ); Thu, 14 Jan 2021 11:37:38 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KAm3KI9pEAbWIBMfPBUvnll76CMzMat3fyyjzlAQDije7aZ+hBtpepJxhZpsLuFqu3g+Ufkf+tteFYANc4qsaVe5KZMbCzZysFTZJ8EQO0T/nOTFE78WGFLeReStqcIa0Xi136XS83TMhOIad/CYvfXTygm8V3E77vDqebAyA75ZkH8NsNHOsDHLF2R0mwvexlWTpHaHwemQBrGiK6n4E/QVFw5D9sRIAPGPp2CU1KfXC2Dn+JopSwXwv8EDp+rw+XIabsDvyruGEmUPTxRo/s6fzJcN1fYDNaPY7toTnBkJXhCeT0r5k60Hzc1UMTgyzMP50kwaFxTxxK6sPgTVdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lt/ZS5eT7lGfPEv50hVPvkQTWPJuFrCMvcBrUzLxZIY=; b=OgiFwKBjEMNi1dQaUhcx8wxRj6z4XRT8sCKr6OyN7u2WSWL7+LoFdEkDr5t2j+SZuXzotuqSmk3PUjUUfJ/wCmkmMQemOtDHtxtiUV5FKjNSlJU9Uo7eZDXzorhIH5i2tdnmTkobFSWZiFyNzpk3tEO4MRADRaiDbN1Ej1+5VzN9P7Ah4LQEbTZ0w5GGVzlyANQoAYbyBcUABnBeHRvDGUzT5S/Pue80k2HYLR5vGfaAF6Rg2KhrvctyUTNN19OJEBFbvPxSTTPPTfSmn5fJs25uc/7YlMtL7/BoL/6iQY2zsgF6ZCLk9hR24zQf3qK0PZdCn2H1jtf5Y9gSaDrFAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bang-olufsen.dk; dmarc=pass action=none header.from=bang-olufsen.dk; dkim=pass header.d=bang-olufsen.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bang-olufsen.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lt/ZS5eT7lGfPEv50hVPvkQTWPJuFrCMvcBrUzLxZIY=; b=aLIl41ZvmBvp89FIHnXG8iTqHObrIBmjOM940eAEPCorIZ8hSzC4mXfGW7WlOm6YK+1rAg5gwVegSMSULYtdAOoWnM6PuzOAYlFJWjoBuwL4nlNV4BlQtD7hlzUWDvua/RD46SH/y+K8cCwbX6RTaQE4zCC5VGxvemZNAE2NDuM= Received: from VI1PR03MB3166.eurprd03.prod.outlook.com (2603:10a6:802:32::30) by VI1PR03MB5135.eurprd03.prod.outlook.com (2603:10a6:803:bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 14 Jan 2021 16:36:47 +0000 Received: from VI1PR03MB3166.eurprd03.prod.outlook.com ([fe80::41f1:9e49:1cd0:55c8]) by VI1PR03MB3166.eurprd03.prod.outlook.com ([fe80::41f1:9e49:1cd0:55c8%6]) with mapi id 15.20.3763.009; Thu, 14 Jan 2021 16:36:47 +0000 From: =?utf-8?q?Alvin_=C5=A0ipraga?= To: Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Chung-hsien Hsu , Kalle Valo , "David S. Miller" , Jakub Kicinski CC: =?utf-8?q?Alvin_=C5=A0ipraga?= , "linux-wireless@vger.kernel.org" , "brcm80211-dev-list.pdl@broadcom.com" , "SHA-cyfmac-dev-list@infineon.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2] brcmfmac: add support for CQM RSSI notifications Thread-Topic: [PATCH v2] brcmfmac: add support for CQM RSSI notifications Thread-Index: AQHW6pNzTQg04I/KVkmfDUZ99gM7ag== Date: Thu, 14 Jan 2021 16:36:47 +0000 Message-ID: <20210114163641.2427591-1-alsi@bang-olufsen.dk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.29.2 authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=bang-olufsen.dk; x-originating-ip: [193.89.194.27] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6ae00c66-dede-4dd1-5482-08d8b8aa95f8 x-ms-traffictypediagnostic: VI1PR03MB5135: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JfVsUEdTmi+wyN+jDliI7mhe5ux9LxQ1YcgzctAvgtPPp0kU5cb6RCLJ0HZVxmMtmrgaBayryYqH3z/fWXtCC9xoSipNLT/PzNhJB9iMuxCJPMyMh7jTkbezCuulsqbzuPY+Q2zicP8slnX6pqR1gZMK5SSFFKwBbOrsIAASfUcU+uyOmxJLG0sGrmCuc6ryRU4571kCR6IdXdXREP2mJ1IhG0hTwq9SVgi6p7fx7n2mB9L3tSNi9KH6FJBUdJ7JT3P3NhdOMSVBjF8oLoSRpoQfpdUI6zEZb/4mPAKH4ER6sFahBMGZ2RdEuoRMRlVTfCf0yl2oIpPA6bgsytd7dhChtqpYbslkMmytcYwKu7BhzHztz0IvpPymXMeW107Wk4JP5Q/+VNPsq8KPU0OP7A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR03MB3166.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(39850400004)(366004)(396003)(346002)(136003)(26005)(6486002)(2906002)(71200400001)(8976002)(7416002)(86362001)(6506007)(66476007)(4326008)(54906003)(8936002)(186003)(478600001)(110136005)(36756003)(76116006)(85202003)(83380400001)(91956017)(66946007)(66556008)(8676002)(64756008)(66446008)(6512007)(5660300002)(2616005)(66574015)(316002)(15650500001)(85182001)(1076003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?utf-8?q?uvTYHJdkTkldQpIzUNdDTv7eRGgpU1?= =?utf-8?q?TSp61+1zjRm/D3E0t+z1M/6AVNprcay5AVSLr6t4yS0nGU4TQ+QhBDYJ0pLrZ7adN?= =?utf-8?q?DSnmOcHGG7p1h0f9P/5kz4rw2fCOOn84YoZ1Wo/icuiPDmv9+89AktfFai/7sS0+Z?= =?utf-8?q?Hv8z4RMG5HyJewUNuiriLYRHo5NOxbKHz3Net4TvjMJQzi9sR4Fqs05MkfDHHdeJC?= =?utf-8?q?DYYNkxK0FD39nIFJW5q3P0NnlpWV82qpU1ZIt36CxeRWK/5Oj03BM90eqyKzzcd3/?= =?utf-8?q?rlYRReL9odXSytoqg7/R+Ls8fb2cLl/kNsnBy+oGp6ENkJJ2dGnvOOz68TGkRd1G9?= =?utf-8?q?FQnWsLa+mZJD0ZdXjCoWqDNmTAK02+46AANiVIIN2hzJ7ZqaxT+BJbcc3TtKniV5e?= =?utf-8?q?8BTHD8VT5wsVh6EDN63x0jn/viM32l7uUIHl/9B0cR+jyTkrC4pTOh3Pyy7HT7YbA?= =?utf-8?q?3mF26D07MyRefjNVXbsH3Boya7ZYJqsxsns/J7qYYVqHoF3yxgVRngIuvHA8BORLV?= =?utf-8?q?IBIRv1YytfirgrB9dctQaTjhBK6igLRMa3Wx8bMDJ6IxLYvlmKQpRjNTZn4gNh9zC?= =?utf-8?q?x4AIu6uoCOsQLoQ29nFyZW0OGFDQCfjKmFTPLteVRs6MfqwWqfGPk2IEMyfWfTPWc?= =?utf-8?q?fqGUYN3+QNKVZU4It1NYF5L+dihuYkQh0Lttd6RSN8ErRTAfqGbgJvH6j3OEQUMGI?= =?utf-8?q?5u2smdydDio1HP6oHlbWYzlXPn5TPgryPEugRuOAfwMM2NKEJeqgCpkjrfEaIFyJW?= =?utf-8?q?eUU9WZOad6lOz5IvjDYrHC1/rYgQzGuOjowM8JQgrFHpsyThkvNaUX9CSJ7iPkDWP?= =?utf-8?q?tCl4/Mn4CBHwASz2RVuJYPK8PoiVPj67cq8wxSpL1ghK5sPQq56CjUNooQLEejdbF?= =?utf-8?q?A+g2wTBnG1PTJ5u7mJg2Z4B95szh3F1ayGg3v8WSt4BLQsFOUK+rsF7kdSABzk73q?= =?utf-8?q?z6uG2xGaTukoXjnPd8i?= Content-ID: <3891CEB1032A654DAB1B6349366AF2A6@eurprd03.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: bang-olufsen.dk X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB3166.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ae00c66-dede-4dd1-5482-08d8b8aa95f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2021 16:36:47.1796 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 210d08b8-83f7-470a-bc96-381193ca14a1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: P77P5THgEEHYvp/2uJXXbgXVF9DExaNXD5zp+Y6L/0uUB/Q/UrJuGuQ7YAaQqRuj/WfrNWrXcQYXXB0sSo2ZqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB5135 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for CQM RSSI measurement reporting and advertise the NL80211_EXT_FEATURE_CQM_RSSI_LIST feature. This enables a userspace supplicant such as iwd to be notified of changes in the RSSI for roaming and signal monitoring purposes. Signed-off-by: Alvin Šipraga Reviewed-by: Arend van Spriel --- v1 -> v2: - clarify firmware behaviour in a comment - fix detection of upper bound RSSI transition - improve clamping of min/max RSSI values - remove unnecessary check on last RSSI value --- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 87 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 6 ++ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 28 ++++++ 3 files changed, 121 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 0ee421f30aa2..605aa3f4ddc7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5196,6 +5196,48 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, return err; } +static int brcmf_cfg80211_set_cqm_rssi_range_config(struct wiphy *wiphy, + struct net_device *ndev, + s32 rssi_low, s32 rssi_high) +{ + struct brcmf_cfg80211_vif *vif; + struct brcmf_if *ifp; + int err = 0; + + brcmf_dbg(TRACE, "low=%d high=%d", rssi_low, rssi_high); + + ifp = netdev_priv(ndev); + vif = ifp->vif; + + if (rssi_low != vif->cqm_rssi_low || rssi_high != vif->cqm_rssi_high) { + /* The firmware will send an event when the RSSI is less than or + * equal to a configured level and the previous RSSI event was + * less than or equal to a different level. Set a third level + * so that we also detect the transition from rssi <= rssi_high + * to rssi > rssi_high. + */ + struct brcmf_rssi_event_le config = { + .rate_limit_msec = cpu_to_le32(0), + .rssi_level_num = 3, + .rssi_levels = { + clamp_val(rssi_low, S8_MIN, S8_MAX - 2), + clamp_val(rssi_high, S8_MIN + 1, S8_MAX - 1), + S8_MAX, + }, + }; + + err = brcmf_fil_iovar_data_set(ifp, "rssi_event", &config, + sizeof(config)); + if (err) { + err = -EINVAL; + } else { + vif->cqm_rssi_low = rssi_low; + vif->cqm_rssi_high = rssi_high; + } + } + + return err; +} static int brcmf_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, @@ -5502,6 +5544,7 @@ static struct cfg80211_ops brcmf_cfg80211_ops = { .update_mgmt_frame_registrations = brcmf_cfg80211_update_mgmt_frame_registrations, .mgmt_tx = brcmf_cfg80211_mgmt_tx, + .set_cqm_rssi_range_config = brcmf_cfg80211_set_cqm_rssi_range_config, .remain_on_channel = brcmf_p2p_remain_on_channel, .cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel, .get_channel = brcmf_cfg80211_get_channel, @@ -6137,6 +6180,47 @@ brcmf_notify_mic_status(struct brcmf_if *ifp, return 0; } +static s32 brcmf_notify_rssi(struct brcmf_if *ifp, + const struct brcmf_event_msg *e, void *data) +{ + struct brcmf_cfg80211_vif *vif = ifp->vif; + struct brcmf_rssi_be *info = data; + s32 rssi, snr, noise; + s32 low, high, last; + + if (e->datalen < sizeof(*info)) { + brcmf_err("insufficient RSSI event data\n"); + return 0; + } + + rssi = be32_to_cpu(info->rssi); + snr = be32_to_cpu(info->snr); + noise = be32_to_cpu(info->noise); + + low = vif->cqm_rssi_low; + high = vif->cqm_rssi_high; + last = vif->cqm_rssi_last; + + brcmf_dbg(TRACE, "rssi=%d snr=%d noise=%d low=%d high=%d last=%d\n", + rssi, snr, noise, low, high, last); + + vif->cqm_rssi_last = rssi; + + if (rssi <= low || rssi == 0) { + brcmf_dbg(INFO, "LOW rssi=%d\n", rssi); + cfg80211_cqm_rssi_notify(ifp->ndev, + NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW, + rssi, GFP_KERNEL); + } else if (rssi > high) { + brcmf_dbg(INFO, "HIGH rssi=%d\n", rssi); + cfg80211_cqm_rssi_notify(ifp->ndev, + NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH, + rssi, GFP_KERNEL); + } + + return 0; +} + static s32 brcmf_notify_vif_event(struct brcmf_if *ifp, const struct brcmf_event_msg *e, void *data) { @@ -6235,6 +6319,7 @@ static void brcmf_register_event_handlers(struct brcmf_cfg80211_info *cfg) brcmf_p2p_notify_action_tx_complete); brcmf_fweh_register(cfg->pub, BRCMF_E_PSK_SUP, brcmf_notify_connect_status); + brcmf_fweh_register(cfg->pub, BRCMF_E_RSSI, brcmf_notify_rssi); } static void brcmf_deinit_priv_mem(struct brcmf_cfg80211_info *cfg) @@ -7169,6 +7254,8 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_DFS_OFFLOAD); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); + wiphy_read_of_freq_limits(wiphy); return 0; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h index 17817cdb5de2..e90a30808c22 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h @@ -213,6 +213,9 @@ struct vif_saved_ie { * @list: linked list. * @mgmt_rx_reg: registered rx mgmt frame types. * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P). + * @cqm_rssi_low: Lower RSSI limit for CQM monitoring + * @cqm_rssi_high: Upper RSSI limit for CQM monitoring + * @cqm_rssi_last: Last RSSI reading for CQM monitoring */ struct brcmf_cfg80211_vif { struct brcmf_if *ifp; @@ -224,6 +227,9 @@ struct brcmf_cfg80211_vif { u16 mgmt_rx_reg; bool mbss; int is_11d; + s32 cqm_rssi_low; + s32 cqm_rssi_high; + s32 cqm_rssi_last; }; /* association inform */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h index 2e31cc10c195..ff2ef557f0ea 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h @@ -752,6 +752,34 @@ struct brcmf_assoclist_le { u8 mac[BRCMF_MAX_ASSOCLIST][ETH_ALEN]; }; +/** + * struct brcmf_rssi_be - RSSI threshold event format + * + * @rssi: receive signal strength (in dBm) + * @snr: signal-noise ratio + * @noise: noise (in dBm) + */ +struct brcmf_rssi_be { + __be32 rssi; + __be32 snr; + __be32 noise; +}; + +#define BRCMF_MAX_RSSI_LEVELS 8 + +/** + * struct brcm_rssi_event_le - rssi_event IOVAR format + * + * @rate_limit_msec: RSSI event rate limit + * @rssi_level_num: number of supplied RSSI levels + * @rssi_levels: RSSI levels in ascending order + */ +struct brcmf_rssi_event_le { + __le32 rate_limit_msec; + s8 rssi_level_num; + s8 rssi_levels[BRCMF_MAX_RSSI_LEVELS]; +}; + /** * struct brcmf_wowl_wakeind_le - Wakeup indicators * Note: note both fields contain same information.