From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1204544-1520117957-2-8257734257104515853 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520117956; b=eaXqdM/oaVDmXFKnNnIh2siVhry4xtqSk62wjZKZrCqn9YU sCKf26bR0DKrrro3fow+hj7xmPf0R0To4OF/hrwHeUUh7zYFJCXDAhatJkeiuTy4 YB31eUZMeQNVxXBQRtcDt1aOTGOmE4jwvwMV5VZfzlSRg5iqpzmrr4f9/5mL8G01 UFvwfvC2MNyaChqx25cw6po0tmRphQB+tfgmmfeRLocJiCUs0y87wjq1EKj7dE0U 0TOThT9t6df06Du4bmhB6x/palnSoqZ+zwCAav80j7ZDuYAAIeYRY29pZJZzLNTF cZw/qdaJp3om885y+c9UVPZmTAX9IepJZgmv8/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520117956; bh=9pEqsN eIpiJlLnlO3rZzYR2bfm1waV9cdY+O6r3pDU8=; b=SN0uWcjN3UJQRFCwMQLQNT TAsvOdzVfKDX4EX4TzkxlILs5gjcBVlzVJSBT8/3MNREkW6gsqcWWFMydCwisoyp iiYj7qFEZkL2wR0xWNkdR38qedcZBcUgI4hHSRO1u4hLs4EhqjDbwiDrN9485H4S XWzZMGG+fL6vjUTPCP1U3G8ojcsHsx9jPJX1fVPr6EEpkncG5ACH3WyK8vOm+1Lr BHtQsrv4codO5z5umO6FlXQQWZI9j9BYi4RPF6LS+vuuFT8xlLBe84tLIb0IxY4N TWKAj4cYcn9TFZDHRJrlNwQyHxdGU6DNHev6rJGbP06Fz+eD84DGAoLJdMFvAG6w == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=DBKIB9KR x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=DBKIB9KR x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935305AbeCCWkx (ORCPT ); Sat, 3 Mar 2018 17:40:53 -0500 Received: from mail-co1nam03on0127.outbound.protection.outlook.com ([104.47.40.127]:62430 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934836AbeCCWku (ORCPT ); Sat, 3 Mar 2018 17:40:50 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Ben Greear , Kalle Valo , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 100/115] ath10k: fix invalid STS_CAP_OFFSET_MASK Thread-Topic: [PATCH AUTOSEL for 4.4 100/115] ath10k: fix invalid STS_CAP_OFFSET_MASK Thread-Index: AQHTsz9rwLwCxZ63aUuwYcHKEY4aQQ== Date: Sat, 3 Mar 2018 22:31:49 +0000 Message-ID: <20180303223010.27106-100-alexander.levin@microsoft.com> References: <20180303223010.27106-1-alexander.levin@microsoft.com> In-Reply-To: <20180303223010.27106-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0939;7:jKVGW7KePZP7Ns34tmtugZqUqy1E1kFhvDNLtadtBmtIIlkMbQ4Dn3XrF1kSf1Y9mmRKfdiOBbNDPZVL5JVncxONx2nuCQhT2Iey1lHwKyZ1BTx276mh3PD6x1cedaNl7NKWY444GUsc8uYekmE31PuIN1r6L/3jd458AcP3U4B6eHt3rJ7nO0NepE/jMjSTjJk7a0cPvAa655XmJciS3IxDj2z1ztlAy9TYvby0gwpuD1yPrA9j/RIHkB3rdKmg x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 89fd7c45-9226-44b1-3bfc-08d58157ce68 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020);SRVR:MW2PR2101MB0939; x-ms-traffictypediagnostic: MW2PR2101MB0939: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB0939;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0939; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(366004)(376002)(39380400002)(39860400002)(189003)(199004)(86612001)(76176011)(478600001)(81166006)(81156014)(72206003)(5660300001)(8936002)(25786009)(59450400001)(26005)(6506007)(102836004)(316002)(22452003)(6486002)(8676002)(14454004)(4326008)(6436002)(107886003)(10090500001)(6512007)(53936002)(36756003)(10290500003)(86362001)(575784001)(2900100001)(3660700001)(305945005)(2950100002)(5250100002)(99286004)(3280700002)(97736004)(54906003)(110136005)(2501003)(186003)(106356001)(7736002)(66066001)(3846002)(2906002)(6116002)(105586002)(68736007)(1076002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0939;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: mDhw0PR/faN46rZODl+J3Aj95q/F8LrjVrGzhIX6izUruaV4Deyd2W4pTRlmRFbMnJmTyw5m99/IHKEckA5yuopE1ldBNcKk2RZ0nJTUWf8ByOQb8yo3vV7yfnGv1It30WPtfsHAlXrDGujHLa/GA0Ox4/h7n/0rK1bP2tuG8WQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89fd7c45-9226-44b1-3bfc-08d58157ce68 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:31:49.0895 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0939 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Ben Greear [ Upstream commit 8cec57f5277ef0e354e37a0bf909dc71bc1f865b ] The 10.4 firmware defines this as a 3-bit field, as does the mac80211 stack. The 4th bit is defined as CONF_IMPLICIT_BF at least in the firmware header I have seen. This patch fixes the ath10k wmi header to match the firmware. Signed-off-by: Ben Greear Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/wmi.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/a= th/ath10k/wmi.h index 72a4ef709577..a8b2553e8988 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -4826,7 +4826,8 @@ enum wmi_10_4_vdev_param { #define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3) =20 #define WMI_TXBF_STS_CAP_OFFSET_LSB 4 -#define WMI_TXBF_STS_CAP_OFFSET_MASK 0xf0 +#define WMI_TXBF_STS_CAP_OFFSET_MASK 0x70 +#define WMI_TXBF_CONF_IMPLICIT_BF BIT(7) #define WMI_BF_SOUND_DIM_OFFSET_LSB 8 #define WMI_BF_SOUND_DIM_OFFSET_MASK 0xf00 =20 --=20 2.14.1