From nobody Mon Jun 8 04:24:58 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 94BD927466A; Tue, 2 Jun 2026 05:43:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780379041; cv=none; b=ZxVeP7hFyUm+2q94Giaqcete+XUmoqPZXv5ClzogYK2aGxyMmhnuVRpgw2YFweljlA9/DYujwCtqe5UGw2Cu6Qp1RVgP51qa6Ta/lEWCGUA1FH03oEwkzAO4hADGxktm/rqNB1KHkCWkKcqJZGpLV8Cup4AQfxUKLOjmbooq7Rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780379041; c=relaxed/simple; bh=n0zRNjTBVnQg7PVfcJtNS/A8RtX7RRYb0ux2Z/yTaH4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YfvHX1cBAVYwYOIZrv3+UDhomvT1CJ9Mc15dEs3Ynf1mLg2VmJl/IAr8IShZx6YuznDhLDchdcFXKe9UU+mYkZI2isM0tKXf4fdYg8z3U55YCsjADvugBR7wQBM3zdaDFXM8OBovq2+ujLSaomAyrHWbFc/R+2GEMbJCHgtU2io= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com; spf=fail smtp.mailfrom=gmail.com; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=gmail.com X-UUID: 0abea2ac5e4611f1aa26b74ffac11d73-20260602 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:ea6a243b-a388-4986-acd6-d3c846136447,IP:0,U RL:0,TC:0,Content:0,EDM:25,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:25 X-CID-META: VersionHash:e7bac3a,CLOUDID:cc7987b97370d2f75803ee3150f26bf6,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:102|115|854|861|865|898,TC:nil,Content:0 |15|50,EDM:5|9,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 0abea2ac5e4611f1aa26b74ffac11d73-20260602 X-User: liujiajia@kylinos.cn Received: from nature.lan [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 321207560; Tue, 02 Jun 2026 13:43:54 +0800 From: Jiajia Liu To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Jiajia Liu Subject: [PATCH] wifi: mt76: transform aspm_conf for pci_disable_link_state Date: Tue, 2 Jun 2026 13:43:49 +0800 Message-ID: <20260602054349.42429-1-liujia6264@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jiajia Liu commit b478e162f227 ("PCI/ASPM: Consolidate link state defines") changed PCIE_LINK_STATE_L0S (1) to (BIT(0) | BIT(1)). PCI_EXP_LNKCTL_ASPM_L0S (1) and PCI_EXP_LNKCTL_ASPM_L1 (2) are no longer matched with PCIE_LINK_STATE_L0S (3) and PCIE_LINK_STATE_L1 (4). On the platform enabling ASPM L0s and L1, mt76_pci_disable_aspm is not able to disable L1. Fix this by transforming aspm_conf to pcie link state. Signed-off-by: Jiajia Liu --- drivers/net/wireless/mediatek/mt76/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/pci.c b/drivers/net/wireles= s/mediatek/mt76/pci.c index 833923ab2483..11fe62aa8113 100644 --- a/drivers/net/wireless/mediatek/mt76/pci.c +++ b/drivers/net/wireless/mediatek/mt76/pci.c @@ -30,8 +30,14 @@ void mt76_pci_disable_aspm(struct pci_dev *pdev) =20 if (IS_ENABLED(CONFIG_PCIEASPM)) { int err; + int state =3D 0; =20 - err =3D pci_disable_link_state(pdev, aspm_conf); + if (aspm_conf & PCI_EXP_LNKCTL_ASPM_L0S) + state |=3D PCIE_LINK_STATE_L0S; + if (aspm_conf & PCI_EXP_LNKCTL_ASPM_L1) + state |=3D PCIE_LINK_STATE_L1; + + err =3D pci_disable_link_state(pdev, state); if (!err) return; } --=20 2.53.0