From patchwork Wed Oct 9 09:52:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 13828052 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 D975918B46B; Wed, 9 Oct 2024 09:52:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728467560; cv=none; b=OqiV1SvFM5JsWwo1zWJolWWA4XcgryH40y1qAAFbVlDrC5Qii0Ho7H6tYgpceBBUbLFVhTBKQWywVoY9Ks36ZAgNM8LwlhigZaWuLUrAcHr2FTwOct5dMJm1pqsZCmz3yXNwH2wR5AC1hi3RBYJfIvQjg4PIFK33jSMgTy1TPw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728467560; c=relaxed/simple; bh=geHunfX6QZzmLsx2j98ZMcQHKY8WmF9Mg8gFKGHgjgk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=BcoSn0q33FrOsHNl55Lgj1kqvhoRQkw8ZfmF/62FZr3mbkUNWl+qb3EeV4nkLgQV39REXIMMArxTRom5ZyJ2u1bDI+wVxbtBq2JiAvrbZ5XIFqMBQ2ar8fMJ/JKDJSoGOI1ObeON/pNN8asz8/qvpCdzOxSzuN/lY0JEVLGIV/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ThrFHGCu; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ThrFHGCu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728467558; x=1760003558; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=geHunfX6QZzmLsx2j98ZMcQHKY8WmF9Mg8gFKGHgjgk=; b=ThrFHGCuFVmth2d8/nxDVyFtGMu8Bm/Qv5niy/JmaS+mo502Y6O4Gpw7 RZsArPB/bV/kKlsMJ8TC7nhHejIIpxeNOd0mdMVDG1FfdBnXmZrBOI7i4 HvsHx5pDo05N17qwehWpIGA8XCZBDXhje4SqVDupGbU4cKxwyCJ1+LpvM Fo+AdJTqbjz6DI9FtF1up698ubYNHiMi+CbqyUoRNozpCHswSUlSw7hYY p5A2NvlfIkbI0L43PjIF3j6ORl5j4iu7sL+J9Bx6n2wDOH3maFNE0bCkq alUeArIrCs5b3mmhRf6V/P69AnacTHiOYCDoua/rL1pay55gNXL2TnFsS Q==; X-CSE-ConnectionGUID: zB3/myIcQmSZcpK/bDOr0w== X-CSE-MsgGUID: 5haxAc6CRaGTh5fhUsy6Xg== X-IronPort-AV: E=McAfee;i="6700,10204,11219"; a="38883077" X-IronPort-AV: E=Sophos;i="6.11,189,1725346800"; d="scan'208";a="38883077" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2024 02:52:38 -0700 X-CSE-ConnectionGUID: f1JQbH12S2S7aejojdpTyw== X-CSE-MsgGUID: ByyuQOGFSDm6SkdjrUxXKw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,189,1725346800"; d="scan'208";a="75865393" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.41]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2024 02:52:31 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , "Maciej W. Rozycki" , Jonathan Cameron , Lukas Wunner , Alexandru Gagniuc , Krishna chaitanya chundru , Srinivas Pandruvada , "Rafael J. Wysocki" , linux-pm@vger.kernel.org, Smita Koralahalli Cc: linux-kernel@vger.kernel.org, Daniel Lezcano , Amit Kucheria , Zhang Rui , Christophe JAILLET , =?utf-8?q?Ilpo_J=C3=A4r?= =?utf-8?q?vinen?= Subject: [PATCH v8 0/8] PCI: Add PCIe bandwidth controller Date: Wed, 9 Oct 2024 12:52:15 +0300 Message-Id: <20241009095223.7093-1-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, This series adds PCIe bandwidth controller (bwctrl) and associated PCIe cooling driver to the thermal core side for limiting PCIe Link Speed due to thermal reasons. PCIe bandwidth controller is a PCI express bus port service driver. A cooling device is created for each port the service driver finds to support changing speeds. This series only adds support for controlling PCIe Link Speed. Controlling PCIe Link Width might also be useful but there is no mechanism for that until PCIe 6.0 (L0p) so Link Width throttling is not added by this series. v8 makes bwctrl always enabled if PCIEPORTBUS is enabled (suggested by Rafael J. Wysocki in VFIO/IOMMU/PCI MC at Vienna). This avoid lots of complexity caused by the Kconfig variations. It also ensures the current Link Speed is kept updated if the Link Speed is changing due to reasons unrelated to the BW controller (a feature the mainline currently lacks entirely since the BW notifications revert). v8: - Removed CONFIG_PCIE_BWCTRL (use CONFIG_PCIEPORTBUS) - Removed locking wrappers that dealt with the CONFIG variations - Protect macro parameter with parenthesis to be on the safe side v7: - Rebased on top of Maciej's latest Target Speed quirk patches - Target Speed quirk runs very early, w/o ->subordinate existing yet. This required adapting logic: - Move Supported Link Speeds back to pci_dev - Check for ->subordinate == NULL where necessary - Cannot always take bwctrl's per port mutex (in pcie_bwctrl_data) - Cleaned up locking in pcie_set_target_speed() using wrappers - Allowed removing confusing __pcie_set_target_speed() - Fix building with CONFIG_PCI=n - Correct error check in pcie_lbms_seen() - Don't return error for an empty bus that remains at 2.5GT - Use rwsem to protect ->link_bwctrl setup and bwnotif enable - Clear LBMS in remove_board() - Adding export for pcie_get_supported_speeds() was unnecessary - Call bwctrl's init before hotplug. - Added local variable 'bus' into a few functions v6: - Removed unnecessary PCI_EXP_LNKCAP_SLS mask from PCIE_LNKCAP_SLS2SPEED() - Split error handling in pcie_bwnotif_irq_thread() - pci_info() -> pci_dbg() on bwctrl probe success path - Handle cooling device pointer -Exx codes in bwctrl probe - Reorder port->link_bwctrl setup / bwnotif enable for symmetry - Handle LBMS count == 0 in PCIe quirk by checking LBMS (avoids a race between quirk and bwctrl) - Use cleanup.h in PCIe cooling device's register v5: - Removed patches: LNKCTL2 RMW driver patches went in separately - Refactor pcie_update_link_speed() to read LNKSTA + add __ variant for hotplug that has LNKSTA value at hand - Make series fully compatible with the Target Speed quirk - LBMS counter added, quirk falls back to LBMS bit when bwctrl =n - Separate LBMS patch from set target speed patches - Always provide pcie_bwctrl_change_speed() even if bwctrl =n so drivers don't need to come up their own version (also required by the Target Speed quirk) - Remove devm_* (based on Lukas' comment on some other service driver patch) - Convert to use cleanup.h - Renamed functions/struct to have shorter names v4: - Merge Port's and Endpoint's Supported Link Speeds Vectors into supported_speeds in the struct pci_bus - Reuse pcie_get_speed_cap()'s code for pcie_get_supported_speeds() - Setup supported_speeds with PCI_EXP_LNKCAP2_SLS_2_5GB when no Endpoint exists - Squash revert + add bwctrl patches into one - Change to use threaded IRQ + IRQF_ONESHOT - Enable also LABIE / LABS - Convert Link Speed selection to use bit logic instead of loop - Allocate before requesting IRQ during probe - Use devm_*() - Use u8 for speed_conv array instead of u16 - Removed READ_ONCE() - Improve changelogs, comments, and Kconfig - Name functions slightly more consistently - Use bullet list for RMW protected registers in docs v3: - Correct hfi1 shortlog prefix - Improve error prints in hfi1 - Add L: linux-pci to the MAINTAINERS entry v2: - Adds LNKCTL2 to RMW safe list in Documentation/PCI/pciebus-howto.rst - Renamed cooling devices from PCIe_Port_* to PCIe_Port_Link_Speed_* in order to plan for possibility of adding Link Width cooling devices later on - Moved struct thermal_cooling_device declaration to the correct patch - Small tweaks to Kconfig texts - Series rebased to resolve conflict (in the selftest list) Ilpo Järvinen (8): PCI: Protect Link Control 2 Register with RMW locking PCI: Store all PCIe Supported Link Speeds PCI: Refactor pcie_update_link_speed() PCI/quirks: Abstract LBMS seen check into own function PCI/bwctrl: Re-add BW notification portdrv as PCIe BW controller PCI/bwctrl: Add API to set PCIe Link Speed thermal: Add PCIe cooling driver selftests/pcie_bwctrl: Create selftests Documentation/PCI/pciebus-howto.rst | 14 +- MAINTAINERS | 9 + drivers/pci/hotplug/pciehp_ctrl.c | 5 + drivers/pci/hotplug/pciehp_hpc.c | 2 +- drivers/pci/pci.c | 60 ++- drivers/pci/pci.h | 38 +- drivers/pci/pcie/Makefile | 2 +- drivers/pci/pcie/bwctrl.c | 358 ++++++++++++++++++ drivers/pci/pcie/portdrv.c | 9 +- drivers/pci/pcie/portdrv.h | 6 +- drivers/pci/probe.c | 15 +- drivers/pci/quirks.c | 32 +- drivers/thermal/Kconfig | 9 + drivers/thermal/Makefile | 2 + drivers/thermal/pcie_cooling.c | 80 ++++ include/linux/pci-bwctrl.h | 28 ++ include/linux/pci.h | 24 +- include/uapi/linux/pci_regs.h | 1 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/pcie_bwctrl/Makefile | 2 + .../pcie_bwctrl/set_pcie_cooling_state.sh | 122 ++++++ .../selftests/pcie_bwctrl/set_pcie_speed.sh | 67 ++++ 22 files changed, 832 insertions(+), 54 deletions(-) create mode 100644 drivers/pci/pcie/bwctrl.c create mode 100644 drivers/thermal/pcie_cooling.c create mode 100644 include/linux/pci-bwctrl.h create mode 100644 tools/testing/selftests/pcie_bwctrl/Makefile create mode 100755 tools/testing/selftests/pcie_bwctrl/set_pcie_cooling_state.sh create mode 100755 tools/testing/selftests/pcie_bwctrl/set_pcie_speed.sh