From nobody Sat Oct 4 12:44:50 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D5EBF29A2; Sat, 16 Aug 2025 15:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359237; cv=none; b=X3iKFo2MqKCNJT2Old4h560jDIs/9mTrqCWhG8ruqMHADzBv7Mphpxq1ew85xatCGgDEDZ3FMSy8uAESQ6iO4JfGF0sGKNMpeDfP9cQErZe9sTPxOR90vA+FDKa01q2uUOJEMLbmamv8cQ9tu4Ek9EEppAdyh4epaXM5cYAtpMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359237; c=relaxed/simple; bh=tZD/NI2tbfdKZN3eDHSa07wID0HggpJGNVl01yof5iM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ko7cZFs59knv8vtB+jbWvP+jcCo5fJgEXVh9czb+XcUC9pV9OAHXuMJxbiv/OM+CZw2BP2CnGB5kNerTXnhPIXDmMbYq0G4O6FLpnQu0usIMLVJlPWSnVdgMjpU73N4upCkL6zrNZy/ir9ndX4vF9z8mwMZ6DIhxSq1ugGYJjgw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=VviRnvZO; arc=none smtp.client-ip=117.135.210.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="VviRnvZO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=5m hnomU1tZqz1YQkUYKLJ4Yj9naZm9l9LOEGKmYpfJs=; b=VviRnvZOgwUUNN5LvD X4EBV/1dtQ83B5HBidbQOH1d5gcB6sZGQ5v5vFLo6NBirYjcNptFJO8bWXMLeKM7 3Y4vUi+A4ztL20qqpMmTKsqOEAbNELNSHj+nPOZfOZmqCkpM89YhmBVMpTqJtghI SpifUoCzqu0eHZm+dm1KHOGpY= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wDHfLfip6BoVzqMBw--.15530S3; Sat, 16 Aug 2025 23:46:43 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kw@linux.com, kwilczynski@kernel.org, mani@kernel.org, ilpo.jarvinen@linux.intel.com, jingoohan1@gmail.com Cc: robh@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [PATCH v3 1/3] PCI: Add PCIE_SPEED2LNKCTL2_TLS conversion macro Date: Sat, 16 Aug 2025 23:46:31 +0800 Message-Id: <20250816154633.338653-2-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250816154633.338653-1-18255117159@163.com> References: <20250816154633.338653-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wDHfLfip6BoVzqMBw--.15530S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cry8uFy3Cr43CFyUArWUJwb_yoW8JFWUp3 W7AFy5AFW8W3WUAr98Was2qa4rXFs3GF4Uur47W3sxXFyfK34kAr12yrW3t3sFqr4jkry8 Z3ZrKrWUCFy29F7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRjZXrUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiWxyro2ignM3xTgAAsp Content-Type: text/plain; charset="utf-8" Introduce PCIE_SPEED2LNKCTL2_TLS() macro to standardize the conversion between PCIe speed enumerations and LNKCTL2_TLS register values. This centralizes speed-to-register mapping logic, eliminating duplicated conversion code across multiple drivers. Signed-off-by: Hans Zhang <18255117159@163.com> Acked-by: Manivannan Sadhasivam --- drivers/pci/pci.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 34f65d69662e..679dd0f44d73 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -422,6 +422,15 @@ void pci_bus_put(struct pci_bus *bus); PCI_SPEED_UNKNOWN); \ }) =20 +#define PCIE_SPEED2LNKCTL2_TLS(speed) \ + ((speed) =3D=3D PCIE_SPEED_2_5GT ? PCI_EXP_LNKCTL2_TLS_2_5GT : \ + (speed) =3D=3D PCIE_SPEED_5_0GT ? PCI_EXP_LNKCTL2_TLS_5_0GT : \ + (speed) =3D=3D PCIE_SPEED_8_0GT ? PCI_EXP_LNKCTL2_TLS_8_0GT : \ + (speed) =3D=3D PCIE_SPEED_16_0GT ? PCI_EXP_LNKCTL2_TLS_16_0GT : \ + (speed) =3D=3D PCIE_SPEED_32_0GT ? PCI_EXP_LNKCTL2_TLS_32_0GT : \ + (speed) =3D=3D PCIE_SPEED_64_0GT ? PCI_EXP_LNKCTL2_TLS_64_0GT : \ + 0) + /* PCIe speed to Mb/s reduced by encoding overhead */ #define PCIE_SPEED2MBS_ENC(speed) \ ((speed) =3D=3D PCIE_SPEED_64_0GT ? 64000*1/1 : \ --=20 2.25.1 From nobody Sat Oct 4 12:44:50 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D96E81B043C; Sat, 16 Aug 2025 15:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359239; cv=none; b=pBgtVvlr/aohesatvfFe5PnxW2lwbYMJQpYbuf8pSVXrKYhDbu4vxSigTHPbzIdjHdPlEg7Z1IboLZdS+z94gWh76RPX/RHyNRRZtUtZQyAf+H7CyxZ+ko0Iu8nwd7GSLbD5n39pzL2KeXlxb89Eyz+y3QoK/IGPMsUxbwsKAdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359239; c=relaxed/simple; bh=lvTKCTBw91HoAlCJPze5p+RxRyffn6wYsG6rgY8VTVk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MJuebHhTo0eEURNZ1rLGXhUUo5iftKrRC59Tn94x7CzkgvhmaGfV8Mo67rcFM383sH25irI3wTocUsgvFDRdt+daAC4dmuWavuWyhy600e5VN/cJNkoULPwmO7Y7i2F44V5RoOtJ5tUbSbHEcKmVwmmamZgSld+mc7cFU3KSwu8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=NinZjAYy; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="NinZjAYy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=bW uUI9S8QYFB3nfyY0vQQR080x5RgbGFM4axB7wTYog=; b=NinZjAYy/53Vhb1Wsx cSWips5JUFc+pGPh/8JYJ8+xRYoEMSSVckIpOGUMgub8TtXsJBtMaf2mz4ViHj8K qCyZdW5Tf7TjrcSu7p2/DIzfkoj6Zc5O8EnVKVCrk++GFc/GkWoAv5cANof1fFkw rSWHbri5/4abWpIqOzSI5HnR0= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wDHfLfip6BoVzqMBw--.15530S4; Sat, 16 Aug 2025 23:46:44 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kw@linux.com, kwilczynski@kernel.org, mani@kernel.org, ilpo.jarvinen@linux.intel.com, jingoohan1@gmail.com Cc: robh@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [PATCH v3 2/3] PCI: dwc: Simplify link speed configuration with macro Date: Sat, 16 Aug 2025 23:46:32 +0800 Message-Id: <20250816154633.338653-3-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250816154633.338653-1-18255117159@163.com> References: <20250816154633.338653-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wDHfLfip6BoVzqMBw--.15530S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFW5ZFWxuw15Gr4fJryftFb_yoW8WryDpa y3AF18ZF48Ja13ZFs0gas7Za4UXFnxGF4DCFZ8W3ZagFy2ya9xWF10yrySq34akFZ2kr13 uw17JrWUG3W7tFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zZg4U5UUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiWwGro2ignM3xVwAAst Content-Type: text/plain; charset="utf-8" Replace switch-case based speed-to-register conversion in DesignWare driver with the newly introduced PCIE_SPEED2LNKCTL2_TLS() macro. Signed-off-by: Hans Zhang <18255117159@163.com> Acked-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-designware.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/con= troller/dwc/pcie-designware.c index 89aad5a08928..d99f3bde847d 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -776,24 +776,12 @@ static void dw_pcie_link_set_max_speed(struct dw_pcie= *pci) ctrl2 =3D dw_pcie_readl_dbi(pci, offset + PCI_EXP_LNKCTL2); ctrl2 &=3D ~PCI_EXP_LNKCTL2_TLS; =20 - switch (pcie_link_speed[pci->max_link_speed]) { - case PCIE_SPEED_2_5GT: - link_speed =3D PCI_EXP_LNKCTL2_TLS_2_5GT; - break; - case PCIE_SPEED_5_0GT: - link_speed =3D PCI_EXP_LNKCTL2_TLS_5_0GT; - break; - case PCIE_SPEED_8_0GT: - link_speed =3D PCI_EXP_LNKCTL2_TLS_8_0GT; - break; - case PCIE_SPEED_16_0GT: - link_speed =3D PCI_EXP_LNKCTL2_TLS_16_0GT; - break; - default: + link_speed =3D pcie_link_speed[pci->max_link_speed]; + link_speed =3D PCIE_SPEED2LNKCTL2_TLS(link_speed); + if (link_speed =3D=3D 0) { /* Use hardware capability */ link_speed =3D FIELD_GET(PCI_EXP_LNKCAP_SLS, cap); ctrl2 &=3D ~PCI_EXP_LNKCTL2_HASD; - break; } =20 dw_pcie_writel_dbi(pci, offset + PCI_EXP_LNKCTL2, ctrl2 | link_speed); --=20 2.25.1 From nobody Sat Oct 4 12:44:50 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 03C7B2F39C5; Sat, 16 Aug 2025 15:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359247; cv=none; b=rnESeb5iArrfxqMTsb5kETqVGRLHJEqopyi+DPsD1/tEOInDo22hhs83b54r+mQawhyliw7EY8VBJrk/hoKAbhS12Kb//Yn+99+g1G2HdFDFCwm2Hjw8PVW4xHrl54b47ppzNPQoS10ASZMBqW8dYgwsTYkEd5kC1CgGBd1vpbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755359247; c=relaxed/simple; bh=8UJUmByqC5ZJ/kLIwSKORSBpsuOfmy0bNm7GrUTj6Wc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MdtfJj7L7Yol+a29LgkOFo/uR7ULKYiIkHQaGq6ZUlRS4lY06L/acPmzDn3h1w75ytKpmOum5gYt/MCG09HfzPe/HydCJpKK1X4kiEJJIuJ7hqI/n4dy2qaORoL7vKXDnTOE2IH4aWjqu5mYN+jdM1RwnyLw59EV7PtAoYLSMaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=E6V0LA+E; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="E6V0LA+E" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=ki Sx+tc76wSSVUkV3cDAPGdZW0D+Af1HbMarao/S99A=; b=E6V0LA+EnOA9MfGIWW bJahCpZMOODxZzh6GrTeIjOqgqHg2N+lY07aAEGtnVnFLL1k5e7lV1M8Or5LlxWl eD3n5p1/qKH58dV8Pio/1Shwwt+buZ5xO/3gZtbxVk2SsbnhmfPy+W03R2eauxPh ZZ+tvDqS8hEwdwhKdh6LlWcq4= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wDHfLfip6BoVzqMBw--.15530S5; Sat, 16 Aug 2025 23:46:44 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kw@linux.com, kwilczynski@kernel.org, mani@kernel.org, ilpo.jarvinen@linux.intel.com, jingoohan1@gmail.com Cc: robh@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [PATCH v3 3/3] PCI/bwctrl: Replace legacy speed conversion with shared macro Date: Sat, 16 Aug 2025 23:46:33 +0800 Message-Id: <20250816154633.338653-4-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250816154633.338653-1-18255117159@163.com> References: <20250816154633.338653-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wDHfLfip6BoVzqMBw--.15530S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tr43WrykXFy5urWkAFWrKrg_yoW8AF43pa 9xZr1UAFy8Aw15ArZ0g3WvqFyUXFnxJrWUCw4fW3s5XFy3A395Ga42yFWSyryaqrWakry8 C3WUJF48Gw12yaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zRYXdbUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiWxmro2ignM3xWAABs7 Content-Type: text/plain; charset="utf-8" Remove obsolete pci_bus_speed2lnkctl2() function and utilize the common PCIE_SPEED2LNKCTL2_TLS() macro instead. Signed-off-by: Hans Zhang <18255117159@163.com> Acked-by: Manivannan Sadhasivam --- drivers/pci/pcie/bwctrl.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/pci/pcie/bwctrl.c b/drivers/pci/pcie/bwctrl.c index 36f939f23d34..802ab8daf68b 100644 --- a/drivers/pci/pcie/bwctrl.c +++ b/drivers/pci/pcie/bwctrl.c @@ -53,23 +53,6 @@ static bool pcie_valid_speed(enum pci_bus_speed speed) return (speed >=3D PCIE_SPEED_2_5GT) && (speed <=3D PCIE_SPEED_64_0GT); } =20 -static u16 pci_bus_speed2lnkctl2(enum pci_bus_speed speed) -{ - static const u8 speed_conv[] =3D { - [PCIE_SPEED_2_5GT] =3D PCI_EXP_LNKCTL2_TLS_2_5GT, - [PCIE_SPEED_5_0GT] =3D PCI_EXP_LNKCTL2_TLS_5_0GT, - [PCIE_SPEED_8_0GT] =3D PCI_EXP_LNKCTL2_TLS_8_0GT, - [PCIE_SPEED_16_0GT] =3D PCI_EXP_LNKCTL2_TLS_16_0GT, - [PCIE_SPEED_32_0GT] =3D PCI_EXP_LNKCTL2_TLS_32_0GT, - [PCIE_SPEED_64_0GT] =3D PCI_EXP_LNKCTL2_TLS_64_0GT, - }; - - if (WARN_ON_ONCE(!pcie_valid_speed(speed))) - return 0; - - return speed_conv[speed]; -} - static inline u16 pcie_supported_speeds2target_speed(u8 supported_speeds) { return __fls(supported_speeds); @@ -91,7 +74,7 @@ static u16 pcie_bwctrl_select_speed(struct pci_dev *port,= enum pci_bus_speed spe u8 desired_speeds, supported_speeds; struct pci_dev *dev; =20 - desired_speeds =3D GENMASK(pci_bus_speed2lnkctl2(speed_req), + desired_speeds =3D GENMASK(PCIE_SPEED2LNKCTL2_TLS(speed_req), __fls(PCI_EXP_LNKCAP2_SLS_2_5GB)); =20 supported_speeds =3D port->supported_speeds; --=20 2.25.1