From nobody Sun Feb 8 23:14:20 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 656A6184F; Sat, 7 Jun 2025 15:56:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749311785; cv=none; b=UfUQuFuAA3iTAIHr7rY1pfDj/Zy8GZHOmty4tQWggPnjKCubRR+P8q5fHKiRRCprDQovIx+Es6NEGaoHcmwM98hvo2RBPm96Es9D02EAHiQoGfUAhNMKVmDlqqalpfIlklbFmrdv8mdfWtn1Vq6EuxUsY3EtBzuu1amiDn7xMSM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749311785; c=relaxed/simple; bh=WsNR2SmiSh7BZPADmuWTrFANirlmqcGhSK4rh60bu+s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bOSym98w78a67q5xwuoH+MZ9lDmEiEWQPqfW/PV9D5nQ95hdhdKdyw7TDM7oF7e1GxZmfpkVT4zikE3aqnrFJB4qqrJyB9zM5aacGOte+zz6zXNg0sxDB4c6GOkuJFhgxiXV+hUQfAge4yy2DDhyfUzJmDLNhSkicnDoknN3o50= 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=fFsnUK2y; arc=none smtp.client-ip=220.197.31.5 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="fFsnUK2y" 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=X/ WBIqYRbYLnjTD8APSSM3WfSwD1nNWWxZufGQx512k=; b=fFsnUK2yIOgJZkorYl GCPjegiph6oCPmTU5UMWVlXANrgBU1TaHN34xz3qqDtKJEj3NssPYqiCkDSzyBs8 LICfhZInKRqFAZn2pct5FsUgNYSbWj+2CkRKpgktEpCQlPaagrGIyTk8nYHk/axM r2d7rzrFZwLsvueMcaNGdx4c0= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wC3dpsKYURonH09Gw--.59622S3; Sat, 07 Jun 2025 23:55:55 +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 v2 1/3] PCI: Add PCIE_SPEED2LNKCTL2_TLS conversion macro Date: Sat, 7 Jun 2025 23:55:43 +0800 Message-Id: <20250607155545.806496-2-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250607155545.806496-1-18255117159@163.com> References: <20250607155545.806496-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: _____wC3dpsKYURonH09Gw--.59622S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cry8uFy3Cr43CFyfZFWfAFb_yoW8JFWxpa 47AF1UArW8Ww1UAr98Was2qa4rXFZ3GF4UuF47W39xXFySya4kCr12yFW3tr9rZr4jkry8 Z3ZrKrWUCFyI9F7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piF_MsUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbBDwBlo2hEWUa55AABsm 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 12215ee72afb..b5a3ce6c239b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -419,6 +419,15 @@ void pci_bus_put(struct pci_bus *bus); (lnkctl2) =3D=3D PCI_EXP_LNKCTL2_TLS_2_5GT ? PCIE_SPEED_2_5GT : \ 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 Sun Feb 8 23:14:20 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB6E513E02A; Sat, 7 Jun 2025 15:56:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749311787; cv=none; b=UlGi4YAHZz9dSHv65Dv2JZsdxrZBZXT5uOmeO53zzZt+3rHheLJwKJT1O0XyHBIHEFTSzWMNDPfdpttSXMTLTKsfeLQnpBJxhVFZMBeh82cb5C8YrDcFPKG0dS8rIXAVCfPAG87lvOXM4lL4r/Q1FKlzJBxM5ZipYIslmL9MciU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749311787; c=relaxed/simple; bh=fFeDiADoe+sKeDqiwUsCZLbJgfwv5CvHPS3We/bA0TU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CZMMTwnPs6c+MypSeSvNtqbm9+HjakhWVIUJvwYM3KkoBguWm/Cy2ZugH0edQmLC+0bbLoDHhd5DZJxPBvsGybcxoay8xWwhhl1iM/CpcY6qSmEn+n5l1keaVWHSDGqLV3cg14sFGeBI/Z3sz3z/rfInf8PYwF6rpbKnO6Ig84g= 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=g5ybccpf; arc=none smtp.client-ip=220.197.31.4 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="g5ybccpf" 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=ue mAjLG+fq7E3m+VSfTHWSSRfPttGVg0NlJysUzuR4o=; b=g5ybccpfaEljW56lEj Ey+aPXDrUTgxaEpTpFkcDA3O4Z7j5nkSVGBQwPXZHPuQm/4ejvUp9odWTKL7JMfR 7aEjGXSguuizi3kVkjsE9PUgHhaNnL7DFP3eb7klZ39G8731z7wq/uXeMRTyfpsN R1yGn8UKDeEHiq6YEPbvSexyA= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wC3dpsKYURonH09Gw--.59622S4; Sat, 07 Jun 2025 23:55:56 +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 v2 2/3] PCI: dwc: Simplify link speed configuration with macro Date: Sat, 7 Jun 2025 23:55:44 +0800 Message-Id: <20250607155545.806496-3-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250607155545.806496-1-18255117159@163.com> References: <20250607155545.806496-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: _____wC3dpsKYURonH09Gw--.59622S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFW5ZFWxuF43AryrGr48Zwb_yoW8Xw15pa y3AFy8ZF48Ja13ZFs8Was7Za4UXFnxCFWDCFZ8W3Z3WFy2yasxWFy0yrySq34akFZ2yr13 ury7JrWUG3W7tFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zElksgUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbBDw9lo2hEWUa6AAAAsP 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 4d794964fa0f..da91b57ad744 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -768,24 +768,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 Sun Feb 8 23:14:20 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F80F1F4C94; Sat, 7 Jun 2025 15:56:27 +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=1749311790; cv=none; b=hBL9PQlgmxcwDwezclpJXFlOXOHQOXnZWu4zeLMPNpYPUDLOt9Vw3qOM2/xQzc0YodUzLx3g8V5P7/hkUFFr28FHxoxIrTRlYb10rNBOpz/PFWoaXBcPEj4xw+LAjnzJziiH784jlprugyn69qMgtKGKpGSEARfeCP2FRKR/zAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749311790; c=relaxed/simple; bh=Pc7Qom0KKkFpSWIW57jEO7mM9ZbqoQXVmiH5CdunMoE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H4etP65umW9ZldwPR0xxZcAht4hkSubYa5GNLHwSnX5z7J3b98j8CJjZ+kd3yxkZEuURBXqrR5h8oNoKLPtAL7x4TxobyhkN8ufVxbcMPtqO/aMXKuUFhI9qz/ScORexR0nUJid8sSTd97qOInGDm0NFwxQOXfRmij5oN7tcmSo= 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=nkicv9jl; 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="nkicv9jl" 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=6W 76j04zvlqq/OoBm/X67iqNSUqmGknmHQ6PW9oOO+8=; b=nkicv9jlUfvVfoI0u/ /HfGT5cDJjZVFJxyIVfUbGicOCU2RDMo2OkH+csYz60cvCpvWrJbuODuQyU00fOc YB7ADwopJWGYJxmcAuuQiXnN16Cm8GcNjgW5dtYNi3dYrjskUMNt3PGDldekmIl+ 14P7jkgCqPgttz8d1u0eB80p0= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wC3dpsKYURonH09Gw--.59622S5; Sat, 07 Jun 2025 23:55:56 +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 v2 3/3] PCI/bwctrl: Replace legacy speed conversion with shared macro Date: Sat, 7 Jun 2025 23:55:45 +0800 Message-Id: <20250607155545.806496-4-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250607155545.806496-1-18255117159@163.com> References: <20250607155545.806496-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: _____wC3dpsKYURonH09Gw--.59622S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tF1DKrW3ZFyUWFWktr17GFg_yoW8Ar4Upa 9xZr1UAFy8Aw15CrZ0g3WvqFyUXFn3JFWUC3yfW3s5XFy7A395Ga42yFWftryaqrZIkry8 C3WUJF48Cw12kaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zRv4i5UUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiOhhlo2hEXNpgJQACsJ 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..5afc1f45c444 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