From patchwork Mon Apr 27 13:40:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277654 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=oygfM4Gx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mBp2Vqnz9sT0 for ; Mon, 27 Apr 2020 23:41:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727891AbgD0NlD (ORCPT ); Mon, 27 Apr 2020 09:41:03 -0400 Received: from mail-mw2nam12on2071.outbound.protection.outlook.com ([40.107.244.71]:6160 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727844AbgD0NlC (ORCPT ); Mon, 27 Apr 2020 09:41:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWScUi6LTxJnsK7J9zglDRw4ITVfhnE2KljLit5Z9TnBo6td0dBqiqwEY6a98xn6XcZr7a8+U93a0VHbrR4OnuWiXT8Ds7XDUKQz1ZOZ2CrnD2XnTDEUnhg96Ji4FvhGyAO2qYdRSAwvtOmPjDqkEEIpIdvJ9fmmm7FZZ9MhzPhMF/gKuPiaPFgWz7I3nie2nFVNl9lfjHU3s3b0hsOAlFyET+W0q1YgCLSwsq7GnEzrOv8Po4Ie7NjrbGby5IJO/HkMwpFhVB/JSZT8WP01RjWzRIUMSR7EkW0a+ctHZAZUNR4tcmfA8rk+hlSDcP1d0qVX264EMWRPc5lcHHMxEA== 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=wNn7O+LkSOLVea7vlLN+uZe+zF/6KR4RChRExQDAq6U=; b=I/r3iWoaR3JpJZCqBAIkMj1X8qmeCVqiAdCBlsJGsR1EAODEtKBlm9CZ21UG0Cb335ANZmcQqD68N+gGQBmIlxGslejtwQWvacVjkjkr1nTETPY3nvAoHXfDXOg+bBvjtGtqwNjVuAvrZz10xCgy9V+0C42w8OX3swUobJwphLZ5NCyesn04AzjBnKg1VJwbjmmibm/QqkOTbjrIPpCQ3/4cDHJyct9AwTV8O7s61i3KNPwnj236XaabX/fGl2m24f8sRcKPA6IkJuBiarFbHYbpw6lPmy+BeJA/RhpILL1H0z8r9qMYq8VAXOYVrNkdlgxFrNqyz6fSyLpbCrT+/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wNn7O+LkSOLVea7vlLN+uZe+zF/6KR4RChRExQDAq6U=; b=oygfM4Gx+6LFVnbZeUrsiauGgTIYvZ89bfElLeNmn4b7U0bOf2aYyKI9F31FSr6Mxd9UlHGgCAH7oNyPs/ObE2HOmLzOJnhlWx8LxAGUXptsNIOSRgWI/MGCYScuCmMWsG714pktQwkQlRakCtorhrgTWTPZL3pjD5ZmcBlBWjI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:00 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:40:59 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 01/17] staging: wfx: fix (future) TDLS support Date: Mon, 27 Apr 2020 15:40:15 +0200 Message-Id: <20200427134031.323403-2-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:40:57 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f37661d9-c036-4132-d0d6-08d7eab09ec0 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2O/UdelLHzAkPrph+RQgbuDNCh2eo6h94npKJqq1lfpeRrFwX0w+PhvdD+C4GZ9fedhqsTUgj//75HfAwXNSDjSQlXkIk3Tt1qduBL9uBRqRO4OVL4Q5E8K8ywbYufpYL8NFfz46e0/GyUhNkEnc/2riBm3ztoNtT1GrI/PC74T1DtmGIxzKoVbOl+WXCj/8fUdL8eYuWzeHg7MFJOxCNf3f5vUnW4c06dv32nVvMH3He1zXmomzEC82h/JxtngSkzCEtff1S+EI+4uHOtVADa1P6stJCJOl1+E7Chh/SsERJ8LWn2v6fgJ8t07GguxDV2MufyrbwAesjFdLbVP2wlMyXQj50STTVzYJPsIUvCkrikYrHfw7F/g02PhEJ6TKYkBUBrlb7CvLo2fnyBYnvjZscnqDOnBDa93H8qK7/ynRuvvOViqzdNLWnvcwpc1d X-MS-Exchange-AntiSpam-MessageData: kktZQnoBN5aoW+do5KAdTtQuZqrF6zErfPtO/pRMHhSZPws3wh4zO6iH5L20e3+FexrdseO179d3lucqEqTQjcU7HA1gvy9J3USjTSSIaZXB7wcMNSb84h16l29rgFrN9gZ6LyQl1YtVVvslvy5pc3whjni+QSD8UM89sRMDWfsNUV115y5o7wp8xjpdc9I49MXpmOpGBJSqMODh+j7y7pZTZ/t1JYzjtYjTcbkyw/U5G+LOWpAZvKH32KG3zTaIP0c11ZmeKLRqLu5RDwbGyrg2HrDDt4htpYGneP6cTc1SNVgjI6umjJiptl06Ab3B+hOd/mkpuU80XznWZBra0S0etCbwPswkOSz921ERw0vrbOQhQw3yk9bqcd7tZqVcI+wtWx7boeGaL/3XM5jALuJX+WrpJQf2Lw77vi6LwAJIep1w3T5PLSezHVo8gZLUQgniLDxxvl0411dfLaj6/2fmA4/EZ/rwy4Ah//jpucaDEDoH59zFee3Tqw286zGNY70VIqcLnmWAiPi8zAbCKO+lwhrhp4SQHYOPtJJ/JadtsCozcIsvkXEc6O+K3MwF+ZunVTqmzmxmLgBtrR7Db9BpkgMy6NwlZ8BGVC5G+XxvAvWaVv0TIAyOtvF4+cAFGHcn4KXYncOrNSQVipcXYSJ20uujmcnlh8qWR+vJQZmVqNUjPeyt8DyZBNaws8yv2ZfInUwiiEMpI4NgzFXrRbmW0DLw3DuWINWHj+xvFdmyfoV0haGCeCCmy9npmNYwSxOWETmPJ85wKYn2hU7lgOqclVr8vFYGaONpIuWF9IV/veWkMf0LuKiZxDC49FiyPg74FhR1/MQcLoGAZzbImFLGSr4nYXOqByr+VhiFZtE= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f37661d9-c036-4132-d0d6-08d7eab09ec0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:40:59.6953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AZK5Xog5eoDBoXRUhbp2FE6vh7Y3Jz5+75izXQGomzpkUdK7UqT6oc0JrWqZv/SfIAglzQz+7hW2weH7VSI5Jw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device does not expect that the AP to have a link-id. However, TDLS peers should have a a link-id. The driver does not yet declare itself as supporting TDLS. Notwithstanding, fix the code in anticipation of the support of TDLS. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index f3e106f7eeac..2262e1de37f6 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -384,9 +384,8 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, spin_lock_init(&sta_priv->lock); sta_priv->vif_id = wvif->id; - // FIXME: in station mode, the current API interprets new link-id as a - // tdls peer. - if (vif->type == NL80211_IFTYPE_STATION) + // In station mode, the firmware interprets new link-id as a TDLS peer. + if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls) return 0; sta_priv->link_id = ffz(wvif->link_id_map); wvif->link_id_map |= BIT(sta_priv->link_id); @@ -408,8 +407,8 @@ int wfx_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (sta_priv->buffered[i]) dev_warn(wvif->wdev->dev, "release station while %d pending frame on queue %d", sta_priv->buffered[i], i); - // FIXME: see note in wfx_sta_add() - if (vif->type == NL80211_IFTYPE_STATION) + // See note in wfx_sta_add() + if (!sta_priv->link_id) return 0; // FIXME add a mutex? hif_map_link(wvif, sta->addr, 1, sta_priv->link_id); From patchwork Mon Apr 27 13:40:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277670 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=lg3SeNf/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mF86PTPz9sSq for ; Mon, 27 Apr 2020 23:43:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727982AbgD0NlI (ORCPT ); Mon, 27 Apr 2020 09:41:08 -0400 Received: from mail-mw2nam12on2055.outbound.protection.outlook.com ([40.107.244.55]:9980 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727944AbgD0NlF (ORCPT ); Mon, 27 Apr 2020 09:41:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=duMt3DXje3M2rE+HihBK8AP9s+XUHe8pIxOdlqxx0HziSfqYleG64RmU52iv7hQ4g8veSipWJ40nm/1vKJnLKX6fuXrgVZeGXqP4b6ta/h6oFx7MoJSF8GiksUiMQ06Kea5FUsvu+yjSRNMU3UJeIJq8KGjMVLqZ8DS9sSlHS+v40xXHMsEObpkDOq2+f6XDidqWq9qu3o/ivGHrEgiBlR+tV+xGGt9qk3Xz4Re6i7GUZiYqZDrbuaJaN9ysaElT3q9YiaZFo2ZvBWk0ZAyO+3EwJMzG3I2RI2Ax295CoX1vOLxWrtAS5ox7uhGL7gBuF6dcUpDVkfh3VPbfKvDeWA== 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=wPGhlRhQV8LoVCtdI7RwpboNHZqL6bcToiGsJGCk/yk=; b=SCXq5+mIbLdIMknmOkj8i3Q6L1qo3MYxhaUmSaXvhQ2PjWr8O8jXhrKxVi1ZjhF8kELuKCHALkBbGugH5dbzBg6RolFJ0ZVOB3pLviJYv5Fkmfp12LLqVUA54wtVMYQaqxqhcGLIL8Xm4uAtheWiApJBLDun/mfIyruN/T2BMX5hqMXnGrRbu2Qhs/CTDESOv4gIyzn6ThdNVxsML/d86k+p2vaOq2bVHnmP3bd27Zlzm+gT6Fja7tsKl7WNbUgI20p+tz2WRQ9LdklZYKBhb1uv8r5iZZFG2MQlhIFFQFpYJNa7u4+8GnRljGSsd9276NrI87CrMR1/mYsgelfqMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wPGhlRhQV8LoVCtdI7RwpboNHZqL6bcToiGsJGCk/yk=; b=lg3SeNf/vysYQArUz9jmUmsK0oa4V33rgnJBCrp3QkvEO2Yk7XkcJSlTzPFU3oqZZCRH6sHH+btbUVlzv/CQn0YcOGqAZzWGsp+lxTkFOXmTcj7JZQuWIhu0U/g39GpUtXQilXm354nnjlW9NTCJWHpkrmTJJyvB9FmbggXtWqM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:03 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:02 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 02/17] staging: wfx: change the field chip_frozen into a boolean Date: Mon, 27 Apr 2020 15:40:16 +0200 Message-Id: <20200427134031.323403-3-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:00 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08be903d-4b18-450c-a142-08d7eab0a090 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1850; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L53ToBQjJvlKhpNQRoKP+1NhERmTbDHOSxbBT39ZoXgzo8u27hJMdXVPJoaYWXsVRNxiXmIEC/OOqfHB+q7a/zyvUP6Xa2rwID6m6PEwQ6EPzIGpH6wtX+Km0iLJvA0WBqj4SQw65jCobKM/S0L4bwGRQJq53STkBjSEDUf4Ln/zU8D9LtZPs72fdekqZQ78oeTB9zj/4xi7aC4eaP2N7XtdEHtyRGItct69xXATRljo+nW5ZOzFvhNT+HwSDE6PI76u+AbL43SJHiL5ior+gtzwzLBKvxATVczBeGpnsD6Fo6cVdp4mNQVN9beAMU6OvqfgeZM3dFKVCpGYk81urbr9p9Ll8o3zYgtpVqSM9UkarZX/YtPI/EoEpsD9xIgsrmRGoU2oJqKq73PxmzTIxB82YRCywelRuRILPk3hbDt9YHLH4vmuZIpiR5gSlRH/ X-MS-Exchange-AntiSpam-MessageData: prQW5TJgEOafXAx1bEG3Jv/j3LvpuWPZaC/u6jDwVFJOqxI6buRbIqmfHUGasZQBBOa5n3KlBfZTJ/d5t+tR+gOX+Z+CGxoc8kJ+VBA1i167IXHQXFdA4U+mCEgeDkKMw7P5I0YMzAa4A5JAHdDb05vSBcFcIfckwsxNsc2SMA+C2xrF1emx+9Av9NvOai3B6EUy+sW7rgU0ns9jT3KvqoX+TQUiGoMI2tAel41VISZac7Ju+SiIJqrWLGX1M17iCJ5IxTBGZa7ZaNFSpuyY3eZ0YaAXEEPGb30k5IcLCxVbgtZL0f6758Y17gDzJ1j6JqPTR4wbSTJnFfOM8r/vza6cWusfGAG+PqpjbLC+nUqV9FpuSiEzVqXEq86jL70gH/acpVDbiwELIbXyOOT+rqaT8xF+6KkNjlU4XtRtBu2Ni306uEZMOpihYJEjilYcuU0mVACfBU//5fvtnjEkWJq6fR0YZVTKOKXKJAD5cEDNNGi5iiG5BsATuqnO83Uk2gRIjv9I7TX7x1tDvTm3KOBEfy3QP6MCze0w2xyZoNVQ9H5HlGS4sARklalvNgGa9d2h2FM+kag5kKT1UsBC6PQGZhitFKQ3kDq3b8t1ckshq67e8Dv+B1couubOAXWnpRyFBFz2YB4/KhrRd7QmW/LqJaY/aJ3EXSoPZ7Vs9F2t482Wy1ZqW5I3VSjvssJlLyHnE4rncXEFB4IXwMch4AJOc2oKI4gWJ0sDkZ3RwNl5a/2ST8rX8qOk+Ehidl1np3oPyqNukZqiaARfwyXiDNHqe8K+KwmmhqVt2x+HRe1yIGw6OVODeRCdPlDrJcrKd6ilTkQDaORahq0QswlGiLoDUXeRpCVTOcPX+dnLgf4= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08be903d-4b18-450c-a142-08d7eab0a090 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:02.7210 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YVQn3ZzTd9FhLgwE+w9KESby9ls8/l2ynWnASRqOnZsvdc8yrKK8quY+F6B5JH4pfYtg+FZ68jkaRjpapM2RPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The field chip_frozen is declared as an integer, but it is only used as a boolean. So, convert it into a boolean. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 2 +- drivers/staging/wfx/hif_tx.c | 2 +- drivers/staging/wfx/queue.c | 2 +- drivers/staging/wfx/wfx.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index b8d570256498..b56138fef0bb 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -316,7 +316,7 @@ static int hif_exception_indication(struct wfx_dev *wdev, dev_err(wdev->dev, "firmware exception\n"); print_hex_dump_bytes("Dump: ", DUMP_PREFIX_NONE, buf, len); - wdev->chip_frozen = 1; + wdev->chip_frozen = true; return -1; } diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 17721cf9e2a3..e8f3c5f9ce7b 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -91,7 +91,7 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, void *reply, if (!ret) { dev_err(wdev->dev, "chip did not answer\n"); wfx_pending_dump_old_frames(wdev, 3000); - wdev->chip_frozen = 1; + wdev->chip_frozen = true; reinit_completion(&wdev->hif_cmd.done); ret = -ETIMEDOUT; } else { diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 2f6f9faf15be..0c799cedd101 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -52,7 +52,7 @@ void wfx_tx_flush(struct wfx_dev *wdev) wdev->hif.tx_buffers_used); wfx_pending_dump_old_frames(wdev, 3000); // FIXME: drop pending frames here - wdev->chip_frozen = 1; + wdev->chip_frozen = true; } mutex_unlock(&wdev->hif_cmd.lock); wfx_tx_unlock(wdev); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 706e95cd1092..77bb6c617546 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -45,7 +45,7 @@ struct wfx_dev { struct hif_ind_startup hw_caps; struct wfx_hif hif; struct sl_context sl; - int chip_frozen; + bool chip_frozen; struct mutex conf_mutex; struct wfx_hif_cmd hif_cmd; From patchwork Mon Apr 27 13:40:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277669 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=HfNwU2da; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mF440tFz9sT0 for ; Mon, 27 Apr 2020 23:43:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728001AbgD0NlK (ORCPT ); Mon, 27 Apr 2020 09:41:10 -0400 Received: from mail-mw2nam12on2055.outbound.protection.outlook.com ([40.107.244.55]:9980 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727844AbgD0NlH (ORCPT ); Mon, 27 Apr 2020 09:41:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gk1nkiRT5yPJ1/FwZOzneD7SUjTeuYre5WQho4yg4jHK6qoPWdUDgRTdIK8Ygji6XhhHO+NwOSvy+UYRAUjM7pB70OvNbBQ9NCX2hEhr7Tox1tpScXrCE8yoZeC95ghxG0SqAZgs3YZWiQMpjJdhBsxxxqFgjxP2EHNLWeXc8nNt8RYS8jAy6MrR6Q60hqwQhN7MMxh+T8WG+hyh9T34eUq5oHMj2rLhG7qFZAvYnM2gWk5pPyhWI4G3TM/n+dD9p+HuiNDrbVxbxgdTAXp7HDT+Md4dO8rb9qSSG8g0BkB4zwdA2d5igFrzAhPibYYRA5oy+VoQAkwfK59j+IQpZw== 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=+GxryEBoOR/UFhLpgEEXMeXqf2ZX0cZxiTA24EZdFIA=; b=X+mDhhAvnErGDfjW9GbZH4BOICN2uMBM//+Pptj2mjcUoaohUTkk2AWSjb+tg1KSSaot9Jvp/lv/TpBZZYZ6HGmiR8Xq/LcBByZld6gBua+WXX/7pZoxRtMwWmXjyzZO/QO0WHquot7WjL3r9zvIZmXGMOJH/mviErYudQAm8Lw4CqI77aCqUXaXOzo+jmVmv1YPu3sIKb1R4XNCxHsCW+bYz2CRpnhA1nmNOCaYCVSoxIg3MHW1yCOGRjUiLRimnF7Vv5z2wruVVjzR/v4tKC8FXF5eQzGVKTf/3UOiZLp+K17XaGumvUovqGlzFGRnLySQACkleqclEPcuV3CKTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+GxryEBoOR/UFhLpgEEXMeXqf2ZX0cZxiTA24EZdFIA=; b=HfNwU2dacg7IlkDqxpKpjr86sNT4SgN4drcItbUQ3XINXZk1tzMkFn8sFuPVWryK/KL1x8IQD9GOgFxz64rBu/QPEtSajFTDF4CDQ6N46+/htmFJ1KK5Rp4eZYPA3n+Acln/HejmlyuIYXZGYsfuIyqgwDgWzSMuNzI02Lgx2aI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:05 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:05 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 03/17] staging: wfx: mark chip frozen on error indication Date: Mon, 27 Apr 2020 15:40:17 +0200 Message-Id: <20200427134031.323403-4-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:03 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d14050b-f51e-4fd5-fd92-08d7eab0a244 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4744005)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M1Aa3xMXR/2539ZlHeausStvOiGTprkIdAnB3yT6dtpcmgy3BEHFPBBKmUuwN6zzSSnhiLNuRZuh3ihJer8nrvy4V8mc9fGiE9HamP86tqvMe8ZNL9Nr/1C8ibtv5GHBQi36A0WCNkaB1M9a40wkiByDBu7r4lxGBLDzqTI31n9UimMQioEAGPbBz45ot7CPR3cDzmoY0l+qkkPifQTkXSTquElQP/QnbGWnIpyh08lTpFOtcAhO1va/miKrOhq4d7sru3xsyBRBpUCbBNQc7U5XZsik/UKVTuUM3ioyvnqOZsItiYosF91LzqCnVXthfwzFsA5qzCmIdlSCIoHkFb4//bbmKos7P1dYT7IoRmopZ3SxqZ58LC05D+oamODG2kg9mezKcLlCJnJjq5XKjFP2PbQxt2BKWurzuGul07sfKEeEF89a2agAE++MmOUe X-MS-Exchange-AntiSpam-MessageData: K6LDB0godt2pNvO0BwXidIWEmrIt7qkbbzxDMFonY04WK2yKnsDP3714ATtKrBVsFFlJu8gWkzE56OiQKcldh/bQaFt+F0IB30a8sDvovn6HfIKQxHk+JvHCE4tr3kdBJ6ENo/RrGbKCkTGPnEb6a9GthafGumt2vudqKA8xQano1xO9ln+GADvXxAw82QVvm9pyJGqpP+SNHOdrQOucZp67e6KsrsEBNKeZk/nwrsCvm4P1TIcosJH0dnXPbpHnxU+bjddMUk+kc98GHOv8vLdzEHzpnLAPXdsRS/lR7S9PQA2hcDUk/G6c3pmY2XXHZUjuEAfKhgVd2tau7415r4sQ9l1OlCSIK4l7t0hGTx4MduTCnaRFKe4z9aS7dSziBrMHklaiDyiuN5/7k11bj+7RIStnNf4H8vvsLSm8038I/3SrzDCdEp4h44KjVVRCdmWeEH5S8Sx5ywe5LbxWLtqwI/8qyztb1ZF5Ni5hYyHTumgN76kXD/FfREitLsk9sghz10nnh7A6YRPg9NRWrgMtHppfIjTnZtdEN/rDdlA3WsVlXFDKajbfk2IFYrNcECh6/Kz0UN0+wxdO9PZiyj1M6nO1oxQlWQ2sI3vQBP2ojQgrbDWJOoO1k/rQsZ/OY/D5ZUq5LVTgrlaefAU3mcqdWFxUNC7SVi5dKsyaCedc+hqXs3kUp82A8pKfIle5/om3Fu0vwUzwrsW77SrwD5lozIolxnnNN/TMT8IYjSS9k5Zpm2331Mb7UacEd1XZ4lnpYuKOmPwatcgbaj/ihpAzJvIPlmcw/Csx2OHhaKpbTGmeYZrHMDrIFfdco+JxyG0UaqK9zYE1AJ3vfwjX2FKtfG4s7YxlbzkLui0xyKc= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d14050b-f51e-4fd5-fd92-08d7eab0a244 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:05.7606 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j2GEOGWkHymZdAzG7ae1oOb1ECwAQJ3+lH1eImD/lkz7LxBcIeFhhQtK/frfAfgUhFFr5NNJ6QqA5wV5cKlubA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller When the driver receive an error indication, it means the chip won't answer to any command anymore. Therefore, mark the chip frozen when it happens (as when the driver receive an exception indication). Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index b56138fef0bb..6dbe289a368f 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -276,6 +276,7 @@ static int hif_error_indication(struct wfx_dev *wdev, body->type); break; } + wdev->chip_frozen = true; return 0; } From patchwork Mon Apr 27 13:40:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277655 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=PtYagRck; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mC00n8vz9sT1 for ; Mon, 27 Apr 2020 23:41:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbgD0NlO (ORCPT ); Mon, 27 Apr 2020 09:41:14 -0400 Received: from mail-mw2nam12on2086.outbound.protection.outlook.com ([40.107.244.86]:6127 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727992AbgD0NlL (ORCPT ); Mon, 27 Apr 2020 09:41:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AuLPTCJPT+pvTo2W3Qllvd/2i/Q+yLAU1GYPY2+Mc5ISiSn9dQCSKLGFQwYpCDdhLS2EXUCygragCDtAR1lBz+7rDxSOvfMtTZmIlQrVxAp8kkyAC/d23eKyCMCQFdqZytYccX7jx2FZX6wuu/PXnh2eRYftJotvSbFPLYjOZrPgYYnM12bEIhkOQUlGkyzAzXc18B1J1yV/kczecerxTXZXK4M1oMNXILKTZ3/lgE358rtFMre+J7w0LJspBIXHXwSkS5mgWT8j2p5T2DieEGOmtX/8L/ro5HSjzbyVVh36pmlFqn1yfdmqwXh4btqbsknw+PCmKGi/9dwnKGCm1A== 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=P4Z9XHMk2EIFcuuUeSbslGWvZpkT0RcgtGB0oJKFgr0=; b=NlL99G+ohndy3UsnU7yDVJBHDhRbcafjHZBJsLLJE6Cx8ZxLGfGWtm+XVCn50U0Rfx8GGAVijqcDttZxbyt4Cny6xkmC0M9VHl7j6y0B0fmqx1iw4ruULCPDqPBacPHDnxc2z8w3OMvORsSrHkIYnoC+NJleY0xfOI3CkxdkkyM2oTL3/4AHRat/B7gmb5a281TimvjX//ASlAvY52XjP8hXKXX7U+HZa9ZMOrjSBQrn7C6mjci5lb4bA98p0rUQbrY35DTPFKpcnY08985Itu9PPfwuu6vqLqOqz30hSAmTit0taILkKe3xQ8N5l5S5lDH1wQ2BfWHhwB4KTRQM2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P4Z9XHMk2EIFcuuUeSbslGWvZpkT0RcgtGB0oJKFgr0=; b=PtYagRck0n60073veLaoidcJxOzY9EtbiBg8FRjMSh+9IiPAvQ+E4Ae9g7dSwQQp/3lEmWPY+xT5vJqhtlJ4e9k5JzUT5tF+4l3/8FtfiDVzx/ptSWvJ3FaEaJIM4/gFtoY/mQrKLHap0FoDqHJB4ttuWXGhhJIVAXMDZGZs4AA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:08 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:08 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 04/17] staging: wfx: fix support for AP that do not support PS-Poll Date: Mon, 27 Apr 2020 15:40:18 +0200 Message-Id: <20200427134031.323403-5-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:06 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5619c46f-bbb2-4c49-21da-08d7eab0a3ef X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fcEtMjYai7Rq7+dJ45dUF4QdCRG8QD1PBOodE//mBLCqc0bkH5UkTHI9JUhFBDFBqv+ebWi9aJ4JcNfv+NXVi390TAC+n9RdpC9yKhke+007YE6SDn7I01p+0TqfDg04Tpq0+v0Qgz/qIx2pVfwEgM9e1AxlyQXWdJo+icJr/Z7SV2kG+NQjAplmT6eWNzViAFQGHWpjjCDe98bBzOC+EW9pG+c7teBGoD0EfnWI2waZj/b0qrUJYTj7PFkpX/u68zHVPDjx5bG3kLAXNLB6VJeRvsPwpjughOyS7mJbzyqNT4pBbdbNv6m/MX4MbQzx31RlCr3ucS+rtMraoyG5UlNwCd5amYpXx0Nk6O/F/hgirELmfaBhdqovVelX+sS8HHYtlXpqIrywwMl7yFlqH8ufHgc1KEyg1505Qy8U47yik0WLRr/YYm1kA3mzSWOK X-MS-Exchange-AntiSpam-MessageData: xBrZGCj7CYMXoY49/QH+1DVO5CAG6zPu9DFeXUw2yh7THlJMLK3MeQ3B0MSyk8QgL/H9J9+/B62goWz5dWHqjheZcd5mPclQITlZ9MPry1l5hNadVFWqT+LtW17U9+LmieLNXC+xuVvMd0bKGtxY6IuOX4SbmEt354yXowjB1mOoCl1CW6UgdO6sz/DhF3l3vivwtr4nYmPpFFUPTxM1VEQNJq1lYTAFofMbcCARiLfGi+c/eun/aR+3Qas7oxXGm0y7H9IC6J40/iEeq17XLPeokRiC1HsktTmh74C4RAZkWC0+hygbo7//PJM4Aj8H0cGaeF2aaiqMNDpdtcIznUQDlTHfKjKkzQASN8PbyRsNJhwpXRfB4D3+tRWnjDv1Vg/JQJ0l9//sCCzljnz0BVhdKuSAxWQiBdszdimf9gZLB/vz/d1jpqLvBrB1uaqcDuVD/+HacqiAzdbte5FvWPskYFjAe3kdQ2ImS6Ld2g4DEu86sfnPoOtSwlZ/89RAlQVJ6BCfTYnCchq7gZ+7lASu4Eap5wS2stYRXtchZrn4yPe97ztrRs/lY3cMsSdrBK6A07DLD2ADlYW8QXBWCFWX4UThcSEla6+zUn1ZPbuLe0gWWnGOYav141pw11KUBTlt5UCtfMEvriJCTVLnv7KyMe1MkXCy3Lo4sI9S37mmlMRYdJhkVGPR29vZRLDqU/dTNJjZ90NgMiayp9Dycod1+G1XUJ9/Z4AbeXiKKMp0FGxKBYYknpQFSr4Y8Vw8PfswlICH9PSTtRyQ6lcG/Vzgpw8nFyFARoELrSRmcI39Kp9WCSbrmh4S/72pUmUfgQy12gZGatdov5JneBVTerRp08RQDUn4D/3u/5cOuhw= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5619c46f-bbb2-4c49-21da-08d7eab0a3ef X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:08.5734 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uG9VmFYLpqLCr8aRi98Z0BTZ7fuVcTe+5mC6jYWDJIH8ZvQHEGn4ttnVb5gtZZQ6AzpJhZ3ZV6yEutavh5cdBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller When multiple virtual interfaces (on different channels) are in use, the device ask to activate Power Save on station interfaces. The device developers recommends to use legacy PS-Poll in this case since it is the mode that disturb the less the other interface. However, some AP start to not answer anymore to PS-Poll. The device is able to detect this case and return a special warning in this case. So, this commit catch the warning and force usage of FastPS in this case. In order to confuse the less possible the other interface a small FastPS period is used (30ms). Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 8 +++++++- drivers/staging/wfx/sta.c | 16 +++++++++++++++- drivers/staging/wfx/wfx.h | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 6dbe289a368f..a2ac6c098163 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -176,7 +176,13 @@ static int hif_event_indication(struct wfx_dev *wdev, dev_dbg(wdev->dev, "ignore BSSREGAINED indication\n"); break; case HIF_EVENT_IND_PS_MODE_ERROR: - dev_warn(wdev->dev, "error while processing power save request\n"); + dev_warn(wdev->dev, "error while processing power save request: %d\n", + body->event_data.ps_mode_error); + if (body->event_data.ps_mode_error == + HIF_PS_ERROR_AP_NOT_RESP_TO_POLL) { + wvif->bss_not_support_ps_poll = true; + schedule_work(&wvif->update_pm_work); + } break; default: dev_warn(wdev->dev, "unhandled event indication: %.2x\n", diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 2262e1de37f6..77d5ff17a59a 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -205,7 +205,10 @@ static int wfx_update_pm(struct wfx_vif *wvif) if (chan0 && chan1 && chan0->hw_value != chan1->hw_value && wvif->vif->type != NL80211_IFTYPE_AP) { ps = true; - ps_timeout = 0; + if (wvif->bss_not_support_ps_poll) + ps_timeout = 30; + else + ps_timeout = 0; } if (!wait_for_completion_timeout(&wvif->set_pm_mode_complete, @@ -215,6 +218,14 @@ static int wfx_update_pm(struct wfx_vif *wvif) return hif_set_pm(wvif, ps, ps_timeout); } +static void wfx_update_pm_work(struct work_struct *work) +{ + struct wfx_vif *wvif = container_of(work, struct wfx_vif, + update_pm_work); + + wfx_update_pm(wvif); +} + int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue, const struct ieee80211_tx_queue_params *params) { @@ -293,6 +304,7 @@ static void wfx_do_unjoin(struct wfx_vif *wvif) if (wvif_count(wvif->wdev) <= 1) hif_set_block_ack_policy(wvif, 0xFF, 0xFF); wfx_tx_unlock(wvif->wdev); + wvif->bss_not_support_ps_poll = false; cancel_delayed_work_sync(&wvif->beacon_loss_work); } @@ -453,6 +465,7 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) wfx_tx_policy_init(wvif); if (wvif_count(wvif->wdev) <= 1) hif_set_block_ack_policy(wvif, 0xFF, 0xFF); + wvif->bss_not_support_ps_poll = false; } static void wfx_join_finalize(struct wfx_vif *wvif, @@ -737,6 +750,7 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) init_completion(&wvif->set_pm_mode_complete); complete(&wvif->set_pm_mode_complete); + INIT_WORK(&wvif->update_pm_work, wfx_update_pm_work); INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work); mutex_init(&wvif->scan_lock); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 77bb6c617546..c7a58ab3beaa 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -89,6 +89,8 @@ struct wfx_vif { bool scan_abort; struct ieee80211_scan_request *scan_req; + bool bss_not_support_ps_poll; + struct work_struct update_pm_work; struct completion set_pm_mode_complete; }; From patchwork Mon Apr 27 13:40:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277656 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=YVwmDjdh; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mC13FZwz9sSr for ; Mon, 27 Apr 2020 23:41:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728047AbgD0NlQ (ORCPT ); Mon, 27 Apr 2020 09:41:16 -0400 Received: from mail-mw2nam12on2043.outbound.protection.outlook.com ([40.107.244.43]:54528 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728023AbgD0NlO (ORCPT ); Mon, 27 Apr 2020 09:41:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fLi1NTJC+bmMOYJr7jR7cgCFcQz7un5Gad0NypAJilKHN0+RrPFKpmfUULW/w2YcLpUswWk2jkRwFl1wSj1ODbTEAdHxYVIOQPMFUkT9QvcnM8rlVi/nVmRrBcE79BkQYHwZOc1JZmuDWIkv1pDxKGvl7ITNPc48wQB5PBjzWeXZmp0QbrqkAKZ2vAGkjfXd6zQu/LQ63N65ZVAaA9JsKgK5XrtAFP3+3HkbUT5/j03aq7+uCQkJ32wKi43yd/UCCxKZu479FXMFmFLdaWY+0xZwlPf+pVivJzz00ulsiTSDc1Kewd92AJAjb7IzuzaWduRqmXcdAEaMXISn8QrXXw== 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=wwN1CSqxAkNpNx9GcjrtNvXNAKQ0nmOQLgVi1ERHmhs=; b=R4bLtpt6+ivDpYySnwOOJWicerD86s4bqrfSmJdWSg2mNE1bJlc8Pkg7pReQqykC234p/YF5YBPWX4kMRQ5bM5+CgeMh1k2qhryraVMHUAgRRPwXgt4i7FPTK2rUHjO7Z/8RMJJA/YXgFTHiRFt9xLXje5p99P70oYZyjJS0RDXdhgyunZIhhklw7k6rKIMdIgh2F5MVHszxu2v4by9fHL219ypHYgnInB3PjEXdCBGEL8b/gMBMyUHx3zI1GIuMau2RBQf/cUrJgEF0UjCmqJk5IUBb/WGwr1m3U2s5KUkZ7KBodCt4rqzAy+ti2lzTzK9BdxAkX/P4ovJXDKGUbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wwN1CSqxAkNpNx9GcjrtNvXNAKQ0nmOQLgVi1ERHmhs=; b=YVwmDjdhpXYyKHaTSepo7FwTDSV/gaE+/FgPGTnpqlaCYhscPTO/JI011JhAFcjfmanEmUwvI/HKsiYiwpw1hAtArwu8vi9TpakfZ8PY8WIL+5D7aB8j/5s42ddUz7a+O+cMJiaCVfhyz1+wjJxiCWL9gs/sbw/z+IExYQ7gyGc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:12 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:12 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 05/17] staging: wfx: fix CAB sent at the wrong time Date: Mon, 27 Apr 2020 15:40:19 +0200 Message-Id: <20200427134031.323403-6-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:08 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf205ff6-e2b0-4d51-1dd8-08d7eab0a630 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gR+mlpNiAwzNikdEssHXPT7dx4GD60dgnhWUnHxLd1VX5deMINNj2fCuIY8VGrlf/XR08vxfu3rF9WOLYKL0S7SaKXJllHvKdDOv1/m1jBulKUOdeTGRrMEL9k31qBOvafM/KfsioNmvLi9t/hdo0lNQzvjXAd7n9zypzj/kZoWn3O7cCdGGwluMbOHXHNhX+FwX0bwmfTc92HS+Ee94fxCSvPZoDkVzgv4XFCm0bweAruE82LIE3iMBfjEuNNAFbVtH+t10pleUnNSb+drfw+BS0IdylCHhovfo5toro3fFz0briRnzp9yyWAotuyeKQcZzVogZG1hEbP2tXaq3fmUDlWGUpWkFxm1Z6Sh1em5wkLO++2WfQy30CXyOrkCoN44ljPsra2JoE4P0Aty4QCDU6jnSoiDzQePe9PrhmPEiG3gD/DXia8iFsSR1kKsp X-MS-Exchange-AntiSpam-MessageData: 31ig2v6Gry7xAuRmP+EBV9VBwuuMOau7Cens3w7boQ0vOaaNCh8c+AUa/EVGL9fMflZYxdSr1X0ePc0BPhYzy1AxWQF3suvSqGZNifIS+gVi6iL0RIGGOI3XFDGBv/dkniZbexwD8Pp39mlRZkxfx7fbmy2BcTtH+mQdiGFGUlDcyIYR6oJXm7ANYJLiGuW8QTa6YX7TKtfJzEn+/9QRCBiFcfbGUqnDVddRkP1nSfUAANvwXDhikXf1uKwTHsvxieAN7WkCQAA92ZSd/ogKfFHFpc9PTxdAPUj7wqjGlv77Gx2KDxPIKLmkpkiWerwnKe3I+LoE1bsW4V3PNSGG57LdoPcQkCuwccKxknT35Y8IrUA/ClHVMgIESjpbi01gc/GDY2Qv6PX7Z8kieghC8yCtqJ2MKRHtudv7ITPX7je+F7JapRxoYQjB++b1aof+1GVnR9Cg0ec0TquMyyq70deB7ue+6bJ5PGVfAheZ42VDWW7MVF/Zg7kmLS0B9Gxo6lRoHMGszF/Dtx/WBs+nAy6wvuxVZ+AmiY4WwVHlyjUNwxTPzRkjQcULLjrCUzyGZsRAtDFJizahmh6sSsP0uz0HzJdznl2y2rVjPBVX+TqDy0UK7iGf1jYu9zCY6CQHfv+eEz4DxIxyvWxxtnyZU9CiPPnQIm4mOCD1cXeLeCBoQsgWVS9uuNyXWUVACaA1/Rwi+Mft38WuL9TxlxGiwb5W4P45lD2U6ick9kkqax45DaGt7JMVpeaKMruMsvipqh9DEKAIb6GSD3hTeQGwM0StHTuHZIL7HNR3CtroZq8EFa6tmZRNMB0OorUklq3a6/WfwgQdIp1cDQBQZ85zMRzQlD//AD8t2sTGgB3uqRA= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf205ff6-e2b0-4d51-1dd8-08d7eab0a630 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:12.3327 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Eh5YG+fAMyJwue/uJD54RNBnVFtwL38J8jWZ3ppIEh+vMdVQeTHoRVZDFZkC6jmNjGXzljvIl5tohtMBLTU1Vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller wfx_suspend_resume_mc() is called when the device is about to sent a DTIM. This is the right moment to enqueue Content After DTIM Beacon (CAB). However, wfx_suspend_resume_mc() is also called when the DTIM period ends. Until now, this event did also trig CAB. Note this issue did not have too much impact since when a CAB is sent outside of DTIM window, an error is reported by the firmware and mac80211 retries to send the data. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 77d5ff17a59a..5132c19e0367 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -641,6 +641,8 @@ int wfx_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set) void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd notify_cmd) { + if (notify_cmd != STA_NOTIFY_AWAKE) + return; WARN(!wfx_tx_queues_has_cab(wvif), "incorrect sequence"); WARN(wvif->after_dtim_tx_allowed, "incorrect sequence"); wvif->after_dtim_tx_allowed = true; From patchwork Mon Apr 27 13:40:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277657 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=PH6q/l8b; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mC84gSgz9sT1 for ; Mon, 27 Apr 2020 23:41:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728071AbgD0NlT (ORCPT ); Mon, 27 Apr 2020 09:41:19 -0400 Received: from mail-mw2nam12on2089.outbound.protection.outlook.com ([40.107.244.89]:62212 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728039AbgD0NlQ (ORCPT ); Mon, 27 Apr 2020 09:41:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gmnXzy+iJ9rddlLIdowG5oVRCuzdIB9+LvaeSs5F+wqdL65eDLMMmjHXPRPbYgdeDaEVP7tDrBmFsVaEtsiPv7xfep1y435knj8x60Js4qLtZ2yNKW4gmpOviraXP0NSFlalQ2lna6ZO7Y4a+ogG2FLTury7xgLnmrytAssG8MF1UuuszpnbUlELVEpIeqI7UrPnp/CMp8X4e3gxQ0w76Tu5CPAmQ5VZIFg5uToexepiiR/c/MhJQeMi5gKJ7gn2KW5pY/l7q0EgnjNpoazdGLc5zoIHHNi4xmzS2FRNsf7xo6KPljbKxjf39GSPwH/8owaxDpxequU/PQb1O6pGlA== 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=SlhKzyyAtScIwXKv8cVUaj8lHOyXNli0M2jDxTxuPXU=; b=ZPEIZkQm2URl2NHBhN7lHzIB9YjLks8nQa3ydMYuvic7fdA5pTWUaxIGVLmoOeKOS+xbjYI3j1KBR3k2wU+DXRlOms5014iT5TyvcOfYza7v03b6H2Ul29sr+cfXnc0pSMXsmH8RKazHvrTh4zXs5B6KbpRArf5gCaXzYWatZa1XW/yJbl7LBhUoaM9VerP5FwvBm8no5+e816O8rg1i3VllS8lAZyV7a2JMbnzT9hod835CgXm5JIfwYSoPN899aC0kWCEvW72nuHOmgCa49+vTEikJhYU+LeOl+Z3cPp3StXHNaSERzyV3QzxyiwFt4sn3hXcaInmU2W1L4AyqBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SlhKzyyAtScIwXKv8cVUaj8lHOyXNli0M2jDxTxuPXU=; b=PH6q/l8bFSDa6YcUS/a/OBtgKevYsgSTDUQOjyCWRkMpdDLQrNCuNxIWBkqBHzzawUo5fGpfB8PLsB7bAYNeyGhN6vFNosX2K0k3KH9C0D7S4DUAoWwLt4EOKr/ifHaNJBsgZ6YqnaGdhhsJxOXkmvMmt8PAaSnT5JWiu7t3mGw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:14 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:14 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 06/17] staging: wfx: add support for 'device too hot' indication Date: Mon, 27 Apr 2020 15:40:20 +0200 Message-Id: <20200427134031.323403-7-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:12 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a77beb1d-a777-4835-263b-08d7eab0a797 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HHEUaZedoOewOMkJPyiW3sePv4XO1kWXSriNS38xlQTLYMW82EWi8qCuBxat/B9X3CdZizz7Jaxfi5KKO+IjzoVCy/rZ9D8r1DSz2lW67eHMjJKkoDabKhEVcTMeuxyUyvjn4FVUTSxRtn6uyh7Oqx+UDaO1VRq4wMgUK3lsponmJaL5Tw/5e2k5EvjRMLQTAyZsid/IHJh1EsFMgyb4rFoOOk4X/eYxfOsj0ojJatQOllZjNRU861ZaGRXeTD+41HrRBLqP6IVFdRTTirrxf+IXWxQEU7cvHP01EKFG3xfejhFX5gL1X7Gy+65JmdKuYdZRFz1G/vjz3kqymrqa3MCXcs0vgNo9fhLypRtstR54qEoj1wnMVoJvwGohX7uI56PGbCky36usY9nKA7DYNBKWZxeIea1WGeeN4EeGK9HMCtf+ZNLl2M+mInpLZaA6 X-MS-Exchange-AntiSpam-MessageData: kj7qXx4KZf2ZMjTXuGuyVdMtnlS3kCY9Ogw/GbhKTki69jgz0SB4QsQnnsGN1V5iQjrNPWMSw0ToBR9sm6IoN0UCOJeO26WDgSDJyOaAU4c23QdOPIrCU/A8FyVwrBRDi0DSGi0ioKAFgW6bs6+yv/CipRjprmU10zY+W9+h+S1dOTr50Y0HdbfdLkiiQcOgm7Vr29lMp8WZxAIsZpEonhjibjACoUDAkRBEThr00ld9MNLDAhcZSeJDutmhfRyXvPrMDdadodwaYH7puLn0cLYUuFF/9oi6VAr4Wvj60NzHLiwr3DBwL9J1nBs8dYm1gch6v0NIR/ClcXsgWp2TzG829q87EUFfws43LXxVFVScy8+ktAGYTayBxqTR88ehMHbZKLBESId8088TKmme/KC9qlBwW9S529XtCl480NqG+N5t/UeoGP6A1iggyxkb3vbzN6w8zm2Cr8ZvsKPq9WkksUJZPoXfFbJbOemC/ZDJiDwderQCPg12soFM6ffu7XioOfCAUFPRRJc8Op2YwqHvpDCo3VXp0YmROo9kRyRd6dabCUIPCA5JS9wkabAZHv0/1Ul7Aotg5k1SV5bWz56Rj4+grFBT617+2aUysrLyLP7qqaFIqFBhoTPCfBJKfT5Fsat09o+5OlXXMvHshg371yGUvPA+CKFn7ruv1qpPG79pK5T20xfd3Old5jGrnnCXQCjpNjJ0XxT3e/oxknin0xcY2VpBr5OApSmbNZMZXG7im9MlKjotKFJJ5Ypgbe7WliGBCgpW2YSqQYkF0Kf5qJV+jua3TULIvY4mLtW7+EwiDUyzhJf6vxTgXnmzqojdVmLv4QIZkAAhkZ9Me357FJneFNaPOWgi8v3FAN8= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a77beb1d-a777-4835-263b-08d7eab0a797 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:14.5517 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Y1jvPNCSFKMSmz/in69MBJoPYIUA3Gr31IcpgwuN8+3XNHFk6h4NP7iLOCWPIdw78mWjLWnFM0BTEsiYebtcWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Device is able to detect a high temperature. In this case, the traffic is not allowed to be sent until the temperature decrease. This patch detects the warnings raised by the device and stop the traffic accordingly. It also add a delayed task as safeguard in case the chip would never send the indication that the temperature decrease. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 20 ++++++++++++++------ drivers/staging/wfx/main.c | 2 ++ drivers/staging/wfx/sta.c | 23 +++++++++++++++++++++++ drivers/staging/wfx/sta.h | 2 ++ drivers/staging/wfx/wfx.h | 1 + 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index a2ac6c098163..6de210139d8a 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -235,12 +235,20 @@ static int hif_suspend_resume_indication(struct wfx_dev *wdev, struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); const struct hif_ind_suspend_resume_tx *body = buf; - WARN_ON(!wvif); - WARN(!body->suspend_resume_flags.bc_mc_only, "unsupported suspend/resume notification"); - if (body->suspend_resume_flags.resume) - wfx_suspend_resume_mc(wvif, STA_NOTIFY_AWAKE); - else - wfx_suspend_resume_mc(wvif, STA_NOTIFY_SLEEP); + if (body->suspend_resume_flags.bc_mc_only) { + WARN_ON(!wvif); + if (body->suspend_resume_flags.resume) + wfx_suspend_resume_mc(wvif, STA_NOTIFY_AWAKE); + else + wfx_suspend_resume_mc(wvif, STA_NOTIFY_SLEEP); + } else { + WARN(body->peer_sta_set, "misunderstood indication"); + WARN(hif->interface != 2, "misunderstood indication"); + if (body->suspend_resume_flags.resume) + wfx_suspend_hot_dev(wdev, STA_NOTIFY_AWAKE); + else + wfx_suspend_hot_dev(wdev, STA_NOTIFY_SLEEP); + } return 0; } diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index cc7f924f3106..1093584373ad 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -341,6 +341,8 @@ struct wfx_dev *wfx_init_common(struct device *dev, mutex_init(&wdev->conf_mutex); mutex_init(&wdev->rx_stats_lock); init_completion(&wdev->firmware_ready); + INIT_DELAYED_WORK(&wdev->cooling_timeout_work, + wfx_cooling_timeout_work); wfx_init_hif_cmd(&wdev->hif_cmd); wfx_tx_queues_init(wdev); diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 5132c19e0367..67eb4a6e176b 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -38,6 +38,29 @@ u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates) return ret; } +void wfx_cooling_timeout_work(struct work_struct *work) +{ + struct wfx_dev *wdev = container_of(to_delayed_work(work), + struct wfx_dev, + cooling_timeout_work); + + wdev->chip_frozen = true; + wfx_tx_unlock(wdev); +} + +void wfx_suspend_hot_dev(struct wfx_dev *wdev, enum sta_notify_cmd cmd) +{ + if (cmd == STA_NOTIFY_AWAKE) { + // Device recover normal temperature + if (cancel_delayed_work(&wdev->cooling_timeout_work)) + wfx_tx_unlock(wdev); + } else { + // Device is too hot + schedule_delayed_work(&wdev->cooling_timeout_work, 10 * HZ); + wfx_tx_lock(wdev); + } +} + static void wfx_filter_beacon(struct wfx_vif *wvif, bool filter_beacon) { const struct hif_ie_table_entry filter_ies[] = { diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index e814fe743b7d..f7e876d1b031 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -67,6 +67,8 @@ void wfx_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf); // WSM Callbacks +void wfx_cooling_timeout_work(struct work_struct *work); +void wfx_suspend_hot_dev(struct wfx_dev *wdev, enum sta_notify_cmd cmd); void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd); void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index c7a58ab3beaa..09bbb5da4f06 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -45,6 +45,7 @@ struct wfx_dev { struct hif_ind_startup hw_caps; struct wfx_hif hif; struct sl_context sl; + struct delayed_work cooling_timeout_work; bool chip_frozen; struct mutex conf_mutex; From patchwork Mon Apr 27 13:40:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277658 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=OE+laAYx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mCG5qCjz9sT1 for ; Mon, 27 Apr 2020 23:41:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728105AbgD0Nl2 (ORCPT ); Mon, 27 Apr 2020 09:41:28 -0400 Received: from mail-mw2nam12on2070.outbound.protection.outlook.com ([40.107.244.70]:26405 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728057AbgD0NlT (ORCPT ); Mon, 27 Apr 2020 09:41:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h6f/IKkPNzsyGecOBcTPPdkIrzojNwDUHIs8GeT8e16DaNZPf/+io4dxKnm2V18pWL0Ig4Wi6v6rAWZAYYLcQEFrME6DR7PdjhQK1g91KnJ4PO9wFqD/ValZYuA2cwhXLapo6rnEC/S3ms5vUyFsZsV1bZdrkt8alb/SvIB8T7B8n3UXNkYrhNsneQsMcIpdKO5RJYk0vAqD5HeESFoEa6fRVUo0ZcJCNB9Sbxr/yRCzhUyDu1vd6mRZiEcuNk0I9rpjycZcKhYNeKfwZnZ58GUTt6KMNKjO+2enO+XPipAeyHPSnUuO5CXSxKJVu1Q8iHCTtv5+9PdkLpnWWtSlkQ== 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=Ls12IveF/ET4mH1NJA5R84/E6bI4tj6ugofbKWmst6g=; b=FjXz46DJeLygf39RSuVhJBJPJ7i9XLnRZVGZjGYWGuIEO/kB7rpac5GguX0TGmB3l7SIj4CFunsKdtOLIDrKeTvaS5SNME+TDPniUXfciXeZSwB+3VxVwjQsINu596hJMKgbH1FVYJ0Xie0j0UASzMi+BeVXuEG3JzP/BSEDphDuiOC3OPsspQMbxUIZkaB+9aPs2pFBbW3wnlc2jQ8SxAUFblis/FD6qr3/lZ8RFVDloAHxiuA31yH3qbLZ1sew2wyxPPVj2C2onp/PszInYhgXUGNn/Way2NOgWeo6Q2jv6/mipRgQ/ch250g3m+Uht/5F3fjFV5/hTuG3PUr3bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ls12IveF/ET4mH1NJA5R84/E6bI4tj6ugofbKWmst6g=; b=OE+laAYx1zVoeLwpuTaFG+TJjgyHLDKHHyFaATSrnnAc6SJSGIFTF4sem2CS5NAaPa0azR8ubvEItTzaElCqWXMw2O4kPIJesx+EmeVBA3zjKnDZjbilhTfBjBQh2MSGxMypS50mECU+g5MOUU4jn9Gp1ugysN/t0E0jXVW00cw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:17 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:17 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 07/17] staging: wfx: add an explicit warning when chip detect too high temperature Date: Mon, 27 Apr 2020 15:40:21 +0200 Message-Id: <20200427134031.323403-8-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:14 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d7b5a36-3022-45e8-2c9b-08d7eab0a934 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pcNnUOaV36BM1jTS8xlEBIv5aeslHoLXy00PHYUsLYAULeUcbqThiHhJZnBJMOgsHyJ4YgWnk/Pc7sXg1InofviuMXPkJC4Tb+5PU8EtOo+e//ymM91Z09THzOmpf3c+37284SV9aoG9OlgGIi4wj9r/eIt3E9828zh4cqS5Q8x479olOVLfgj+tEFAPwqTdAbt8Kl6a0m2a9XZJAxDNDrjFSo/J2+qMa1imHyIo7o6JI9IRhQ/FVfp30li1aq9uOBWroTwnq23QLdC/UJ0sm2pIYWlV29SgG6b3rMXHQvYY89k1kJhAKYWecv7XR+uUdd0WmCUmvuaC3UkhHgZPRmRQkM3odk6Yv8rWa/jMbuiAM86gxGJZ1XBuCoh2m5wALex3fHRibPkB4oVajRT0R2b0rVMWa93bHxZaSou3ES5LyzOJHhVNQtMvfnVbr2MR X-MS-Exchange-AntiSpam-MessageData: kfiLR5kjbtrYUfkMQUdsiZ/GyYYlmboWYwR7mk+HJ3KnoX1REOiJmqVCLOZGgLdtgv+hxtRwIjyRjaWWKXRVHbnjjw41Rca/DVfRrqe0Z50mW8qrCB5pcvlI7ppDcAWwdESH7r91PWaE8Vcbv5+EV5Ob+ue0pXZKPRwtX3u5RUK3BCs7qY6se9yIpr+Uanz3WIxCbAsX6DPqrr9BJlOaOeMO8gmQcMLpBdn414neuSBJ5UxoHip87dKYCj3yTyT0F58WTdc30lwGGKxilzCBit82EFkBMaq6WuBWbmjgcFktwI2XDgZE1270iF3DaZvF6WnjpLtKQr7Fb49xLUxZZEUXVJ/UfCSrphNDwcJWfTIAUZeEnL6MntPcz75Xs0BoMj9T3m9URd4qBIUTwPlVfjgfiyG22On3+8yJHsGz4QvxDwPScbVPjLv3bD8Cr3634Fw4AVGBZkOLr4QGNpszesb/vUdxo72NJWxUDn5s8MOTa2wNUlzGaLyM61nK7iezf0MDaJwUsZUY+YbttzWv8oZI4hoPgRg0Leyvu38qcTqovUAUBp1/XRAqCaE0xKkfU27ZwIEr87tVIetZFa0d4hDFUf5rg4vp4+QPd46WdcX32IMjf31PydYfisv7RbqiyVNhvGVXbyJyeDO8CHxexFiauBSO7aDMLc4EReu0psfAW+UrzaeZFIfob+ehbXEn/4SZd/sdWbj/wjQ371XzAGz2oBGvtKw4pFnb9bjoNogeWWmcXJl99Z3y5lmFWPJeqHX4wngdAY0FGzOH9eeMFkxHQyDDptH5ZL1UBvcrvIPYmAZFzshJ+sE933MJlUrZLeK8ljQj5F5Zc+09eDP5h2T4Wo6SEPiPSpRhgWpVzdA= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d7b5a36-3022-45e8-2c9b-08d7eab0a934 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:17.2026 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: g/FwydEZOkKD8L2Z/5PqdZSCkG5j6ekC9lvh5APibOwXo5J9NpoOIH8E9cq1IoXhLWLA9DO2eM2JjMz+Uy1vJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Device is able to measure its temperature and raise warning when this one is too high. If the the temperature is even higher, the chipis also able to send an error just before to stop responding. Until now, the error message was "asynchronous error: unknown (6)". Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 6de210139d8a..e6daac36f5c8 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -280,6 +280,10 @@ static int hif_error_indication(struct wfx_dev *wdev, dev_err(wdev->dev, "asynchronous error: out-of-range overvoltage: %#.8x\n", *pStatus); break; + case HIF_ERROR_OOR_TEMPERATURE: + dev_err(wdev->dev, "asynchronous error: out-of-range temperature: %#.8x\n", + *pStatus); + break; case HIF_ERROR_PDS_VERSION: dev_err(wdev->dev, "asynchronous error: wrong PDS payload or version: %#.8x\n", From patchwork Mon Apr 27 13:40:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277667 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=ce5Ohdhf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mDc5SVRz9sRY for ; Mon, 27 Apr 2020 23:42:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728090AbgD0Nl1 (ORCPT ); Mon, 27 Apr 2020 09:41:27 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728039AbgD0NlW (ORCPT ); Mon, 27 Apr 2020 09:41:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WKEbyalUu3uCswzX3SyS9H9CwFiTZPf32suLvOvIm55iOvb69Q6KZa3BlIqstLtFgdpQjGMyBIcs1PjX0tJI1jjUcDiK05btlE0i4XnYy97sxwZAYQG9NfZf9glFcNBXA6q0VBSI8vOCz/kz6LUJOUetNwoo7+RudAYUCwEK1BTQrvk+1+xrPkXH+dfZzNesR37o/VPPEWA9SSkERb9+6Fqh7a0HgnedcfOtqn2ALnmwnolYSOiq8MxbIA1DBgqrYfMmMT44txuyrtz3s+j6Y3WXhX0l8khcL0fBlM4TTFHyc8TKpCRLW8DfG+6XIlV4+8iXrQv3YaILAqYD3JiXtw== 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=ArHefbqV21SB9u1u11bvJ2ldj7JfEtPQEMPuhZ4pQ5g=; b=I56hOfbq4TrBDzeUhsvWIxUabhqJo6wprRGXXV+UOcPMXRWyi/NqPRp1Rf0upKMxzhIIQ4Ncx+GXaJldmhHBtXQ7Y5xOcYpuYitG6k/l5WMU6PcM9JYvatDQJGU83B+FHfJVsOs/cbvOeCXyt8Aj+yHGX34Ui+s75d/ik2sVyJju3PsIydos0zndBzqQVIw1FOspauxNBXQkBj9VYFxOpJjs+4QivD/gI+bABg/5QLV4oVIyg0V8c2rxYzY+r476/hfZUEgs5ayHMjeR+Wn27m/q0rLGAwy9W/4A4kkYlj3f3P2Hlzr9y4pMnc6BKd1Hcm8wj2f2pAt38LdlBKCKrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ArHefbqV21SB9u1u11bvJ2ldj7JfEtPQEMPuhZ4pQ5g=; b=ce5Ohdhf7qaqf1df7or0N+cFDReMdZbOsXErFJQaaMi5U4URbiBrv0hIGhak8drqOYnNq+cQG2jK1E9GiVVKeaKA4bn+zGDE6vIJQqqnTegtV/ucMNRRTMdcLb+3mYFaOFLAe6dEtOQPXx1fuRnkNPwhrh+AzxioFT+bY6dWjqs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:20 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:20 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 08/17] staging: wfx: fix highest Rx value declared in ieee80211_supported_band Date: Mon, 27 Apr 2020 15:40:22 +0200 Message-Id: <20200427134031.323403-9-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:17 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3383b784-e967-481b-15d3-08d7eab0ab25 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4744005)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q/1XJupTjPYq0sCCH0R44mnao4/5sG1nGuuechHGjbPeLF4rNE50gMz4Zg8MXsPXweFj7e7pBDdbCfyL5RIUkgZBLI+4rhdDbY9+9ZYhvp0GxQ8SIOrleE+WSuhPFY+4zCiNQL5+47eS2mIN6bkvdkAwE7MuEY5i7TVTDm05LDErbaIEdtWfUwwH+QkiyRla1Yn7t2Pl24dAXFfti0Ba4LO4y56/hoMRExF39XWLd+o1AwBduejGR//Qd452I8Wzps64ZcTnQXypAmvhi6aF3Xo2H4xRv5JXflkPGt2OnLz9O8lwhNeH2AShTqDEs5iD9d9wI9349HovU/vU3isDLKYfGOwaEvylCdc6qF58A9of3gLQPbKBjhq1jcX36m+76ylAbiSCkGYVxDH0niKNnPR3CiQ61rWAdYv5KUiIzn2W4GNMWHpYEXQiyCuIyBhM X-MS-Exchange-AntiSpam-MessageData: hbqOdKH4fSxR0R8Csou9gs1K8E5bRbnHedGm+rB446MzJuuMtLt9Z7DRosxE83acHqouh14xl+oWej6OIU+NT3gqT9Pm9+m7dvqSJb51fMIvTADzVH5yDF/R9hqF3/GgeoocOMy+TCOTHz1pxyONckXLLe6cWEoBuPFtoCoF8Dj2pnxzbiNWbxH49vCG0L3J9jBL26MPTfkko1bBC+L1y6FBkPwLoJaR82Z8MIJjc5AOwkR1zkukN/j7DiJZhmMaNCc65LQNFVL+2QDHaF5TwEzVHDU1iQ1vGoqfsmjkoOjRpdIyP3hvi4KBl4ZOhbdbFi+FSrCUPcYusjQL+/EqnuHyHXx15FMkEKWM6hagYz51GR1AESNyKWrtqT9RZQqQuU/lIk+8aMR1RRSNqo9uNyG0R62u494wpvnYQUv+7hFqcqYlXzi/kB8QG5NNuHnVgLK1wIeHFL66Xt77r8ReQ34k0R6rR1fkSMCxxip+barbDxDGNtQeVeEIhKqQT4H7VEbHTPY+DoJcENt3rShvR/3eE1a5odlOzDn5MKZyMfJJesXPMGJ24QLsuHNuifM8DJ8f9lnKyP5zSPnVAEBp8vQ0fmL7HAYGUCG7IAVm6tLPcxBuuYIt8v6EMhNb5VE2KQlTfaj1cYyqoPrPj77tx7F4IfRk2XAbyLfxoK8cwBYSojnMAlyYLa1ng3LhC6fyRTGh5IC9Bfuf2YJIcWpoUrX5qavOcMACDUjFUCQdB8r4q6oT3QWWn3MG2L3yJE37nkKpkfvy6wI5HuyokoqGwnM0DTjRlaMlfXdpMjKM0ZHg0xOVJxjV2Fn7ZvfqjnJ8c/1tIkRzyPCHOsxHWpw8d+MysDeHrTWz7PVUFcyBYrU= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3383b784-e967-481b-15d3-08d7eab0ab25 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:20.6990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AZ/HkmTCTFLt27RL1TbCOaOKQpv+jsnkJSnveze61ptkiqn+gkRLiQyLwiu89goJUdF0GHbkkS6JzV2+cRsJ0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The highest Rx value declared in ieee80211_supported_band had two problems: 1. The value should be little endian 2. ShortGI was not taken into account. So value should be 72 instead of 65. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 1093584373ad..742a286c9207 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -106,7 +106,7 @@ static const struct ieee80211_supported_band wfx_band_2ghz = { .ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE, .mcs = { .rx_mask = { 0xFF }, // MCS0 to MCS7 - .rx_highest = 65, + .rx_highest = cpu_to_le16(72), .tx_params = IEEE80211_HT_MCS_TX_DEFINED, }, }, From patchwork Mon Apr 27 13:40:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277668 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=VB5ufhil; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mDk6xmcz9sSb for ; Mon, 27 Apr 2020 23:42:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728291AbgD0Nmn (ORCPT ); Mon, 27 Apr 2020 09:42:43 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727977AbgD0NlZ (ORCPT ); Mon, 27 Apr 2020 09:41:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QPNxTLltAoeN7+UdBsxPu9j9der0VUi/uuHLM0/85R2+V0+Zv2tNGTh2QuB4NGPrjFCfRCKWGD4t86LJjAmEjkWLGkfrCQ9vNq8wWmBqyouJXRHXB5M1oryIyghWAtkoDmFf7Q8LQD5OsZgA/yQKWHycWmxEsCx3ZMzwOQEB9x1jFhx88XvFl/pyGhrZ2cMD2NiTQ6jWdSDGkwCEpdT6z1dGbDK1gIKEtLpH56nzFjFiXIWmkxzqV3bAFhchX2DUWcdcLjqqVhNAD8I1jaWFaw6jwsdv3owMYyomrM4V71P5klBRwsO+0aQlLdbkQ7FcBg7yZDVJeTspAB4crVgT/g== 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=X6uDElDmF4BJeb2iUOBzvnX7akdRxQ+c+0g1HkzX/GM=; b=WWjusyBTQ866lZCem5CPf64XsZgzk3oqQz0reZ9YgXR47ckXNnDgcfrRz3teEVDVypufeaXtMSC+fHFxv29MzCb2oFJ68TMOBF+bwaiifiUAfHszxN5Bk3xhs8etNHThnALC84BR5nPPnOHlKrjAVyWe+InSqJAVN4SyAtH7DDOaVE9I/ciknYUBmNjbtAxwpiEqqL8kcwh3zlODSf2q+v1RS4pgLoKFxubT9WigeMsSXuPnBR6H1uRGGjRrKw+EIrPbMY3GpbVvQANlatNghE6TNxkj+X3p/5aQalwljDB11iNB+wfG2fA+GB87PBy0FkeSx0kCRhgFWV25+wWX5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X6uDElDmF4BJeb2iUOBzvnX7akdRxQ+c+0g1HkzX/GM=; b=VB5ufhilHdM8ETSpfQ7ikf8suERL/o8jfMltvqZSURkBYQjQ9CwUf1Kew8M6wwzJKZSHLBBmcgX4PBEsAoI+BCfsXwIQlhFxxEE8+xSGt9p4cxoOA4H04FLsz6XLV+hpY/1Jo9tplGDofjp2Wam63AIbMbDc8Ob+5qjkAE+E3Q0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:23 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:23 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 09/17] staging: wfx: fix overflow in frame counters Date: Mon, 27 Apr 2020 15:40:23 +0200 Message-Id: <20200427134031.323403-10-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:21 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8144568-c3b9-44ad-0f53-08d7eab0acbf X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oAw3BhWUPavU/AZbmVr9LNN4dHLJMg7ENUdusnhN2v12wH70GBZ9z29lwrT9BUW7Ca0BeSDse5ao3dDFy1yPUwe0rLlP0mjkCcixNtCWTZQhyBFx6DeZKQiQ2rZKRV66Un/BqHpaEOr5aFk6dkfIyWyxjlPSYcxa419E/3roWKiL8pXcY+To67se2B7YSxcKdDMdr5e3jBlNGehrbD48U6nYJ/K8VJPopv/JYbwnWo+9NIEsn3ThVKvSqMOqQlXsWJF3sGUE1jBYvW3rBvH+NajCm6aj7VGmjfC1gii1O8OajkBDXhKzyqP81k8glCqXreB8aVtuFvTolcCexyH6hvd9eJrDujqe+dx7brm1qEufkr8A43fH3BoZkDassXZD57mxEkYFEwpYqaJA7eBAxwxLsJRKAuRc0VD97CmFBUH8HsUd4g9Yx2H5bU60VuPQ X-MS-Exchange-AntiSpam-MessageData: Td3FUCpur+o/8/tuhiiojX1PzqbuR148dlnub+o7UAmcD4nUWaKW7vVEMCoUp/NBCpTNJwwE6eOJz0X2/n5EEmHEEoqMFyqv9fGjTMlXmeDhG26yi7rSi6RpJeVnaGNqJQ8Z5F55rWGiPXbT+58wxD+nCPS4LMXOKVhsJtuVxhcTZR6u7qxsD5dIieYvmKoFkE6ZSPW1R1qdeNwqZj31uDz7Gd6e8kzSFinnU7E9obFLuQeOpRXsJjjE7NyWDRBdLMzSeiY687kw6cNcYsgF2g4VkpAwzR5gf/AcK4WSNojiLPq9eV14pMlRMa2hDM4gLpZ9jqUuta4KBKpnt7/wwrfKzUfehIf+ssTRVd49QC9/nJH7rgVkMw0hVhiOdOwtbnG/YAh6n/AcZ2YiLywksfad+aAfJ9k4YtyatTbKeJgo6406d8DnNlVYJvWpxykMbR5Dne0D0WCoprwj13dY8QmDfm7ERIVa4QB2h/jfr3Qvc1DnvuXw9UTqwrgF2IG1B27mXdqdHvZqxuRKPLg02vfDt9ZrrOwd+xI5K1sNm0p52wBP1lKL/EWeVfnmuPYu2g3WV4vUn2Kw7rA3ebEUcWVsvWAyVVjyZmmaKb399jxV9QhCqqhIItM+bbD2xh63QnFOtmkj9sKVppNERPfxKgtUbCimvCzdA4t5tyXlX6RrrxV/z9LJzL9og/4MsqGOPlT1Cf6LfKI118MS953VZkdwYTXnVDNg8OLvpQ/Ozx5H7N/Qt88WcCpcV3bdVNARFnraVwq4Z6OS3MSLp6dVVmazbbYGMdbXwVr0KQIKyABTINuplUz7I6QjgJAz/j1ne8JOWeW6GdwlRuMVpLDKGUzhPsAhAY34odLNnd/BxYU= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8144568-c3b9-44ad-0f53-08d7eab0acbf X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:23.1859 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rz7hRVIQG4xewr/kk8yR1hAamNtlD8DPCjPyiMvAtZ/6tXeRXwWzDp1W3Bv4kUHo2lkm5heujUOEwsccl7SNug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller It has been reported that trying to send small packets of data could produce a "inconsistent notification" warning. It seems that in some circumstances, the number of frame queued in the driver could greatly increase and exceed UCHAR_MAX. So the field "buffered" from struct sta_priv can overflow. Just increase the size of "bueffered" to fix the problem. Fixes: 7d2d2bfdeb82 ("staging: wfx: relocate "buffered" information to sta_priv") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index f7e876d1b031..a0e025c18341 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -18,7 +18,7 @@ struct wfx_vif; struct wfx_sta_priv { int link_id; int vif_id; - u8 buffered[IEEE80211_NUM_TIDS]; + int buffered[IEEE80211_NUM_TIDS]; // Ensure atomicity of "buffered" and calls to ieee80211_sta_set_buffered() spinlock_t lock; }; From patchwork Mon Apr 27 13:40:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277665 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=L0j6BhRP; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mDN4vpRz9sT1 for ; Mon, 27 Apr 2020 23:42:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728130AbgD0Nle (ORCPT ); Mon, 27 Apr 2020 09:41:34 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728091AbgD0Nla (ORCPT ); Mon, 27 Apr 2020 09:41:30 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AB4+yeYtRwBzvo0O7f/4Hkg8GeF/FB1HKslCgzbmPWmC12R7KUGlscVR85enPWGfXLnd1nKwwDozfp9/sSeFGHeitNzGR3XQ5AgD2TA746fvyYqfuwos3z4/X8DymC3+HkyntDzEDQ7JX4np2/gz9TIjpX6naTbKBQiQzvarCCSIexVq85jRgeTAymgU8HeMylz7XSpOVHTjsa6OFiBhmSJHTZdizcJStiRjAZbCBeYQb8d8bAU9i7GEyXOXic7CkfUjx3rFhPel6oHbd132Ktbu4IdfhXLE+6IqzmRq5NAqY6C6UHVaBABzbf0t+WJc7Nkbr0qaChsKt2xu7eM6UQ== 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=GOXpCjXjNn0vmAehZaXxc39KhoDaQOMwOW0WJM7VOCQ=; b=kKwlFnqz4d8y4wOzNEvuA57GlF4bcvdNUiqUMa6kL9H1wv4Pa8TAXfUnL9HjzDEi7o+nnx640a7Fq5TWqQFb6s3mUpzseO/hy1ISMtWpyE8Lx3ZnWHyLLXQF8x9bSW8wvYwpilwnzb6J4Pc/ZO1VtoiChmfGqn41Qkh4swTI4Ww4uWLpN+Lgpf1GbfMrcs2ciLFxBYbUnEOZ8bL8jBGOJ5Y3phLasBwgpzDmHZnYk4E9RzdDUDjeDWFkiFn1xqVhCexw6p6kLYszHcvlxWG+Cvm+5YHrljfXDyv8hvkvlPJtx4g/ThqN89VEiN9W+0xqmTKp+RnMXaUstQBzFmWeoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GOXpCjXjNn0vmAehZaXxc39KhoDaQOMwOW0WJM7VOCQ=; b=L0j6BhRPAr0S1PbvR2/NZ4A3F5qKIV6aON407Y3NA3UobdXoTxUgAPrzgihD8wqH6M5SDaCOYB9n5Nk5HBhZsUP5/gGWq/URRBykkvPBawVVBhlVs3AiyYgzxu2TnSfNlAbRpLSRnYvJwsSchnzKHSFi2RY0pSt5F7Afe+Pd68Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:25 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:25 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 10/17] staging: wfx: fix the warning "inconsistent notification" Date: Mon, 27 Apr 2020 15:40:24 +0200 Message-Id: <20200427134031.323403-11-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:23 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d5508f0-71a5-474e-f200-08d7eab0ae01 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(45080400002)(8936002)(15650500001)(6486002)(52116002)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wo+XuBYqeRLJV39h2Gxgx1QHIgaOrzmChEArGUtUS9sk97s9q9b9Acdd43ibWmXozuKIhJJMDqfZtw+sTZHXgjSGqdpBB47xlNufauaoirEbZwjCe8FmR5kAxTXXOqqApN8+FZJZAf0Urr8ZPTr8DPfaSmI/UusZCsRASQQUDof81A1PhJAokTCFF12spdvsLhcOCqFuyiuUnzgqdaEsShBYo6vgwrRAhLJuW4lZbyWRPaTPOQ6RYXVxWHUUTtoCakUHUSs5Ihhpk2OtHKN7jXHJE0Bkf4ughdYjBkec9CM+w/2isjsr27vcgL/ZYaXDbnPwsy4DI1v2xalunZwMgetL1j3NgPkkja/45Z/BrYSdcNxWbXUZMglFnx+LQtvfPjNv3kHWbPBAUo6pDz94ljwwmGMvafBNSlu6R8TSdQvEtknkmzeKWhQMzBAoThSy X-MS-Exchange-AntiSpam-MessageData: NdjaQFxM81XA16hPFY/WJZXZ89kQgoRAGfiHJ7T7eMYbsKib9X1Q6VG4dSB4jreILobdcA5eZ6lotmVpjGxNk8T9pdTizqdPFJ2T/PgWr6+SRiwCBmVEsh1yq7gNmzC4WVaZBuGzevCYSEquNpz6t7Bzv8ktlZC1mAoyMCGNBpKh1gj/LwCDsPBa4n4F9UrE+AkqG872RU5R8A2zOv+stApxpRTR7BwiPOgxksEcLiAboM7yb5G7HyQ4vGeFp/b7AlnxgLVL1qk7gh8XScILMLjlKIy65LkUoTPnbrSNju5Vw3WrTjypDTnIh+hpZmDxFH4hCzXgTOxbvVlvNjx+WwbBeA3jstppi8bghpPuwW08bUR434stjuDKP3gI+5Y1wUuYUEoYNPuDnKxFmoeHc9OSWbwB3U0Y53BjKHWWjcNf3uxr95F0jFmpLqgX0kPnKfEjqTe+gmkfQL7KquHfD/9TkY5jZBIwC2k6ArPII+V1795RffIQWSxyCul3kg7UuvH1s+uYCxAVM2z7JN3ftljojVYlJwy7+EeYooroYlsCyolGP12D6i/P4gcGter8mrCZVnokj2XyygLHP5OvuJpfs1PNTfltpAjdOlIlJFl6rsv5O9HN4jRsAKKfZT259tEvoCmDflEy3H7OrbS+DujDSMyT40H9rC4udpWPaLMUiazg66vzrVU4UCEtMjSXgSVyw7/a8YrueON8sKYEfe4YRD7N6FwOdQ09o1N0VyyQhyzvuxyYZW9YFezcBkIlwCB9vpr3kZ/4iBFTzEwhxccElMZqA0gqk48Ay3OQIX8OJyW+rE3EhueenUc5AQbF4KBY2JWNAReJ4EhiJDUe1iIHkKUX/wPJnlgXUvab/4M= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d5508f0-71a5-474e-f200-08d7eab0ae01 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:25.3869 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H/ZG6wSBb7jx/ALmUujQm/0WZgj4D6A7DRWFubEj83zliRFQlh7eOrDjCV2Fw0DUtQNBxNooSjz9Bi5FpdYLVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller In some circumstances, Tx traffic is sent without associated station but the station exists when the Tx status is received. Beside that, the driver keep a counter associated to each station. So, in this case, the counter is not incremented, but is decremented. In this case a warning "inconsistent notification" appears: ------------[ cut here ]------------ WARNING: CPU: 3 PID: 82 at /home/jerome/wfx/data_tx.c:469 wfx_skb_dtor+0x1a4/0x1d4 [wfx] inconsistent notification Modules linked in: [...] CPU: 3 PID: 82 Comm: kworker/3:1H Tainted: G C O 4.19.57-v7l+ #1244 Hardware name: BCM2835 Workqueue: events_highpri bh_work [wfx] [] (unwind_backtrace) from [] (show_stack+0x20/0x24) [] (show_stack) from [] (dump_stack+0xd4/0x118) [] (dump_stack) from [] (__warn+0x104/0x11c) [] (__warn) from [] (warn_slowpath_fmt+0x58/0x74) [] (warn_slowpath_fmt) from [] (wfx_skb_dtor+0x1a4/0x1d4 [wfx]) [] (wfx_skb_dtor [wfx]) from [] (wfx_tx_confirm_cb+0x198/0x2f0 [wfx]) [] (wfx_tx_confirm_cb [wfx]) from [] (hif_tx_confirm+0x50/0x70 [wfx]) [] (hif_tx_confirm [wfx]) from [] (wfx_handle_rx+0x128/0x22c [wfx]) [] (wfx_handle_rx [wfx]) from [] (bh_work+0x3cc/0x964 [wfx]) [] (bh_work [wfx]) from [] (process_one_work+0x170/0x458) [] (process_one_work) from [] (worker_thread+0x5c/0x5a4) [] (worker_thread) from [] (kthread+0x138/0x168) [] (kthread) from [] (ret_from_fork+0x14/0x28) Exception stack(0xee199fb0 to 0xee199ff8) 9fa0: 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 64b9e754e12ef7de ]--- This patch fix this race between the station creation and the Tx data. Fixes: 7d2d2bfdeb82 ("staging: wfx: relocate "buffered" information to sta_priv") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_tx.c | 18 +++++++++++++----- drivers/staging/wfx/data_tx.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index 9c1a91207dd8..f8812079d801 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -224,6 +224,7 @@ static void wfx_tx_manage_pm(struct wfx_vif *wvif, struct ieee80211_hdr *hdr, int tid = ieee80211_get_tid(hdr); if (sta) { + tx_priv->has_sta = true; sta_priv = (struct wfx_sta_priv *)&sta->drv_priv; spin_lock_bh(&sta_priv->lock); sta_priv->buffered[tid]++; @@ -469,7 +470,8 @@ static void wfx_notify_buffered_tx(struct wfx_vif *wvif, struct sk_buff *skb) rcu_read_unlock(); } -static void wfx_skb_dtor(struct wfx_dev *wdev, struct sk_buff *skb) +static void wfx_skb_dtor(struct wfx_dev *wdev, + struct sk_buff *skb, bool has_sta) { struct hif_msg *hif = (struct hif_msg *)skb->data; struct hif_req_tx *req = (struct hif_req_tx *)hif->body; @@ -480,7 +482,8 @@ static void wfx_skb_dtor(struct wfx_dev *wdev, struct sk_buff *skb) WARN_ON(!wvif); skb_pull(skb, offset); - wfx_notify_buffered_tx(wvif, skb); + if (has_sta) + wfx_notify_buffered_tx(wvif, skb); wfx_tx_policy_put(wvif, req->tx_flags.retry_policy_index); ieee80211_tx_status_irqsafe(wdev->hw, skb); } @@ -493,6 +496,7 @@ void wfx_tx_confirm_cb(struct wfx_vif *wvif, const struct hif_cnf_tx *arg) struct ieee80211_tx_rate *rate; struct ieee80211_tx_info *tx_info; const struct wfx_tx_priv *tx_priv; + bool has_sta; skb = wfx_pending_get(wvif->wdev, arg->packet_id); if (!skb) { @@ -503,6 +507,7 @@ void wfx_tx_confirm_cb(struct wfx_vif *wvif, const struct hif_cnf_tx *arg) } tx_info = IEEE80211_SKB_CB(skb); tx_priv = wfx_skb_tx_priv(skb); + has_sta = tx_priv->has_sta; _trace_tx_stats(arg, skb, wfx_pending_get_pkt_us_delay(wvif->wdev, skb)); @@ -561,12 +566,13 @@ void wfx_tx_confirm_cb(struct wfx_vif *wvif, const struct hif_cnf_tx *arg) } tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; } - wfx_skb_dtor(wvif->wdev, skb); + wfx_skb_dtor(wvif->wdev, skb, has_sta); } void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop) { + const struct wfx_tx_priv *tx_priv; struct wfx_dev *wdev = hw->priv; struct sk_buff_head dropped; struct wfx_queue *queue; @@ -593,7 +599,9 @@ void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, wfx_tx_flush(wdev); if (wdev->chip_frozen) wfx_pending_drop(wdev, &dropped); - while ((skb = skb_dequeue(&dropped)) != NULL) - wfx_skb_dtor(wdev, skb); + while ((skb = skb_dequeue(&dropped)) != NULL) { + tx_priv = wfx_skb_tx_priv(skb); + wfx_skb_dtor(wdev, skb, tx_priv->has_sta); + } } diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index a308af3d68ad..54fff24508fb 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -36,6 +36,7 @@ struct tx_policy_cache { struct wfx_tx_priv { ktime_t xmit_timestamp; struct ieee80211_key_conf *hw_key; + bool has_sta; } __packed; void wfx_tx_policy_init(struct wfx_vif *wvif); From patchwork Mon Apr 27 13:40:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277666 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=I3fGbg5C; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mDT48ykz9sSb for ; Mon, 27 Apr 2020 23:42:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728278AbgD0Nma (ORCPT ); Mon, 27 Apr 2020 09:42:30 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728116AbgD0Nlc (ORCPT ); Mon, 27 Apr 2020 09:41:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XPj6v55XamexDKiGixbHEpWScxaYmMKB90SIyuZrB25Bb7y/9mbvvN+lgauLJSzF2jyWXYD2beDOLALxcMD6kuWIHoLt190qWNrwQPXOfngh2SBlLRG3pSlycIwdX/4tB8o39MctfvacJwjRPEOV3FmoKcdYg1Es21AvfpNDFkKkzRvEPHxYdwwa8rTjX2UjaUhV3mdo+XTITDLvGueoOQDPi5csVm1An0U1UMPD/MdrHZw1pmINDgvD3wtWqom4B4LgrvA9TVnVzFyFRQW8WIjjr///D2xcHshMEp6iXl3qGBTxtI8QK8HCxLjl3zkYgTq6kgF4w05G719ppC7REQ== 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=On2eMFuNjyY36pdcuuXf4k4EUyRYjcNDklcZkuROdwE=; b=eTBpRhGAzr6vcD3UgtYVXVb6T+Eszbxtw5VfB9NXJVESCtvPP6YyQuJxJU570a3OSpBnL6d/8wbpOSlnUWkq/AUMwqyRnhst06EXVaPy81rPwHzg9YwMlwqtBMXwIN+muxyCxiJ7yfghGJuU2F6moSmiKK16Ogl6aJUkzyJpWdZT7nS+ZTtgmy9a0myew4Wq7X6t4gctAe0g+qWP2j6g3TUeGqPkt+tifaAMLC1GLCr2rPBy/pEg2QXEZqM7SBOxuv3VVxnk6Wi1R4pqf9s39JQy7JxPzE0ApQq/eLIY+7HW+TACSoenolUAhZXyitwy8/AjdtKYoOObhlnI4wtfsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=On2eMFuNjyY36pdcuuXf4k4EUyRYjcNDklcZkuROdwE=; b=I3fGbg5CXtcHEva16WxHN99XUdW1mgcNVfrWBcK6X5KVd4ZVGy/lhR16SbTgqnjZL8MxVIGXsFXHl1htvPoSi2UPza0V64xMWIKYWsPLfRJ95Fu2+s42yknJLu8zyTJjRPETippWNVq7JFj2ZsYLx+Oc7BiH9G6usDOFR5AO2yM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:28 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:28 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 11/17] staging: wfx: fix double init of tx_policy_upload_work Date: Mon, 27 Apr 2020 15:40:25 +0200 Message-Id: <20200427134031.323403-12-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:25 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6a75ff4-01dc-4d4e-3162-08d7eab0af8e X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4744005)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JhQrA7DO9Ue1NQkIv7op2nnRO9BnnmtYYQIgXd+uGXda4vEMTbqrcQ44YPrZhOkgNSpD+vuoisH6bJrNfl6KHHP3HGW/7JwmJ2xVF1HnuoTC/cIbsaw0yDOYflC0bOhdlJQxbKirSEXaCIl1+gNB3lA8QBC0F7Ee+b/KBAhH7sCindZ1/ZaB5UfughoXUjw+i6Ax+BJHQFZ2Hsb7aRgaTlwXa8gbgK1tXXf7ksvKT3VkPlUYzhe2L7zwiszhkOilQN7ZbaAYEKy2fLWxF94XqtUnefFP/WO90fb9ck7Re8OYUSnOp89w0ucAC8k2ApbHLxBHJqdmNkA29KZe/lBdhP6wZ3CbK64BAzc7pxXRLx52ZUecV8m4xBY6/9lfmQKparvmhhjZnUGgU3eNhCPkOM/ORwlpKdJgvgj8YfG1g8Ex12wVb/Q7IwtSCRoYukI7 X-MS-Exchange-AntiSpam-MessageData: Ytz4JuhSDdP3QtvfbYHhEOznn41/Sv+izIYYKkGhYE/filRoTqSzPSa3c6yXGsrDQ2kSpxnBk6yU6EpQprNkBUUmsBENC16NcOBMEd9V0PzKu4xXNKH6WkAzfrJdX4w9ryTgrl8POU9BHGtYBOeCBKexvsBLoYLx44cVytmXcRUhlum9Rj9b6nebNkWgJz6HqnsFGrZloEc3vuw9pKo/AoO85wE2wGiESC+aC1VdueB7Sqn13sYq9f4E0MIItr7u57+msZkczlbCQaDgIRuwfNhiu9pyFO279XZ6/tg6PxzOks1y58sFdZr6kP85ZRyf4bhA8YohGhkB7DX8ETbs9BnZ0blZ+Pv2lfPPuDdFaQ1mstxvFkAe0tlSb/pjOsy2naKToer+9DLehQm2Ys1ucP32pRpeUDzVutE1cCLXK/70CfZWKysAisodhvJ349WTKtF1cAPe11S4yf3AfN5x9ysyf7J27v1YmQLW/rZ3T/En1MhLySlH/so7LcJuMdd9e3oGFa0z8TbthqZcvvglM1UI+QjEsdrBkre5Hn8hXIOJzqTisZZlek/rAqqC8jkcAIX1mHLuZhki5LW0D97lrPQR3Me1mz9fOAq63KIzexj6PH0An6DiKAF3HjnWSSBg2Plyvk54dfC5FNc/wZ9jUuzrQhY0phGJjmzPUjCV3tOQg31s/UsY83VZdDMw2xCTuDA665xwTt4F9z/bOC9dE46AP21DeIceSa2OlnlcEYtqm802TKY8rKI9yNhShvQiVCpUdh7j8Y0M094MCGaQyxORuhD/8bAHlFccIvTtIwIGwlEydkK9ZcgxNUXuqA3keZSrxfFtpZFE0hXkMMzFHkWAxuV02tZ9oQg/7zrFk7g= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6a75ff4-01dc-4d4e-3162-08d7eab0af8e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:28.1927 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eqC01YgsYeKsFUpm7BwCQuYx9iZA5ibp4GxKgu50RTK2fjlIKagAWSL8K9EdJVs1XfrfH4Q7mT2aFcgE+aDoHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The work_struct tx_policy_upload_work was initialized twice. Fixes: 99879121bfbb ("staging: wfx: fix the cache of rate policies on interface reset") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 67eb4a6e176b..74ec0b604085 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -782,7 +782,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) init_completion(&wvif->scan_complete); INIT_WORK(&wvif->scan_work, wfx_hw_scan_work); - INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work); mutex_unlock(&wdev->conf_mutex); hif_set_macaddr(wvif, vif->addr); From patchwork Mon Apr 27 13:40:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277659 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=hlQL+Dk3; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mCV2Lqqz9sSk for ; Mon, 27 Apr 2020 23:41:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728150AbgD0Nlh (ORCPT ); Mon, 27 Apr 2020 09:41:37 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728128AbgD0Nlf (ORCPT ); Mon, 27 Apr 2020 09:41:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IhiQsi7VNFXJ+qFx0XgmKZSdwgl5ZSzSgnCi1wWx1QeNkDTO+M+CCWp/wusKIfvHhmNnqmkgAJqMWt1rnb+9Oam21a6qv6NT/C6nGG2lLDTtFy5aD6RIKIJJZkRfMz80UkC5ACysyth0zsuJDE6m/xQguOH15C5NV3QlkBluZ0ZhlEHhdsI499eU5Pg80CAx7qw2CKwXvfrUJ8WVTY0qP9syxwItTufKSdvzin5gsyJmv9e5FZZqzNjxp1cGAr5vycM7Ofejg0eDiMN/3pNNVxx9y3NucGCQW9cL9gb0gOE73N9F34WGCh251bZZqcVHK74rdzMAFpnewEGd48tQ2w== 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=egCdpDIyXQUcXWET33IMa8Zq84wxdpYxLexcnAsxUfc=; b=ErZpfVkDMpiK/H/E5bMXAoTwiYw0pUi16riP3C7RgCzOHYbKr3YOBsLDFfUZp2VqsQSIQ28J2yjhLDUKw85grzTx7NEp5gnIw5xyqzIUO+C//saGICGQ6QqbsroFCjYoirBFqP0sy320dGDrG3njSKw01jNIdwt9zfIYDM8P7vis7ME5EOyJj2GNLuIorQj49FJZEEhA3jN1CUSojKi045mh9dDW/xGfTyCLn/zbKlMHn0q/Gy9lGuxMP8i5+koZsnIOSCqWWSg6cajH/te0oMFYLkV40TLrC2A0dgvNhT2e3YMzWomOd7nWgLirVCFchF+P7E/WNPwKDsKtxIrdJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=egCdpDIyXQUcXWET33IMa8Zq84wxdpYxLexcnAsxUfc=; b=hlQL+Dk36+Fpyf2ITZ1sB99Ho8xFc14WFhr5ZeBnOw33xqXUaUknp2Uc4eE4vl7NV7iE/i0XJ/4hJU81LX0IqGeHjH9uTsONhEDVIdOg2+P1QaQ49uHet6Etx/3nVd6lNTWvUsTMAD5ngdjETnEjbKxF3jIxqgUUEuMXL8vkHto= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:31 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:31 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 12/17] staging: wfx: show counters of all interfaces Date: Mon, 27 Apr 2020 15:40:26 +0200 Message-Id: <20200427134031.323403-13-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:28 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fb43a34-fd5d-49ea-8b56-08d7eab0b181 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kA7oOVJE6AEvAosobbht3i2EzKpqDC35Wh3Z9qJThFEeQpCRBb2cJElMsMR9MlM9WPkujh8l7bZrEEs/JwWt4wd9NqerwN4hJV8KY4KySstm+5heLFCxnUOM7NAQQci/wsuUJZHiHjhaXegvarjT0zVi11UX4QPYpaarpxdhhY1ipgXTgBCHdz2shGEO7MkB4XDdUb6mRSl9/CiqTHI7lUpF7axCl8w0aTy4jXqvBpmDfdax3BtiRkWJzGozOHqhiqogKpcf869WiixOrw8rd+WhmDiHA7tB6PHzHWU13FnfnUoaVAXRaVaDzkH0W8LB+AVGfuo2l5TYVDzvvz96wGYCzSSZh0/gb7VRF5bF+FzshYSJ69+OD/efSmMfRbVnQ4T/t6oGw2JBQjc1qa0yCR/a+6HHM5UiDclrRYD/iWnJ5U0nc2hZ8G0biEnLEIE0 X-MS-Exchange-AntiSpam-MessageData: +eKH2md+QPmroqBnEeLIhoXcTDFm6Go9kNUixGRJRkQ9kSApTEAXtu3puJZPapi2OpIeAvvxJvCXwdvnu87cul16mDl1slzszjKyyCd1uokcrAbSZAWzZhowrmPMNcRE+QwE0zCzFlmnQkmuEsMaEOG+99JWQcJOColz9vtxpZ6hl8HCyMa7qKqPYSeUMbrCsoReJLOhXPG6IJhdtyKqaYqsNG5xGX6VZakAbWzD0pR9U4SRR4afyDgcQRUCzhVCHU/cBBt2Iklduhkt7TzefemKaZlmW/S+s2GzW/DqFHxX379aL+murJuyqQTXu9Pv9KianEEil8aNMy1vTmHJZ/PO6G9rteN9QZH2Rxi9hPtrjBJmv8xKdKElTUHC8HEuTDr+JCZDtNEBh3RIYgaLgnHzCuDr7FtFHKSdMvCejWx73AO7Vr47ZZ+8YRdt3AVvxjJ1H7sFCkxF+Ka2HQsOw4/kk3xNaEEgzmNvYu9DAfGaXM8u6XVwcXF4M6xObDJHA9ijaNL8bWNgqroDvCU1R90PRaITeSVaudrs1RtYHGW7VD69sIKJfy0zl1unG8vJ0gKKZkrDaY3eJWuzozasc/MjevOjDXRd2//gVL9kpi3hDtxZt/4kmPbW/OGzZbVPXan/w3h2dN5zVKdf1vlYO4aUScEcIqYQkAq8dpkjERBCVF32EUSvmA86BjZl12fKgGS1wx9BAu+VJcPMpXSnVhQtGnXiWh6BMD2CTzf8a11bQfrS/IBo8eCeA/+uraKq6BX0SbjSPYzemzU/3aDbGjbCNRo7LRlOH/4nocdoDRFolGkigXxlDqzq7ZM1SvKaAXsPgf2Loqrb4jWtDAzXx6jdoWSwsgCJIHk7u8RYCA4= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fb43a34-fd5d-49ea-8b56-08d7eab0b181 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:31.1124 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ibBvm+OWguMJS5T1+aVLT3zIJvO77T68PJlWJpR5ShTt1RlYptqyJlF7dZ4sGocrZZ7uwuixnr3aEfje4R7Pxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device keep up to date three series of stats. One for each virtual interface and one for the whole device. Until to now, the stats for the whole device were unavailable. Moreover, it is interesting to retrieve counters for all interfaces even if they are not awake. Change the counters available in debugfs in order to retrieve stats from all interfaces. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/debug.c | 25 ++++++++++++++++--------- drivers/staging/wfx/hif_tx_mib.c | 6 +++--- drivers/staging/wfx/hif_tx_mib.h | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index 1164aba118a1..4dc4f6a0b92b 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -61,19 +61,26 @@ const char *get_reg_name(unsigned long id) static int wfx_counters_show(struct seq_file *seq, void *v) { - int ret; + int ret, i; struct wfx_dev *wdev = seq->private; - struct hif_mib_extended_count_table counters; + struct hif_mib_extended_count_table counters[3]; - ret = hif_get_counters_table(wdev, &counters); - if (ret < 0) - return ret; - if (ret > 0) - return -EIO; + for (i = 0; i < ARRAY_SIZE(counters); i++) { + ret = hif_get_counters_table(wdev, i, counters + i); + if (ret < 0) + return ret; + if (ret > 0) + return -EIO; + } + + seq_printf(seq, "%-24s %12s %12s %12s\n", + "", "global", "iface 0", "iface 1"); #define PUT_COUNTER(name) \ - seq_printf(seq, "%24s %d\n", #name ":",\ - le32_to_cpu(counters.count_##name)) + seq_printf(seq, "%-24s %12d %12d %12d\n", #name, \ + le32_to_cpu(counters[2].count_##name), \ + le32_to_cpu(counters[0].count_##name), \ + le32_to_cpu(counters[1].count_##name)) PUT_COUNTER(tx_packets); PUT_COUNTER(tx_multicast_frames); diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index 16f4908055af..6fdde5a4c9a1 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -64,16 +64,16 @@ int hif_set_rcpi_rssi_threshold(struct wfx_vif *wvif, HIF_MIB_ID_RCPI_RSSI_THRESHOLD, &arg, sizeof(arg)); } -int hif_get_counters_table(struct wfx_dev *wdev, +int hif_get_counters_table(struct wfx_dev *wdev, int vif_id, struct hif_mib_extended_count_table *arg) { if (wfx_api_older_than(wdev, 1, 3)) { // extended_count_table is wider than count_table memset(arg, 0xFF, sizeof(*arg)); - return hif_read_mib(wdev, 0, HIF_MIB_ID_COUNTERS_TABLE, + return hif_read_mib(wdev, vif_id, HIF_MIB_ID_COUNTERS_TABLE, arg, sizeof(struct hif_mib_count_table)); } else { - return hif_read_mib(wdev, 0, + return hif_read_mib(wdev, vif_id, HIF_MIB_ID_EXTENDED_COUNTERS_TABLE, arg, sizeof(struct hif_mib_extended_count_table)); } diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h index bb7c104a03d8..b72770a4ba12 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/staging/wfx/hif_tx_mib.h @@ -20,7 +20,7 @@ int hif_set_beacon_wakeup_period(struct wfx_vif *wvif, unsigned int listen_interval); int hif_set_rcpi_rssi_threshold(struct wfx_vif *wvif, int rssi_thold, int rssi_hyst); -int hif_get_counters_table(struct wfx_dev *wdev, +int hif_get_counters_table(struct wfx_dev *wdev, int vif_id, struct hif_mib_extended_count_table *arg); int hif_set_macaddr(struct wfx_vif *wvif, u8 *mac); int hif_set_rx_filter(struct wfx_vif *wvif, From patchwork Mon Apr 27 13:40:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277664 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=Ff/YWolO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mDK6ft1z9sT1 for ; Mon, 27 Apr 2020 23:42:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728259AbgD0NmV (ORCPT ); Mon, 27 Apr 2020 09:42:21 -0400 Received: from mail-mw2nam12on2085.outbound.protection.outlook.com ([40.107.244.85]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728091AbgD0Nlg (ORCPT ); Mon, 27 Apr 2020 09:41:36 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyYOQ7bAVzSSajIbQmParbHG4LolEZxkyKbYjNssleEX33vYXNHhuSgHTvcCrlU2jAymr2HV7MoUOhCCfZe6JYafPu7+S/r90okjoTIelFf/YtBRyQic7NsYoSvSjLh2LvLi09ZvxIIZrtiJ4qSP4hcG9h2kfRLwQRvoJcunqenn6CbENeyNvxMUb2po7N5jd0lgL+Tt7tTe1HMpWIQqFalmwNyxrDT7oOEKd/SpGaiAcDfFukbpI/TbCt5pmSXNGoFnKGr71BR5NC/lwiHKCkM9aGZTYz4XPf00WiC2V4SO+2HN7AP8ld1R/DafamlTZCrao2AQVnHjUJ6YJFwFLQ== 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=SfI8C4D8XYBn/gT5TXywrCOmodway3QLz7Dgr0sbX2k=; b=U8guohqWx0M+oFeBsOfxR1zKJRWgM/0pWWYQsDHc4GQVGNR8OEWbpkWOEX9mn9V/SnlMOYZ0nCmQIbGsLNjxAwxElld6y0PVSXhxZyuREh53AOQGBY8QjE9UBlMoYfHkZidECGnxqzKPlbyiIzUZ06mCWOhlWCLCT7jmEMYGltA4Jc4j45LyJ4sEzdN3rE/mj1ua+ZbGaDLyYYrLU99F/XrjzboLkY8+FDvfeGFcvyVRN+ewweEGzA12SHGVLCmmlag1VmIFWOGvfqTysfw35TW6GkHUD0tOVSoTOM5YqVRP4ai8ntx6RBfV3Z69rggFBIqYLeDx8frRdX4CiFxfzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SfI8C4D8XYBn/gT5TXywrCOmodway3QLz7Dgr0sbX2k=; b=Ff/YWolOkqVBA9bZHrShvlIj8N4OIQMheysvqWUii/WAD2ugfYTdJkMW0dmJdYRR5iCRRNq/5+lvnyXBA1zBgM+bHjmqrGl779HalOiO0PTjoEjC1fOfjKmI2yEvjeHyJWWPHCkxvD69WAQuBVxJpJTpZEplbbo/IXkNMs6ZnvA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:34 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:34 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 13/17] staging: wfx: also show unnamed counters fields Date: Mon, 27 Apr 2020 15:40:27 +0200 Message-Id: <20200427134031.323403-14-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:31 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a248b770-01dd-44ea-a825-08d7eab0b37e X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R8kUwl0W/kr5VWMsES+E4RocR6Cf+I43flKzR2YP9XPLjB/RFwpOzOyH96lrk4B4r/k7is8DoMS8EEdBXAHU5JjSi5bAbahsS5UkpeyKS/bzDCoUTogd3HyDtzQ9JFFT7qB1lzdTsW1TSe7uBg+750tnr8AZyAX9cplBgwXVo6QTpKd9wO7N5hNxycn/ToDyxQcz5lgD/GSYsZ2sK7uJ6tdl4l4GabpCOXLqYX8aLp4FfvSIQcgVyCPoDdbj/n5m1H0EgDoOV3+tQO7JZcSogw2m5oXmVbeZocqG0wO+e130i57mHClLJ6nw8JHVrtFYXJRlpF3hq7wtcGuNUHY/kGSA/M5WkXkyC7a9IwSbpxENf5JYOxRq5wL34ZYGUUZ5o2GYCCkDthqQ8/qlOffa4n1kJ7kXlnFyAuN+Z2kFeEklldSorXS3W/H7TCiq9zHY X-MS-Exchange-AntiSpam-MessageData: nTTjR9kxOOcXL3gmL4VOyv2RaKPPLhQ4fnYqY6vvu3jqqJQbWumcPx8RLrUL4fH1YBLOPBW5o3tMr5jIqbJTVcG4cZvoWRfqSVYarlSrhCtt5tO02Y5hwiVfK/1Sr0ZGKPrK1BiPDHIbKzjSHpjVtw0fL/9tG9G6YC91IlO6jF/l1a4LYxPxfqbE47jI1crPNveA46LGc0567KB6VHaNS5gojPL3KNnWvmGgS+kpjsFTSwwBv2equJ9MB7vOiUqwBSGuu94rEfwLCrxIu4CFkhCaGbIk88Q3yK7vgsJOsQrTm12tH0vSG8yJmE3afQyQnoWljF2Z677q/k/icTzjgwaQCvmscDJ8AWwQx9aT4ifagxmGjVclv/dg8HpPU1vg/G1u5ItkY8DeUkDd7cnO4wrbEHJ58sPF/F2Z/R8uVk6KVcoltwZszTnJd5ophphqc0qbTUbpom9A8jyWlMeM4nfcWZ6U+g13c06+zEb9OVfuf3RpEOs8JTpLjA9wZSkR0x0Qaj8+kPy16AYFiGx5/jjl28gBdvI2rfEU+PLARPD+B3Yy3pMzGsmH6qyYxJXrYnRtnT67mow5xysUsQMuEm7aPL3tyfe4/55dnvkYQN8vokD2KYKDWV0G9g0KURyUWrjURGIM3fEzaOLrKqapieaq0YAYLADQPSp5sp4u1OqbOniqUreqbdmhQLrNdoQICrvcGJNRpaQAYzUv32fzUaCqFJiansa5NlquTeueeCfVaa4vvjJ4uZ1kINltEA3mxYQAeaTf4oEAlxWx4qEopGenqY3wzuKQxEdg72YUearWsAan3q5ZTkp5o2AnXDSfU+vA8R1fnNcNSRQ3FdU6Fs7MxK5SLSl/xEBlLsKFsPM= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a248b770-01dd-44ea-a825-08d7eab0b37e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:34.5409 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qrmbRQpZy9T25MSTA4Gr16aVwgIUBRLRBR4/xrJ0z3XgSjIsPxwdlfRNOggWcwSk95iWLJkUZcqxW+yt3y4bTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The struct hif_mib_extended_count_table contains some debug information accessible from the debugfs. The struct contains not yet used fields at the end. In order to support future firmware versions, this patch also show these not yet named fields. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/debug.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index 4dc4f6a0b92b..2fae6c913b01 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -112,6 +112,12 @@ static int wfx_counters_show(struct seq_file *seq, void *v) #undef PUT_COUNTER + for (i = 0; i < ARRAY_SIZE(counters[0].reserved); i++) + seq_printf(seq, "reserved[%02d]%12s %12d %12d %12d\n", i, "", + le32_to_cpu(counters[2].reserved[i]), + le32_to_cpu(counters[0].reserved[i]), + le32_to_cpu(counters[1].reserved[i])); + return 0; } DEFINE_SHOW_ATTRIBUTE(wfx_counters); From patchwork Mon Apr 27 13:40:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277660 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=X4DyRizG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mCX45b5z9sSk for ; Mon, 27 Apr 2020 23:41:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728169AbgD0Nln (ORCPT ); Mon, 27 Apr 2020 09:41:43 -0400 Received: from mail-mw2nam12on2079.outbound.protection.outlook.com ([40.107.244.79]:26048 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728128AbgD0Nlk (ORCPT ); Mon, 27 Apr 2020 09:41:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UICqT+9rq4c/5qgq+AqBWi+MK59BcOw490o43dUWW66Dc7bRlT/OE96sx7yoZws5yHRbl5TrfKyP3HQtzec8unZKSjHmhXeC1v2m/HddMO8C9Z3cbgbNg7HQEXN5Qz095UXCEwWFZs/p11K/F3SHvbHXUwwQqirqQMMx39a0pm4kgKUNjnij6qgNI2Y/a4R0pifUEoaxk/jIY/GfOU4n0WvW4yIGh0y3qwwKTft2PA6rhV6oT0fL0c+/mRfkf/FXZjk1RY9gWIs6gYZ/DoIzU5uveYjB7ptpaFJ/MbiVTMKnXvmWZJaQlXzgJYj7odW+KMjPUJpNVtf5GJ/nCyzQwQ== 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=t4/GjzrCFiTbCEHiqTUBdkSPriUhMCEf9S0AkojpW7U=; b=MBR/wXn6ZyeWv88qERfdGXYCSPU3XL5EOhdIhVfirNQxwZjThxlVrCidTqQ7d7DRNOWYKM9EIqAF5g6mbn08CVPLgGY2lH6Y0YzSwNPJ7TBIGxHwPRCFU5TLzCtxKwgs2bFfUKmYRJH6sAspZd5MLawxC3WH6vmnVLPueqiIKkvpuMONOGsdkusFg0mt2TyNFGUAIrtAxAEbtrL+EP6sFKM4VvHF3m338oe7eEoQW3x2CVGWWCp+dGXXWVsNFz0eD9c49eiOZvJ/hnpi9Soz0Dc1JXO3DGOue/NxcpQLek/rRmqWwwvHE5sMPn48i8KfowAHhilj6bZ7brAtJS9leA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t4/GjzrCFiTbCEHiqTUBdkSPriUhMCEf9S0AkojpW7U=; b=X4DyRizGBV+fpntuDSsI3I5FnSPtkCRNuPdAB6d6QqNJX4OYvr40ALBurzUxrcaUDvljFEnZSA6vSkkh99Iw8ci0Z5Bbdq2EENLa44gHs1/TeoOPt26YyEjS9XFoTihdgfWanAY1M5z4eR+PTH7z8oeNuwBX4SfEa43xY6FRq1o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:38 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:38 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 14/17] staging: wfx: update list of known messages in tracepoints Date: Mon, 27 Apr 2020 15:40:28 +0200 Message-Id: <20200427134031.323403-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:34 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4b9079f-3866-4906-231b-08d7eab0b5a1 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(15650500001)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wbShc5w4OgEyQbaWGdk4fr6qih4y8tlox4MGCSqefacAjzlRLTX6h7lWlJyIseNSRUdJyTPg7CScrytSzP99ThWz/3ahbBzHRa63PFukUMX5L2HEPc8J2nmLFrQ7uVmkXZM5JurTHIxMmn9zzeQFoaHqPZoH/zj8kURPAIzH6Mm9U6ntSeXUNlQV+8Q/n9SLzm05m0xLSd787Id1SGcfl6N+FAaYlItdyViQyM6LHkMqKV8uXFA022vY+n7Un0xpVSiyRA2cSAsE+Z6DO/8JKwCDoaOXusuhwakbg5k/FJl8KeBSvUdUP2J/sE8KLDYnn9nbliiFEgz/txX0hqNk2HdH9RTpB7lq30AWtu8DtNYfrre1XAHQL5G9IskbFF3JI1KHuVeFKK/9fc7838iQImVcxpu9NLE0ydCjdB72HX25RSPZBY5CneKAKJ1bVl1d X-MS-Exchange-AntiSpam-MessageData: 1chnTdK9BOV2MpXqa5F29XRxUwKQDka7YjQRZ9hf8z8+Jwo/WY/ZYirHDC7ZEwJ3S0lZ2D+UdUdMYGBRATp1pHdFnqeK0MxQb6V8Wr4qLYoLpXLeFOsnnOLp8fqXxuNgJ9Roao06CVhVJpzrasmaCcfeZDWThMvg+rwLU3dA/dM5zsEBdHlSjzR38E5MuGlVd/xzBOt8iCwRJO08ICu2cWFfU8SBH3wIB8/UGFmKEmbljDTczCzPzxqdmbyy/Z8JXKDkRlRGKmbYkXjCHD9el9JLhGEYMZNs8pNmXedx4YZJ/Q+VG7vSOn2YsTXd/gL4xFVXjFBdscppS3Qz2sO7/iYFMFdLe1vxJC313z/omfwVVAn+TXDToB6t2WCpA4304SVgXJnxXj1lZTobjMWKy6Na9b5WxoL8pR/ZHxaevnLD1rUsWwbVuUALHH1xxi2T190vc02DHgl34yXmkxEYNxDEWCp76+ns9KGsijU8BRyfPKE66K0QzmAHRH5oMibSfBwRdDFwQhfHFN/dtkK+X3mGGzPS/oI1QYJs9Fv6R8X5YaXRgxW5BcspUdcGAdOISZVwJLgddPOG1e8h9NtOJ4PBIoYD0EneWty/8CmqFTLa8s3g+T9CabnV9kpt5XoIv9fI9zAQvQKxRsxXHj7vI3MtdwialRaEfOoSyhxy6ZiJC5wmX5Uj+ej0Ss9O3V12Vro6gDktUa7Njs2Ky5NxEtR7w44DLrGqvreN/0DpGfvF8ERX5C9E56xxzeqYCLAbBMAhP/fVEkVSU/wtAIfA3pCcEc1+m/2Ljqq9dQwsl6hdi/+U7g7gpzxPBOtaNYs94juvFx3/crqppjVp+vFADj/L4inkVzG7pCUqXsdR280= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4b9079f-3866-4906-231b-08d7eab0b5a1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:38.0503 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5oV16SfmD+AyWG8740O2LV6e3aOvVGusXWfBaDbze3vDGRqegxVeiORfYvJkMdH4is/adh6QCYerN+6Q4GQAng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Some messages are missing from the list of symbolic messages defined in traces.h. Add them. Also sort the list in order to simplify next changes. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/traces.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wfx/traces.h b/drivers/staging/wfx/traces.h index 30c6a13f0e22..7b25e9511b00 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/staging/wfx/traces.h @@ -104,8 +104,10 @@ hif_msg_list_enum hif_mib_name(ARP_KEEP_ALIVE_PERIOD) \ hif_mib_name(BEACON_FILTER_ENABLE) \ hif_mib_name(BEACON_FILTER_TABLE) \ + hif_mib_name(BEACON_STATS) \ hif_mib_name(BEACON_WAKEUP_PERIOD) \ hif_mib_name(BLOCK_ACK_POLICY) \ + hif_mib_name(CCA_CONFIG) \ hif_mib_name(CONFIG_DATA_FILTER) \ hif_mib_name(COUNTERS_TABLE) \ hif_mib_name(CURRENT_TX_POWER_LEVEL) \ @@ -114,29 +116,32 @@ hif_msg_list_enum hif_mib_name(DOT11_MAX_TRANSMIT_MSDU_LIFETIME) \ hif_mib_name(DOT11_RTS_THRESHOLD) \ hif_mib_name(DOT11_WEP_DEFAULT_KEY_ID) \ + hif_mib_name(ETHERTYPE_DATAFRAME_CONDITION) \ + hif_mib_name(EXTENDED_COUNTERS_TABLE) \ hif_mib_name(GL_BLOCK_ACK_INFO) \ hif_mib_name(GL_OPERATIONAL_POWER_MODE) \ hif_mib_name(GL_SET_MULTI_MSG) \ + hif_mib_name(GRP_SEQ_COUNTER) \ hif_mib_name(INACTIVITY_TIMER) \ hif_mib_name(INTERFACE_PROTECTION) \ hif_mib_name(IPV4_ADDR_DATAFRAME_CONDITION) \ hif_mib_name(IPV6_ADDR_DATAFRAME_CONDITION) \ hif_mib_name(KEEP_ALIVE_PERIOD) \ hif_mib_name(MAC_ADDR_DATAFRAME_CONDITION) \ + hif_mib_name(MAGIC_DATAFRAME_CONDITION) \ + hif_mib_name(MAX_TX_POWER_LEVEL) \ hif_mib_name(NON_ERP_PROTECTION) \ hif_mib_name(NS_IP_ADDRESSES_TABLE) \ hif_mib_name(OVERRIDE_INTERNAL_TX_RATE) \ + hif_mib_name(PORT_DATAFRAME_CONDITION) \ hif_mib_name(PROTECTED_MGMT_POLICY) \ - hif_mib_name(RX_FILTER) \ hif_mib_name(RCPI_RSSI_THRESHOLD) \ + hif_mib_name(RX_FILTER) \ hif_mib_name(SET_ASSOCIATION_MODE) \ hif_mib_name(SET_DATA_FILTERING) \ - hif_mib_name(ETHERTYPE_DATAFRAME_CONDITION) \ hif_mib_name(SET_HT_PROTECTION) \ - hif_mib_name(MAGIC_DATAFRAME_CONDITION) \ hif_mib_name(SET_TX_RATE_RETRY_POLICY) \ hif_mib_name(SET_UAPSD_INFORMATION) \ - hif_mib_name(PORT_DATAFRAME_CONDITION) \ hif_mib_name(SLOT_TIME) \ hif_mib_name(STATISTICS_TABLE) \ hif_mib_name(TEMPLATE_FRAME) \ From patchwork Mon Apr 27 13:40:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277661 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=NGsd0IfJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mCf3bPrz9sSk for ; Mon, 27 Apr 2020 23:41:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728188AbgD0Nlq (ORCPT ); Mon, 27 Apr 2020 09:41:46 -0400 Received: from mail-mw2nam10on2043.outbound.protection.outlook.com ([40.107.94.43]:22881 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728159AbgD0Nln (ORCPT ); Mon, 27 Apr 2020 09:41:43 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPGai4T3gpVYGVPs5rxSWq4xVRwX6E5gpCKYb2g4ZCKTm0ZG1PLAynlETYY+HXU7ufZZXE+37IVRg6Q0O3Ss4fUWea56R0ROnvfpXfJGW4uIu7Opuk9blsORAlyTPKGytVTb8xuHypZnbwDL97heM6DE69dLXaJUwIhe5Zx7RFmlhOCUIInymBWudT24FmeJ0AmTPx2sKMeyE+NybDrczxKv3ZDltnWCv5Ty7se+qJ1qGUytlgNeOL2FzzjnZQfsQJ7bgj14y+Zdgb6llv2lGc7Al5YznujnUrzGB8AxM5mJIDmFFn1fAmlhfzwxp7foeEr3bDJ+F91Q4SBsseNVuQ== 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=fhp0x+pyCoDjQ41/lER5crX4TiQhMwkEuHtqx0ROSEM=; b=m3kLjlhfHOpHdXLrIyAhDQC2y0XwNH21SmYMwKMBVXEtcWiXdPzZqUqZ0SVKYaBImxUR+MpUNj6eh3/HxavMwxIt+hOifkZmokbTZ/cDm5JsAM05ZJmOe74LuUHh+hYS2Vlcj5Vh/NWwqXnnr3Ejwq+HpWtPJyYr7gS+J8caOpMT7xGkT3nBQeqwWXeRovUUV9Qx1DaW3ZjKsFa+/e2ezZqQHR31JbomoxOezsjRntMde3kA3NY1KK5waD/XUJxvxkYhzE1sywEiXigh8BJ7QQiM/qBLgyvqzJXCHQgvM+HQ6SgqI6vnaCtROZcTsgTFfTvDbLtxvd5dMk3uTXBOlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhp0x+pyCoDjQ41/lER5crX4TiQhMwkEuHtqx0ROSEM=; b=NGsd0IfJqX6ncjQcWpLtmNsZtDAf0+d2p5+q+YalSLq6r7D8KMxcqthR4+Qb1FfqhZOjx1e9shvFLMxmXTnSIYMrB4SVmf4fRfxo/mOP/2Qv8NJUtHaQ5dlECsYZaxyXqaiG4ZN/W/0X5TlAgcGxIBovJVG2JdvW19ky7zQZ9Dg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:41 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:41 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 15/17] staging: wfx: fix messages names in tracepoints Date: Mon, 27 Apr 2020 15:40:29 +0200 Message-Id: <20200427134031.323403-16-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:38 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b8795c0-a427-4535-66ef-08d7eab0b79e X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:935; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4744005)(4326008)(81156014)(86362001)(8936002)(15650500001)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U8qgvy7uqFhLWDrmCs0wdN6UhSm//JGyXqJ8KmbrNk1ZjOWaD0Vq22UxQLa/a0dCUU5X1y1RqpV7EtXUawZAbh7Z/EsnCG+JqE21hQlA8gTr32fZeEWFRrvLrgUPYgFEXuelxv8G3rwNFjkUNApo3BoSFuH9RRFLVTLHeegoKUGcGP/I0SqwmJaKCGa+FVZ+i0QWoYkCkWt67HegXLuL+eG6L67omWnHUlpKfYSFi4h1qyMZ3i0MCqucW4gMJj1yHpktrQeapPUNERiYJhWv3ntV8J/3yk3luujirf9dSBhqN4u8PBNdNT/1w0ip8KmrvwKuQ8QmWkbXuvRST/PQJwCpyBARcfVlrngytVemmy2mtWGa4Zu8qZmYFFlwqjhnqwhdN+MDfJ+tlGdIK6Wnw+ZJwaEa1RxmRSOk0XFu32hdAFOxI9zi2MYmrls95K43 X-MS-Exchange-AntiSpam-MessageData: iyMbWqIspVvuN/eGRDkAAeyt48pt6UoHgahxYWGy2z0uoFJ12JroQe4efSeYEgzDMYvR8WkgMvwzL5dex5Kfw/D3Qe02lPtZHFJ9w0+GPZCNGQakQd0AVECY/L7LU3AUmT8FQUxmYcpoIP9JivRb1ta+Tgh8vt9gmfkLIgH7Co7U6PGwWMR8L/GnAMXGECcO3CKy/Jpm51Zpz1BmFXITCFXwFpJlUHqfC1Un8utC6X/GK+fRsMvmWHoevEuxZ0VNsQj77vvrgIC+aoHcZ+SUn2LlTA238CwZbeLudqQyS+AzEVee3iuTIieRiZzzNaqHU3WnuiUBtM2NaoAY1ZFDb6T+GK9Fbc0A+iTWtGDDpGvdh+AIHir+PDdOCsmrY8w1hohE5fjY2de9A7F7l2TQjkJz5+w7XI0tRlbE1Uehce1/wn8+j27oCLUSDWTH2dKUgVs7y5tq8aHuKyQYb09+Qqla6a1nWE57e2/uzskkMRqSFhPp7OwYmEyP1fcakW6FkNHl3hVm/mBJnbos8RNQeQyY/5y8xDI+yBtCtIX75KTTf6qZA/QEubj2dfZq+hpjov3d9M1MtkFtxVW03JlJVdLFh7JT/3xOpHLuJWm/POh6yJehDEfBJjQtDVV7x33Tnc+d8GAUU+fz0kiIW7ThCUnrVHH6FNkV8FzC9HdBypHMiKmRGyJ5YGjgg/Wh9+y2MipEUHo0cxkp8/6xEO6nw0rExsJBQhV4LJzRFvQHrz5K65YZnXAWG2Lu8s+MBkq/VFquQyVhe/ZiRDjBmC6BDA/Cd0DFxfvERW1eoS67mXln+I8dQhljbcSNfQL0iCEiKaBHqotCzhuFxmNhz6p6hOYN0NHVE/jiDALIFaryS70= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b8795c0-a427-4535-66ef-08d7eab0b79e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:41.6527 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vLMIC2gCPgvZL4CkuNQ6EtknYdojm2o+WPdac0Mh5XTZC81jINeGCFh7GfMvdFSir3Xf3YX+93EU6ACDGfATlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The names of the hardware interface messages are not displayed correctly in tracepoints. Thus, REQ_JOIN is displayed JOIN_REQ. Fix that in order to get the names as defined in headers of HIF API. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/traces.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wfx/traces.h b/drivers/staging/wfx/traces.h index 7b25e9511b00..bb9f7e9e7d21 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/staging/wfx/traces.h @@ -198,8 +198,8 @@ DECLARE_EVENT_CLASS(hif_data, TP_printk("%d:%d:%s_%s%s%s: %s%s (%d bytes)", __entry->tx_fill_level, __entry->if_id, - __print_symbolic(__entry->msg_id, hif_msg_list), __entry->msg_type, + __print_symbolic(__entry->msg_id, hif_msg_list), __entry->mib != -1 ? "/" : "", __entry->mib != -1 ? __print_symbolic(__entry->mib, hif_mib_list) : "", __print_hex(__entry->buf, __entry->buf_len), From patchwork Mon Apr 27 13:40:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277662 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=jYxyC/OA; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mCt1vHpz9sT0 for ; Mon, 27 Apr 2020 23:42:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728217AbgD0Nl7 (ORCPT ); Mon, 27 Apr 2020 09:41:59 -0400 Received: from mail-mw2nam12on2078.outbound.protection.outlook.com ([40.107.244.78]:6167 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728181AbgD0Nlr (ORCPT ); Mon, 27 Apr 2020 09:41:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q+m8A4dkt537S3/+e0Yhi6kWCWCNBlzSx4OyA5+s4UoKGCxvOGFUFsocOc42lHWt79wBYkivluKtwsT1SS69y1MAWZwqusiwProb2egybPXU0Fip0V1yXUJNufUMHNgd08TN8sSwZIu+lbzTtc8IfKtP6GfgopgWF81XuuEQ9gW+7HG/f8zHdeLXNCkaEXIysvTV50BMC3xjoHzUsDaACuwNwOmPmJ6f93+669c6JAtcbu1DPBChKM9i5Nm0Lblbo03+5HABnCEqtpVk65duCvWknMNJs9Y55Ez/di8+acWzwqZRpjk9PVUw4dl+sJ37vNxC3hVv6K9Z2u4qMMPpNA== 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=U4Qf85QInMmItIH52jEcdSx4hflv5Asj3HUCTAdM1jU=; b=UZd0Z97EnilVKjt6MqDEZ5/1uN4az8WdeM9ZfqSEMsNkCmX4Ha8mmTinKHKCvuokJ/TDfN7q6IM1yoDR56c0bwsDeMpaqWWOKV07eBVVVpPMhMIjrmnpTAQgGCmwZ9gbjfWr1O3U2zl30Obiji0to0Bb4bYCff6vQXT9P5cLK89HVVTDXBrohJRSGwS2xsKEsKyamulOqCl5WYA0ycBuMjcWdzZoYL90Xe+Hx2/c1HM/a05P67AgkndO4aXFA9KILlYWRl/NHXQCq5q6CBh4KddaUeOp5+Um04QL6IwhUg/VvZ3Ic/JRDehh3krA2tqFsLMJHHOXX2JZuVWgW7mGRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U4Qf85QInMmItIH52jEcdSx4hflv5Asj3HUCTAdM1jU=; b=jYxyC/OAyvoD3iX17p7QvSisTkTj13bnCgIo1oXn6rQC3j5C4om5j3SdpmGRAGZjmyJY+A893YBZRMh/kGydtNWaeuMgN4tm65RSimoRzI+wrhO1tQNWbKa8sZlwCadb7LGr7lRHml6lxceBGnW5vp/4VhaFM94JbqGEQONBu+c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:45 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:45 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 16/17] staging: wfx: fix display of exception indication Date: Mon, 27 Apr 2020 15:40:30 +0200 Message-Id: <20200427134031.323403-17-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:42 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca74b27a-f279-4da2-a0fa-08d7eab0b9ba X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5xis6d1uaPVeI6VEx1aEabKBIGp1o17Acq+U8LrhdMuKiEWuOjlXTsL/Fjod7KAxp6KjyAIn+VJw2MdYTe9JWderKZRteIKGm9B2PKkcPTeaA0xu9Fxizfna4WBsEaWVj0l5dAYAX1+kJaYjHeyx1dOzsewCHMipZjFS9thGdDLp+A5fSL4RAJPIVUNvVtIewgyZHcaDZE5HU7altJmQODnG1gLqI8t7vFcjrKAK377fGMKFTAjAi+WYFeBJYMTr4s1+nb9Z45R82egNqp8tmSGaZQt7+k+WphaM9ydoImB+kFJso+cUkqaQKvgy2+7XlcQgCc0FD4RsZ7cQQDE0OSN8i5J1+AX+p8hpEebHkAhAfJlS5ul5s5vJ3Bnzkaai1+Ocw9l7u1qfFjaL+/avSGj4p9HcmJeMuiAgVE6ftxJ1Lf4GaDe+wnn0gcS0zt98 X-MS-Exchange-AntiSpam-MessageData: JIRBfXEPyonqzp5gVPWhM1IBmZ4UgoN4ixLvUKphcwR51GDWKY8Snrwdm7i8DomLqwzH3NwWpYucRZt89RkDozxILHbSmuvIJ5iMmUprZTqkbDG/Wvu7SUCjGM7HqGJzpTXRaBnQsyHQKEK3rQ/xXNl3XMbgkfT2pKd1G2syK3M79+stu1CuhEGPVqbiJsk+SC0i7FkI1+zgKHNgp2vftEDHBiMNTm5TvLha9WgF8zUGrOudV9fksgdzjUKcfB/9KWUAl4T2woBe7uYJ/47n0bui6cUhiUOh+pI5PNWD+sSs20TAP/Gsf7p/XObr2MHHIWKcQ7uqTR6h6uzgTR0rWiYQzUawrWDzQgtdP2PIXppChIzCD5yD4j81mq97WnMsN+hzhhn5zKeJ6rQzMTna+aaEDUJtgAz3e9Lhyz6Lrb5bdDGkxCKaI1NfyacMRnymR05ImJqbz6eCW+dRtl8RHLJTlScfPtoMNBWKlOpDjQjcM+EN9hKMH6OIY0pmXi4Q3cS+eXjfceV2h4Co3e5K/veyHeVcxS6JbM/zcfdFKNW154WfkPz+KmzigmyWyAu+aXr/PBdAjEGfWUdFbQzVI/P2vXONwd/aoviD1hU88rgWlFW3LoxfI4aGPzZpG7m4TN8cPdhTWKCBumWWmfMtde5RFUe7dk7jhyyk4dyYRJ1w+vC3gq5cE5mnlH3LhWzN+4+ifaDYuLXJj11Au7oH5eKZcwC7RBbMfbjDaY51OoKfyQ6Cgh4wPQViLJSDNg2h4+qjp+H3K8plIooja226JH069RGXc913DOH1aQdGJerQtxqXV/OIGP1TQ+eR9pCYbkeRpyHG9Qsv7e8rS6rJA0j9gxf5YhXey+YAKzNKa3A= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca74b27a-f279-4da2-a0fa-08d7eab0b9ba X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:44.9663 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +HPJC8v9Ilapq407cIMrFpD6Ze1uJYMSdekVnQE7J8bQN+BdYAdWM1tGCqAMu2Biuf+zDOc/yCWFksdDFUYW3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Until now, the exception received from the chip was only displayed if driver was compiled with DEBUG enabled. It was not very convenient to help users. We prefer to show the exception unconditionally. In add, this patch provides the semantic of the first bytes of the struct. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_general.h | 11 +++++------ drivers/staging/wfx/hif_rx.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index 275354eb6b6a..1c010f15c6d0 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -223,12 +223,6 @@ struct hif_ind_generic { union hif_indication_data indication_data; } __packed; - -struct hif_ind_exception { - u8 data[124]; -} __packed; - - enum hif_error { HIF_ERROR_FIRMWARE_ROLLBACK = 0x0, HIF_ERROR_FIRMWARE_DEBUG_ENABLED = 0x1, @@ -248,6 +242,11 @@ struct hif_ind_error { u8 data[]; } __packed; +struct hif_ind_exception { + __le32 type; + u8 data[]; +} __packed; + enum hif_secure_link_state { SEC_LINK_UNAVAILABLE = 0x0, SEC_LINK_RESERVED = 0x1, diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index e6daac36f5c8..783f301d58a8 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -331,10 +331,16 @@ static int hif_generic_indication(struct wfx_dev *wdev, static int hif_exception_indication(struct wfx_dev *wdev, const struct hif_msg *hif, const void *buf) { - size_t len = hif->len - 4; // drop header + const struct hif_ind_exception *body = buf; + int type = le32_to_cpu(body->type); - dev_err(wdev->dev, "firmware exception\n"); - print_hex_dump_bytes("Dump: ", DUMP_PREFIX_NONE, buf, len); + if (type == 4) + dev_err(wdev->dev, "firmware assert %d\n", + le32_to_cpup((__le32 *)body->data)); + else + dev_err(wdev->dev, "firmware exception\n"); + print_hex_dump(KERN_INFO, "hif: ", DUMP_PREFIX_OFFSET, + 16, 1, hif, hif->len, false); wdev->chip_frozen = true; return -1; From patchwork Mon Apr 27 13:40:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1277663 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=A/kGiUFZ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 499mD066fVz9sT1 for ; Mon, 27 Apr 2020 23:42:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728234AbgD0NmE (ORCPT ); Mon, 27 Apr 2020 09:42:04 -0400 Received: from mail-mw2nam12on2078.outbound.protection.outlook.com ([40.107.244.78]:6167 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728159AbgD0Nl7 (ORCPT ); Mon, 27 Apr 2020 09:41:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hElmyXNazKewLsrWD5OXIqxVSO/ziDUkS+JDpRolLR+y0LbOWklcqH/f98CooshHtHygJ4JNR9ajOLjGIi5ouExYYSRzJFof/aMqND8dnCGsAGMno+o+CwA3NG2TBmCDjANovDxuiAZeUp/uxjdZaPG/kUXf61sqnAkovS3bPMpe6JS1mpizEr9WpYW4XKd7DVg2H8JErQ2jvn8jDqG+cXdIo4qP4W2JA1LDhhCco5VZ/8d+8Dfq4DijqVWo3OsHAZuRrH07HIQfx8OLNiHYgD2vSh8UiltKqbgTTXO7QLa7p7hXvmXTiM6mhlc0mBdoi0/2fJ5vgf5oHpOeuS4iqA== 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=oywlY9bZiBzuqdYxVPOHJa4gwfeS6Tzsat0A43dBjSY=; b=dhXmDQ59nRw7UbSiYrexENrpHVGGsPle4M8mDRcYBnlRSkPH/PmpmNJv/m3hSYPXJsVZd/s+ME6ZF0BiuYpsKNCeG3JjmXWXZjduHybkh/Qay5Qu+zrWec0mLdbprP2y3qKAsGytjj9bl8lGKBGLbTpAecb7381/SZdhFMB1s6uqThvhwBUDR8mkd6BOxUOKYVNUugjWhRFTmykAIKNj9rpqLRYtCgMmfT2u+Pyujf1jtigOyR1IG/PPFE1MNBkAn1Q0KCycqjI9lIYqNIPcjZoVvJXc/Y9Ow86tFrS1xtT1MO0OI6vugDUSJmaJUROlnWUbKuoIZFSoHv6VNdxWIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oywlY9bZiBzuqdYxVPOHJa4gwfeS6Tzsat0A43dBjSY=; b=A/kGiUFZACL9L7uMGeo4Vn59BHXiTym89dQNYgI4hTkJrxxp0kqeEQ8HRYrqoQ6ioMFQ6GLXOWgRkzlLA4A5jZX2e4sLsf1euuEEUJVbl5m8c8/6LFn1wnoHqQ0F1SRLqISF3zJSVdVl5v2GYIR6MxvZvs3uFPjm0W8N1ZW83/o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1424.namprd11.prod.outlook.com (2603:10b6:300:26::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 13:41:48 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 13:41:48 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 17/17] staging: wfx: update list of errors Date: Mon, 27 Apr 2020 15:40:31 +0200 Message-Id: <20200427134031.323403-18-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> References: <20200427134031.323403-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR0P264CA0232.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 13:41:45 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79757a0a-b4ac-47ff-60ba-08d7eab0bb77 X-MS-TrafficTypeDiagnostic: MWHPR11MB1424: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39850400004)(376002)(346002)(396003)(366004)(8886007)(66476007)(66556008)(4326008)(81156014)(86362001)(8936002)(15650500001)(6486002)(52116002)(6666004)(6506007)(5660300002)(16526019)(6512007)(1076003)(478600001)(8676002)(36756003)(186003)(2616005)(54906003)(107886003)(66574012)(2906002)(316002)(66946007);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rNlXHZlcZeju6QSx0ra3m3uoRLTRt1AQZCWMp9RvIiwud6hqN8TLCblknZSSQ0yjR4ZmcztM9Ok+uvvKrsxMoq3c46SQAtfw08R9LRpRg7esUAaynMsGsNM1Am6cLn8sOLgaN7CUlLbwb0TgF9ci+0fTuuBTHNiQ2Iu+gpC6FrjPbxEiYRghuKqFoEdOLxLcrZHlhqGmKQ42c3VADh7XQGuKom86d+/4AH8GknG5yjNZMowqvKUFmJc62z+/eLPVsY0rG6DN5fNUP9yyCdq7gnJTc1oQW/cJLIfekC5z0qDcJzJ8ub4c8LnKbY2shENBk9gwHNdgQIyfZcUtwB6HUfFCzMFVdiAonggOlkDocw51DZmnK9Ua4d4D/0RPwX+z0/n0wXQ47Q0bLb+xN74vfXMmmLpd1WSVk1gtqQbEnlwaT0WCU7SA640kRwKSdKjr X-MS-Exchange-AntiSpam-MessageData: k9Xum+BeU4wB/fIkmZ5bWPh5Ex5f72sFP5L/4CsUw8bIqtn78ZBhQkK9mjLMC6DCdPATfCAAsxGOOc6SHMlMO8S/KFqAyiNwuqdWfKfWSFAPO7ZTkxrG6ZZNt6EDFw9bkkxzpLr0I7peAswhxJWjojIynAFGgCWUVR/wCTmYSde8X0WlXVDMfGstwI9skBDBrw4XT5MlzarypKAHTolms3aVQoqiKKAIPPQf5444U7uBe5auan4yq9SwH+rlSQBdJpprxTIyhWQlSOuMipJ8+pOWFZHB2XbOjdk1bEUpYR8YT0sg0sRMDTgHusTYpqIZU+qjpO2yOxwCKc62UBe2GRcIUSalaayvWTwxMzjOXieOSMc+9Qx0KKVD7QdnKSr3FHlZXUI2Q8n7NsJq564x8b+Xlnl1btvMOMCITfNSCVaBcqcAsOGvQQ6WDsUtSYkKRD1scJjKfef5E0h6ZbzaZGwL14WY3Wpcc0gcdlmFWNGTMqXN4g4kervwOFZyX+1bkI/57Kmz7nwsmrI6Qieeznrj/njQiJHBBf0I3mXpqlO3j9EKm940TcQo5H8jbFuEQ42wjDpzL+TNQ8Mm5kgS8ZJN4qs9/59Ha6expHkz89byNyvd/FaC+f6XM6xs+C1bheJyjp4eEvUIPKdF+A3ISszn+fXpABedvqaSMGIZnzbtpPvhy/3hA9sCvFAePoLbkoxpBj7VhxQXDvb+lhiIR95HwTxwIdYv3yKAjJroLugqut1QR2SrvRglgxWzDmqvSxacUU8FUIVDYmA+CSWKGdU2E0PRvzzJCkSRCe41v1FCxx2aLgJa0kViGezgciWv6vOuDnwgLB96rLwYVJC4je08n07fuSJ5+Fr3GtlpeIQ= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79757a0a-b4ac-47ff-60ba-08d7eab0bb77 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 13:41:47.8810 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jFX+ANsKeszk4+TxuKo9nC1OY1ZEvZx88h7gYEUlRphstWrk8iufFvqipx4u4CMqgwzWidnKpvMkYfASiZnz8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device raises error indications when it thinks there is a bug in the driver and it can't recover it (while it raises exception when a bug is detected in the device). The current list of of errors was a bit dated. This patch cleans up the list of errors and the associated message. It is also the right time to clean up the way the error indications are handled. Replace the switch..case with a clean loop over an array. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_general.h | 28 ++++--- drivers/staging/wfx/hif_rx.c | 114 ++++++++++++++++---------- 2 files changed, 86 insertions(+), 56 deletions(-) diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index 1c010f15c6d0..f0135d27120c 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -224,17 +224,23 @@ struct hif_ind_generic { } __packed; enum hif_error { - HIF_ERROR_FIRMWARE_ROLLBACK = 0x0, - HIF_ERROR_FIRMWARE_DEBUG_ENABLED = 0x1, - HIF_ERROR_OUTDATED_SESSION_KEY = 0x2, - HIF_ERROR_INVALID_SESSION_KEY = 0x3, - HIF_ERROR_OOR_VOLTAGE = 0x4, - HIF_ERROR_PDS_VERSION = 0x5, - HIF_ERROR_OOR_TEMPERATURE = 0x6, - HIF_ERROR_REQ_DURING_KEY_EXCHANGE = 0x7, - HIF_ERROR_MULTI_TX_CNF_SECURELINK = 0x8, - HIF_ERROR_SECURELINK_OVERFLOW = 0x9, - HIF_ERROR_SECURELINK_DECRYPTION = 0xa + HIF_ERROR_FIRMWARE_ROLLBACK = 0x00, + HIF_ERROR_FIRMWARE_DEBUG_ENABLED = 0x01, + HIF_ERROR_SLK_OUTDATED_SESSION_KEY = 0x02, + HIF_ERROR_SLK_SESSION_KEY = 0x03, + HIF_ERROR_OOR_VOLTAGE = 0x04, + HIF_ERROR_PDS_PAYLOAD = 0x05, + HIF_ERROR_OOR_TEMPERATURE = 0x06, + HIF_ERROR_SLK_REQ_DURING_KEY_EXCHANGE = 0x07, + HIF_ERROR_SLK_MULTI_TX_UNSUPPORTED = 0x08, + HIF_ERROR_SLK_OVERFLOW = 0x09, + HIF_ERROR_SLK_DECRYPTION = 0x0a, + HIF_ERROR_SLK_WRONG_ENCRYPTION_STATE = 0x0b, + HIF_ERROR_HIF_BUS_FREQUENCY_TOO_LOW = 0x0c, + HIF_ERROR_HIF_RX_DATA_TOO_LARGE = 0x0e, + HIF_ERROR_HIF_TX_QUEUE_FULL = 0x0d, + HIF_ERROR_HIF_BUS = 0x0f, + HIF_ERROR_PDS_TESTFEATURE = 0x10, }; struct hif_ind_error { diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 783f301d58a8..b786714a8755 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -253,51 +253,6 @@ static int hif_suspend_resume_indication(struct wfx_dev *wdev, return 0; } -static int hif_error_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) -{ - const struct hif_ind_error *body = buf; - u8 *pRollback = (u8 *) body->data; - u32 *pStatus = (u32 *) body->data; - - switch (body->type) { - case HIF_ERROR_FIRMWARE_ROLLBACK: - dev_err(wdev->dev, - "asynchronous error: firmware rollback error %d\n", - *pRollback); - break; - case HIF_ERROR_FIRMWARE_DEBUG_ENABLED: - dev_err(wdev->dev, "asynchronous error: firmware debug feature enabled\n"); - break; - case HIF_ERROR_OUTDATED_SESSION_KEY: - dev_err(wdev->dev, "asynchronous error: secure link outdated key: %#.8x\n", - *pStatus); - break; - case HIF_ERROR_INVALID_SESSION_KEY: - dev_err(wdev->dev, "asynchronous error: invalid session key\n"); - break; - case HIF_ERROR_OOR_VOLTAGE: - dev_err(wdev->dev, "asynchronous error: out-of-range overvoltage: %#.8x\n", - *pStatus); - break; - case HIF_ERROR_OOR_TEMPERATURE: - dev_err(wdev->dev, "asynchronous error: out-of-range temperature: %#.8x\n", - *pStatus); - break; - case HIF_ERROR_PDS_VERSION: - dev_err(wdev->dev, - "asynchronous error: wrong PDS payload or version: %#.8x\n", - *pStatus); - break; - default: - dev_err(wdev->dev, "asynchronous error: unknown (%d)\n", - body->type); - break; - } - wdev->chip_frozen = true; - return 0; -} - static int hif_generic_indication(struct wfx_dev *wdev, const struct hif_msg *hif, const void *buf) { @@ -328,6 +283,75 @@ static int hif_generic_indication(struct wfx_dev *wdev, } } +static const struct { + int val; + const char *str; + bool has_param; +} hif_errors[] = { + { HIF_ERROR_FIRMWARE_ROLLBACK, + "rollback status" }, + { HIF_ERROR_FIRMWARE_DEBUG_ENABLED, + "debug feature enabled" }, + { HIF_ERROR_PDS_PAYLOAD, + "PDS version is not supported" }, + { HIF_ERROR_PDS_TESTFEATURE, + "PDS ask for an unknown test mode" }, + { HIF_ERROR_OOR_VOLTAGE, + "out-of-range power supply voltage", true }, + { HIF_ERROR_OOR_TEMPERATURE, + "out-of-range temperature", true }, + { HIF_ERROR_SLK_REQ_DURING_KEY_EXCHANGE, + "secure link does not expect request during key exchange" }, + { HIF_ERROR_SLK_SESSION_KEY, + "secure link session key is invalid" }, + { HIF_ERROR_SLK_OVERFLOW, + "secure link overflow" }, + { HIF_ERROR_SLK_WRONG_ENCRYPTION_STATE, + "secure link messages list does not match message encryption" }, + { HIF_ERROR_HIF_BUS_FREQUENCY_TOO_LOW, + "bus clock is too slow (<1kHz)" }, + { HIF_ERROR_HIF_RX_DATA_TOO_LARGE, + "HIF message too large" }, + // Following errors only exists in old firmware versions: + { HIF_ERROR_HIF_TX_QUEUE_FULL, + "HIF messages queue is full" }, + { HIF_ERROR_HIF_BUS, + "HIF bus" }, + { HIF_ERROR_SLK_MULTI_TX_UNSUPPORTED, + "secure link does not support multi-tx confirmations" }, + { HIF_ERROR_SLK_OUTDATED_SESSION_KEY, + "secure link session key is outdated" }, + { HIF_ERROR_SLK_DECRYPTION, + "secure link params (nonce or tag) mismatch" }, +}; + +static int hif_error_indication(struct wfx_dev *wdev, + const struct hif_msg *hif, const void *buf) +{ + const struct hif_ind_error *body = buf; + int type = le32_to_cpu(body->type); + int param = (s8)body->data[0]; + int i; + + for (i = 0; i < ARRAY_SIZE(hif_errors); i++) + if (type == hif_errors[i].val) + break; + if (i < ARRAY_SIZE(hif_errors)) + if (hif_errors[i].has_param) + dev_err(wdev->dev, "asynchronous error: %s: %d\n", + hif_errors[i].str, param); + else + dev_err(wdev->dev, "asynchronous error: %s\n", + hif_errors[i].str); + else + dev_err(wdev->dev, "asynchronous error: unknown: %08x\n", type); + print_hex_dump(KERN_INFO, "hif: ", DUMP_PREFIX_OFFSET, + 16, 1, hif, hif->len, false); + wdev->chip_frozen = true; + + return 0; +}; + static int hif_exception_indication(struct wfx_dev *wdev, const struct hif_msg *hif, const void *buf) {