From: Brian Norris <briannorris@chromium.org>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, <linux-kernel@vger.kernel.org>,
Brian Norris <briannorris@chromium.org>,
Yu Wang <yyuwang@codeaurora.org>,
Rakesh Pillai <pillair@codeaurora.org>,
Govind Singh <govinds@codeaurora.org>,
stable@vger.kernel.org
Subject: [PATCH REGRESSION] Revert "ath10k: add quiet mode support for QCA6174/QCA9377"
Date: Wed, 7 Nov 2018 10:56:43 -0800 [thread overview]
Message-ID: <20181107185643.240346-1-briannorris@chromium.org> (raw)
This reverts commit cfb353c0dc058bc1619cc226d3cbbda1f360bdd3.
WCN3990 firmware does not yet implement this feature, and so it crashes
like this:
fatal error received: err_qdi.c:456:EX:wlan_process:1:WLAN RT:207a:PC=b001b4f0
This feature can be re-implemented with a proper service bitmap or other
feature-discovery mechanism in the future. But it should not break
working boards.
Fixes: cfb353c0dc05 ("ath10k: add quiet mode support for QCA6174/QCA9377")
Cc: Yu Wang <yyuwang@codeaurora.org>
Cc: Rakesh Pillai <pillair@codeaurora.org>
Cc: Govind Singh <govinds@codeaurora.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 33 +----------------------
drivers/net/wireless/ath/ath10k/wmi-tlv.h | 16 -----------
2 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index ad4114a88170..099e78b5de1f 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -3209,37 +3209,6 @@ ath10k_wmi_tlv_op_gen_tdls_peer_update(struct ath10k *ar,
return skb;
}
-static struct sk_buff *
-ath10k_wmi_tlv_op_gen_pdev_set_quiet_mode(struct ath10k *ar, u32 period,
- u32 duration, u32 next_offset,
- u32 enabled)
-{
- struct wmi_tlv_set_quiet_cmd *cmd;
- struct wmi_tlv *tlv;
- struct sk_buff *skb;
-
- skb = ath10k_wmi_alloc_skb(ar, sizeof(*tlv) + sizeof(*cmd));
- if (!skb)
- return ERR_PTR(-ENOMEM);
-
- tlv = (void *)skb->data;
- tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_PDEV_SET_QUIET_CMD);
- tlv->len = __cpu_to_le16(sizeof(*cmd));
- cmd = (void *)tlv->value;
-
- /* vdev_id is not in use, set to 0 */
- cmd->vdev_id = __cpu_to_le32(0);
- cmd->period = __cpu_to_le32(period);
- cmd->duration = __cpu_to_le32(duration);
- cmd->next_start = __cpu_to_le32(next_offset);
- cmd->enabled = __cpu_to_le32(enabled);
-
- ath10k_dbg(ar, ATH10K_DBG_WMI,
- "wmi tlv quiet param: period %u duration %u enabled %d\n",
- period, duration, enabled);
- return skb;
-}
-
static struct sk_buff *
ath10k_wmi_tlv_op_gen_wow_enable(struct ath10k *ar)
{
@@ -4143,7 +4112,7 @@ static const struct wmi_ops wmi_tlv_ops = {
.gen_dbglog_cfg = ath10k_wmi_tlv_op_gen_dbglog_cfg,
.gen_pktlog_enable = ath10k_wmi_tlv_op_gen_pktlog_enable,
.gen_pktlog_disable = ath10k_wmi_tlv_op_gen_pktlog_disable,
- .gen_pdev_set_quiet_mode = ath10k_wmi_tlv_op_gen_pdev_set_quiet_mode,
+ /* .gen_pdev_set_quiet_mode not implemented */
.gen_pdev_get_temperature = ath10k_wmi_tlv_op_gen_pdev_get_temperature,
/* .gen_addba_clear_resp not implemented */
/* .gen_addba_send not implemented */
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index bf8a4320c39c..5db294558ce5 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -1,7 +1,6 @@
/*
* Copyright (c) 2005-2011 Atheros Communications Inc.
* Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -1980,21 +1979,6 @@ struct wmi_tlv_wow_add_del_event_cmd {
__le32 event_bitmap;
} __packed;
-/* Command to set/unset chip in quiet mode */
-struct wmi_tlv_set_quiet_cmd {
- __le32 vdev_id;
-
- /* in TUs */
- __le32 period;
-
- /* in TUs */
- __le32 duration;
-
- /* offset in TUs */
- __le32 next_start;
- __le32 enabled;
-} __packed;
-
struct wmi_tlv_wow_enable_cmd {
__le32 enable;
} __packed;
--
2.19.1.930.g4563a0d9d0-goog
next reply other threads:[~2018-11-07 18:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 18:56 Brian Norris [this message]
2018-11-07 21:30 ` [PATCH REGRESSION] Revert "ath10k: add quiet mode support for QCA6174/QCA9377" Rajkumar Manoharan
2018-11-08 4:31 ` Govind Singh
2018-11-08 17:30 ` Brian Norris
2018-11-08 19:52 ` Rajkumar Manoharan
2018-11-16 10:14 ` Kalle Valo
2018-11-16 21:15 ` Brian Norris
2019-02-04 16:42 ` Kalle Valo
2019-02-04 22:54 ` Brian Norris
2019-02-05 4:49 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181107185643.240346-1-briannorris@chromium.org \
--to=briannorris@chromium.org \
--cc=ath10k@lists.infradead.org \
--cc=govinds@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=pillair@codeaurora.org \
--cc=stable@vger.kernel.org \
--cc=yyuwang@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).