From patchwork Mon Sep 23 19:49:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 11157519 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ADDCB13BD for ; Mon, 23 Sep 2019 19:49:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CBEE20665 for ; Mon, 23 Sep 2019 19:49:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AhBHyFJg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502364AbfIWTtb (ORCPT ); Mon, 23 Sep 2019 15:49:31 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:46805 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbfIWTtb (ORCPT ); Mon, 23 Sep 2019 15:49:31 -0400 Received: by mail-wr1-f48.google.com with SMTP id o18so15291192wrv.13 for ; Mon, 23 Sep 2019 12:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5lK6WlBeQcjY7Not1nMx9ZS5+6Wp3U85aur3QzZr1FA=; b=AhBHyFJgbx7ML1bQqxnUg1XlOIo3uu/rqUHrLIGn/QlzNb2sRelCeoxIsF8KvQnyz9 1R1aRtcwtmtbRnU9mm84CroTa0WBiwwUj1Zhvb4tIxp6uR8zC7RKqJoNLD2Ptyg9Hlwh Il9yhAy6L1H/s8uFFvaTNWe70l0YO30PTSaOft5HXIYIGGOJMl9c8i+l+q9P/kB0XFRd aS0ECl9ysYtzBPzj+AAiovGMjQekzYqWAIG2wG/kPDUa3QVVhiKvwRfO9w6ru46fOZE2 xU+6Rrk4zP/4YxugTG+IyuQzkd4KA2vXUXwZ9bDD9gxRpi27xPLnI8EifkqDcB+2VYeg WvCw== 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=5lK6WlBeQcjY7Not1nMx9ZS5+6Wp3U85aur3QzZr1FA=; b=msq4AkaeLtb0YvQKexn310IaDyZ2GN/HEl7C3IAJAv9cqayTwaa9tJfyA5EPhyc4m+ YHIA4/Z5ipXLCq2lM4dtFQNk99d0ysEgxcyrYEwc51TP2gOXTRD1/Lnn8eQznZBYpzGd 3E7GgvpjenVhIu7aec9RV5O19cGyH9VPbHlRGA7LQ+pqE5afugcyePjOmFSauTsWtors dcECSa3mgaZwr19spy9NFroY0+R2tBexVqoHmqXyvliK3UbowKLkwjCbp4T5O10O+MID Crjm3mLzRr+kC8TcDWi5BCy4z5vLcxfjliOsLoSfNLziKliPc74Rsl5lvrXF2GQ0lvxG XIOA== X-Gm-Message-State: APjAAAWHPFOTnZ2wXnFD37AnmuNdcpwqkOblMoDvoZUu2dSAQJWZS5c+ gzxe3iXF5keYUV3eAJpbRWhdosEz X-Google-Smtp-Source: APXvYqzfXPfuj8hKWKJL2QQ6nISmLt+VACR6pfnLr6MlfHcXleAdCC4nCekzlP95ch/PBmkO5qrsGg== X-Received: by 2002:adf:f5cc:: with SMTP id k12mr766764wrp.278.1569268169290; Mon, 23 Sep 2019 12:49:29 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id o188sm25108013wma.14.2019.09.23.12.49.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Sep 2019 12:49:28 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath10k@lists.infradead.org Subject: [PATCH 1/5] ath10k: add 2ghz channel arguments to service ready structure Date: Mon, 23 Sep 2019 21:49:21 +0200 Message-Id: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add lowest/highest 2ghz channel arguments for use within WMI service ready structure. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath10k/core.h | 2 ++ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 ++ drivers/net/wireless/ath/ath10k/wmi.c | 6 ++++++ drivers/net/wireless/ath/ath10k/wmi.h | 2 ++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index c96d1a1..2a0a008 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -967,6 +967,8 @@ struct ath10k { u32 num_rf_chains; u32 max_spatial_stream; /* protected by conf_mutex */ + u32 low_2ghz_chan; + u32 high_2ghz_chan; u32 low_5ghz_chan; u32 high_5ghz_chan; bool ani_enabled; diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c index 363fd0b..bda52ca 100644 --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c @@ -1207,6 +1207,8 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar, arg->phy_capab = ev->phy_capability; arg->num_rf_chains = ev->num_rf_chains; arg->eeprom_rd = reg->eeprom_rd; + arg->low_2ghz_chan = reg->low_2ghz_chan; + arg->high_2ghz_chan = reg->high_2ghz_chan; arg->low_5ghz_chan = reg->low_5ghz_chan; arg->high_5ghz_chan = reg->high_5ghz_chan; arg->num_mem_reqs = ev->num_mem_reqs; diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 1ec609d..3ef6ee3 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -5362,6 +5362,8 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, arg->phy_capab = ev->phy_capability; arg->num_rf_chains = ev->num_rf_chains; arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; + arg->low_2ghz_chan = ev->hal_reg_capabilities.low_2ghz_chan; + arg->high_2ghz_chan = ev->hal_reg_capabilities.high_2ghz_chan; arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan; arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan; arg->num_mem_reqs = ev->num_mem_reqs; @@ -5400,6 +5402,8 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, arg->phy_capab = ev->phy_capability; arg->num_rf_chains = ev->num_rf_chains; arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; + arg->low_2ghz_chan = ev->hal_reg_capabilities.low_2ghz_chan; + arg->high_2ghz_chan = ev->hal_reg_capabilities.high_2ghz_chan; arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan; arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan; arg->num_mem_reqs = ev->num_mem_reqs; @@ -5454,6 +5458,8 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) ar->phy_capability = __le32_to_cpu(arg.phy_capab); ar->num_rf_chains = __le32_to_cpu(arg.num_rf_chains); ar->hw_eeprom_rd = __le32_to_cpu(arg.eeprom_rd); + ar->low_2ghz_chan = __le32_to_cpu(arg.low_2ghz_chan); + ar->high_2ghz_chan = __le32_to_cpu(arg.high_2ghz_chan); ar->low_5ghz_chan = __le32_to_cpu(arg.low_5ghz_chan); ar->high_5ghz_chan = __le32_to_cpu(arg.high_5ghz_chan); diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index bdeebc5..9ccaeb7 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -6870,6 +6870,8 @@ struct wmi_svc_rdy_ev_arg { __le32 num_rf_chains; __le32 eeprom_rd; __le32 num_mem_reqs; + __le32 low_2ghz_chan; + __le32 high_2ghz_chan; __le32 low_5ghz_chan; __le32 high_5ghz_chan; const __le32 *service_map; From patchwork Mon Sep 23 19:49:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 11157523 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 807D214ED for ; Mon, 23 Sep 2019 19:49:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EC2A20665 for ; Mon, 23 Sep 2019 19:49:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rt60OX8Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502381AbfIWTtd (ORCPT ); Mon, 23 Sep 2019 15:49:33 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:38577 "EHLO mail-wr1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2502372AbfIWTtd (ORCPT ); Mon, 23 Sep 2019 15:49:33 -0400 Received: by mail-wr1-f41.google.com with SMTP id l11so15317637wrx.5 for ; Mon, 23 Sep 2019 12:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wFJ6zWicZY8f8WavDOdQQjHVPH6dk+nXo+I5rtEql2Q=; b=Rt60OX8Z2aP2lClSHF94qpReq81yO6UTZhBKFzpRND/bqG0AbzEElEMBwTCFa3NgJ0 Kil6nR38vaTtwgYB6TQKSuLhKZnmk7KTpotl8+TBRGiv1Z4VtdMupC/sPsHKc5J18hgA mPObVg1eCcX3jKX0NwaMIUqqln7FYYL/Nvw0okslxgb0CA7qZV8NrIcoCo9kPd7zpIC7 lyJkCIuHmTDubMiCcEgpk1hwhcA5PWDKUzpa6MLVd2BEpmxRL1Vllp+Z1JJgTuNQb61h KPmMlBUCV4TK2MotuMZHXENBQ5oBLsx2f8gw+wGCVdC1S+2SyGS6YlJHlS9wYpnKqX9N bxPw== 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=wFJ6zWicZY8f8WavDOdQQjHVPH6dk+nXo+I5rtEql2Q=; b=Y4NunZGrfE10e6XFyHVEoPL2AlQZMRANRNDcq56l9WMyqpcS5t61KaMQ8VLjt+MdWR Mwtc+aDHTuSOAEFGl1tbyedfXVjaho9a0wEcuLw1NBhApqas0V/Au9aEyI/fOqmhPCMy 9uYZoImieFa13xZBz5K6o1POZhzHz9RWYvDjQmsejlmfAmOOVCGpZllQxTRSor5rCj9g X/ctzSVUyHLwxPTWuLjCSUlgsk4GyOXedonm5ITFdhupmVhtDOXG1fg1ORXCayhzCN0v qxLE568W5mtvR1w8+VE2gMbfHph+nbY9IqNRDDlgkEBZC4SqkktViM3Hz9MtNW6CEBIx 28Ow== X-Gm-Message-State: APjAAAX8zccbE0N6VPdkSfE+HXioDptyfOOwGGSx8mrqAvl/aXDQ1cG7 FNywSUH0ni9CpCZPAvhVs1DHG5VB X-Google-Smtp-Source: APXvYqw03u9SkaVmEb8taXLU0dIbm/Mctsk+NemQWRnzsl/iUMVEZVxqkRKY019oIu2Ty1RnAh8I9Q== X-Received: by 2002:adf:ce83:: with SMTP id r3mr846161wrn.219.1569268170162; Mon, 23 Sep 2019 12:49:30 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id o188sm25108013wma.14.2019.09.23.12.49.29 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Sep 2019 12:49:29 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath10k@lists.infradead.org Subject: [PATCH 2/5] ath10k: print service ready returned channel range Date: Mon, 23 Sep 2019 21:49:22 +0200 Message-Id: <1569268165-1639-2-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> References: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Displays lowest/highest supported channels for both 2ghz and 5ghz bands as they're fetched within WMI service ready event. These are shown in a frequency format. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath10k/wmi.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 3ef6ee3..b7b8072 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -5563,7 +5563,7 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) skip_mem_alloc: ath10k_dbg(ar, ATH10K_DBG_WMI, - "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x num_mem_reqs 0x%08x\n", + "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x low_2ghz_chan %d high_2ghz_chan %d low_5ghz_chan %d high_5ghz_chan %d num_mem_reqs 0x%08x\n", __le32_to_cpu(arg.min_tx_power), __le32_to_cpu(arg.max_tx_power), __le32_to_cpu(arg.ht_cap), @@ -5574,6 +5574,10 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) __le32_to_cpu(arg.phy_capab), __le32_to_cpu(arg.num_rf_chains), __le32_to_cpu(arg.eeprom_rd), + __le32_to_cpu(arg.low_2ghz_chan), + __le32_to_cpu(arg.high_2ghz_chan), + __le32_to_cpu(arg.low_5ghz_chan), + __le32_to_cpu(arg.high_5ghz_chan), __le32_to_cpu(arg.num_mem_reqs)); dev_kfree_skb(skb); From patchwork Mon Sep 23 19:49:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 11157521 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DB5F13BD for ; Mon, 23 Sep 2019 19:49:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C812206C2 for ; Mon, 23 Sep 2019 19:49:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nkJynhx+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502383AbfIWTte (ORCPT ); Mon, 23 Sep 2019 15:49:34 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:42088 "EHLO mail-wr1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbfIWTtd (ORCPT ); Mon, 23 Sep 2019 15:49:33 -0400 Received: by mail-wr1-f43.google.com with SMTP id n14so15314567wrw.9 for ; Mon, 23 Sep 2019 12:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CkWW93VozEz14AiNPO1yGBR7cePQrOV3NZ94jN8016A=; b=nkJynhx+vwQ0RhTfTBsO2m56l3r8vY/SrUOX/dZeE8TiM5/QM5w0u1bkm4Vv9RcHk/ xlVnP/V5h/5+CNqvoZZorJX1/9JOn0IHChkyAYdp6SWULMAOX86w9gZlaCz2Nr2VW21O ERBQwKZTDf4iwAvpj5TaRRbcLhs6EPhJ3cQzCqviZJCQHtkdgVQefY4BEg1/YqNb58BW cO6S6mSbS3jUqsP4GBuWJ+AcMBLoBLgyexTV5TtmV5vXkzaXDMGCpmNtYG3va0N0aSwU wcvjkO56Cp5HA+9jLIJEEcHJUlwMGW8N8H5jDS9RKyvfXMJbooiduXk/nwubJCRkos3X yrgA== 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=CkWW93VozEz14AiNPO1yGBR7cePQrOV3NZ94jN8016A=; b=EIQuPoV0gT3VaVTHD4To9Pmt3ioNMjcJJnHvrMsNwdasRAD3ppvBc76xSck4LXvIWw a34obSrJEc/Hq1+6wq4yvlA1QRbTv7Q5+3HaWC/zTSf0YtSQ2V0k1jQ9AXu54O6R8c/8 xbNL3RIAyQHCPZn2IjSVLZgG+JobVTQDLKugQn6qKblZ1YB7eq2Ye7nc1MWGeTASQ4gD ndbwuf6OeNHfO9/sOookL1PzZf9EAtkY4sBH5sVKNuGbpw5vAKNnivYEKkcg3pRAnq9H jPiH0g4yswVP2q3v4xVpDHfJ87T0fC1ffLR4q1flOxu7Mx8h2295BiPbTtYG/cJupyHK cT9w== X-Gm-Message-State: APjAAAVKW5iu4ViWfJOFG8b50Yeuep+6JchOFH3Pcp6Quq+70bFKW1Ki VFX+bAhCWH7M21O4qPsA1h7MrSXi X-Google-Smtp-Source: APXvYqxLULFakI4c/RH3kHp+oLCsg5q8vI+kXh2wJM7CGtIFBiOne5ZxU9/T7iUVXVtSASPTFJLmHA== X-Received: by 2002:adf:ab57:: with SMTP id r23mr786240wrc.222.1569268170984; Mon, 23 Sep 2019 12:49:30 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id o188sm25108013wma.14.2019.09.23.12.49.30 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Sep 2019 12:49:30 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath10k@lists.infradead.org Subject: [PATCH 3/5] ath10k: print supported MCS rates within service ready event Date: Mon, 23 Sep 2019 21:49:23 +0200 Message-Id: <1569268165-1639-3-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> References: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add vht_supp_mcs argument to service ready structure and print supported MCS rates in WMI service ready debug message. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 1 + drivers/net/wireless/ath/ath10k/wmi.c | 6 +++++- drivers/net/wireless/ath/ath10k/wmi.h | 1 + 4 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 2a0a008..153c4a2 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -964,6 +964,7 @@ struct ath10k { u32 hw_eeprom_rd; u32 ht_cap_info; u32 vht_cap_info; + u32 vht_supp_mcs; u32 num_rf_chains; u32 max_spatial_stream; /* protected by conf_mutex */ diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c index bda52ca..2432a74 100644 --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c @@ -1201,6 +1201,7 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar, arg->max_tx_power = ev->hw_max_tx_power; arg->ht_cap = ev->ht_cap_info; arg->vht_cap = ev->vht_cap_info; + arg->vht_supp_mcs = ev->vht_supp_mcs; arg->sw_ver0 = ev->abi.abi_ver0; arg->sw_ver1 = ev->abi.abi_ver1; arg->fw_build = ev->fw_build_vers; diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index b7b8072..2d43adf 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -5357,6 +5357,7 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, arg->max_tx_power = ev->hw_max_tx_power; arg->ht_cap = ev->ht_cap_info; arg->vht_cap = ev->vht_cap_info; + arg->vht_supp_mcs = ev->vht_supp_mcs; arg->sw_ver0 = ev->sw_version; arg->sw_ver1 = ev->sw_version_1; arg->phy_capab = ev->phy_capability; @@ -5398,6 +5399,7 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, arg->max_tx_power = ev->hw_max_tx_power; arg->ht_cap = ev->ht_cap_info; arg->vht_cap = ev->vht_cap_info; + arg->vht_supp_mcs = ev->vht_supp_mcs; arg->sw_ver0 = ev->sw_version; arg->phy_capab = ev->phy_capability; arg->num_rf_chains = ev->num_rf_chains; @@ -5449,6 +5451,7 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) ar->hw_max_tx_power = __le32_to_cpu(arg.max_tx_power); ar->ht_cap_info = __le32_to_cpu(arg.ht_cap); ar->vht_cap_info = __le32_to_cpu(arg.vht_cap); + ar->vht_supp_mcs = __le32_to_cpu(arg.vht_supp_mcs); ar->fw_version_major = (__le32_to_cpu(arg.sw_ver0) & 0xff000000) >> 24; ar->fw_version_minor = (__le32_to_cpu(arg.sw_ver0) & 0x00ffffff); @@ -5563,11 +5566,12 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) skip_mem_alloc: ath10k_dbg(ar, ATH10K_DBG_WMI, - "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x low_2ghz_chan %d high_2ghz_chan %d low_5ghz_chan %d high_5ghz_chan %d num_mem_reqs 0x%08x\n", + "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x vht_supp_mcs 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x low_2ghz_chan %d high_2ghz_chan %d low_5ghz_chan %d high_5ghz_chan %d num_mem_reqs 0x%08x\n", __le32_to_cpu(arg.min_tx_power), __le32_to_cpu(arg.max_tx_power), __le32_to_cpu(arg.ht_cap), __le32_to_cpu(arg.vht_cap), + __le32_to_cpu(arg.vht_supp_mcs), __le32_to_cpu(arg.sw_ver0), __le32_to_cpu(arg.sw_ver1), __le32_to_cpu(arg.fw_build), diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index 9ccaeb7..d9d53e5 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -6863,6 +6863,7 @@ struct wmi_svc_rdy_ev_arg { __le32 max_tx_power; __le32 ht_cap; __le32 vht_cap; + __le32 vht_supp_mcs; __le32 sw_ver0; __le32 sw_ver1; __le32 fw_build; From patchwork Mon Sep 23 19:49:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 11157525 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FA0314ED for ; Mon, 23 Sep 2019 19:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E16A206C2 for ; Mon, 23 Sep 2019 19:49:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JsvvtVAx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502403AbfIWTtf (ORCPT ); Mon, 23 Sep 2019 15:49:35 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:43735 "EHLO mail-wr1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbfIWTtf (ORCPT ); Mon, 23 Sep 2019 15:49:35 -0400 Received: by mail-wr1-f54.google.com with SMTP id q17so15314194wrx.10 for ; Mon, 23 Sep 2019 12:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aKtmtSedZmqwNRKQvTjw2tVLyZk03BE91Oh9l3casmw=; b=JsvvtVAxCOZoelDBfv0L7dpTIp+6bhECrNPMlbkJBaReoPqBMYFAsQQF6DWn+iKuoV AXsMK8uu/ZpJmKRa1Hoe/Jp1kF7U+nKFMSFA7cOBi4AuYf+IDVeQhl395hPLX1bunZPX +KwUHbiEUX2sI8DnvXOrf8hJ5Ff4sLiyAn2YkEPXay2myhY3/pB3CxN8kH6Yhxgu3BWn WQluni2SyyXpjmdQEexEfZLb5a4Owu9ImsJpEipmIULkyzlMMUn5CyO9VeqXh6AA/J2Z vzNI+C0jD6XaAyvgbTAjxxZ9LeeKoeY/RG2U5LGlL/bdfQXXkajTEZzj8p5P4olaZoqq 8LKA== 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=aKtmtSedZmqwNRKQvTjw2tVLyZk03BE91Oh9l3casmw=; b=Ck3WvrA0A31xFhB5ZRYJl3fPUdurP1/SNXsdci0MQ2lzyX23QZW+ztBE3EsMiqDsUM TTBZcPMf+ZTJe7VTMJWjTP4MVTu093x9mRLNcggpmPtP7P/8ASFVDBifoxEKYHbzM/KC ivYj5AX1XzioQfLK81SPewtWZhf55kuaTKsHydC6ZGfnGVm6CUf/Z9zvY5xt2OvrW+qw JFuEfpcBp+DcUiy9Ja3OKzBCx4Hc2v1754k5R5iGgH9cwdnAnXbJdQAPRzW191Mh+2lF mIN5e6qVAW5LktF7kd0nJhlyCfnrtix+fsa5G4JmeNWyjY/Hqt41NQ7IR/cVGHllPdc/ oTOA== X-Gm-Message-State: APjAAAW8285aSlfw8jjzqmW3g5g2kmnsHsdFnDolg/N8NZysIZP1pIuW Y/gtQjukQHz9JJxlcQDqWx1tS7+a X-Google-Smtp-Source: APXvYqzRZfNdTml48n2fpSD+PnGFA8XeER/BMeskg+CehdxikXvvDyocfgel1T0zP/CQteTzEEuTAA== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr802484wrx.226.1569268171849; Mon, 23 Sep 2019 12:49:31 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id o188sm25108013wma.14.2019.09.23.12.49.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Sep 2019 12:49:31 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath10k@lists.infradead.org Subject: [PATCH 4/5] ath10k: change sw version print format to hex Date: Mon, 23 Sep 2019 21:49:24 +0200 Message-Id: <1569268165-1639-4-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> References: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Software version within WMI event ready message was displayed in a not very useful decimal format. Change this info to be shown in a hexadecimal format instead. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 2d43adf..59d2d2a 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -5650,7 +5650,7 @@ int ath10k_wmi_event_ready(struct ath10k *ar, struct sk_buff *skb) } ath10k_dbg(ar, ATH10K_DBG_WMI, - "wmi event ready sw_version %u abi_version %u mac_addr %pM status %d\n", + "wmi event ready sw_version 0x%08x abi_version %u mac_addr %pM status %d\n", __le32_to_cpu(arg.sw_version), __le32_to_cpu(arg.abi_version), arg.mac_addr, From patchwork Mon Sep 23 19:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 11157527 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B265113BD for ; Mon, 23 Sep 2019 19:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 900C120665 for ; Mon, 23 Sep 2019 19:49:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Je1LjaS7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502409AbfIWTtg (ORCPT ); Mon, 23 Sep 2019 15:49:36 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51806 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2502394AbfIWTtg (ORCPT ); Mon, 23 Sep 2019 15:49:36 -0400 Received: by mail-wm1-f67.google.com with SMTP id 7so11333350wme.1 for ; Mon, 23 Sep 2019 12:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5B/Mh0LM7+3R0IUqdEb/xm0Cw/iYqewSqzeC/0CfkIw=; b=Je1LjaS7mkfqGTMy9PS8hdn/1XvE3ixc3SgKhuKwXQNG5LT/RpvjxmvOfS+90WubTc jbm8RG8AY7l1Wf5EVFaKtWt1NI5F48WubqwcJBsx76PHTi7rJzQqtwR/ASifgWuiyP2V Grr4K90JF9ANJiQ3UvDP8JQS5CFkrVuirR7yd9W0HVgEKTdh9+DyBPpCd0ahkkB6U1Xi aaRd4su4ZBKmpiTzv9WHNPX517tUHRM64xLSUGTaL8Lf9lhyFuUVh2OW9YWXxt3R3bKL iQfWWBPsfjSofThp1HF0FhbIILBlSZT0LdictHzrZ/wTnd76e66+yXxXNWYhwx6xl4Vd JcVQ== 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=5B/Mh0LM7+3R0IUqdEb/xm0Cw/iYqewSqzeC/0CfkIw=; b=XvzM4Prnt3LmIiGR2opvFeweDXnnTmYY1STwZ0VNweFUfUflyvyMfzvO41Q1PoWZeK aLQ6e0eaqzs23ixT7SatmwOOJrlgQ3KUmEYysJ2kW0C8f6PPSxFA3+1e1FTpKhI8xrYT 2GX23+T5/FiB7NmoakDv5DMJWkEecQB8TwtZcKZf1TRqDTuD7Ek16TMtr+eIRRHwOw48 T/0eDfc1VlXLa5OUPYKKUcPFxwN0Nn0qv3fzrndOePHT5xI1tCePNtJx2EVDd52Cf1A9 nDU5+8fl7C2BVy0Q3dfi8yLsXZz606Aj42B+JOO7HqnWTOECxTcx1f7pn4n3Gkmug7Cl aUJw== X-Gm-Message-State: APjAAAUFHXc97CzUF6oKKe2HDAgk4gxi44RGePxQcEAeBxUPtyHfHZD+ idJ1Oo7P9PNwgdyUmgme74buZdAH X-Google-Smtp-Source: APXvYqwL53XSKibUyDWZ7XLazAjizCey5Aut1uilDPUfzn73pHc89LjaNpRT0xm8yHme8Bz578baAA== X-Received: by 2002:a1c:6a06:: with SMTP id f6mr991788wmc.113.1569268172748; Mon, 23 Sep 2019 12:49:32 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id o188sm25108013wma.14.2019.09.23.12.49.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Sep 2019 12:49:32 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath10k@lists.infradead.org Subject: [PATCH 5/5] ath10k: pull_svc_rdy code-style fix Date: Mon, 23 Sep 2019 21:49:25 +0200 Message-Id: <1569268165-1639-5-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> References: <1569268165-1639-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Drop unneeded lines by moving skb data in both main and 10x WMI pull service ready event operations. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath10k/wmi.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 59d2d2a..8ab178c 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -5345,13 +5345,12 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, ath10k_wmi_main_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, struct wmi_svc_rdy_ev_arg *arg) { - struct wmi_service_ready_event *ev; + struct wmi_service_ready_event *ev = (void *)skb->data; size_t i, n; if (skb->len < sizeof(*ev)) return -EPROTO; - ev = (void *)skb->data; skb_pull(skb, sizeof(*ev)); arg->min_tx_power = ev->hw_min_tx_power; arg->max_tx_power = ev->hw_max_tx_power; @@ -5387,13 +5386,12 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, ath10k_wmi_10x_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, struct wmi_svc_rdy_ev_arg *arg) { - struct wmi_10x_service_ready_event *ev; + struct wmi_10x_service_ready_event *ev = (void *)skb->data; int i, n; if (skb->len < sizeof(*ev)) return -EPROTO; - ev = (void *)skb->data; skb_pull(skb, sizeof(*ev)); arg->min_tx_power = ev->hw_min_tx_power; arg->max_tx_power = ev->hw_max_tx_power;