[02/17] PCI: pciehp: Protect LNKCTL changes

Message ID	20230511131441.45704-3-ilpo.jarvinen@linux.intel.com
State	New
Headers	show Return-Path: <linux-pci-owner@vger.kernel.org> From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> To: linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>, Rob Herring <robh@kernel.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>, Lukas Wunner <lukas@wunner.de>, Bjorn Helgaas <bhelgaas@google.com>, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> Subject: [PATCH 02/17] PCI: pciehp: Protect LNKCTL changes Date: Thu, 11 May 2023 16:14:26 +0300 Message-Id: <20230511131441.45704-3-ilpo.jarvinen@linux.intel.com> In-Reply-To: <20230511131441.45704-1-ilpo.jarvinen@linux.intel.com> References: <20230511131441.45704-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	PCI: Improve LNKCTL & LNKCTL2 concurrency control \| expand [00/17] PCI: Improve LNKCTL & LNKCTL2 concurrency control [01/17] PCI: Add concurrency safe clear_and_set variants for LNKCTL{,2} [02/17] PCI: pciehp: Protect LNKCTL changes [03/17] PCI/ASPM: Use pcie_lnkctl_clear_and_set() [04/17] drm/amdgpu: Use pcie_lnkctl{,2}_clear_and_set() for changing LNKCTL{,2} [05/17] drm/radeon: Use pcie_lnkctl{,2}_clear_and_set() for changing LNKCTL{,2} [06/17] IB/hfi1: Use pcie_lnkctl{,2}_clear_and_set() for changing LNKCTL{,2} [07/17] e1000e: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [08/17] net/mlx5: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [09/17] wifi: ath9k: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [10/17] mt76: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [11/17] Bluetooth: hci_bcm4377: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [12/17] misc: rtsx: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [13/17] net/tg3: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [14/17] r8169: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [15/17] wifi: ath11k: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [16/17] wifi: ath12k: Use pcie_lnkctl_clear_and_set() for changing LNKCTL [17/17] wifi: ath10k: Use pcie_lnkctl_clear_and_set() for changing LNKCTL

Message ID

20230511131441.45704-3-ilpo.jarvinen@linux.intel.com

State

New

Headers

From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>,
 Rob Herring <robh@kernel.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	=?utf-8?q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>,
 Lukas Wunner <lukas@wunner.de>, Bjorn Helgaas <bhelgaas@google.com>,
 linux-kernel@vger.kernel.org
Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 02/17] PCI: pciehp: Protect LNKCTL changes
Date: Thu, 11 May 2023 16:14:26 +0300
Message-Id: <20230511131441.45704-3-ilpo.jarvinen@linux.intel.com>
In-Reply-To: <20230511131441.45704-1-ilpo.jarvinen@linux.intel.com>
References: <20230511131441.45704-1-ilpo.jarvinen@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

PCI: Improve LNKCTL & LNKCTL2 concurrency control | expand

Commit Message

Ilpo Järvinen May 11, 2023, 1:14 p.m. UTC

As hotplug is not the only driver touching LNKCTL, use the
pcie_lnkctl_clear_and_set() helper which handles concurrent changes
correctly.

Suggested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 drivers/pci/hotplug/pciehp_hpc.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index f8c70115b691..14ffbb27957c 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -332,17 +332,10 @@  int pciehp_check_link_status(struct controller *ctrl)
 static int __pciehp_link_set(struct controller *ctrl, bool enable)
 {
 	struct pci_dev *pdev = ctrl_dev(ctrl);
-	u16 lnk_ctrl;
 
-	pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &lnk_ctrl);
+	pcie_lnkctl_clear_and_set(pdev, PCI_EXP_LNKCTL_LD,
+				  !enable ? PCI_EXP_LNKCTL_LD : 0);
 
-	if (enable)
-		lnk_ctrl &= ~PCI_EXP_LNKCTL_LD;
-	else
-		lnk_ctrl |= PCI_EXP_LNKCTL_LD;
-
-	pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, lnk_ctrl);
-	ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl);
 	return 0;
 }

[02/17] PCI: pciehp: Protect LNKCTL changes

Commit Message

Patch