From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Sasha Levin" <sashal@kernel.org>,
thomas.petazzoni@bootlin.com, pali@kernel.org,
lpieralisi@kernel.org, kw@linux.com, linux-pci@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 6.1 17/30] PCI: mvebu: Use FIELD_PREP() with Link Width
Date: Tue, 7 Nov 2023 10:49:51 -0500 [thread overview]
Message-ID: <20231107155024.3766950-17-sashal@kernel.org> (raw)
In-Reply-To: <20231107155024.3766950-1-sashal@kernel.org>
From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Upstream commit 408599ec561ad5862cda4f107626009f6fa97a74 ]
mvebu_pcie_setup_hw() setups the Maximum Link Width field in the Link
Capabilities registers using an open-coded variant of FIELD_PREP() with
a literal in shift. Improve readability by using
FIELD_PREP(PCI_EXP_LNKCAP_MLW, ...).
Link: https://lore.kernel.org/r/20230919125648.1920-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/pci/controller/pci-mvebu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 1ced73726a267..668601fd0b296 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -264,7 +264,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
*/
lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP);
lnkcap &= ~PCI_EXP_LNKCAP_MLW;
- lnkcap |= (port->is_x4 ? 4 : 1) << 4;
+ lnkcap |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1);
mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP);
/* Disable Root Bridge I/O space, memory space and bus mastering. */
--
2.42.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Sasha Levin" <sashal@kernel.org>,
thomas.petazzoni@bootlin.com, pali@kernel.org,
lpieralisi@kernel.org, kw@linux.com, linux-pci@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 6.1 17/30] PCI: mvebu: Use FIELD_PREP() with Link Width
Date: Tue, 7 Nov 2023 10:49:51 -0500 [thread overview]
Message-ID: <20231107155024.3766950-17-sashal@kernel.org> (raw)
In-Reply-To: <20231107155024.3766950-1-sashal@kernel.org>
From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Upstream commit 408599ec561ad5862cda4f107626009f6fa97a74 ]
mvebu_pcie_setup_hw() setups the Maximum Link Width field in the Link
Capabilities registers using an open-coded variant of FIELD_PREP() with
a literal in shift. Improve readability by using
FIELD_PREP(PCI_EXP_LNKCAP_MLW, ...).
Link: https://lore.kernel.org/r/20230919125648.1920-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/pci/controller/pci-mvebu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 1ced73726a267..668601fd0b296 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -264,7 +264,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
*/
lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP);
lnkcap &= ~PCI_EXP_LNKCAP_MLW;
- lnkcap |= (port->is_x4 ? 4 : 1) << 4;
+ lnkcap |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1);
mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP);
/* Disable Root Bridge I/O space, memory space and bus mastering. */
--
2.42.0
next prev parent reply other threads:[~2023-11-07 15:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 15:49 [PATCH AUTOSEL 6.1 01/30] ASoC: soc-card: Add storage for PCI SSID Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 02/30] ASoC: SOF: Pass PCI SSID to machine driver Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 03/30] crypto: pcrypt - Fix hungtask for PADATA_RESET Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 04/30] ALSA: scarlett2: Move USB IDs out from device_info struct Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 05/30] ASoC: SOF: ipc4: handle EXCEPTION_CAUGHT notification from firmware Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 06/30] RDMA/hfi1: Use FIELD_GET() to extract Link Width Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 07/30] scsi: hisi_sas: Set debugfs_dir pointer to NULL after removing debugfs Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 08/30] scsi: ibmvfc: Remove BUG_ON in the case of an empty event pool Sasha Levin
2023-11-07 15:49 ` Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 09/30] fs/jfs: Add check for negative db_l2nbperpage Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 10/30] fs/jfs: Add validity check for db_maxag and db_agpref Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 11/30] jfs: fix array-index-out-of-bounds in dbFindLeaf Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 12/30] jfs: fix array-index-out-of-bounds in diAlloc Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 13/30] HID: lenovo: Detect quirk-free fw on cptkbd and stop applying workaround Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 14/30] ARM: 9320/1: fix stack depot IRQ stack filter Sasha Levin
2023-11-07 15:49 ` Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 15/30] ALSA: hda: Fix possible null-ptr-deref when assigning a stream Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 16/30] PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields Sasha Levin
2023-11-07 15:49 ` Sasha Levin [this message]
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 17/30] PCI: mvebu: Use FIELD_PREP() with Link Width Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 18/30] atm: iphase: Do PCI error checks on own line Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 19/30] PCI: Do error check on own line to split long "if" conditions Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 20/30] scsi: libfc: Fix potential NULL pointer dereference in fc_lport_ptp_setup() Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 21/30] PCI: Use FIELD_GET() to extract Link Width Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 22/30] PCI: Extract ATS disabling to a helper function Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 23/30] PCI: Disable ATS for specific Intel IPU E2000 devices Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 24/30] misc: pci_endpoint_test: Add Device ID for R-Car S4-8 PCIe controller Sasha Levin
2023-11-07 15:49 ` [PATCH AUTOSEL 6.1 25/30] PCI: Use FIELD_GET() in Sapphire RX 5600 XT Pulse quirk Sasha Levin
2023-11-07 15:50 ` [PATCH AUTOSEL 6.1 26/30] ASoC: Intel: soc-acpi-cht: Add Lenovo Yoga Tab 3 Pro YT3-X90 quirk Sasha Levin
2023-11-07 15:50 ` [PATCH AUTOSEL 6.1 27/30] crypto: hisilicon/qm - prevent soft lockup in receive loop Sasha Levin
2023-11-07 15:50 ` [PATCH AUTOSEL 6.1 28/30] HID: Add quirk for Dell Pro Wireless Keyboard and Mouse KM5221W Sasha Levin
2023-11-07 15:50 ` [PATCH AUTOSEL 6.1 29/30] exfat: support handle zero-size directory Sasha Levin
2023-11-07 15:50 ` [PATCH AUTOSEL 6.1 30/30] mfd: intel-lpss: Add Intel Lunar Lake-M PCI IDs Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231107155024.3766950-17-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=bhelgaas@google.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=pali@kernel.org \
--cc=stable@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.