Add support for suspend/resume and WOW for WCN3990 chipset
v3 cover Add support for suspend/resume and WOW for WCN3990 chipset
This series adds support for driver suspend/resume and wake over wlan support for WCN3990 chipset. CE2 is configured as wakeup source before driver suspend and FW can wake up application processor on Magic packet/Deauth/AP lost.
Changes since v2:
* Removed BUS TYPE check and introduced bus param at struct ath10k level for scalability.
Changes since v1:
* dropped ath10k: configure the vdev listen interval before wow suspend patch from the series. This can be send later after refactoring/tuning.
* updated commit text in ath10k: Disable interface pause wow config for integrated chipset patch.
Govind Singh (3):
ath10k: Enable bus layer suspend/resume for WCN3990
ath10k: Disable interface pause wow config for integrated chipset
ath10k: Request credit report if flow control enabled on ep
drivers/net/wireless/ath/ath10k/core.c | 5 ++- drivers/net/wireless/ath/ath10k/core.h | 2 + drivers/net/wireless/ath/ath10k/coredump.c | 2 +- drivers/net/wireless/ath/ath10k/debug.c | 4 +- drivers/net/wireless/ath/ath10k/htc.c | 9 +++-- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++--- drivers/net/wireless/ath/ath10k/htt_tx.c | 6 +-- drivers/net/wireless/ath/ath10k/pci.c | 3 +- drivers/net/wireless/ath/ath10k/snoc.c | 45 ++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/txrx.c | 2 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 7 ++++ 12 files changed, 78 insertions(+), 19 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 1/3 ath10k: Enable bus layer suspend/resume for WCN3990
Register snoc bus layer suspend/resume PM ops and configure the wakeup source(CE2) for the device.
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.
--- drivers/net/wireless/ath/ath10k/snoc.c | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/net/wireless/ath/ath10k/snoc.c +45 -0
@@ -30,6 +30,7 @@#define ATH10K_SNOC_RX_POST_RETRY_MS 50#define CE_POLL_PIPE 4 +#define ATH10K_SNOC_WAKE_IRQ 2static char *const ce_name[] = {"WLAN_CE_0" ,
@@ -1041,6 +1042,46 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar)return ret; } +#ifdef CONFIG_PM +static int ath10k_snoc_hif_suspend (struct ath10k *ar) +{ +struct ath10k_snoc *ar_snoc =ath10k_snoc_priv (ar); +int ret; + +if (!device_may_wakeup (ar->dev)) +return -EPERM ; + + ret =enable_irq_wake (ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ ].irq_line); +if (ret) { +ath10k_err (ar,"failed to enable wakeup irq :%d\n" , ret); +return ret; + } + +ath10k_dbg (ar,ATH10K_DBG_SNOC ,"snoc device suspended\n" ); + +return ret; +} + +static int ath10k_snoc_hif_resume (struct ath10k *ar) +{ +struct ath10k_snoc *ar_snoc =ath10k_snoc_priv (ar); +int ret; + +if (!device_may_wakeup (ar->dev)) +return -EPERM ; + + ret =disable_irq_wake (ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ ].irq_line); +if (ret) { +ath10k_err (ar,"failed to disable wakeup irq: %d\n" , ret); +return ret; + } + +ath10k_dbg (ar,ATH10K_DBG_SNOC ,"snoc device resumed\n" ); + +return ret; +} +#endif +static const struct ath10k_hif_ops ath10k_snoc_hif_ops = { .read32 = ath10k_snoc_read32, .write32 = ath10k_snoc_write32,
@@ -1054,6 +1095,10 @@ static const struct ath10k_hif_ops ath10k_snoc_hif_ops = { .send_complete_check = ath10k_snoc_hif_send_complete_check, .get_free_queue_number = ath10k_snoc_hif_get_free_queue_number, .get_target_info = ath10k_snoc_hif_get_target_info, +#ifdef CONFIG_PM + .suspend = ath10k_snoc_hif_suspend, + .resume = ath10k_snoc_hif_resume, +#endif }; static const struct ath10k_bus_ops ath10k_snoc_bus_ops = {
Signature · 8 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 2/3 ath10k: Disable interface pause wow config for integrated chipset
In reply to Govind Singhwow pause iface config controls the PCI D0/D3-WOW cases for pcie bus state. Firmware does not expects WOW_IFACE_PAUSE_ENABLED config for bus/link that cannot be suspended ex:snoc and does not trigger common subsystem shutdown.
Disable interface pause wow config for integrated chipset(WCN3990) for correct WOW configuration in the firmware.
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.
--- drivers/net/wireless/ath/ath10k/core.c | 5 +++-- drivers/net/wireless/ath/ath10k/core.h | 2 ++ drivers/net/wireless/ath/ath10k/coredump.c | 2 +- drivers/net/wireless/ath/ath10k/debug.c | 4 ++-- drivers/net/wireless/ath/ath10k/htc.c | 6 +++--- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 +++++----- drivers/net/wireless/ath/ath10k/htt_tx.c | 6 +++--- drivers/net/wireless/ath/ath10k/pci.c | 3 ++- drivers/net/wireless/ath/ath10k/txrx.c | 2 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 ++ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 7 +++++++ 11 files changed, 31 insertions(+), 18 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +3 -2
@@ -2955,8 +2955,9 @@ static void ath10k_core_register_work(struct work_struct *work)int ath10k_core_register (struct ath10k *ar,const struct ath10k_bus_params *bus_params) { - ar->chip_id = bus_params->chip_id; - ar->dev_type = bus_params->dev_type; + ar->bus_param.chip_id = bus_params->chip_id; + ar->bus_param.dev_type = bus_params->dev_type; + ar->bus_param.link_can_suspend = bus_params->link_can_suspend;queue_work (ar->workqueue, &ar->register_work);return 0 ;
drivers/net/wireless/ath/ath10k/core.h +2 -0
@@ -921,6 +921,7 @@ enum ath10k_dev_type {struct ath10k_bus_params {u32 chip_id;enum ath10k_dev_type dev_type; +bool link_can_suspend; };struct ath10k {
@@ -1189,6 +1190,7 @@ struct ath10k {enum ath10k_radar_confirmation_state radar_conf_state;struct ath10k_radar_found_info last_radar_info;struct work_struct radar_confirmation_work; +struct ath10k_bus_params bus_param;/* must be last */ u8 drv_priv[0 ]__aligned(sizeof(void *)) ;
drivers/net/wireless/ath/ath10k/coredump.c +1 -1
@@ -1167,7 +1167,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar) dump_data->version =cpu_to_le32 (ATH10K_FW_CRASH_DUMP_VERSION );guid_copy (&dump_data->guid, &crash_data->guid); - dump_data->chip_id =cpu_to_le32 (ar->chip_id); + dump_data->chip_id =cpu_to_le32 (ar->bus_param.chip_id); dump_data->bus_type =cpu_to_le32 (0 ); dump_data->target_version =cpu_to_le32 (ar->target_version); dump_data->fw_version_major =cpu_to_le32 (ar->fw_version_major);
drivers/net/wireless/ath/ath10k/debug.c +2 -2
@@ -58,7 +58,7 @@ void ath10k_debug_print_hwfw_info(struct ath10k *ar)ath10k_info (ar,"%s target 0x%08x chip_id 0x%08x sub %04x:%04x" , ar->hw_params.name, ar->target_version, - ar->chip_id, + ar->bus_param.chip_id, ar->id.subsystem_vendor, ar->id.subsystem_device); ath10k_info(ar, "kconfig debug %d debugfs %d tracing %d dfs %d testmode %d\n",
@@ -625,7 +625,7 @@ static ssize_t ath10k_read_chip_id(struct file *file, char __user *user_buf,size_t len;char buf[50 ]; - len =scnprintf (buf,sizeof (buf),"0x%08x\n" , ar->chip_id); + len =scnprintf (buf,sizeof (buf),"0x%08x\n" , ar->bus_param.chip_id);return simple_read_from_buffer (user_buf, count, ppos, buf, len); }
drivers/net/wireless/ath/ath10k/htc.c +3 -3
@@ -53,7 +53,7 @@ static inline void ath10k_htc_restore_tx_skb(struct ath10k_htc *htc, {struct ath10k_skb_cb *skb_cb =ATH10K_SKB_CB (skb); -if (htc->ar->dev_type !=ATH10K_DEV_TYPE_HL ) +if (htc->ar->bus_param.dev_type !=ATH10K_DEV_TYPE_HL )dma_unmap_single (htc->ar->dev, skb_cb->paddr, skb->len,DMA_TO_DEVICE );skb_pull (skb,sizeof (struct ath10k_htc_hdr )); }
@@ -138,7 +138,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,ath10k_htc_prepare_tx_skb (ep, skb); skb_cb->eid = eid; -if (ar->dev_type !=ATH10K_DEV_TYPE_HL ) { +if (ar->bus_param.dev_type !=ATH10K_DEV_TYPE_HL ) { skb_cb->paddr =dma_map_single (dev, skb->data, skb->len,DMA_TO_DEVICE ); ret =dma_mapping_error (dev, skb_cb->paddr);
@@ -161,7 +161,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,return 0 ; err_unmap: -if (ar->dev_type !=ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type !=ATH10K_DEV_TYPE_HL )dma_unmap_single (dev, skb_cb->paddr, skb->len,DMA_TO_DEVICE ); err_credits:if (ep->tx_credit_flow_enabled) {
drivers/net/wireless/ath/ath10k/htt_rx.c +5 -5
@@ -265,7 +265,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)struct ath10k_htt *htt = &ar->htt;int ret; -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return 0 ;spin_lock_bh (&htt->rx_ring.lock);
@@ -282,7 +282,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)void ath10k_htt_rx_free (struct ath10k_htt *htt) { -if (htt->ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (htt->ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return ;del_timer_sync (&htt->rx_ring.refill_retry_timer);
@@ -576,7 +576,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)size_t size;struct timer_list *timer = &htt->rx_ring.refill_retry_timer; -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return 0 ; htt->rx_confused = false;
@@ -2960,7 +2960,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)break ; }case HTT_T2H_MSG_TYPE_RX_IND : -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return ath10k_htt_rx_proc_rx_ind_hl (htt, &resp->rx_ind_hl, skb);
@@ -3256,7 +3256,7 @@ void ath10k_htt_set_rx_ops(struct ath10k_htt *htt) {struct ath10k *ar = htt->ar; -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL ) htt->rx_ops = &htt_rx_ops_hl;else if (ar->hw_params.target_64bit) htt->rx_ops = &htt_rx_ops_64;
drivers/net/wireless/ath/ath10k/htt_tx.c +3 -3
@@ -495,7 +495,7 @@ int ath10k_htt_tx_start(struct ath10k_htt *htt)if (htt->tx_mem_allocated)return 0 ; -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return 0 ; ret =ath10k_htt_tx_alloc_buf (htt);
@@ -1177,7 +1177,7 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)return 0 ; err_unmap_msdu: -if (ar->dev_type !=ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type !=ATH10K_DEV_TYPE_HL )dma_unmap_single (dev, skb_cb->paddr, msdu->len,DMA_TO_DEVICE ); err_free_txdesc:dev_kfree_skb_any (txdesc);
@@ -1714,7 +1714,7 @@ void ath10k_htt_set_tx_ops(struct ath10k_htt *htt) {struct ath10k *ar = htt->ar; -if (ar->dev_type ==ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL ) htt->tx_ops = &htt_tx_ops_hl;else if (ar->hw_params.target_64bit) htt->tx_ops = &htt_tx_ops_64;
drivers/net/wireless/ath/ath10k/pci.c +2 -1
@@ -2284,7 +2284,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar)return 1 ;case QCA6164_2_1_DEVICE_ID :case QCA6174_2_1_DEVICE_ID : -switch (MS (ar->chip_id,SOC_CHIP_ID_REV )) { +switch (MS (ar->bus_param.chip_id,SOC_CHIP_ID_REV )) {case QCA6174_HW_1_0_CHIP_ID_REV :case QCA6174_HW_1_1_CHIP_ID_REV :case QCA6174_HW_2_1_CHIP_ID_REV :
@@ -3637,6 +3637,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, } bus_params.dev_type =ATH10K_DEV_TYPE_LL ; + bus_params.link_can_suspend = true; bus_params.chip_id =ath10k_pci_soc_read32 (ar,SOC_CHIP_ID_ADDRESS );if (bus_params.chip_id ==0xffffffff ) {ath10k_err (ar,"failed to get chip id\n" );
drivers/net/wireless/ath/ath10k/txrx.c +1 -1
@@ -95,7 +95,7 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,wake_up (&htt->empty_tx_wq);spin_unlock_bh (&htt->tx_lock); -if (ar->dev_type !=ATH10K_DEV_TYPE_HL ) +if (ar->bus_param.dev_type !=ATH10K_DEV_TYPE_HL )dma_unmap_single (dev, skb_cb->paddr, msdu->len,DMA_TO_DEVICE );ath10k_report_offchan_tx (htt->ar, msdu);
drivers/net/wireless/ath/ath10k/wmi-tlv.c +2 -0
@@ -3259,6 +3259,8 @@ ath10k_wmi_tlv_op_gen_wow_enable(struct ath10k *ar) cmd = (void *)tlv->value; cmd->enable =__cpu_to_le32 (1 ); +if (!ar->bus_param.link_can_suspend) + cmd->pause_iface_config =WOW_IFACE_PAUSE_DISABLED ;ath10k_dbg (ar,ATH10K_DBG_WMI ,"wmi tlv wow enable\n" );return skb;
drivers/net/wireless/ath/ath10k/wmi-tlv.h +7 -0
@@ -1998,8 +1998,15 @@ struct wmi_tlv_set_quiet_cmd {__le32 enabled; } __packed; +enum wmi_tlv_wow_interface_cfg { +WOW_IFACE_PAUSE_ENABLED , +WOW_IFACE_PAUSE_DISABLED +}; +struct wmi_tlv_wow_enable_cmd {__le32 enable; +__le32 pause_iface_config; +__le32 flags; } __packed;struct wmi_tlv_wow_host_wakeup_ind {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 3/3 ath10k: Request credit report if flow control enabled on ep
In reply to Govind SinghFW credit flow control is enabled for only WMI ctrl service(CE3) but credit update is requested unconditionally on all HTC services as part of HTC tx in CE3/CE0/CE4.
This is causing WOW failure as FW is not expecting credit report request on other end-points(CE0/CE4).
Request credit report only on those endpoints where credit flow control is enabled.
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.
--- drivers/net/wireless/ath/ath10k/htc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/htc.c +2 -1
@@ -88,7 +88,8 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep, hdr->eid = ep->eid; hdr->len =__cpu_to_le16 (skb->len -sizeof (*hdr)); hdr->flags =0 ; - hdr->flags |=ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE ; +if (ep->tx_credit_flow_enabled) + hdr->flags |=ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE ;spin_lock_bh (&ep->htc->tx_lock); hdr->seq_no = ep->seq_no++;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 2/3] ath10k: Disable interface pause wow config for integrated chipset
In reply to Govind SinghQuoted 7 lines · Govind Singh
wow pause iface config controls the PCI D0/D3-WOW cases for pcie bus state. Firmware does not expects
WOW_IFACE_PAUSE_ENABLEDconfig for bus/link that cannot be suspended ex:snoc and does not trigger common subsystem shutdown.
Disable interface pause wow config for integrated chipset(WCN3990) for correct WOW configuration in the firmware.
Quoted 6 lines
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.Signed-off-by Govind Singh <[email protected]>Signed-off-by Kalle Valo <[email protected]>
This issued a new warning:
drivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: warning: incorrect type in assignment (different base types)drivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: expected restricted __le32 [usertype] pause_iface_configdrivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: got int
I fixed it in the pending branch:
Signature · 9 lines
https://patchwork.kernel.org/patch/10799253/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCH v3 2/3] ath10k: Disable interface pause wow config for integrated chipset
In reply to Govind SinghQuoted 7 lines · Govind Singh
wow pause iface config controls the PCI D0/D3-WOW cases for pcie bus state. Firmware does not expects
WOW_IFACE_PAUSE_ENABLEDconfig for bus/link that cannot be suspended ex:snoc and does not trigger common subsystem shutdown.
Disable interface pause wow config for integrated chipset(WCN3990) for correct WOW configuration in the firmware.
Quoted 6 lines
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.Signed-off-by Govind Singh <[email protected]>Signed-off-by Kalle Valo <[email protected]>
This issued a new warning:
drivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: warning: incorrect type in assignment (different base types)drivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: expected restricted __le32 [usertype] pause_iface_configdrivers/net/wireless/ath/ath10k/wmi-tlv.c:3327:41: got int
I fixed it in the pending branch:
Signature · 3 lines
https://patchwork.kernel.org/patch/10799253/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH v3 1/3] ath10k: Enable bus layer suspend/resume for WCN3990
In reply to Govind SinghQuoted 9 lines · Govind Singh
Register snoc bus layer suspend/resume PM ops and configure the wakeup source(CE2) for the device.
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.Signed-off-by Govind Singh <[email protected]>Signed-off-by Kalle Valo <[email protected]>
3 patches applied to ath-next branch of ath.git, thanks.
185be1c66469 ath10k: enable bus layer suspend/resume for WCN3990 de8781d7e74d ath10k: disable interface pause wow config for integrated chipset c40e448e0bcf ath10k: request credit report if flow control enabled on ep
Signature · 9 lines
https://patchwork.kernel.org/patch/10799247/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCH v3 1/3] ath10k: Enable bus layer suspend/resume for WCN3990
In reply to Govind SinghQuoted 9 lines · Govind Singh
Register snoc bus layer suspend/resume PM ops and configure the wakeup source(CE2) for the device.
Testing:
Tested on WCN3990 HW.
Tested FW: WLAN.HL.2.0-01192-QCAHLSWMTPLZ-1.Signed-off-by Govind Singh <[email protected]>Signed-off-by Kalle Valo <[email protected]>
3 patches applied to ath-next branch of ath.git, thanks.
185be1c66469 ath10k: enable bus layer suspend/resume for WCN3990 de8781d7e74d ath10k: disable interface pause wow config for integrated chipset c40e448e0bcf ath10k: request credit report if flow control enabled on ep
Signature · 3 lines
https://patchwork.kernel.org/patch/10799247/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches