From patchwork Fri Nov 2 17:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10665915 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF4E017D5 for ; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A298E2BEC0 for ; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 970222BEEC; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C2EF2BEC0 for ; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727962AbeKCC0W (ORCPT ); Fri, 2 Nov 2018 22:26:22 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44822 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbeKCC0V (ORCPT ); Fri, 2 Nov 2018 22:26:21 -0400 Received: by mail-pg1-f194.google.com with SMTP id w3-v6so1244645pgs.11 for ; Fri, 02 Nov 2018 10:18:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ffqVuA97Vr+ZfIuptqd/ikvaB11RwRd45xwN+Xck2yw=; b=gZmyvMQ1BgWqzZpMTTGDB033FKeMtSTtMkr2Icmv1yO3Ym56bWu0StqaPMQDxBMvQs I8SQBv/YODZ9coKNXMXnXRtTLl1KVoeIYVownzw8hf9m6Tbfn3X9sv5Q3IJhfswdKbxm ugMNbTwINUyJ/GOwj9sNSVxSdsH+E+tGI/dio= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ffqVuA97Vr+ZfIuptqd/ikvaB11RwRd45xwN+Xck2yw=; b=AjrC7L5LZSRjMQxcCDrahc8aafbLhLMDsKklYn2bbaaFaXddGCX04l9c66rowA8bpz V4xdThTsIZ6g+NsA0WKsDCrSdnKCF5kpgbvhmrex2GgT7xw5erAdguybVJG5rWC+/yEu b2MoDSyOXXOqLnMKcWgin8CuSzXNer7k8H+vDZn48DSv/7Cnax3CPhqOkcYggBSfK884 X/Yvi4d6VVcMe3ul8zsG5MxhhC7ernvyxFhSlxtOn+HMA9vx01rTVQ06sDPV372BVENm 1OctFefGTEOknwscuzDKw8LED/f4GRIGgRuoN0cI5ZMI+1ahOFlD3EfiE0DNv2UBPqhZ GAmg== X-Gm-Message-State: AGRZ1gJhDlJYp9I/lXXW6B8KatVlQbLSU0UpAY9iKys5sGVd+1TWoaXv Zp9N7XBoxiEkzh2eYG2rvzJ2PQ== X-Google-Smtp-Source: AJdET5cstslmQBp4QugmvmduufvZ7LTX3N7fqusSgkKwZ4jpGICEXm+qxXLKmkN/NU4Olp/1uNd0iA== X-Received: by 2002:a62:2741:: with SMTP id n62-v6mr12702939pfn.138.1541179108582; Fri, 02 Nov 2018 10:18:28 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:299d:6b87:5478:d28a]) by smtp.gmail.com with ESMTPSA id d5-v6sm19222675pfo.131.2018.11.02.10.18.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 10:18:27 -0700 (PDT) From: Brian Norris To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Rakesh Pillai , Govind Singh , , Brian Norris Subject: [PATCH 1/3] ath10k: assign 'n_cipher_suites' for WCN3990 Date: Fri, 2 Nov 2018 10:17:47 -0700 Message-Id: <20181102171749.38680-1-briannorris@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 2ea9f12cefe4 ("ath10k: add new cipher suite support") added a new n_cipher_suites HW param with a fallback value and a warning log. Commit 03a72288c546 ("ath10k: wmi: add hw params entry for wcn3990") later added WCN3990 HW entries, but it missed the n_cipher_suites. Rather than seeing this warning every boot ath10k_snoc 18800000.wifi: invalid hw_params.n_cipher_suites 0 let's provide the appropriate value. Cc: Rakesh Pillai Cc: Govind Singh Signed-off-by: Brian Norris --- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index da607febfd82..bdc81f1cdb94 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -561,6 +561,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .hw_ops = &wcn3990_ops, .decap_align_bytes = 1, .num_peers = TARGET_HL_10_TLV_NUM_PEERS, + .n_cipher_suites = 8, .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT, .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES, .target_64bit = true, From patchwork Fri Nov 2 17:17:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10665911 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6C7C13B5 for ; Fri, 2 Nov 2018 17:18:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA7372BEC0 for ; Fri, 2 Nov 2018 17:18:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E07F2BEEC; Fri, 2 Nov 2018 17:18:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E9AD2BEC0 for ; Fri, 2 Nov 2018 17:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728149AbeKCC0X (ORCPT ); Fri, 2 Nov 2018 22:26:23 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40930 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728101AbeKCC0W (ORCPT ); Fri, 2 Nov 2018 22:26:22 -0400 Received: by mail-pl1-f195.google.com with SMTP id b9-v6so1300164pls.7 for ; Fri, 02 Nov 2018 10:18:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qddL7HZd/lZK+Srg7fwIVx8jlZhLuoxjkC7Np29U/7Q=; b=SyljX0FvhHDK1Kre7YLubwVo8ngPk+byge563qS3IquXVDihRS/12F7vggTP9CXfjf xU1t1lTPDcObldTrz/zN5s8kOlsTIBaCFhLAoW20i2e7cPy3jQK+BnBOyyORvg5qVTSJ UJip3C+Ho/ZoST0Nr8mQfj9xTgRs0jQnnXiNU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qddL7HZd/lZK+Srg7fwIVx8jlZhLuoxjkC7Np29U/7Q=; b=KwOdeGGl129mVZZHlsgAME+RH9ObhPWoTNY9kPgKbmY3pShDq/kAz3QlDRA9ASGIDS 9l7/rStM76R0APaanIAqjHRItu8bnBKIx3DKYSSISKKTYdmf55LmaswP5oMUYzfoBE0e 9aSXtq1PiqzuLotdhRhh5SjDf9Zd3CaUlzuJfe7EXd2j8YwTW5dkrpurX1aqbLhwQOM+ dwbr6pyZNJoThFh3iGeDZyQcNF3X/4TS+ljcys0a1A8joqLxgiPe4OhISs9fiCdWFhsf WbIVyaDKb3eNj+nFXwXY4MlgXyK6MwK5Sv/tJ5MG8BrgsfzAuByHP7LNNJlE6lHBGwCM frcw== X-Gm-Message-State: AGRZ1gIkt5kVBmtkgDm+R4UFngW4wCYgJAMfWpZokAxEUAAE0XZajiz5 p38uBvsBcAcVFOB0IgnM0pzf1w== X-Google-Smtp-Source: AJdET5eWUGzz3fWsIniTrLX8U7yKATPA2/eBtlWSpIUcgJ66SbfD3yB8ftUcH0I34p1BY4pAglkcFQ== X-Received: by 2002:a17:902:9009:: with SMTP id a9-v6mr12606518plp.134.1541179110162; Fri, 02 Nov 2018 10:18:30 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:299d:6b87:5478:d28a]) by smtp.gmail.com with ESMTPSA id d5-v6sm19222675pfo.131.2018.11.02.10.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 10:18:28 -0700 (PDT) From: Brian Norris To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Rakesh Pillai , Govind Singh , , Brian Norris Subject: [PATCH 2/3] ath10k: don't assume this is a PCI dev in generic code Date: Fri, 2 Nov 2018 10:17:48 -0700 Message-Id: <20181102171749.38680-2-briannorris@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181102171749.38680-1-briannorris@chromium.org> References: <20181102171749.38680-1-briannorris@chromium.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Not all devices using this driver are backed by a PCI device, so it's not fair to assume 'to_pci_dev()' is valid. Fortunately, we only were using this to convert straight back to a bare 'device', which means we were only doing no-op pointer arithmetic, and not actually accessing potentially out-of-bounds memory. But this is still bad practice. Just use 'ar->dev' directly, since that's really all we're looking for. Fixes: 209b2a68de76 ("ath10k: add platform regulatory domain support") Signed-off-by: Brian Norris --- drivers/net/wireless/ath/ath10k/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a1c2801ded10..5c4ee66382d9 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -8313,7 +8313,6 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) { - struct pci_dev __maybe_unused *pdev = to_pci_dev(ar->dev); acpi_handle root_handle; acpi_handle handle; struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL}; @@ -8321,7 +8320,7 @@ static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) u32 alpha2_code; char alpha2[3]; - root_handle = ACPI_HANDLE(&pdev->dev); + root_handle = ACPI_HANDLE(ar->dev); if (!root_handle) return -EOPNOTSUPP; From patchwork Fri Nov 2 17:17:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10665909 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B58CD17D4 for ; Fri, 2 Nov 2018 17:18:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98AFB2BEC0 for ; Fri, 2 Nov 2018 17:18:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BAEF2BEEC; Fri, 2 Nov 2018 17:18:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3605A2BEC0 for ; Fri, 2 Nov 2018 17:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728186AbeKCC0Z (ORCPT ); Fri, 2 Nov 2018 22:26:25 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:41769 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727859AbeKCC0Y (ORCPT ); Fri, 2 Nov 2018 22:26:24 -0400 Received: by mail-pl1-f194.google.com with SMTP id p16-v6so1296879plr.8 for ; Fri, 02 Nov 2018 10:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vxrhorXX1I4QvppP0esrwgeopQAFC7+da941Yp0F+Tg=; b=Rjn4VI5fPWJytnOMb4Oj6XR7S0nwzDVRNwgoJyMmX2GczojuTlrJgVFu0DIjSu9gO9 tmXq2e5KZqBPx2Kq1v9QOAHW79COqMmgHmmWKXithrpZt9vsdCgFfE+oCkOMb/jcgq9y PI2teqlVQ4DnKnSe5BRX2JHvJfNtwZftoE6Z0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vxrhorXX1I4QvppP0esrwgeopQAFC7+da941Yp0F+Tg=; b=X6yeAb5K9oTMZdvINSskuoyRrYqdUf9bfzSe4tZW5JKXpxkKrxdfjOaFibF9sYSZjs +pn9re884XJTAY9lC7avkOZd4QK83uuqzCv5LjVBZ1ZCCLc0LMfV12u8hmSoYhE6JPUe n+t/AfaEuJgM1iQ6JHeXA26/VOV40RVKJ7esEdkagwEpkv0WdyoZ+R1/+h9qkm3/hAiP hL20bqmfPhWBjxPglo2KyKM4AqaGFPHBJP8m6x2GS+JmW0Ro3R6Qy2dGF3XpuUElodlf jwzP6llvi5R39apm+baaVbB3gbIbNwmMg8NbH3EchSpTCsDqRQQOZBxHnqdglpJQeej2 qy4Q== X-Gm-Message-State: AGRZ1gK52HQUv6RFz2T23wObVRvyxN6/HDpmfbenS1nXxzt5yaajOK4M nagimrXHKwiAqzpYF3ptDf2eHg== X-Google-Smtp-Source: AJdET5f9d82pLUTbT81Ulv+XX3x8SN/YI7w0S26HUFseQXn/kHBNtgvnwusVbdQmwBF+pRqr6lMiKg== X-Received: by 2002:a17:902:9b84:: with SMTP id y4-v6mr12645436plp.332.1541179112291; Fri, 02 Nov 2018 10:18:32 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:299d:6b87:5478:d28a]) by smtp.gmail.com with ESMTPSA id d5-v6sm19222675pfo.131.2018.11.02.10.18.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 10:18:31 -0700 (PDT) From: Brian Norris To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Rakesh Pillai , Govind Singh , , Brian Norris Subject: [PATCH 3/3] ath10k: fix struct init whitespace in SNOC driver Date: Fri, 2 Nov 2018 10:17:49 -0700 Message-Id: <20181102171749.38680-3-briannorris@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181102171749.38680-1-briannorris@chromium.org> References: <20181102171749.38680-1-briannorris@chromium.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Brian Norris --- drivers/net/wireless/ath/ath10k/snoc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 8d3d9bca410f..ffdebf9a5ac6 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -1641,12 +1641,12 @@ static int ath10k_snoc_remove(struct platform_device *pdev) } static struct platform_driver ath10k_snoc_driver = { - .probe = ath10k_snoc_probe, - .remove = ath10k_snoc_remove, - .driver = { - .name = "ath10k_snoc", - .of_match_table = ath10k_snoc_dt_match, - }, + .probe = ath10k_snoc_probe, + .remove = ath10k_snoc_remove, + .driver = { + .name = "ath10k_snoc", + .of_match_table = ath10k_snoc_dt_match, + }, }; module_platform_driver(ath10k_snoc_driver);