From patchwork Fri Jul 19 07:55:31 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: 13736944 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (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 C88E654765 for ; Fri, 19 Jul 2024 07:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721375793; cv=none; b=itZ0P7wVkD+zLNHqFV7Ykmt8Cc51T7uGCklb6w4qt+E58VJs0z2fLsnxo8oqHf4JzghXEN4yvNhd+tFtvRXPoWpHAfMPobROrQ9VGu9vte3ygWy5G1va36q2mekcnD3dFTiW+kcc1HWDdgdi10sTHke4zDhy/mOfwHZeVcPFcD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721375793; c=relaxed/simple; bh=VVLI7EBeuyh7YB4ZWYo4aVqSu8I3Wae6ccX9RaRy7wo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SlXxO4bIs1OEUCcma/10VVuiTqu90VxsdgOk4fdUuXw0iPvBuXmX/UQQ+jqswryd03IRcI/b6vjxGKmjzkeXvZMRUuAuWpekqGmtp/tUh6l4LNcxtQSvYjx9KLXGJDd+nhiouf9WJY0qr8U1ZGxb667DV4B4pu9SH70/Cyt7HRk= 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=Rg8ukAKS; arc=none smtp.client-ip=209.85.166.180 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="Rg8ukAKS" Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3856b7be480so6399865ab.0 for ; Fri, 19 Jul 2024 00:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1721375790; x=1721980590; 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=9zkHaNFtXIQ/P4HLzQzvdxFcOV87v0OUt5zn/ONL6Gw=; b=Rg8ukAKS9ly1i/ZszdUIK5pRhGueH6PPe+ogOtylRNilh+2MzeVDnCAfr6f7U3g1Ds qNVbGiUrbWjdQTkgpi25fl3GB8HJsJ3cNe8m2P0+mgQsV1wFx/C7M22pgJCWlPpx82Fy G33AXk7TDt5NHW9f+Ca6UPZx7BW2XVEyNI5GZVaSFSxINo2ytdA7RxJIWx77I3YZpjP9 uDRFOV52Gcc2pTsOExKdovPRJebDsJ3iHVRIuhYnZNNZKv++a/Ve8RHuKw+NM4Wl9KuL xgQdrI5PFaq6WbPgIlrX6PnXgB06QGE3+E/GBDa2I4WDhvxe5MpeZ28Wtu8rC2CLuPSh bueQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721375790; x=1721980590; 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=9zkHaNFtXIQ/P4HLzQzvdxFcOV87v0OUt5zn/ONL6Gw=; b=agg/8NtnhQ4jWm13eVsnQnuvEW+wR218euV2LcR+DCYCWhnQ/05o0V//u2D5syAM/w vgjnhqBDPH96NrWqgNpNZGRqNwGERD5XUWS48QAFTkf+JzG0isSyb7GaDefd81QvigsT WRO6Acm6p6dxwk1C135b9GgrHiHxnFYMygWP4OYwXUqKpbuPQuWRKaGwJytGBprThp1l GIiwWAJLaF+NkOvSeNzYV9BR5k+HAsYNJu8NVjkNgvOudlQcILC+e1fmj41h0xewyShm 5hSV02YFVMojjPw76JCjudxppwJYQ5dM3+43tlSnKk2nfBul0zrfd+XG3YEucGApLIr5 x1Ew== X-Forwarded-Encrypted: i=1; AJvYcCUFsZVXF1LeDMQl63XcM4mEVwmCydE/QjPkIvUKLnoHF3ADD2GuAu4kjCp7FmQ44TmvlJGqgHcKjf9ILg3uqVyaUzLf9sa0ZCQM X-Gm-Message-State: AOJu0YxxrsOtaYIoOnQy45r4GzNhcw7VlbWHR8xOJfGIjxILuE+yuaNK zH/0taZ2Guavq5ZNItGlLStXRWGf/MA6xa84uxTCpW9LcnH0Gw7rUIWgQSwPuWk= X-Google-Smtp-Source: AGHT+IE0wORkD6pr4U4z9t7gs611kg67MGiYa52JMh5ONOt3fIFRWAhH+wStlHElGCaFj5DbYOXlXA== X-Received: by 2002:a92:cda8:0:b0:375:9dd4:d693 with SMTP id e9e14a558f8ab-395553328c2mr95714975ab.3.1721375789914; Fri, 19 Jul 2024 00:56:29 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-70cff4914b2sm675676b3a.33.2024.07.19.00.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 00:56:29 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Mika Westerberg , Damien Le Moal , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH v8 1/4] PCI: vmd: Set PCI devices to D0 before enable PCI PM's L1 substates Date: Fri, 19 Jul 2024 15:55:31 +0800 Message-ID: <20240719075530.10852-2-jhp@endlessos.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240719075200.10717-2-jhp@endlessos.org> References: <20240719075200.10717-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=0ns L1SubCtl2: T_PwrOn=10us 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 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 a726de0af011..d021129d661c 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -751,11 +751,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 @@ -763,7 +761,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 @@ -775,6 +773,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 Jul 19 07:57:54 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: 13736947 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 44DF754765 for ; Fri, 19 Jul 2024 07:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721375967; cv=none; b=h4gF4VC8fKiD2RB6kpodsRVhTPd4za1w0i0q+gZf+qJDlG8Px9/ni9+G67CJfD0l5PxxS4RTzCECGoT+rBjJ+bKIA+Fh6YWPaGiJtYl3r5Hku06hZUo728+0YoyS1EiIl4VQ2xJBQhcbjWgMHwq0FYPhSqgEYoJssoTyw5vQE/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721375967; c=relaxed/simple; bh=dG95QewEG8mN5e80OJowMbRNCEU8UUwID07dkXmIk7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UuhC62Zf2Kb172Kwana0Qtpksl9/bYhyzBO4wypDTbrqkO9wHNdBEPLs7NLoqSDglZeJRVz32BFDUzrZ/jyOcShAejk5fNzgUmyYr9166hZUzF2BwwKGi0U4eE1YpdLhqINmgvZDcx734LVCvgj4qTBm243dOY4JRYM5mBEZw3k= 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=XuT+Zi/c; arc=none smtp.client-ip=209.85.216.43 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="XuT+Zi/c" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2cb50bcabd1so775233a91.2 for ; Fri, 19 Jul 2024 00:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1721375964; x=1721980764; 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=VDVxrTlyCYmX4gNYVSGtw5JAwr1I2e12lJyeUPu4kzA=; b=XuT+Zi/cLpndpMZ2iySVTEU3bPXCaEJtuxNmJjnW5abmjg7fQFnMmNorS1wEUjAL8H UbEh5k2STottJzn6MxgrJgAoz2SyfGm1iZyrufPsSzvQvV+b1rAWa0Sm4hCXo07OHLyk A0uYdebLJWP7GX4+7B6iL1ngcqJd6OZZUwVKv+mRbGd6SjPvMU+18502PZ88OfwSvlcD 71ErcaUnVLRDjI8cm0Ao6Jph0z3IFRkjZ5Y/4xJKi16ng/h72ORMkXenGH0CR2UGD1Sd QRMHYW2oUwHCkKMFnVwhJ7OmNVyA5ADgQ+pQmCahkddN3s8mn1/R/wc0hL65zb4wOwqx D0AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721375964; x=1721980764; 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=VDVxrTlyCYmX4gNYVSGtw5JAwr1I2e12lJyeUPu4kzA=; b=Ti2cDQIsAx9YAeWsO/E1vw8N1iDox9uLCvp8fQBshOZ/i8hkpsFC6TXVEZTYVIN0Lg Vsni9xwI8AVPfY28Bu9YOhBdyq8MMCWfGwJVI5IkkVLHVE5pV1Uoo0TJgwPpaxPGQdHs Txb1QROS9Hy/mb9NhMrjuAO4fdx9Oznngh0P/P6yjKvfoM3FaK9VQG4GqgeFcLBJILba 5onsGXJrjW27lNlrmjtuaYsJXSXSG+Bs/yctdGpGubcpuagSj2r4sxSyVcYUnvKoa0G/ ODuuNiFidU7rUhHO8UECokyoTwUTyYQpXaT9/cjhpdWazq09UOhQ9XD6CmZoyHl/8NS6 5V8A== X-Forwarded-Encrypted: i=1; AJvYcCVbFXTtFOZrR/DbM5Y1HBAdf3h4UCNXhXuVZ2W1+olwZj8f8SrHQXN5F799Der06Di52iw5m+xFyfE2T3gkBgPH9rfV06ivU3E8 X-Gm-Message-State: AOJu0YwyeGd7a1pGyT0rQFWdECJzkZzym0bL+YN0YZXtGrCmMw83tJHz 9VAj7DVe1YJq/1rZ4SODBqUkXUzyuMFagbRw/APRM3YEtR363evXV+4pxLHayuE= X-Google-Smtp-Source: AGHT+IHT+6quf4rYKsrBUnn6NfLGKfmvUAKKbfARVQXy1NR/Ekq0ZjIfo2ufGSrvu2kO1esvs/I7NA== X-Received: by 2002:a17:90a:d181:b0:2c9:7fba:d890 with SMTP id 98e67ed59e1d1-2cb5294bf43mr5302138a91.43.1721375964348; Fri, 19 Jul 2024 00:59:24 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2cb7750674csm2058112a91.43.2024.07.19.00.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 00:59:24 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Mika Westerberg , Damien Le Moal , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan , Bjorn Helgaas Subject: [PATCH v8 2/4] PCI/ASPM: Add notes about enabling PCI-PM L1SS to pci_enable_link_state(_locked) Date: Fri, 19 Jul 2024 15:57:54 +0800 Message-ID: <20240719075752.10883-3-jhp@endlessos.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240719075200.10717-2-jhp@endlessos.org> References: <20240719075200.10717-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~8: - 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 Jul 19 07:59:35 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: 13736948 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 487D269D31 for ; Fri, 19 Jul 2024 08:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721376057; cv=none; b=txhs2PcyPexnmFB2kiWGYu62KSCFCHVlObSqPPUlPQKiGHxMPgqonQ+f9+czTqZ6y0HBYeBnEzMIXrIMHPuVmenZH5Qjak1BgJjAk523vWYT/aRZwkE3iT/Md7w4WdS9y/18P5rAPpU20iguXgzi00zmKCcCwJJP97Hc/kzMGC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721376057; c=relaxed/simple; bh=w1k5K+jcQ9Q/ykVMsX/qJoDslBERO24AtB8r7OJuygc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ym+H/ujxinh0w6NGPWNcW+Ye0xNARQGlknHxQ8HpNOBBpmy0WeSlgfSXf+H1B9PE+HwdGM+Qu6FR51ig8obyQYyyDiwmgyNYQwzwHFmBCQF/830o3RIp2P/Zij2MJfdRStvuHOWqvCol5758FPjyl3k6QRnvAa/jCXHptA2o0ug= 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=fe5nq4Qm; arc=none smtp.client-ip=209.85.214.174 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="fe5nq4Qm" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1fbc09ef46aso15093225ad.3 for ; Fri, 19 Jul 2024 01:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1721376055; x=1721980855; 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=xLDFsfKJCWA+fTu6bBjMm9nM8Y4NH8EbtQ02Y3aYHlI=; b=fe5nq4Qm99qD+jby4LK8KDExHNsBpPpG6SVBr5xt7oYJvN7b2YDnl2iylaV7XaWZQX NRMg+3flMjD45Rk7sb63dBFS8i4fTeUAoVyodeqqrPU3LeVIoDgDQsODUAD88bcXVWQd M/B4DAV27zrILp8XjwhZ5h/DBPrKsi+j8VSf1VwRE9Wpsv1xDv3CGFDVqJORHtPMPZ0c G9GkzP1kuWY2HkWzoBoHN1YuFeQOr0phdIU17U4hHaCkae2RIdhtXOV8+PdesuGs/ymX 7h4koL6ilMVZ4D+aEUrFjKC770s7+dNuDXSVGqBhgvbCcFsijm4M9HRTX7y/v8R4IPx2 JTbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721376055; x=1721980855; 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=xLDFsfKJCWA+fTu6bBjMm9nM8Y4NH8EbtQ02Y3aYHlI=; b=Sel/PbhF6dnm+2SVPqpRKfmudkiOPDHvhWqdP6DYszbd+jXn4tJ7kUjp7NMZ+IWMf4 Hx3Zw2CfQYYI6VArqlpd/xfOhKZsmDwPpoJzLWgXeHla6vK9GihPks3uWFlCFn8Ge+oB kmGkJveQ+hWNw4TCDxvQVlO0ALSiBVT79vMRaf/dng/YZYBFY9OirXFDhmr6SGzBaaaW /d9G+VT0SxhbkjURpHv/HI856UzCuPoaX/f5/aF8hrq+RzLlkoFDoy28mYZtWuYJp2NM R+2eWHkgxH1Ro0ZUbHDPmbriJaxn5agv0GvT5x+gzJ0vnAudv7P7gGiLsDM0zqQktpYG pXww== X-Forwarded-Encrypted: i=1; AJvYcCUcyLK6SFpd7MS4AtyCo/f5SNdh6vUH3/z+Nor7gly7up8SCdOaF2yu8pmRwcgxmsjJWLLvoAtymdNnWVWYlrBBkFbGwrMuotKD X-Gm-Message-State: AOJu0YxNBUoCDPk7gCs+k0nviR+HgIv/oM3wNQ3sumotgAAVIjM/AImZ p+wrNb6grb3FWWe43JdU34fKWuWJa8FPm2yy33nNQYAU4yHH9bXCOJTyTZjZOt8= X-Google-Smtp-Source: AGHT+IHWV9JAlT/QGF5Yig86nrNCGmsxqCwu1UVWib6rPn8P85SqUNSnDoKPxgrwWBLSh0X3fR1cSg== X-Received: by 2002:a17:902:c40b:b0:1fb:72b4:8775 with SMTP id d9443c01a7336-1fc4e56b617mr53354115ad.40.1721376055315; Fri, 19 Jul 2024 01:00:55 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1fd64d07ad9sm8178055ad.177.2024.07.19.01.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 01:00:54 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Mika Westerberg , Damien Le Moal , Nirmal Patel , Jonathan Derrick , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH v8 3/4] PCI/ASPM: Introduce aspm_get_l1ss_cap() Date: Fri, 19 Jul 2024 15:59:35 +0800 Message-ID: <20240719075934.10950-2-jhp@endlessos.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240719075200.10717-2-jhp@endlessos.org> References: <20240719075200.10717-2-jhp@endlessos.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce aspm_get_l1ss_cap() which is extracted from aspm_l1ss_init() to get the PCIe's L1SS capability. This does not change any behavior, but aspm_get_l1ss_cap() can be reused later. Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan Reviewed-by: David E. Box --- v6: - Skipped v7: - Pick back v8: - The same drivers/pci/pcie/aspm.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index bd0a8a05647e..5db1044c9895 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -611,6 +611,18 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint) } } +static u32 aspm_get_l1ss_cap(struct pci_dev *pdev) +{ + u32 l1ss_cap; + + pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CAP, &l1ss_cap); + + if (!(l1ss_cap & PCI_L1SS_CAP_L1_PM_SS)) + l1ss_cap = 0; + + return l1ss_cap; +} + /* Calculate L1.2 PM substate timing parameters */ static void aspm_calc_l12_info(struct pcie_link_state *link, u32 parent_l1ss_cap, u32 child_l1ss_cap) @@ -721,15 +733,8 @@ static void aspm_l1ss_init(struct pcie_link_state *link) return; /* Setup L1 substate */ - pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CAP, - &parent_l1ss_cap); - pci_read_config_dword(child, child->l1ss + PCI_L1SS_CAP, - &child_l1ss_cap); - - if (!(parent_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS)) - parent_l1ss_cap = 0; - if (!(child_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS)) - child_l1ss_cap = 0; + parent_l1ss_cap = aspm_get_l1ss_cap(parent); + child_l1ss_cap = aspm_get_l1ss_cap(child); /* * If we don't have LTR for the entire path from the Root Complex From patchwork Fri Jul 19 08:02:56 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: 13736949 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 C9A9E482ED for ; Fri, 19 Jul 2024 08:04:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721376254; cv=none; b=kCz0lOgWefd5A/LtimE7wh2qHdajcO7KNeSKGOl5YEqYZd+JJWoaOSurS3Hm3ikClkuvHzx7sSBX8fo6aMw+HbTFHCHkgTToeuZ2XNEiMbI0SzJs5mk3021GpGfiEt92wqUSGAv5KHjgMGYiZT8L28XfB8HM+iDSsmRZorqowyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721376254; c=relaxed/simple; bh=jTRf7xZ3ujh53lj7xh+rpGBs5RvvdwAlNUcJwKLpMmQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b0A1JY9af5z5k9WRyhyeXvLialgM4YgfkFmoqCeJn8hPn2gRz59tVDmxJbxSCgcUiPZoRCEydBLuMZIhJ1XQlVW6XLlp4QAaaxL4SVcxhEq416zujmhbT3FafG1fJIPbmyUjGlt+adO4Ii75qvlP0ewuNNQzTA2bJAj+tbIn9E4= 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=af0l+luh; arc=none smtp.client-ip=209.85.214.176 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="af0l+luh" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1fc6a017abdso9472055ad.0 for ; Fri, 19 Jul 2024 01:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1721376252; x=1721981052; 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=uY5/vXX2UA8wdmQpH2tTJS3cs9Ik563y6vUWoxRDgb4=; b=af0l+luhk+QmrUlBVOekk1yYjiAj9by+5qT/ce0KboCVhtWpMDxm2vlY/ByeQAXfPq 5pxrlmpLLd33/8bqCn5IltKWC+Sa280OpjHtaL8559Xn23t8le0p4lBGqr9QnLkQyNm8 4lWSSDanZlG9ZDOSW3KO9nBIRLE779v9Wxi6Mgc2AM4HfLDVz9zkhkCYTcVbMVZdREh+ rCKydihXlWwkOd0gxnnKrKK+CKOKNtzDSkwJewaYByPoJGIDKhu1Vq/BxHJhjdKR0/Gc OloRQkRgP/bAuTT5QYRoBSjDa1GWYt7AUEiHxUNEPSMXWkgTKX1GcWeiV1APCA/fMwT4 Symw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721376252; x=1721981052; 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=uY5/vXX2UA8wdmQpH2tTJS3cs9Ik563y6vUWoxRDgb4=; b=JyskfwbwwS4XZuVrDNqEXW8IAHZTUQDbShW29iTIoNksob9IUNfwWXgsMZoIoECYQL eutI6ztVCBAgq01qhp+YjHL99XrcuQcAr49NfYprOLR3rXtyuJSNmx3BwmrdPe9s0og7 zYQC5P9MzpXVf9JVX+qVIdxbd+4/4ydCFtnNKmN08NiPj1QXpZesCUVjP3X+3B+8YQMg ZGE5zvT8i/IxtplzzsQ8qJp/RLObD2dvRl9hkhiaDDWtidN7IVI+DIug3jFXp5oox8S9 dEgffBLfq3wjDkLNmBpxI+qld6Wyh23Tpq9x3jI9erU7fS/wwa1HcNRTehIgXdozz0Wi DKmg== X-Forwarded-Encrypted: i=1; AJvYcCW5G9NHG/G8j5ZibZW4wXWi+ZQ6v1DkzegqZ8rkhWgVVTfEk5EpcO9pkp/rUdOGpRn9EQhGiCjCpFUlcyP/B/7nf19BD7XP0yVo X-Gm-Message-State: AOJu0YwR4pJ98SLSI/5lTnEmgrautiEYSwzZA8UyO8G2r0Bqd50BltMK HQMn6u8mPdxNxGpKXtHI46T36QBAgLVY5xaQUzxujb+D6pRRpjIw43kEekNby2Y= X-Google-Smtp-Source: AGHT+IFCGZ0EyKLoSp8zm5CM41G3ClPJ/b1OF2cL9FgGrTsPn5xM7KvYEBALJOfUsG655oWGIzuVhA== X-Received: by 2002:a17:902:ea04:b0:1fb:9a83:4496 with SMTP id d9443c01a7336-1fc4e11f2e5mr63727195ad.2.1721376251496; Fri, 19 Jul 2024 01:04:11 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1fd64b5112csm8263615ad.1.2024.07.19.01.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jul 2024 01:04:11 -0700 (PDT) From: Jian-Hong Pan To: Bjorn Helgaas Cc: Johan Hovold , David Box , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Kuppuswamy Sathyanarayanan , Mika Westerberg , Damien Le Moal , Nirmal Patel , Jonathan Derrick , Paul M Stillwell Jr , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH v8 4/4] PCI/ASPM: Fix L1.2 parameters when enable link state Date: Fri, 19 Jul 2024 16:02:56 +0800 Message-ID: <20240719080255.10998-2-jhp@endlessos.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240719075200.10717-2-jhp@endlessos.org> References: <20240719075200.10717-2-jhp@endlessos.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently, when enable link's L1.2 features with __pci_enable_link_state(), it configs the link directly without ensuring related L1.2 parameters, such as T_POWER_ON, Common_Mode_Restore_Time, and LTR_L1.2_THRESHOLD have been programmed. This leads the link's L1.2 between PCIe Root Port and child device gets wrong configs when a caller tries to enabled it. Here is a failed example on ASUS B1400CEAE with enabled VMD: 10000:e0:06.0 PCI bridge: Intel Corporation 11th Gen Core Processor PCIe Controller (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=45us LTR1.2_Threshold=101376ns L1SubCtl2: T_PwrOn=50us 10000:e1:00.0 Non-Volatile memory controller: Sandisk Corp WD Blue SN550 NVMe SSD (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=0ns L1SubCtl2: T_PwrOn=10us According to "PCIe r6.0, sec 5.5.4", before enabling ASPM L1.2 on the PCIe Root Port and the child NVMe, they should be programmed with the same LTR1.2_Threshold value. However, they have different values in this case. Invoke aspm_calc_l12_info() to program the L1.2 parameters properly before enable L1.2 bits of L1 PM Substates Control Register in __pci_enable_link_state(). Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan --- v2: - Prepare the PCIe LTR parameters before enable L1 Substates v3: - Only enable supported features for the L1 Substates part v4: - Focus on fixing L1.2 parameters, instead of re-initializing whole L1SS v5: - Fix typo and commit message - Split introducing aspm_get_l1ss_cap() to "PCI/ASPM: Introduce aspm_get_l1ss_cap()" v6: - Skipped v7: - Pick back and rebase on the new version kernel - Drop the link state flag check. And, always config link state's timing parameters v8: - Because pcie_aspm_get_link() might return the link as NULL, move getting the link's parent and child devices after check the link is not NULL. This avoids NULL memory access. drivers/pci/pcie/aspm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 5db1044c9895..55ff1d26fcea 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1411,9 +1411,15 @@ EXPORT_SYMBOL(pci_disable_link_state); static int __pci_enable_link_state(struct pci_dev *pdev, int state, bool locked) { struct pcie_link_state *link = pcie_aspm_get_link(pdev); + u32 parent_l1ss_cap, child_l1ss_cap; + struct pci_dev *parent, *child; if (!link) return -EINVAL; + + parent = link->pdev; + child = link->downstream; + /* * A driver requested that ASPM be enabled on this device, but * if we don't have permission to manage ASPM (e.g., on ACPI @@ -1428,6 +1434,15 @@ static int __pci_enable_link_state(struct pci_dev *pdev, int state, bool locked) if (!locked) down_read(&pci_bus_sem); mutex_lock(&aspm_lock); + /* + * Ensure L1.2 parameters: Common_Mode_Restore_Times, T_POWER_ON and + * LTR_L1.2_THRESHOLD are programmed properly before enable bits for + * L1.2, per PCIe r6.0, sec 5.5.4. + */ + parent_l1ss_cap = aspm_get_l1ss_cap(parent); + child_l1ss_cap = aspm_get_l1ss_cap(child); + aspm_calc_l12_info(link, parent_l1ss_cap, child_l1ss_cap); + link->aspm_default = pci_calc_aspm_enable_mask(state); pcie_config_aspm_link(link, policy_to_aspm_state(link));