PCI: dwc: Use FIELD_GET/PREP()
Subsystems (4)
PATCH v2 1/1 PCI: dwc: Use FIELD_GET/PREP()
Convert open-coded variants of PCI field access into FIELD_GET/PREP() to make the code easier to understand.
Add two missing defines into pci_regs.h. Logically, the Max No-Snoop Latency Register is a separate word sized register in the PCIe spec, but the pre-existing LTR defines in pci_regs.h with dword long values seem to consider the registers together (the same goes for the only user). Thus, follow the custom and make the new values also take both word long LTR registers as a joint dword register.
---
This patch REPLACES the previous patch which caused the build fail on arm and also failed to copy the entire value into nosnoop register like the original code did.
v2:
- Correct define name used in FIELD_PREP()
- Correctly copy the contents of the full register, not just the Max Latency Value field.
- Wrap also the 110 literal into FIELD_PREP()
drivers/pci/controller/dwc/pcie-designware-ep.c | 7 ++++--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 +++++++--- include/uapi/linux/pci_regs.h | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +4 -3
@@ -6,6 +6,7 @@* Author: Kishon Vijay Abraham I <[email protected]> */ +#include <linux/bitfield.h> #include <linux/of.h> #include <linux/platform_device.h>
@@ -334,7 +335,7 @@ static int dw_pcie_ep_get_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no)if (!(val &PCI_MSI_FLAGS_ENABLE ))return -EINVAL ; - val = (val &PCI_MSI_FLAGS_QSIZE ) >>4 ; + val =FIELD_GET (PCI_MSI_FLAGS_QSIZE , val);return val; }
@@ -357,7 +358,7 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no, reg = ep_func->msi_cap + func_offset +PCI_MSI_FLAGS ; val =dw_pcie_readw_dbi (pci, reg); val &= ~PCI_MSI_FLAGS_QMASK ; - val |= (interrupts <<1 ) &PCI_MSI_FLAGS_QMASK ; + val |=FIELD_PREP (PCI_MSI_FLAGS_QMASK , interrupts);dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writew_dbi (pci, reg, val);dw_pcie_dbi_ro_wr_dis (pci);
@@ -584,7 +585,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, reg = ep_func->msix_cap + func_offset +PCI_MSIX_TABLE ; tbl_offset =dw_pcie_readl_dbi (pci, reg); - bir = (tbl_offset &PCI_MSIX_TABLE_BIR ); + bir =FIELD_GET (PCI_MSIX_TABLE_BIR , tbl_offset); tbl_offset &=PCI_MSIX_TABLE_OFFSET ; msix_tbl = ep->epf_bar[bir]->addr + tbl_offset;
drivers/pci/controller/dwc/pcie-tegra194.c +7 -3
@@ -126,7 +126,7 @@#define APPL_LTR_MSG_1 0xC4#define LTR_MSG_REQ BIT(15) -#define LTR_MST_NO_SNOOP_SHIFT 16 +#define LTR_NOSNOOP_MSG_REQ BIT(31)#define APPL_LTR_MSG_2 0xC8#define APPL_LTR_MSG_2_LTR_MSG_REQ_STATE BIT(3)
@@ -496,8 +496,12 @@ static irqreturn_t tegra_pcie_ep_irq_thread(int irq, void *arg)ktime_t timeout;/* 110us for both snoop and no-snoop */ - val =110 | (2 <<PCI_LTR_SCALE_SHIFT ) |LTR_MSG_REQ ; - val |= (val <<LTR_MST_NO_SNOOP_SHIFT ); + val =FIELD_PREP (PCI_LTR_VALUE_MASK ,110 ) | +FIELD_PREP (PCI_LTR_SCALE_MASK ,2 ) | +LTR_MSG_REQ | +FIELD_PREP (PCI_LTR_NOSNOOP_VALUE ,110 ) | +FIELD_PREP (PCI_LTR_NOSNOOP_SCALE ,2 ) | +LTR_NOSNOOP_MSG_REQ ;appl_writel (pcie, val,APPL_LTR_MSG_1 );/* Send LTR upstream */
include/uapi/linux/pci_regs.h +2 -0
@@ -975,6 +975,8 @@#define PCI_LTR_VALUE_MASK 0x000003ff#define PCI_LTR_SCALE_MASK 0x00001c00#define PCI_LTR_SCALE_SHIFT 10 +#define PCI_LTR_NOSNOOP_VALUE 0x03ff0000/* Max No-Snoop Latency Value */ +#define PCI_LTR_NOSNOOP_SCALE 0x1c000000/* Scale for Max Value */ #define PCI_EXT_CAP_LTR_SIZEOF 8/* Access Control Service */
Signature · 1 line
2.30.2
Quoted 11 lines · Ilpo Järvinen
Convert open-coded variants of PCI field access into FIELD_GET/PREP() to make the code easier to understand.
Add two missing defines into
pci_regs.h. Logically, the Max No-Snoop Latency Register is a separate word sized register in the PCIe spec, but the pre-existing LTR defines inpci_regs.hwith dword long values seem to consider the registers together (the same goes for the only user). Thus, follow the custom and make the new values also take both word long LTR registers as a joint dword register.Signed-off-by Ilpo Järvinen <[email protected]>
Replaced the previous "PCI: dwc: Use FIELD_GET/PREP()" patch on pci/field-get, thanks!
Here's the diff from a1a3a781d0ba (the previous head of pci/field-get) to the current head:
drivers/pci/controller/dwc/pcie-tegra194.c +7 -2
@@ -126,6 +126,7 @@#define APPL_LTR_MSG_1 0xC4#define LTR_MSG_REQ BIT(15) +#define LTR_NOSNOOP_MSG_REQ BIT(31)#define APPL_LTR_MSG_2 0xC8#define APPL_LTR_MSG_2_LTR_MSG_REQ_STATE BIT(3)
@@ -495,8 +496,12 @@ static irqreturn_t tegra_pcie_ep_irq_thread(int irq, void *arg)ktime_t timeout;/* 110us for both snoop and no-snoop */ - val =110 |FIELD_PREP (PCI_LTR_SCALE_SHIFT ,2 ) |LTR_MSG_REQ ; - val |=FIELD_PREP (PCI_LTR_NOSNOOP_VALUE , val); + val =FIELD_PREP (PCI_LTR_VALUE_MASK ,110 ) | +FIELD_PREP (PCI_LTR_SCALE_MASK ,2 ) | +LTR_MSG_REQ | +FIELD_PREP (PCI_LTR_NOSNOOP_VALUE ,110 ) | +FIELD_PREP (PCI_LTR_NOSNOOP_SCALE ,2 ) | +LTR_NOSNOOP_MSG_REQ ;appl_writel (pcie, val,APPL_LTR_MSG_1 );/* Send LTR upstream */
Quoted 100 lines
---
This patch REPLACES the previous patch which caused the build fail on arm and also failed to copy the entire value into nosnoop register like the original code did.
v2:
- Correct define name used inFIELD_PREP()
- Correctly copy the contents of the full register, not just the Max Latency Value field.
- Wrap also the 110 literal intoFIELD_PREP()drivers/pci/controller/dwc/pcie-designware-ep.c | 7 ++++--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 +++++++--- include/uapi/linux/pci_regs.h | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-)drivers/pci/controller/dwc/pcie-designware-ep.c +4
-3@@ -6,6 +6,7 @@* Author: Kishon Vijay Abraham I <[email protected]> */ +#include <linux/bitfield.h> #include <linux/of.h> #include <linux/platform_device.h> @@ -334,7 +335,7 @@ static int dw_pcie_ep_get_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no)if (!(val &PCI_MSI_FLAGS_ENABLE ))return -EINVAL ; - val = (val &PCI_MSI_FLAGS_QSIZE ) >>4 ; + val =FIELD_GET (PCI_MSI_FLAGS_QSIZE , val);return val; }@@ -357,7 +358,7 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no, reg = ep_func->msi_cap + func_offset +PCI_MSI_FLAGS ; val =dw_pcie_readw_dbi (pci, reg); val &= ~PCI_MSI_FLAGS_QMASK ; - val |= (interrupts <<1 ) &PCI_MSI_FLAGS_QMASK ; + val |=FIELD_PREP (PCI_MSI_FLAGS_QMASK , interrupts);dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writew_dbi (pci, reg, val);dw_pcie_dbi_ro_wr_dis (pci);@@ -584,7 +585,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, reg = ep_func->msix_cap + func_offset +PCI_MSIX_TABLE ; tbl_offset =dw_pcie_readl_dbi (pci, reg); - bir = (tbl_offset &PCI_MSIX_TABLE_BIR ); + bir =FIELD_GET (PCI_MSIX_TABLE_BIR , tbl_offset); tbl_offset &=PCI_MSIX_TABLE_OFFSET ; msix_tbl = ep->epf_bar[bir]->addr + tbl_offset;drivers/pci/controller/dwc/pcie-tegra194.c +7
-3@@ -126,7 +126,7 @@#define APPL_LTR_MSG_1 0xC4#define LTR_MSG_REQ BIT(15) -#define LTR_MST_NO_SNOOP_SHIFT 16 +#define LTR_NOSNOOP_MSG_REQ BIT(31)#define APPL_LTR_MSG_2 0xC8#define APPL_LTR_MSG_2_LTR_MSG_REQ_STATE BIT(3)@@ -496,8 +496,12 @@ static irqreturn_t tegra_pcie_ep_irq_thread(int irq, void *arg)ktime_t timeout;/* 110us for both snoop and no-snoop */ - val =110 | (2 <<PCI_LTR_SCALE_SHIFT ) |LTR_MSG_REQ ; - val |= (val <<LTR_MST_NO_SNOOP_SHIFT ); + val =FIELD_PREP (PCI_LTR_VALUE_MASK ,110 ) | +FIELD_PREP (PCI_LTR_SCALE_MASK ,2 ) | +LTR_MSG_REQ | +FIELD_PREP (PCI_LTR_NOSNOOP_VALUE ,110 ) | +FIELD_PREP (PCI_LTR_NOSNOOP_SCALE ,2 ) | +LTR_NOSNOOP_MSG_REQ ;appl_writel (pcie, val,APPL_LTR_MSG_1 );/* Send LTR upstream */ include/uapi/linux/pci_regs.h +2
-0@@ -975,6 +975,8 @@#define PCI_LTR_VALUE_MASK 0x000003ff#define PCI_LTR_SCALE_MASK 0x00001c00#define PCI_LTR_SCALE_SHIFT 10 +#define PCI_LTR_NOSNOOP_VALUE 0x03ff0000/* Max No-Snoop Latency Value */ +#define PCI_LTR_NOSNOOP_SCALE 0x1c000000/* Scale for Max Value */ #define PCI_EXT_CAP_LTR_SIZEOF 8/* Access Control Service */ Signature · 1 line
2.30.2