From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0EA17522696; Thu, 17 Sep 2026 17:00:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664418; cv=none; b=F5MpmoWG56F34EwVM0torUZwe91PTeY2uG20s4JlmpSpqv5zOLHBf2DA9hLSHJmFszGoZsHvJy/ipAZTGKB8ScUlTxAtJEGNQhAiqZG6vXbrBQuua1ykSx+c1a5v3VIpkTT4Sz+0Qn+pbSGOg73DRUAuMQasK/MsKnvfeKR6CCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664418; c=relaxed/simple; bh=gk67LxAD3IZgiqCYBHvN+3rXhqGMiF4ObsBooA2ILWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OOBWYFUeodQdQTg7c9MbZAQ5QLlK0CcTWn0lCMHK7Am15UC5EEddpjGzy5AQpsXulPOiXOKWFuKKgKlKnAuF9U3RKuLjI596+ZyYH8qIeKKAPgl8NcN6ab9oHM5nGas4Zz+5/uljShfuKwaQ5F26fEooFnyp2Lp5Xg9eScEQXTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pVqruofn; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pVqruofn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41C3F1F000FF; Thu, 17 Sep 2026 17:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789664416; bh=VEZJyxhWffyAo40THdFEN4lMfC48jXRcVSNpuWATRd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pVqruofnOX5USKEinklqor/mdyfctuLZm3VBF+e0khPYaRRRgK/ir/j/nt1uSh237 8iRX6bhl+XhK+szlAx/jIznbItAG4q3RwDGs9XU8JTl6wTs1xO+7qBIXQ02H1GAY0c rjch0G8D65vCthBM64T/Lqarolg1SEEx/gqFTLaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiajia Liu , Felix Fietkau , Sasha Levin Subject: [PATCH 6.18 0366/1250] wifi: mt76: transform aspm_conf for pci_disable_link_state Date: Thu, 17 Sep 2026 16:02:41 +0100 Message-ID: <20260917151601.982450193@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiajia Liu [ Upstream commit 2dd78856223484895306351df1f903a4b75d213f ] 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 Link: https://patch.msgid.link/20260602054349.42429-1-liujia6264@gmail.com Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- 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/wireless/mediatek/mt76/pci.c index b5031ca7f73fb..4c864afefe2f2 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) if (IS_ENABLED(CONFIG_PCIEASPM)) { int err; + int state = 0; - err = pci_disable_link_state(pdev, aspm_conf); + if (aspm_conf & PCI_EXP_LNKCTL_ASPM_L0S) + state |= PCIE_LINK_STATE_L0S; + if (aspm_conf & PCI_EXP_LNKCTL_ASPM_L1) + state |= PCIE_LINK_STATE_L1; + + err = pci_disable_link_state(pdev, state); if (!err) return; } -- 2.53.0