From patchwork Fri Sep 27 10:36:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 13814122 X-Patchwork-Delegate: kw@linux.com Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10BDF156864 for ; Fri, 27 Sep 2024 10:36:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433414; cv=none; b=O9k6QAt/j/RaQS2nkXBfRN9Rga3imLtpAP6DozY+ikmOf7IB4hOtzNwAIKOAY1K7LGxdHR2f9S6okK/Xr1FncHcQzXSjMcfoGPgsJNAjws7ilVPgfD8HWPT3UkVW7hVdQ2j9jvgBNIOBzt8nBIX81H7N6r8HfIjNdh/y7soSkyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433414; c=relaxed/simple; bh=y3FXP+giOaa0bTHNOIiOqrz67Of+uUBaKr7xcqryCuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TmRR6HDlI8gM5b0nAox4oJf7A5iZMPnT2+HhK4RfxLgufHIAImNnk1Iwq5r0oNHYMIwtMwWaTNrvLgzTsa4dzHLnc/ySjWJJnzHfyyTepZHHO/lzi4ljh4I5C8lI4fR6kY7WThK1OnK8sBFdxEDwnrkX8bV2j45qoksDfRlMObM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=jSGCrRrA; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="jSGCrRrA" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2e053f42932so1503287a91.0 for ; Fri, 27 Sep 2024 03:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1727433411; x=1728038211; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G55JHJhI3qkxlwOlcFB2xhqazWP5g+D6GuyYd2HAN1Q=; b=jSGCrRrAOdE7/wjdcR20hhFGpGuuD/eAAqySx1LVLYIP/mOGevML0Lc1/EV74Y5nOJ PBDExRN501LK8WqEtm/eoUfu4+nrdhduVNns8yeNqZlQ0VmnmsOY3Tpr+Pui6FJV2MbZ DNSqwA9luvWFZsRcdfNzmG/TgtoK4vvw1oJ5URH4sLojLPtZSwY5Eola3MJfc38ySMb8 WCVEHbGh89xd2dGJB34g7v1elf4+NWftq2CV5WsouJkdhrWNdTsuOH5wBhOxiUjlOLcy r+zh/i1mgblvjbwlhV+y5TLL6xqCY8cOM/c4HL535yAA7bIi6bcirRUbwg0veJGoCAfS 8+hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727433411; x=1728038211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G55JHJhI3qkxlwOlcFB2xhqazWP5g+D6GuyYd2HAN1Q=; b=INVdBPRUztvYCPWF4J/FFvRIc4Ir3FK/vHf+cAAaKUGwphKlrqY4PIVRLPQ+pAEqUR gaPR30iD1POrgr2Yy62WvqL/YaCtwoDVEeERy0FgrOV27j4/ZkTIOwjyU7zZOyD3Phaz 7dd6R/FaI4+g9N6NfXTWef8uH94NsPtiblZ9usMlntDFXHg1I08GcQfvKCPPZjfa2jIG Oo55duJDkcM4fQr3DjeiNT2h++8tRz5O2qjFU6b7RwPVYAWOC4L76fq1qRkunw8AbWFg ZBT+HcDZVMvkNZFc922GJTHB+4fNzABVQnSSlhLJwJPwMZ5zFGUXJrNq6+X+gb1ukJwb D7tw== X-Forwarded-Encrypted: i=1; AJvYcCXoLSO/OppgfqsAtgJNByGIGAX+H6UKHrqkDWJLRjuFwUJ7JjabB6OX55qR1WGnMQVFGXzVHoalg1k=@vger.kernel.org X-Gm-Message-State: AOJu0Yxbl8pYffUnCr2/32KTOIXgaCD5LBXmKdPAc150vSrHwgCFD28l yy1ACTQZRC3skZCdD2rnqeCpT4UmIRYf1ISidMpje4G8OuUZ2CX+RsVStSy+mmg= X-Google-Smtp-Source: AGHT+IEOCmycZY2cGaK5utdLVzhwCqkIWWFB/+435nxWSLC1tqzJCayG612KqIrzMA24Q+k1herCcA== X-Received: by 2002:a17:90b:360c:b0:2d3:c87e:b888 with SMTP id 98e67ed59e1d1-2e0b8ebcd31mr3051772a91.27.1727433411235; Fri, 27 Sep 2024 03:36:51 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2e06e1cd35asm5177819a91.24.2024.09.27.03.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 03:36:50 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH v10 1/3] PCI: vmd: Set PCI devices to D0 before enable PCI PM's L1 substates Date: Fri, 27 Sep 2024 18:36:12 +0800 Message-ID: <20240927103612.24582-1-jhp@endlessos.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20240927103231.24244-2-jhp@endlessos.org> References: <20240927103231.24244-2-jhp@endlessos.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The remapped PCIe Root Port and the child device have PCI PM L1 substates capability, but they are disabled originally. Here is a failed example on ASUS B1400CEAE: Capabilities: [900 v1] L1 PM Substates L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- L1_PM_Substates+ PortCommonModeRestoreTime=32us PortTPowerOnTime=10us L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- T_CommonMode=0us LTR1.2_Threshold=101376ns L1SubCtl2: T_PwrOn=50us Power on all of the VMD remapped PCI devices to D0 before enable PCI-PM L1 PM Substates by following "PCIe r6.0, sec 5.5.4". Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan Reviewed-by: Kuppuswamy Sathyanarayanan --- v2: - Power on the VMD remapped devices with pci_set_power_state_locked() - Prepare the PCIe LTR parameters before enable L1 Substates - Add note into the comments of both pci_enable_link_state() and pci_enable_link_state_locked() for kernel-doc. - The original patch set can be split as individual patches. v3: - Re-send for the missed version information. - Split drivers/pci/pcie/aspm.c modification into following patches. - Fix the comment for enasuring the PCI devices in D0. v4: - The same v5: - Tweak the commit title and message - Change the goto label from out_enable_link_state to out_state_change v6~8: - The same v9: - Update L1 PM Substates information against kernel v6.11 in commit message v10: - The same drivers/pci/controller/vmd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 264a180403a0..11870d1fc818 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -740,11 +740,9 @@ static int vmd_pm_enable_quirk(struct pci_dev *pdev, void *userdata) if (!(features & VMD_FEAT_BIOS_PM_QUIRK)) return 0; - pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL); - pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_LTR); if (!pos) - return 0; + goto out_state_change; /* * Skip if the max snoop LTR is non-zero, indicating BIOS has set it @@ -752,7 +750,7 @@ static int vmd_pm_enable_quirk(struct pci_dev *pdev, void *userdata) */ pci_read_config_dword(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, <r_reg); if (!!(ltr_reg & (PCI_LTR_VALUE_MASK | PCI_LTR_SCALE_MASK))) - return 0; + goto out_state_change; /* * Set the default values to the maximum required by the platform to @@ -764,6 +762,13 @@ static int vmd_pm_enable_quirk(struct pci_dev *pdev, void *userdata) pci_write_config_dword(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, ltr_reg); pci_info(pdev, "VMD: Default LTR value set by driver\n"); +out_state_change: + /* + * Ensure devices are in D0 before enabling PCI-PM L1 PM Substates, per + * PCIe r6.0, sec 5.5.4. + */ + pci_set_power_state_locked(pdev, PCI_D0); + pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL); return 0; } From patchwork Fri Sep 27 10:37:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 13814123 X-Patchwork-Delegate: kw@linux.com Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27F34156864 for ; Fri, 27 Sep 2024 10:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433438; cv=none; b=lxvGcC6atLT/GmdbQMXf6f973c46YpVD190Ybe9MD5zbXCxSwM8FQzyMgwDSF781616m3UguaKnPVHpA+OXQh+ktG730n7CjYOEA1tw5RcbiA5wIOFt01C+OV8ICFUW3hIzkzW3YIwx/qeGPglmJCshXz5gz8CLJb6laNMzwbjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433438; c=relaxed/simple; bh=Tt9jZ/UlU54e+UzJCTQL9NrMvJYonLk5qDAVRDf4jek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pfl01WRQ1TMH5RrKv0wU1dgvuCYshs2eW4Ea6JWdgmKG27SYJMcF5iBj6bPNrzmb68aatebgFFtlHaCu0XIQhnFDc6UsgPTaPAdNFVhmc4YFlg6r3q01Egops0/PjN5SSMel1uG2BvT7WSZBNcYpqRHNN0KDoSY1UkFeWS1v4Ew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=fVK/pveb; arc=none smtp.client-ip=209.85.215.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="fVK/pveb" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7db299608e7so1339882a12.1 for ; Fri, 27 Sep 2024 03:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1727433436; x=1728038236; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IGxVblQfa7uHrpy+5tBOyLSFvRT+VEn8gcPfSrU2Ja0=; b=fVK/pvebJxJXu/4HmJUhcL8gy2axYlsWTtjbKJkeXHkFL9BrtZrHekt+2PD4bKIwu+ AMf7E0FNd7FZcBdUs9xR8tsUwqSSLo9u6wJQkE6tRC1iZHzUoPEWEXmYPBuZM3u37tjE 3aNj9tERw5xYOGZQRrglqwNzmnJt8381+Q+FAVFAG8cTxfbLRH+1Ealg/+niw1MzNu0b jfJITKYJ0MU/30igzNFEi7VGLKLSZfScTmnJaGcmDjgxjb4ykfaXRB6WaFLU723UKzL1 iAO+bBEKA/bAKfUYm9DQL6LSoF1gDl8Y/4gWFmEB7QVSTzj6VNWDFAeI/tfu6rntVgm7 GlKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727433436; x=1728038236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IGxVblQfa7uHrpy+5tBOyLSFvRT+VEn8gcPfSrU2Ja0=; b=ZnSro9v5lVn9kbbuDjc7GCGtrMrLiM8aGqE7HN/7m28ImiaWKANtHXOdgNh6EJebI5 oko+YOLtiAZSetxTUQCSk0XFFFJFiSEgbhQ+B+953a+SrUpKB5a5FFsH26JoeIZekOuj uAbput6RNDtv9MQIprBO3n2UobCv5WNywkIZQTBlqpz3CERiKrgbpF72xs7g3FyT89n9 08xowBS1KiZXcnU2iuFo4U8stcA9BuZ17TQ5+dMNQMp5rpDQL2vKdg0P6J500ewQgCWb FLEpiLgvL0PeKc6ym2cmlJy5GUqo59YOsp0pxGdbXUvb7LIQXTXAEe/xMu01tL0TXgHo k9XQ== X-Forwarded-Encrypted: i=1; AJvYcCU0nHAqZt0zuV9/xm4RojHAF1U2ddKQAXZF5bqb8h6uzh1W+2WA0oMBBvSg1RuS2XJrBx1P5AKPUKY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6SZywLI69S/T+7ArZRyQCDPU+NQUIfr28m04uJTwH0LOYfeZe 5H4zuSq/AmQ1UDpyG7m8W7JdbkYcuFzz5WIV0DR30m9j9AmsL+hTK5sXESZnr5U= X-Google-Smtp-Source: AGHT+IEdr2fEbI1BtpZEI2LBNs60DKodvJNbkxxgSsKjdyxmA9kEzrG50k1Zw1QH67cjtJ9+jtBG3A== X-Received: by 2002:a05:6a21:1796:b0:1cf:3c60:b8dc with SMTP id adf61e73a8af0-1d4fa7ae2f4mr4012116637.34.1727433436352; Fri, 27 Sep 2024 03:37:16 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7e6db2b391bsm1342036a12.22.2024.09.27.03.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 03:37:16 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan , Bjorn Helgaas Subject: [PATCH v10 2/3] PCI/ASPM: Add notes about enabling PCI-PM L1SS to pci_enable_link_state(_locked) Date: Fri, 27 Sep 2024 18:37:00 +0800 Message-ID: <20240927103659.24600-2-jhp@endlessos.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20240927103231.24244-2-jhp@endlessos.org> References: <20240927103231.24244-2-jhp@endlessos.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 According to "PCIe r6.0, sec 5.5.4", add note about D0 requirement in pci_enable_link_state() kernel-doc. Signed-off-by: Jian-Hong Pan Acked-by: Bjorn Helgaas Reviewed-by: Kuppuswamy Sathyanarayanan --- v3: - Fix as readable comments v4: - The same v5: - Tweak and simplify the commit message v6~10: - The same drivers/pci/pcie/aspm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index cee2365e54b8..bd0a8a05647e 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1442,6 +1442,9 @@ static int __pci_enable_link_state(struct pci_dev *pdev, int state, bool locked) * touch the LNKCTL register. Also note that this does not enable states * disabled by pci_disable_link_state(). Return 0 or a negative errno. * + * Note: Ensure devices are in D0 before enabling PCI-PM L1 PM Substates, per + * PCIe r6.0, sec 5.5.4. + * * @pdev: PCI device * @state: Mask of ASPM link states to enable */ @@ -1458,6 +1461,9 @@ EXPORT_SYMBOL(pci_enable_link_state); * can't touch the LNKCTL register. Also note that this does not enable states * disabled by pci_disable_link_state(). Return 0 or a negative errno. * + * Note: Ensure devices are in D0 before enabling PCI-PM L1 PM Substates, per + * PCIe r6.0, sec 5.5.4. + * * @pdev: PCI device * @state: Mask of ASPM link states to enable * From patchwork Fri Sep 27 10:37:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 13814124 X-Patchwork-Delegate: kw@linux.com Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58EE7185956 for ; Fri, 27 Sep 2024 10:37:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433477; cv=none; b=oYwDY6KLDGWUDU6hnDOPVcvZMo8F+vFWuDMsf1tsobyPrN6oNsn+Qrg0AafAML0Qy1LtczXgYmo1SqAvubQydWPHEhE679BssKQtFZbgOn+xdOVYQV0n14EWWJGx/ILuayBQXquJnNBMKNnPecJMw2sbN0Ysb0vMNOdXdqiAIp0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727433477; c=relaxed/simple; bh=4sYaIuJdFSnuaqpKZ8kyV5lKO+ffPujUYfy81/wM48Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HeifKdNaUOiMiRVsaCB1Fd9XOQFALMWBvZy8RRB2YKWyaF8d6w/WjV2zP9j3cVyW1ngSC5ZtJfxSEoMwJLUfN3aZltcZvY1pGZDj63D10rAgv3bRkiBNSTi5isx9JSM5069SXhZTPicF/N0Q/gdRXyNMEKCfDDPasxgPim/l1SY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=THo3CLOd; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="THo3CLOd" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71b8d10e990so316455b3a.3 for ; Fri, 27 Sep 2024 03:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1727433476; x=1728038276; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Hwiyozneamu3/XcerF5d5b//JQF69xFvep1o7r1rVc=; b=THo3CLOd4ZZPMMUYymmExspo14VmE6r6racDn8LErIHIgCrcsH2hvQ3i3DGqMqHxBb 9CPfvZjdrSOMoTT0Ar8Egv9KTeg52NU8PogNMVhucnbU6HX3eTPWwdUtt+lViXDWt2Zm 54uIwA41cADHc2KYMalpi6AL9MXZXcSUje4Gd4i0S0rjwvopq88TYVt77QMCcPuNo7bb LAGpszpbLTMZDmIkGagC4vj+YFl6qCsDNaQt8ycqW/HaEjk7UqyCu/8t8uX+w+gmDHDK dGe/7A5FoqeRxRQLQLU3yF/ka4kNnnZztYn6vIsg2x1trAAUxWkV+IGy0Or5ZSzli1ba nMNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727433476; x=1728038276; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Hwiyozneamu3/XcerF5d5b//JQF69xFvep1o7r1rVc=; b=aThqQtRBg9joYH93SZu0v1kioXXY1BzEMsP1rHfnLWpqOPDXvHbMLddsD5tKwN8jq0 O5ACJBSmMBiyQNb1nWtxUGe/MUS7qKOZdLZDvEekzCLxDfRzetVOJV8oqzqTeaaNN2Ir MUu0fKLOR62WLyj0RAxW3imbWPDrByvUI0jbHpOPRZIp0xjBk+C+vALZiUOwyQ0hYq7l //tbnmhAVadpdZVgMSD63ku3IrW5Xa9QsdKuhrgkNJ0MzznKLpO0DfsEA4AuuQZiH7l0 gf8qWGYPlW0HSz+lWAQEYfmhdRbBrEH2ZS6RTp8B/NVmP+Nxak8jRqN8ut+OIsk4uqyg Z0SA== X-Forwarded-Encrypted: i=1; AJvYcCWlwTzle1AJ2G9LEOacv3+ghGJloG47zx+1Xclm7gW7phhXd4JjV5oo1r0OaI3ZK4ZfNLPqblT9A3o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy087X+s7PhaaOmoP10VXqQ0tX/GvayAeqzqRrXWmCdD+pZwoWI cMLjE7Env1xP+eZ9ykrUb5BV6LYgfKVgbbZnP7h34+S85JqWibMnhq2/5MwKetM= X-Google-Smtp-Source: AGHT+IGXZCssJYEkklvlhujoOLGGBkezQMy0CB2mqfDO5qE0T5PwaTCgyumVMWcnPVuQWf6l9lWzmQ== X-Received: by 2002:a05:6a00:2191:b0:717:88eb:824d with SMTP id d2e1a72fcca58-71b25f356a3mr4502012b3a.7.1727433475631; Fri, 27 Sep 2024 03:37:55 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-71b265249b7sm1342779b3a.148.2024.09.27.03.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 03:37:55 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH v10 3/3] PCI/ASPM: Make pci_save_aspm_l1ss_state save both child and parent's L1SS configuration Date: Fri, 27 Sep 2024 18:37:24 +0800 Message-ID: <20240927103723.24622-2-jhp@endlessos.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20240927103231.24244-2-jhp@endlessos.org> References: <20240927103231.24244-2-jhp@endlessos.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 PCI devices' parameters on the VMD bus have been programmed properly originally. But, cleared after pci_reset_bus() and have not been restored correctly. This leads the link's L1.2 between PCIe Root Port and child device gets wrong configs. Here is a failed example on ASUS B1400CEAE with enabled VMD. Both PCIe bridge and NVMe device should have the same LTR1.2_Threshold value. However, they are configured as different values in this case: 10000:e0:06.0 PCI bridge [0604]: Intel Corporation 11th Gen Core Processor PCIe Controller [8086:9a09] (rev 01) (prog-if 00 [Normal decode]) ... Capabilities: [200 v1] L1 PM Substates L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_L1.2+ ASPM_L1.1+ L1_PM_Substates+ PortCommonModeRestoreTime=45us PortTPowerOnTime=50us L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- T_CommonMode=0us LTR1.2_Threshold=0ns L1SubCtl2: T_PwrOn=0us 10000:e1:00.0 Non-Volatile memory controller [0108]: Sandisk Corp WD Blue SN550 NVMe SSD [15b7:5009] (rev 01) (prog-if 02 [NVM Express]) ... Capabilities: [900 v1] L1 PM Substates L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- L1_PM_Substates+ PortCommonModeRestoreTime=32us PortTPowerOnTime=10us L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- T_CommonMode=0us LTR1.2_Threshold=101376ns L1SubCtl2: T_PwrOn=50us Here is VMD mapped PCI device tree: -+-[0000:00]-+-00.0 Intel Corporation Device 9a04 | ... \-[10000:e0]-+-06.0-[e1]----00.0 Sandisk Corp WD Blue SN550 NVMe SSD \-17.0 Intel Corporation Tiger Lake-LP SATA Controller When pci_reset_bus() resets the bus [e1] of the NVMe, it only saves and restores NVMe's state before and after reset. Because bus [e1] has only one device: 10000:e1:00.0 NVMe. The PCIe bridge is missed. However, when it restores the NVMe's state, it also restores the ASPM L1SS between the PCIe bridge and the NVMe by pci_restore_aspm_l1ss_state(). The NVMe's L1SS is restored correctly. But, the PCIe bridge's L1SS is restored with the wrong value 0x0 [1]. Because, the parent device (PCIe bridge)'s L1SS is not saved by pci_save_aspm_l1ss_state() before reset. That is why pci_restore_aspm_l1ss_state() gets the parent device (PCIe bridge)'s saved state capability data and restores L1SS with value 0. So, if the PCI device has a parent, make pci_save_aspm_l1ss_state() save the parent's L1SS configuration, too. This is symmetric on pci_restore_aspm_l1ss_state(). [1]: https://lore.kernel.org/linux-pci/CAPpJ_eexU0gCHMbXw_z924WxXw0+B6SdS4eG9oGpEX1wmnMLkQ@mail.gmail.com/ Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan --- v9: - Drop the v8 fix about drivers/pci/pcie/aspm.c. Use this in VMD instead. v10: - Drop the v9 fix about drivers/pci/controller/vmd.c - Fix in PCIe ASPM to make it symmetric between pci_save_aspm_l1ss_state() and pci_restore_aspm_l1ss_state() drivers/pci/pcie/aspm.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index bd0a8a05647e..823aaf813978 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -81,24 +81,47 @@ void pci_configure_aspm_l1ss(struct pci_dev *pdev) void pci_save_aspm_l1ss_state(struct pci_dev *pdev) { - struct pci_cap_saved_state *save_state; - u16 l1ss = pdev->l1ss; + struct pci_cap_saved_state *pl_save_state, *cl_save_state; + struct pci_dev *parent; u32 *cap; /* * Save L1 substate configuration. The ASPM L0s/L1 configuration * in PCI_EXP_LNKCTL_ASPMC is saved by pci_save_pcie_state(). */ - if (!l1ss) + if (!pdev->l1ss) return; - save_state = pci_find_saved_ext_cap(pdev, PCI_EXT_CAP_ID_L1SS); - if (!save_state) + cl_save_state = pci_find_saved_ext_cap(pdev, PCI_EXT_CAP_ID_L1SS); + if (!cl_save_state) return; - cap = &save_state->cap.data[0]; - pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL2, cap++); - pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, cap++); + cap = &cl_save_state->cap.data[0]; + pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL2, cap++); + pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL1, cap++); + + /* + * If here is a parent device and it has not saved state, save parent's + * L1 substate configuration, too. This is symmetric on + * pci_restore_aspm_l1ss_state(). + */ + if (!pdev->bus || !pdev->bus->self) + return; + + parent = pdev->bus->self; + if (!parent->l1ss) + return; + + pl_save_state = pci_find_saved_ext_cap(parent, PCI_EXT_CAP_ID_L1SS); + if (!pl_save_state) + return; + + if (parent->state_saved) + return; + + cap = &pl_save_state->cap.data[0]; + pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CTL2, cap++); + pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CTL1, cap++); } void pci_restore_aspm_l1ss_state(struct pci_dev *pdev)