From patchwork Tue Jan 12 11:13:36 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: 362723 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, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 39DD8C433E0 for ; Tue, 12 Jan 2021 11:14:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D52EF208B3 for ; Tue, 12 Jan 2021 11:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726993AbhALLO3 (ORCPT ); Tue, 12 Jan 2021 06:14:29 -0500 Received: from mail-eopbgr80093.outbound.protection.outlook.com ([40.107.8.93]:18055 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725977AbhALLO2 (ORCPT ); Tue, 12 Jan 2021 06:14:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V1HSUqIyPRmBsUSzOVpx362CjYnJm223MFNUf8RSFljRBqDRaiWt1jTHQIb4+01xuM0HqpsM4LctY7G2SZ1rdFnznnjHzSdMWJx0X+vSVxldgEa9N1OFkbFYmtlXCtcAcAT3ABMD/wECEdIQ+hGxaIddGi/IcULdZbj0f9lYtAdOTH2xZk7EF1Wr4rG9FzI7ngPg9/sZp3HJMx/9Jnnenwezy6gOXp96OD9E2m/BQfCAcTjoKmr+eDxZ3vcx5402lEfpN+5M1LMDQJ07yBTmfuudEsvhyJJiaaMMEeAdwZeAHJjstB7Vll099xqCV1umhgTYQjNQIENcfALwEx9dsQ== 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=aWSfuLfkp25kqqbVgK/7rZ3wIGmZDtoPqlvg1YyMt/c=; b=Vj1itMTdcReF/T/B5wiGm5j7KDkrjXXC49idqwO0fHcaAnAtUXo4wYXEBmWk7Im09PAuBwe71bzU+IzXF5nJW1DhKZBcOdVwFvl+StWBQofKZZ67mR+MD4k4EVQOtIQzWrrSDMSD+bDqnOQpzf2U0b903yzLVzoYxyIz4R/kFgXp6LYctW6k+KFCow19BqrvEGaY7NjSJ2Y1zK1mwRwQ6aNnz5/6zJsAbpGVZ+oEE4257dSPMruXhvfYD6k/gGimDOItP/qWS+b0z5YBV4XlFVTb8O7ahsLkuni28ptEzY4dlGgEBepS3QET0y7nISNVD9R/465UsJnAMw0M2soYPQ== 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=aWSfuLfkp25kqqbVgK/7rZ3wIGmZDtoPqlvg1YyMt/c=; b=JXqbo8efISjjCgg1eTmIzP+6YbFPjZet1i8hFSuLWx+huvVlyCgfNHATFX+h8jPBJffeN0CsZfcVnbNcpqYmDoH1ayZWvoTzHrxXpnZWOmf9UvkDmYKDhub5qBkqT59yauXcp4WpfXpeAIp3UfUptWHysFlf6uznlLK2+jQGomg= Received: from DB6PR03MB3158.eurprd03.prod.outlook.com (2603:10a6:6:38::10) by DB6PR0302MB2648.eurprd03.prod.outlook.com (2603:10a6:4:b4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Tue, 12 Jan 2021 11:13:37 +0000 Received: from DB6PR03MB3158.eurprd03.prod.outlook.com ([fe80::d4d4:985d:22d5:8ca6]) by DB6PR03MB3158.eurprd03.prod.outlook.com ([fe80::d4d4:985d:22d5:8ca6%4]) with mapi id 15.20.3742.012; Tue, 12 Jan 2021 11:13:37 +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] brcmfmac: add support for CQM RSSI notifications Thread-Topic: [PATCH] brcmfmac: add support for CQM RSSI notifications Thread-Index: AQHW6NP56plH53ydIkSxb2hpUB/rTA== Date: Tue, 12 Jan 2021 11:13:36 +0000 Message-ID: <20210112111253.4176340-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: 067c758a-42d7-4b18-bc6b-08d8b6eb1ba8 x-ms-traffictypediagnostic: DB6PR0302MB2648: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oQ20/1EJV6FFrASvNZKYUBpnP2lNSGG8PihHHmh/IE8GQBzWloxtJL1GLmTuOu2O+HYXn0gq9RJUXy/N0nfsne2ybvt8MEOhY+g9wS1MHzg8/7/7E2eLReN4+ffjUDyeOwfDPSBXZm4qlopF350xBJWYpwTuIywJYafT6gRMkirodEp1AmPu+8E9Z008k0wMWGYHh84+bvxf+jriZftbWzySjY5Jw8P0BOL29jbWnAAdc+LXZpBciJ59OSsfwzvKiri1moAkE4Hn+o33MfOKSuB6bIz/umeFz/dWBkMPI8zATjcmZzb+8mDtW1dAoRLTIVp/LdVUPCwpRyYjAcmHGZFj0Pbkx2QXnyoZjoBzsICQXCAgiOzsWUZmuDoX+8LR0PK2CuD9MHaU/ESVc8oZdA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR03MB3158.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(346002)(136003)(366004)(376002)(396003)(8976002)(85202003)(6512007)(1076003)(4326008)(36756003)(66574015)(2616005)(478600001)(8936002)(7416002)(316002)(86362001)(26005)(186003)(6486002)(85182001)(2906002)(71200400001)(83380400001)(66476007)(66946007)(8676002)(91956017)(6506007)(54906003)(5660300002)(66556008)(64756008)(110136005)(76116006)(66446008)(15650500001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?utf-8?q?kYNDt4GwkfEK/bjWRXs0/b562Ft?= =?utf-8?q?HOiBDMGoNPYkslaMUfDCKIAgPuEu1rAOaMtKeMJtu2flhhyt40CxEmjy?= =?utf-8?q?4NQzT8+bW9+sqq7+bvivmWMoF/dQd4iYv9pXAGzKSVToYdRjvbZlj5lj?= =?utf-8?q?azVBcxAKQDzORHtnOjgkVyMfeSVpCX3NUvsxpB0a4cUWSztPPMyPmRuK?= =?utf-8?q?ByEdzhI+vTfrlVbJzpGyhq3zeNhHa4MKe1P4+Z7q3AZ0+XXH2QrqVEK0?= =?utf-8?q?SFsopoQJnCh5yXckQwDGcl1U4j3MknBHpl4Zva88aoKuFpTw3JakzHZK?= =?utf-8?q?i4Fp5y/paAdvhslm3BZhZJSkTNC4aWEiERrRPevpO4bYIdEeNbTWy8QC?= =?utf-8?q?rbWGoV1cXyMAktr58RinYqh5BurB3yfUSVNKK21ZIsl46kU03cntX3TY?= =?utf-8?q?mtYQN/hPLVdHfqyUHhWHUJ1fE7SxqT1ee5y7Be9WK1xtGMTvH6anAPWW?= =?utf-8?q?Jha97rf3Q9HE0IA99B1qhvEJFOddBWVUcseoohHideQn6b7h9fD/pIIF?= =?utf-8?q?8YBfu6IEQFvj8fIZHjJLlLD1Yx0iZ/lGnowxP35c1tfQNwBpRSCnt+Fy?= =?utf-8?q?1HXQiWe50Jt9v7QEBvPhBM6SN7Y15ySf77kSGiw3PVnGIDoP9G8ujkhc?= =?utf-8?q?wa83bQtxuloE0ju7J/SbXP87pr9hbbYtvUHNMlacMMC+LKhaK+utN3hn?= =?utf-8?q?m+WxlkdjmzjVeto+aiV3MKKm+31HgJNevPgF9obuLFfx5T7+3f36wtc2?= =?utf-8?q?2FU0q1O2fTzF0q5aHpM8PqgUW+680X7wnlbFol0sGFhrRHJ+J/LD+hwv?= =?utf-8?q?yLyKkKD7I5qwm0ZdSUHb5zTvu6qJkjdNZLYwoqegPNuNaVWUhOnzOJL2?= =?utf-8?q?sYucBvWl7NdfSJUiHVfqNDOoKHMWwwCZTyeFxCxeXGkKbw5o0KqilmRh?= =?utf-8?q?QeWxr3HiPLiB0WHsdFFGadECDdjkpUnphQPQpibB6cb+RXaQ8aHszDXX?= =?utf-8?q?gcwCcRCr5aRDoSb/RMnI8vJX20COpS/7inpdNufqPHQ4D?= Content-ID: <7C30CE048823164E81B6483FD0FB9989@eurprd03.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: bang-olufsen.dk X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB6PR03MB3158.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 067c758a-42d7-4b18-bc6b-08d8b6eb1ba8 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jan 2021 11:13:36.9138 (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: DNVzK43YG1QsWeczvMAO1Ajg9Bg1VkfN6WZX3w/E6zmrtumBE77qxzmWHXTpyyi+G365fRUnSGEW2p0QzeW8TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2648 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 --- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 82 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 6 ++ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 28 +++++++ 3 files changed, 116 insertions(+) -- 2.29.2 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 0ee421f30aa2..21b53bd27f7f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5196,6 +5196,41 @@ 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) { + struct brcmf_rssi_event_le config = { + .rate_limit_msec = cpu_to_le32(0), + .rssi_level_num = 2, + .rssi_levels = { + max_t(s32, rssi_low, S8_MIN), + min_t(s32, rssi_high, 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 +5537,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 +6173,49 @@ 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); + + if (rssi != 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 +6314,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 +7249,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.