From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 477F4289353 for ; Thu, 17 Jul 2025 09:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752744266; cv=none; b=RssPGnmkDWD9+44JLkMaF/sRx0hVoayNLGSaoJLgwHf6qpuCAnat1IX4cCMI/cFldXqEOHoynQTOFxtZ/vmuC9gzIlAQX9y1sZ28rfkMVrenmAFyyZVj+EKgjCxuNCamGc9Yr9F1gmgV0fKC4GvNAf4UA+Wxe0k7HNHwVaeMcxE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752744266; c=relaxed/simple; bh=1CF/Gragh00xF9VVPjCjTM19/W5x3L/UM/4YXNNbhkw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=FuMk1EtEcOKxP0LRWykqnRs/+Xqqnr1WSB6NDOa+latDtloM+XOC9cGzp1Lx27KT/aH6J9DupUjLaa9Yo8US6cTMHtWIj6I+VP2NjZklzpc1Q7dki8gXlV4GjrdGV94E5w5ReyMO0ZAZJKp+IIb8AKM24pn51z77i8Qg1effjiM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ldomBH3i; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ldomBH3i" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56H3uKqi025369 for ; Thu, 17 Jul 2025 09:24:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Ta2Lby5TifhBuvFmm9n6OoINsAcvWrh5mSznvYReTX4=; b=ldomBH3iXX9a/jA0 XgSG5DLUi6l59L/4am/nVRDS2s+WyS7+3Zy/kVJdY4/btcr558vKLH9ZizTIMvuM eeg/2DBoc0vs20xziRoymKeh5uRElxqeX+9+HVXyNFDe1r/Amt/CGQdhrilFST0D W+31eKLthU4efv9D+Rgzjau+vT6rHj57ug2//2TgBFH19QOYcvQx2tPcdFOxTSJd Nf22fckurxLgK/7qDEPBAVCY54onncq+wayMSpsTqTS7QhotEbn8bROmMCJ4gYkR ZmDW9YMYayVDFNrI+OzQYH+YmqrlUKpmr50WmiDMbA51MCgZbIcCTuEeYZ0MdJZp 8JCsOA== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47xbsqb984-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 17 Jul 2025 09:24:22 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b3ba7659210so611786a12.2 for ; Thu, 17 Jul 2025 02:24:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752744261; x=1753349061; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ta2Lby5TifhBuvFmm9n6OoINsAcvWrh5mSznvYReTX4=; b=tE04BvdfdilggdIAABLYvsS0muYPzYy0TWrrVvCBlgJqwmAXMadTrVqhiKYsYJSb0Y 6ihNo7l458T5LtW5qSmi287K+M/UQ16SK9U0Tu8aklNhh/LKZPzDme7TCuvXdlGZoOex lXwXcbYMqrGtSzXdI1z4L+HFzzdcO6Ys+3BVK07mMMeizhD8LPGI3TfX/GZUErWa7GMu ty+PKgCnvr7td4at4g1jhz21nAYyoAxxZKRQPWdlaRiEPhrBP82xOV4xPUyxlVOZiSFn uNszwqdyrwLJ8FcOwMoIf9XC9PutYC15X9K4XYed9+oRBEr0ASNS4yf0dAIzZRHTO8DT rR1Q== X-Forwarded-Encrypted: i=1; AJvYcCURHU3XIluSjJDK7S6BHXuoWFhmZWl08vaQ597JCj3Vrm0TD6LXIRoiaL+Wi4NJAf+TiB3PXArOtZ+gG/w=@vger.kernel.org X-Gm-Message-State: AOJu0YwLfBiYUQjRMZfvUQif3QeN7RaaUopDgdyJDWSuDMe8Cv8W43wc r3xbhG7sY2uavw5o2CFvdDdD3l2eRyvhqxdA56fUtdDGqzf6VNBArt30PjpHycwc4eubvYOcozv 9WwLj/fygm2Mv4+RpxXStHplO4nro7+77hWgAw9hPe+uENGO66P5Wq2qjvdx8LzKbYKI= X-Gm-Gg: ASbGncuiMxCXbAW6t1NpShOajBoPM1tiSpj5jOcfNGWTOPzb4VtDYjruP4Nbfwn9Yhm SnvHVqjSsWw+nko6X1MSa03JlTc+HECqAy2C5151gK0uehDNo69+lEblw96ZRXeNm6V9rnUac5d T/jA9WnJZnogwjs1wM1WSdZ6FoTozfOItwc817hD1LXcqTWmxhtz5DY2GEEXBAxAN84oz3YXHeq AD6LBiJff3y55AtMf2WPpATkgyuqCUapl0KSR+YJQ4JSKe/m7PYmxWDy3f6etoRfvzMJOsrsyA6 504/1tJ/6fyS+ljPqthXQw0CwYA1sf/ReP7Wlq0ZTnz0AAjzWT8ynuyrtnYNN9G7nTWQ2uTQ8Ny J492VmdP55pB9Iat0NJcIKYI0cNbibdgP X-Received: by 2002:a05:6a20:4304:b0:236:5ceb:b9d with SMTP id adf61e73a8af0-23811d5ac1emr8814798637.5.1752744260704; Thu, 17 Jul 2025 02:24:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/9JzHwiHOJVtQDz+Hk2T//V+UKML12UcqWERav6I7D2/TpiYea6gygrZcoMDvan9j0EK5hw== X-Received: by 2002:a05:6a20:4304:b0:236:5ceb:b9d with SMTP id adf61e73a8af0-23811d5ac1emr8814754637.5.1752744260176; Thu, 17 Jul 2025 02:24:20 -0700 (PDT) Received: from [10.133.33.245] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b3bbe579b0esm15220268a12.22.2025.07.17.02.24.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Jul 2025 02:24:19 -0700 (PDT) Message-ID: <38ace6a3-d594-4438-a193-cf730a7b87d6@oss.qualcomm.com> Date: Thu, 17 Jul 2025 17:24:13 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 4/6] wifi: ath12k: Use pci_{enable/disable}_link_state() APIs to enable/disable ASPM states To: manivannan.sadhasivam@oss.qualcomm.com, Jeff Johnson , Manivannan Sadhasivam , Lorenzo Pieralisi , =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , Nirmal Patel , Jonathan Derrick Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath12k@lists.infradead.org, ath11k@lists.infradead.org, ath10k@lists.infradead.org, Bjorn Helgaas , ilpo.jarvinen@linux.intel.com, linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, Krishna Chaitanya Chundru , Qiang Yu References: <20250716-ath-aspm-fix-v1-0-dd3e62c1b692@oss.qualcomm.com> <20250716-ath-aspm-fix-v1-4-dd3e62c1b692@oss.qualcomm.com> Content-Language: en-US From: Baochen Qiang In-Reply-To: <20250716-ath-aspm-fix-v1-4-dd3e62c1b692@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=ad1hnQot c=1 sm=1 tr=0 ts=6878c146 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=fqe-KcBmoLiKQ2-rxgMA:9 a=QEXdDO2ut3YA:10 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: RGP4FgacYJSyWUaxy9QeJ1HIUCRzglTa X-Proofpoint-GUID: RGP4FgacYJSyWUaxy9QeJ1HIUCRzglTa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE3MDA4MiBTYWx0ZWRfX/LlMsOQlkX9g D08aSyq5bpmYi/m1SBDrMMl4668KOiHLf8PT2W/28d4zARG1JJVT/d4HlJWb/glGQnR0/5GehP6 EvHZETlzvBZFAFH3vSCB2Xhf8GZj5S7/wuDOwx25qA6glX+k1CErS7BKbmyW8H96vha9unE/pzW OEZO0J3Fj8EeTO2OCo1HZ3t24Vhh12yPV3NkAxC8wkcbtwudmIp5TTzOlLAQaHAJjM1G9PE9UEe kL78UMIsSYaaiL7cngUaYE6DXQUDS0s5XpVGSEWVa+zI3FGw7Lhk1E3OShsBwKwWO2eCTQpNvBq 1R9/OCAuYE8GWdQwu8orleEmZEik0cL1iAWVTxGNKeC79oCadhcTCholdjF4Ilw8gNLMrhr0zH7 1EvZFmVkM1vD6UYw9DdEFIQYlpLTq3dyp5xB7XhSJUBKBR0qwv2Xfup7ibtt5AwQv6ba1lxi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-17_01,2025-07-16_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507170082 On 7/16/2025 8:56 PM, Manivannan Sadhasivam via B4 Relay wrote: > From: Manivannan Sadhasivam > > It is not recommended to enable/disable the ASPM states on the back of the > PCI core directly using the LNKCTL register. It will break the PCI core's > knowledge about the device ASPM states. So use the APIs exposed by the PCI > core to enable/disable ASPM states. > > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Reported-by: Qiang Yu > Signed-off-by: Manivannan Sadhasivam > --- > drivers/net/wireless/ath/ath.h | 14 ++++++++++++++ > drivers/net/wireless/ath/ath12k/pci.c | 10 ++++------ > 2 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 34654f710d8a1e63f65a47d4602e2035262a4d9e..ef685123b66bf4f41428fec67c1967f242a9ef27 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -21,6 +21,8 @@ > #include > #include > #include > +#include > +#include > #include > > /* > @@ -336,4 +338,16 @@ static inline const char *ath_bus_type_to_string(enum ath_bus_type bustype) > return ath_bus_type_strings[bustype]; > } > > +static inline int ath_pci_aspm_state(u16 lnkctl) > +{ > + int state = 0; > + > + if (lnkctl & PCI_EXP_LNKCTL_ASPM_L0S) > + state |= PCIE_LINK_STATE_L0S; > + if (lnkctl & PCI_EXP_LNKCTL_ASPM_L1) > + state |= PCIE_LINK_STATE_L1; > + > + return state; > +} > + > #endif /* ATH_H */ > diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c > index 489d546390fcdab8f615cc9184006a958d9f140a..a5e11509e3ab8faad6638ff78ce6a8a5e9c3cbbd 100644 > --- a/drivers/net/wireless/ath/ath12k/pci.c > +++ b/drivers/net/wireless/ath/ath12k/pci.c I add some logs: diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c index de5a4059a7a9..5a52093e0226 100644 --- a/drivers/net/wireless/ath/ath12k/pci.c +++ b/drivers/net/wireless/ath/ath12k/pci.c @@ -1161,16 +1161,28 @@ void ath12k_pci_stop(struct ath12k_base *ab) ath12k_ce_cleanup_pipes(ab); } +static void ath12k_pci_dump_pcie_link_ctrl(struct ath12k_pci *ab_pci, const char *str1, u16 line) +{ + u16 link_ctl = 0; + + pcie_capability_read_word(ab_pci->pdev, PCI_EXP_LNKCTL, + &link_ctl); + + pr_info("%s %u: link_ctl 0x%x\n", str1, line, link_ctl); +} + int ath12k_pci_start(struct ath12k_base *ab) { struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); set_bit(ATH12K_PCI_FLAG_INIT_DONE, &ab_pci->flags); + ath12k_pci_dump_pcie_link_ctrl(ab_pci, __func__, __LINE__); if (test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &ab_pci->flags)) ath12k_pci_aspm_restore(ab_pci); else ath12k_info(ab, "leaving PCI ASPM disabled to avoid MHI M2 problems\n"); + ath12k_pci_dump_pcie_link_ctrl(ab_pci, __func__, __LINE__); ath12k_pci_ce_irqs_enable(ab); ath12k_ce_rx_post_buf(ab); @@ -1460,11 +1472,15 @@ int ath12k_pci_power_up(struct ath12k_base *ab) clear_bit(ATH12K_PCI_FLAG_INIT_DONE, &ab_pci->flags); ath12k_pci_sw_reset(ab_pci->ab, true); + ath12k_pci_dump_pcie_link_ctrl(ab_pci, __func__, __LINE__); + /* Disable ASPM during firmware download due to problems switching * to AMSS state. */ ath12k_pci_aspm_disable(ab_pci); + ath12k_pci_dump_pcie_link_ctrl(ab_pci, __func__, __LINE__); + ath12k_pci_msi_enable(ab_pci); if (ath12k_fw_feature_supported(ab, ATH12K_FW_FEATURE_MULTI_QRTR_ID)) > @@ -16,6 +16,8 @@ > #include "mhi.h" > #include "debug.h" > > +#include "../ath.h" > + > #define ATH12K_PCI_BAR_NUM 0 > #define ATH12K_PCI_DMA_MASK 36 > > @@ -928,8 +930,7 @@ static void ath12k_pci_aspm_disable(struct ath12k_pci *ab_pci) > u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1)); > > /* disable L0s and L1 */ > - pcie_capability_clear_word(ab_pci->pdev, PCI_EXP_LNKCTL, > - PCI_EXP_LNKCTL_ASPMC); > + pci_disable_link_state(ab_pci->pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1); Not always, but sometimes seems the 'disable' does not work: [ 279.920507] ath12k_pci_power_up 1475: link_ctl 0x43 //before disable [ 279.920539] ath12k_pci_power_up 1482: link_ctl 0x43 //after disable > > set_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags); > } > @@ -958,10 +959,7 @@ static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci) > { > if (ab_pci->ab->hw_params->supports_aspm && > test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags)) > - pcie_capability_clear_and_set_word(ab_pci->pdev, PCI_EXP_LNKCTL, > - PCI_EXP_LNKCTL_ASPMC, > - ab_pci->link_ctl & > - PCI_EXP_LNKCTL_ASPMC); > + pci_enable_link_state(ab_pci->pdev, ath_pci_aspm_state(ab_pci->link_ctl)); always, the 'enable' is not working: [ 280.561762] ath12k_pci_start 1180: link_ctl 0x43 //before restore [ 280.561809] ath12k_pci_start 1185: link_ctl 0x42 //after restore > } > > static void ath12k_pci_cancel_workqueue(struct ath12k_base *ab) > In addition, frequently I can see below AER warnings: [ 280.383143] aer_ratelimit: 30 callbacks suppressed [ 280.383151] pcieport 0000:00:1c.0: AER: Correctable error message received from 0000:00:1c.0 [ 280.383177] pcieport 0000:00:1c.0: PCIe Bus Error: severity=Correctable, type=Data Link Layer, (Transmitter ID) [ 280.383184] pcieport 0000:00:1c.0: device [8086:7ab8] error status/mask=00001000/00002000 [ 280.383193] pcieport 0000:00:1c.0: [12] Timeout