From patchwork Wed Apr 24 10:59:10 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: 13641722 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.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 0498B15A4A4 for ; Wed, 24 Apr 2024 10:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956384; cv=none; b=nNC91mpyN7L8+1O3EJsublzMVoXCODrcEToj2Lu3sORAQHGvJaocE48qSho81/5JhkUX9MciBVNj0wbAXx8AF+/BuHy3gOrwdx2FDMV+BsvUUgjtU4z5btVsjJEz89ZqQzTlPcti0Je8bJmBa2NmD62+lSICW7288+oMtMzWeDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956384; c=relaxed/simple; bh=gslVWRhVguZAeE5MA5pJRksuEbRpbMCUE2vEnzXXAq8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FPBnPJFaQ7IGR712zAxDJAYuFhD66n1dg1h5iPMA7kT8+h1SACqKwRJHmsJkPbv7j2tBQY45n81DAy1PQ+G8irVa6c6LyvbWMIM1ld25YY3OgGto8ofZsnHdfHN9U1HjItUOV+0tWNiXPptl2JXGnhYhzIEjQg3iHKs+YVuK9Jc= 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=qW/1ln0I; arc=none smtp.client-ip=209.85.210.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="qW/1ln0I" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6eb797e10ceso3901007a34.1 for ; Wed, 24 Apr 2024 03:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1713956381; x=1714561181; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pZHK37+yvrDhIe6YElNn+NVZ9zPGe92/KcA9bWwPrXs=; b=qW/1ln0IUQN1BpZvLlfZXT3nNHV+zXRhjs+LYg9M9KY1adAU0/gXVec4MD416pHw4P KPgPFWsqyRiEAYcb2HWveIi+xaihcdFcjwPMrda9BIiXXVAl+QtZyIHlwjwYNWoemDUz NYvDn/G/xnshH1KUwkZ/DOinLd8/UygkcmYDu1+ycGXZGFuOufLELhWlami4uWkyy3TN YBtUtUs4tMaeQfwTkPFA4C50lw3l+dDR4OWmy558cJU5WyS6nB0+EchkQQcAYbRHdaQo JirXMDIULA4WnYYRo5kISpOUfFKzPEDMec+ikqIn4eadfrFyDcCoQ5b1QPOYx9Mo7WRz M00g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713956381; x=1714561181; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pZHK37+yvrDhIe6YElNn+NVZ9zPGe92/KcA9bWwPrXs=; b=YWkrgKzQOz/qoBCzTPDn3Is8n/MwW7xHlamGE2DKAiWX+vkJGUyPT7m+v64K97x2h9 EBsvh1rTaSF5si2IH5A/DPFKSoUTI2wwyLm4k3QjmxQj79vG+DZ5yzUlzcXRxGc5KlCr 1qQCfuv+jLeGkJkx3sM/AjshVMKnwojU1iSRPfUoWQgTdu+6EjK9ShCDKfSnx1euVE+M 9vGT+l4L5X1RzTEFfI3pPQy2c6oagslz+fK7UwQhjkATduz5cPKgytCuHWlqPjCGEmlw KazMSV+PGz1eAxZ+guEalJtdCAy6ttfNGDQyXK7g4CHDyVBldXXeLxPQboJl9hrTK2Jd VLuw== X-Forwarded-Encrypted: i=1; AJvYcCWzJrDbFYDql7gs4crhEbu+z3eFM8Pg2oX943fC7ftS1H2U/NMjX9mdFLKr2EApeonrZ+f1K7Xrw9odpJTFEu4ixBkDQKlsgJRv X-Gm-Message-State: AOJu0YwiRnANQgodb73pjl0LVcIBNUt6T3ebTAq1QNn81llQeaarwqrh HRpchncP3GR5AhWQ5uqHHoomNyUqX7ey85cXR+XoHq75BHA5gazD5bkpb22qoVg= X-Google-Smtp-Source: AGHT+IEpIS8FDcxzJZdXXPMUscLvqoePXQ0fFeAJ0ZikHn9/nTXolLKov94VE4RkDi6zFrIFthNvVw== X-Received: by 2002:a05:6830:10d0:b0:6eb:8068:914f with SMTP id z16-20020a05683010d000b006eb8068914fmr2217974oto.37.1713956380393; Wed, 24 Apr 2024 03:59:40 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id t20-20020a63b254000000b0060069828aeasm4824104pgo.23.2024.04.24.03.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 03:59:40 -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, Jian-Hong Pan Subject: [PATCH v5 1/4] PCI: vmd: Set PCI devices to D0 before enable PCI PM's L1 substates Date: Wed, 24 Apr 2024 18:59:10 +0800 Message-ID: <20240424105909.21713-2-jhp@endlessos.org> X-Mailer: git-send-email 2.44.0 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 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 87b7856f375a..5309afbe31f9 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 Wed Apr 24 10:59:47 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: 13641738 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 64BC81598FA for ; Wed, 24 Apr 2024 11:00:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956444; cv=none; b=elvPVoDmYS39Od+RW4AYknZyaPtX/gm4IfPDceVioKwOySBSwf9ufGg2Nj33z0xqel0HE+o28KpnWy44T08mHd8r7Hul6YVPb+Vf80lvcclq1ZjHoJeh3qDhAEMKy4tvhLjZs51OZZQczfNNYHD3SARFaPVoHyL8bn+0ta55FZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956444; c=relaxed/simple; bh=xrj+BsF3R/sU6CJ4lWDL94edEEUWp9h51Ook+sFDQOE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bWNaqLQEVoP89Mc0RqtDOI5VBjbbnLs9fmR8/tJP/Wzh6J4lXVH8kSv2E+1otId1Y3r17Lhy+WVkmjyFlV0WYcBP4g2vYIPSn0uqo3mii/ztmATTlnblOHW5gwGQQ08w4U6r/ysNjSOc3YoLCqLDXj9uq8nN/r19/5q2R+C9B3Y= 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=qOfV8VGR; arc=none smtp.client-ip=209.85.216.51 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="qOfV8VGR" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2a68a2b3747so4439788a91.3 for ; Wed, 24 Apr 2024 04:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1713956442; x=1714561242; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=H7v2jzS11FgSVo8HqrZdhIYDLTe97Dot+RPP6pZ20bU=; b=qOfV8VGRhnsSRuLqymRxRvSRF9JBRKKai83ZOWi6yBJkpRX9xxKwThL5T40m2+7QS7 WgSAONpXZYElx8BZaUvYzZgd3A+tPI/BmVbrLSdLrkJf6Mpdh5AJ/Es/glEOK7UH+hWg 1tD3lNpWJnYZEaI7g7d9xNo4DIudjc9Z60egvxsbmoM9cL5Cn3y29SUKGALzfpsK/G3u 6aFoS4DjiEYBTht2KUU39JWolqJ3i+YijtfjOLYm0qhNEMCKV9PkboNlZTNq9EhKxvQF W5CgWJbitody8xXKT9KEZKNZmGMB/88CEhNHtOlgb6U35/aJNPWEyPXDjzfvTv3zSdTy zBNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713956442; x=1714561242; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H7v2jzS11FgSVo8HqrZdhIYDLTe97Dot+RPP6pZ20bU=; b=f6h8J8hxJvxpVUuZs6llI1JWWZnONkwvUgCC1RwH5jJM3Wksgj832vA+mCHEDuh1H3 OyoGwGE99VeIpYCtLj9llymL7Z2ICmme9JEWzmPDJXspoh6qpzbaX/5yURR85ZKDBJpl L3gQA0JSAkWkTHOay4vM85s2JZ69fF203Ei/nqZ20goHLjln3AS4wZh4fUsGLCbkRD5M T3v2FYweXPX5ECzx4F4AWn5CknOlOA5JmEuwLKdiMVpWomeIBoqzWs9RVSETNUXlkpKU gX1vtY3mDqojOIOdNBBwKfeBnZzXUMlbV1Q9kkJ07Qs/WG246cB/sjbO3e0YNQ9ET86j SOmw== X-Forwarded-Encrypted: i=1; AJvYcCXRPF/h4dPUoMh6hEqWXxpW+LgoXwQAdH09qTDwn881hnFJrKyBA/Y5QEBurf+ox0EAizOADzyxkao/icWYCbVIboc2Pya9VZIq X-Gm-Message-State: AOJu0YxOrGF45zbjxhT1iujboS0bP4ls/GyqcxO/KPaxVVxYYHdcE9K8 Zwywu/vMH80Ek02Kp3+d5omIrXfwcIQDyD3JAxnJZo9Eu6uXUM/e65m5N+39xaelJABxu9LLalS 6 X-Google-Smtp-Source: AGHT+IF3QOpQA86HvZTp/W3Psv4CsVXJik+tr2sCT7EyCcIzJbipu2+EoOeiHR34l4PN7lpni/UlSA== X-Received: by 2002:a17:90b:1e0a:b0:2ae:e1e0:3d8f with SMTP id pg10-20020a17090b1e0a00b002aee1e03d8fmr1746429pjb.2.1713956441679; Wed, 24 Apr 2024 04:00:41 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id 65-20020a17090a09c700b002a5d20778ebsm13786899pjo.32.2024.04.24.04.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 04:00:41 -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, Jian-Hong Pan , Bjorn Helgaas Subject: [PATCH v5 2/4] PCI/ASPM: Add notes about enabling PCI-PM L1SS to pci_enable_link_state(_locked) Date: Wed, 24 Apr 2024 18:59:47 +0800 Message-ID: <20240424105946.21735-2-jhp@endlessos.org> X-Mailer: git-send-email 2.44.0 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 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 2428d278e015..91a8b35b1ae2 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1446,6 +1446,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 */ @@ -1462,6 +1465,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 Wed Apr 24 11:00:48 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: 13641739 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 F18A41598FF for ; Wed, 24 Apr 2024 11:02:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956528; cv=none; b=YOnnMgeeQCWIE4Wenc3ciaXH5ouwZphhMGyTKbcZ1Z62HgCYowIrBFXap59R3EEZxVZH9DCuuaYwb4hTdE9j7fNKxuQd0SbGXKPyaTqE2ovIw6pHBLUk0CuPz2xibDo6pqYSUBPXZxknbA1PCJubaE6/e2Ggr34c6/LJPLcwz/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956528; c=relaxed/simple; bh=2jKIjdLV7lftx+xiDBEvy7i/MFRg4Wb2datzsreIZFw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZiPgctZjmMJxY/3DUGc0/CBSWLcGwSpdP74JNW669ZeKjk14PVeV/3zxXCekAXkBO3aFWLEzqnOK1/EtUUHzyGA5tfwid2MeM8FBtW3WvCW49XeZrC/jbhZSYUoN9qfotjZW+Gv6qbgu8ujB+bEQclSomXgxM2WhCp5KDFlao2c= 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=Qjry9X9S; arc=none smtp.client-ip=209.85.215.178 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="Qjry9X9S" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5c66b093b86so623176a12.0 for ; Wed, 24 Apr 2024 04:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1713956526; x=1714561326; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UVuD14qd2v2GJpWMUKxJKGrbwwgi+TYXxSr/usBLCtM=; b=Qjry9X9S+WvNwQfxxgJ5jAjOYuWuZCXuTBgz8HFxuZzfFyOfoOB8QKY9AruVXXCIbc gdPonmkV7sO9AvDKKqza/JapMF6nrPnq2sf4y5zM4A9UDdHQXdpd9Jbl9tcE6wnhxV2Y lWWQfaNjZYdh3YNQqTpL2p2xW3oNVgN7QfBiz5NZFOONqTS3wYD4KSqob3ZhyFg7XdtG zBxtNbekjskRwFXRhPz0Rmh7/gwbPVJpnJNk1lrTnvIIg7gAucDeQUEbETViEi9EYnfK +vGB3coC4QqfY5uvUtWImGQgo+3Km/aGFmWL6/wNAo73CmQvBvfmVTpYDKaWsID2jeVq jVpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713956526; x=1714561326; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UVuD14qd2v2GJpWMUKxJKGrbwwgi+TYXxSr/usBLCtM=; b=LMUX0ZFhqGy/AdG/UeVxKCMqwzvIy7rG79lRh3QXb5Fm14D0qYQm8pAHBsGzcvN0IR 0nEM/eafDiOSmn+r0C5Rl5FEyWDwfFrm9O5h3mXxjQ1Rq5hATy+FrkAebBkef2NcrdIU AGWxV3GoawFyXjV75HvZGbaiv+GsaDnyhYsJ1vXwnh1rSa5d9TWqGL+kn/h1ydT/3KEm 4pCnrTwlchrrq4f//+VmSMSRg1irFF2p5xEO/UynTq2WeZGhymbvGT5d1mSnTjRV+R7i yNn9PYg3xLKWUyns7364M5HAr11Ue9s9rdiL3nDg7QzCdx1RwoIO4EAgaPzEjRHju1AA vsyg== X-Forwarded-Encrypted: i=1; AJvYcCWXQS21eM7G1QNlWwGsDYL9GBzi9KF/Qov3ac6RhCSs6eijL897HrCMOt2tOD+m6q8xnQZL6CAQmcAUtBC0MAKK6f0paO/O1jKV X-Gm-Message-State: AOJu0YwBlSC4pg9gKYpd7qCu64RIfzDDfxmLYhFTPeCZ+4VXd/Mux5A1 C73TdB4hu0BNzrZGnNpYSda0krwmmkwCRFci+OFlSbCaYt0NP3nQeaJaNkGWk0I= X-Google-Smtp-Source: AGHT+IHGwVsOxC3KDLv+3r/1YnzNplxHumhenciI16CLN8PKLRoRBfKLbi53rsWsJbT33eWrnNUl+Q== X-Received: by 2002:a17:90a:5513:b0:2a5:be1a:6831 with SMTP id b19-20020a17090a551300b002a5be1a6831mr7456226pji.19.1713956526095; Wed, 24 Apr 2024 04:02:06 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id x5-20020a17090a388500b002a53b33afa3sm13990338pjb.8.2024.04.24.04.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 04:02:05 -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, Jian-Hong Pan Subject: [PATCH v5 3/4] PCI/ASPM: Introduce aspm_get_l1ss_cap() Date: Wed, 24 Apr 2024 19:00:48 +0800 Message-ID: <20240424110047.21766-2-jhp@endlessos.org> X-Mailer: git-send-email 2.44.0 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 --- 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 91a8b35b1ae2..c55ac11faa73 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -612,6 +612,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) @@ -722,15 +734,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 Wed Apr 24 11:02: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: 13641740 X-Patchwork-Delegate: bhelgaas@google.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 75B051428F9 for ; Wed, 24 Apr 2024 11:03:14 +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=1713956596; cv=none; b=nVlkJal51aUa7mbNUIOwB9TDsC/bj/aRBg1Yfoky6rVdfTJI8v5aZvebc08uGtGvuCSsk7TT5+pfeUTJpg/MpbK4vPaCyX3osCHNzEj/fsdzkEiG42g+EGkXmX6abJCICyQpm5Y3kUPWGxCyoDb3whrenNfjGdcZnPq+SYxh6ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713956596; c=relaxed/simple; bh=uV0/1aSVVcRIoF8efqTChlHildc7U8iR42Xo+0S+bPc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WP3aEdN5+NzCWXJsbWvDIXU07MoegS9Vp+eXS9PgsiV2/c/6r98/CSBOBCDjO+jaN3TkZsQER5TKJ97LscYqnc6kLK8hX8SFpaIqJf6t7CTSQ2rrQyue7jGRmWULc2S4Sg1iK6c4Fjr+0XKASqJHT3drEK1IJY5eahW7SPdZUas= 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=Ow7zLLXf; 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="Ow7zLLXf" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6f074520c8cso6426666b3a.0 for ; Wed, 24 Apr 2024 04:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1713956594; x=1714561394; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ViRbv3+94h9HjFBDUVRxRf1hCf57UQ+V86PhnGFbsxM=; b=Ow7zLLXfVVeT8oiGPskEQCGP3m190TxDiuU1G/wWEptygtCCmfvqa81TCUWDtWEGfq kaIrkyb9Epn30zeBIUPDg0h9AeKZrVqAyER5RqllvUEY9BOisIF6wCK/WzO/N5igpk2D SN7p9EWns0rFoUBohaiQzJi50Rg6akTJUexY07vE7Ct3Xe6SqCXHsCLXgi8+fJmIEywh WHvY4gEOApKCaBBqSmGi/Sql5ebGb9tqSU6ZbwA3Tqk7EXCJMG5tAP5PVFFpHtqDBX3F Ikgn8QhhhbAD2NAVC8fh+OtE1t82X+xFP3DZzFoRcDq4PisVSoPvyeM9V+Luo2onLhcz bn7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713956594; x=1714561394; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ViRbv3+94h9HjFBDUVRxRf1hCf57UQ+V86PhnGFbsxM=; b=f/aZxdKshTAOrYqyXKJ4Pi7xJf+4+RR7fVavP5bRNfjcQYbbYpRgFN13KiF32qnLsm GiJnQlNLpzq/7HjxNQywDbC0aAdqWhwYpzSrUaARbDL1mx7Jhf5sgO5atjIS1x/EOaVx S9wrA66mNWqKxZyz7YpLKD2oc7aezBjaNKSuwfm+mT6HG6oiRdLwjv9MiaEvtS1G3GGX wRDCmK5OdsHiU7NMqGTdOGCNBzjtue5mpLMU6/bBVomL4R3DOWbf+RcxYU285WEhPacK lT8F740ckDCJ26TlFZiiBK+k2biXmufFmbm5Vu1yBlR0PskGQStYiK6n/+x/95ZTTIZt IYpg== X-Forwarded-Encrypted: i=1; AJvYcCVghJ5ve03R4ivHS9tIC2Piukp4Bdv7QgcbKfwJCU5qPLvZA7wtzozToML7XiLNykj21FtmKnpRRfEN7CPy4ztCmL/r4/A0MIGL X-Gm-Message-State: AOJu0YwZgwrJnCcbTxRYvfHt7snmLYj1DowYA81XoN12DhKllV4TXtRu tfzsa45NkKExFAPc2CN9lrjg/jw5eRUdqSIBd3zGrjBcRD5Ey91PT/jHfIiwqPI= X-Google-Smtp-Source: AGHT+IExdGa5rGS/22T53uS80/g8TO4jGAJIp46+PqMsXAM1a+dNmdOR9XUe5M3Ut5BW90bUdVCchg== X-Received: by 2002:a05:6a20:6a0b:b0:1a7:aa08:16de with SMTP id p11-20020a056a206a0b00b001a7aa0816demr2218545pzk.40.1713956593648; Wed, 24 Apr 2024 04:03:13 -0700 (PDT) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id it4-20020a056a00458400b006e623639a80sm11592482pfb.19.2024.04.24.04.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 04:03:13 -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, Jian-Hong Pan Subject: [PATCH v5 4/4] PCI/ASPM: Fix L1.2 parameters when enable link state Date: Wed, 24 Apr 2024 19:02:24 +0800 Message-ID: <20240424110223.21799-2-jhp@endlessos.org> X-Mailer: git-send-email 2.44.0 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()" drivers/pci/pcie/aspm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index c55ac11faa73..553327dee991 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1402,6 +1402,8 @@ 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); + struct pci_dev *child = link->downstream, *parent = link->pdev; + u32 parent_l1ss_cap, child_l1ss_cap; if (!link) return -EINVAL; @@ -1433,6 +1435,16 @@ static int __pci_enable_link_state(struct pci_dev *pdev, int state, bool locked) link->aspm_default |= ASPM_STATE_L1_1_PCIPM | ASPM_STATE_L1; if (state & PCIE_LINK_STATE_L1_2_PCIPM) link->aspm_default |= ASPM_STATE_L1_2_PCIPM | ASPM_STATE_L1; + /* + * 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. + */ + if (state & link->aspm_capable & ASPM_STATE_L1_2_MASK) { + 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); + } pcie_config_aspm_link(link, policy_to_aspm_state(link)); link->clkpm_default = (state & PCIE_LINK_STATE_CLKPM) ? 1 : 0;