* [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h
@ 2022-02-10 13:53 Pali Rohár
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Pali Rohár @ 2022-02-10 13:53 UTC (permalink / raw)
To: Stefan Roese, Marek Behún; +Cc: u-boot
PCI config space of the aardvark PCIe Root Port is available only in
internal aardvark memory space starting at offset 0x0. PCI Express
registers (PCI_EXP_*) start at offset 0xc0. And Advanced Error Reporting
registers (PCI_ERR_*) start at offset 0x100.
Replace custom aardvark register macros by standard PCI macros from
include/pci.h file with fixed offset.
Some DEVCTL and AER macros are not defined in include/pci.h file, so define
them in the same way as in linux uapi header file pci_regs.h.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
drivers/pci/pci-aardvark.c | 82 ++++++++++++++------------------------
include/pci.h | 24 +++++++++++
2 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 22b6d8b62865..ad4edd715bd6 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -35,28 +35,10 @@
#include <linux/delay.h>
#include <linux/ioport.h>
-/* PCIe core registers */
-#define PCIE_CORE_CMD_STATUS_REG 0x4
-#define PCIE_CORE_CMD_IO_ACCESS_EN BIT(0)
-#define PCIE_CORE_CMD_MEM_ACCESS_EN BIT(1)
-#define PCIE_CORE_CMD_MEM_IO_REQ_EN BIT(2)
-#define PCIE_CORE_DEV_REV_REG 0x8
-#define PCIE_CORE_EXP_ROM_BAR_REG 0x30
-#define PCIE_CORE_PCIEXP_CAP_OFF 0xc0
-#define PCIE_CORE_DEV_CTRL_STATS_REG 0xc8
-#define PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE (0 << 4)
-#define PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE (0 << 11)
-#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE 0x2
-#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT 5
-#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE 0x2
-#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT 12
-#define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0
-#define PCIE_CORE_LINK_TRAINING BIT(5)
-#define PCIE_CORE_ERR_CAPCTL_REG 0x118
-#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX BIT(5)
-#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN BIT(6)
-#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK BIT(7)
-#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV BIT(8)
+/* PCIe Root Port register offsets */
+#define ADVK_ROOT_PORT_PCI_CFG_OFF 0x0
+#define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
+#define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
/* PIO registers base address and register offsets */
#define PIO_BASE_ADDR 0x4000
@@ -394,7 +376,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
data = pcie->cfgcache[(offset - 0x10) / 4];
else
- data = advk_readl(pcie, offset & ~3);
+ data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
if ((offset & ~3) == (PCI_HEADER_TYPE & ~3)) {
/*
@@ -406,14 +388,13 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
data |= PCI_HEADER_TYPE_BRIDGE << 16;
}
- if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL) {
+ if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL) {
/* CRSSVE bit is stored only in cache */
if (pcie->cfgcrssve)
data |= PCI_EXP_RTCTL_CRSSVE;
}
- if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF +
- (PCI_EXP_RTCAP & ~3)) {
+ if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + (PCI_EXP_RTCAP & ~3)) {
/* CRS is emulated below, so set CRSVIS capability */
data |= PCI_EXP_RTCAP_CRSVIS << 16;
}
@@ -583,9 +564,9 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
data = 0x0;
pcie->cfgcache[(offset - 0x10) / 4] = data;
} else {
- data = advk_readl(pcie, offset & ~3);
+ data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
data = pci_conv_size_to_32(data, value, offset, size);
- advk_writel(pcie, data, offset & ~3);
+ advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
}
if (offset == PCI_PRIMARY_BUS)
@@ -595,7 +576,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
(offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
pcie->sec_busno = (data >> 8) & 0xff;
- if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL)
+ if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL)
pcie->cfgcrssve = data & PCI_EXP_RTCTL_CRSSVE;
return 0;
@@ -834,26 +815,25 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
* Type 1 registers is redirected to the virtual cfgcache[] buffer,
* which avoids changing unrelated registers.
*/
- reg = advk_readl(pcie, PCIE_CORE_DEV_REV_REG);
+ reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
reg &= ~0xffffff00;
reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
- advk_writel(pcie, reg, PCIE_CORE_DEV_REV_REG);
-
- /* Set Advanced Error Capabilities and Control PF0 register */
- reg = PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX |
- PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN |
- PCIE_CORE_ERR_CAPCTL_ECRC_CHECK |
- PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV;
- advk_writel(pcie, reg, PCIE_CORE_ERR_CAPCTL_REG);
-
- /* Set PCIe Device Control and Status 1 PF0 register */
- reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
- (PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE <<
- PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT) |
- (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE <<
- PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT) |
- PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE;
- advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
+ advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
+
+ /* Enable generation and checking of ECRC on PCIe Root Port */
+ reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
+ reg |= PCI_ERR_CAP_ECRC_GENE | PCI_ERR_CAP_ECRC_CHKE;
+ advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
+
+ /* Set PCIe Device Control register on PCIe Root Port */
+ reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
+ reg &= ~PCI_EXP_DEVCTL_RELAX_EN;
+ reg &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
+ reg &= ~PCI_EXP_DEVCTL_PAYLOAD;
+ reg &= ~PCI_EXP_DEVCTL_READRQ;
+ reg |= PCI_EXP_DEVCTL_PAYLOAD_512B;
+ reg |= PCI_EXP_DEVCTL_READRQ_512B;
+ advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
/* Program PCIe Control 2 to disable strict ordering */
reg = PCIE_CORE_CTRL2_RESERVED |
@@ -994,11 +974,9 @@ static int pcie_advk_remove(struct udevice *dev)
for (i = 0; i < OB_WIN_COUNT; i++)
pcie_advk_disable_ob_win(pcie, i);
- reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
- reg &= ~(PCIE_CORE_CMD_MEM_ACCESS_EN |
- PCIE_CORE_CMD_IO_ACCESS_EN |
- PCIE_CORE_CMD_MEM_IO_REQ_EN);
- advk_writel(pcie, reg, PCIE_CORE_CMD_STATUS_REG);
+ reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
+ reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
+ advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
reg &= ~LINK_TRAINING_EN;
diff --git a/include/pci.h b/include/pci.h
index 9e7910b271b8..673c95c6bb79 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -484,6 +484,22 @@
#define PCI_EXP_DEVCAP 4 /* Device capabilities */
#define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */
#define PCI_EXP_DEVCTL 8 /* Device Control */
+#define PCI_EXP_DEVCTL_PAYLOAD 0x00e0 /* Max_Payload_Size */
+#define PCI_EXP_DEVCTL_PAYLOAD_128B 0x0000 /* 128 Bytes */
+#define PCI_EXP_DEVCTL_PAYLOAD_256B 0x0020 /* 256 Bytes */
+#define PCI_EXP_DEVCTL_PAYLOAD_512B 0x0040 /* 512 Bytes */
+#define PCI_EXP_DEVCTL_PAYLOAD_1024B 0x0060 /* 1024 Bytes */
+#define PCI_EXP_DEVCTL_PAYLOAD_2048B 0x0080 /* 2048 Bytes */
+#define PCI_EXP_DEVCTL_PAYLOAD_4096B 0x00a0 /* 4096 Bytes */
+#define PCI_EXP_DEVCTL_RELAX_EN 0x0010 /* Enable relaxed ordering */
+#define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 /* Enable No Snoop */
+#define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */
+#define PCI_EXP_DEVCTL_READRQ_128B 0x0000 /* 128 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_256B 0x1000 /* 256 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_512B 0x2000 /* 512 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_2048B 0x4000 /* 2048 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_4096B 0x5000 /* 4096 Bytes */
#define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
#define PCI_EXP_LNKCAP 12 /* Link Capabilities */
#define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */
@@ -522,6 +538,14 @@
#define PCI_EXP_LNKCTL2_TLS_5_0GT 0x0002 /* Target Link Speed 5.0GT/s */
#define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003 /* Target Link Speed 8.0GT/s */
+/* Advanced Error Reporting */
+#define PCI_ERR_CAP 24 /* Advanced Error Capabilities */
+#define PCI_ERR_CAP_FEP(x) ((x) & 31) /* First Error Pointer */
+#define PCI_ERR_CAP_ECRC_GENC 0x00000020 /* ECRC Generation Capable */
+#define PCI_ERR_CAP_ECRC_GENE 0x00000040 /* ECRC Generation Enable */
+#define PCI_ERR_CAP_ECRC_CHKC 0x00000080 /* ECRC Check Capable */
+#define PCI_ERR_CAP_ECRC_CHKE 0x00000100 /* ECRC Check Enable */
+
/* Single Root I/O Virtualization Registers */
#define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */
#define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
@ 2022-02-10 13:53 ` Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:35 ` Stefan Roese
2022-02-10 13:53 ` [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr() Pali Rohár
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Pali Rohár @ 2022-02-10 13:53 UTC (permalink / raw)
To: Stefan Roese, Marek Behún; +Cc: u-boot
Remove "PCI_" prefix from all macros which are aardvark specific to not
conflict with macros defined in global include file pci.h. Instead add
"ADVK_" prefix for them so it is visible that they are aardvark specific.
After "ADVK_" prefix append keyword which describes register group, so it
would be clear to which register each macro value belongs.
Rename some macros for consistency with other macros.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
drivers/pci/pci-aardvark.c | 394 ++++++++++++++++++-------------------
1 file changed, 192 insertions(+), 202 deletions(-)
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index ad4edd715bd6..8e3b13b49ea0 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -40,113 +40,104 @@
#define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
#define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
-/* PIO registers base address and register offsets */
-#define PIO_BASE_ADDR 0x4000
-#define PIO_CTRL (PIO_BASE_ADDR + 0x0)
-#define PIO_CTRL_TYPE_MASK GENMASK(3, 0)
-#define PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
-#define PIO_STAT (PIO_BASE_ADDR + 0x4)
-#define PIO_COMPLETION_STATUS_SHIFT 7
-#define PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
-#define PIO_COMPLETION_STATUS_OK 0
-#define PIO_COMPLETION_STATUS_UR 1
-#define PIO_COMPLETION_STATUS_CRS 2
-#define PIO_COMPLETION_STATUS_CA 4
-#define PIO_NON_POSTED_REQ BIT(10)
-#define PIO_ERR_STATUS BIT(11)
-#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)
-#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)
-#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
-#define PIO_WR_DATA_STRB (PIO_BASE_ADDR + 0x14)
-#define PIO_RD_DATA (PIO_BASE_ADDR + 0x18)
-#define PIO_START (PIO_BASE_ADDR + 0x1c)
-#define PIO_ISR (PIO_BASE_ADDR + 0x20)
-
-/* Aardvark Control registers */
-#define CONTROL_BASE_ADDR 0x4800
-#define PCIE_CORE_CTRL0_REG (CONTROL_BASE_ADDR + 0x0)
-#define PCIE_GEN_SEL_MSK 0x3
-#define PCIE_GEN_SEL_SHIFT 0x0
-#define SPEED_GEN_1 0
-#define SPEED_GEN_2 1
-#define SPEED_GEN_3 2
-#define IS_RC_MSK 1
-#define IS_RC_SHIFT 2
-#define LANE_CNT_MSK 0x18
-#define LANE_CNT_SHIFT 0x3
-#define LANE_COUNT_1 (0 << LANE_CNT_SHIFT)
-#define LANE_COUNT_2 (1 << LANE_CNT_SHIFT)
-#define LANE_COUNT_4 (2 << LANE_CNT_SHIFT)
-#define LANE_COUNT_8 (3 << LANE_CNT_SHIFT)
-#define LINK_TRAINING_EN BIT(6)
-#define PCIE_CORE_CTRL2_REG (CONTROL_BASE_ADDR + 0x8)
-#define PCIE_CORE_CTRL2_RESERVED 0x7
-#define PCIE_CORE_CTRL2_TD_ENABLE BIT(4)
-#define PCIE_CORE_CTRL2_STRICT_ORDER_ENABLE BIT(5)
-#define PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE BIT(6)
-
-/* PCIe window configuration */
-#define OB_WIN_BASE_ADDR 0x4c00
-#define OB_WIN_BLOCK_SIZE 0x20
-#define OB_WIN_COUNT 8
-#define OB_WIN_REG_ADDR(win, offset) (OB_WIN_BASE_ADDR + \
- OB_WIN_BLOCK_SIZE * (win) + \
- (offset))
-#define OB_WIN_MATCH_LS(win) OB_WIN_REG_ADDR(win, 0x00)
-#define OB_WIN_ENABLE BIT(0)
-#define OB_WIN_MATCH_MS(win) OB_WIN_REG_ADDR(win, 0x04)
-#define OB_WIN_REMAP_LS(win) OB_WIN_REG_ADDR(win, 0x08)
-#define OB_WIN_REMAP_MS(win) OB_WIN_REG_ADDR(win, 0x0c)
-#define OB_WIN_MASK_LS(win) OB_WIN_REG_ADDR(win, 0x10)
-#define OB_WIN_MASK_MS(win) OB_WIN_REG_ADDR(win, 0x14)
-#define OB_WIN_ACTIONS(win) OB_WIN_REG_ADDR(win, 0x18)
-#define OB_WIN_DEFAULT_ACTIONS (OB_WIN_ACTIONS(OB_WIN_COUNT-1) + 0x4)
-#define OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
-#define OB_WIN_FUNC_NUM_SHIFT 24
-#define OB_WIN_FUNC_NUM_ENABLE BIT(23)
-#define OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
-#define OB_WIN_BUS_NUM_BITS_SHIFT 20
-#define OB_WIN_MSG_CODE_ENABLE BIT(22)
-#define OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
-#define OB_WIN_MSG_CODE_SHIFT 14
-#define OB_WIN_MSG_PAYLOAD_LEN BIT(12)
-#define OB_WIN_ATTR_ENABLE BIT(11)
-#define OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
-#define OB_WIN_ATTR_TC_SHIFT 8
-#define OB_WIN_ATTR_RELAXED BIT(7)
-#define OB_WIN_ATTR_NOSNOOP BIT(6)
-#define OB_WIN_ATTR_POISON BIT(5)
-#define OB_WIN_ATTR_IDO BIT(4)
-#define OB_WIN_TYPE_MASK GENMASK(3, 0)
-#define OB_WIN_TYPE_SHIFT 0
-#define OB_WIN_TYPE_MEM 0x0
-#define OB_WIN_TYPE_IO 0x4
-#define OB_WIN_TYPE_CONFIG_TYPE0 0x8
-#define OB_WIN_TYPE_CONFIG_TYPE1 0x9
-#define OB_WIN_TYPE_MSG 0xc
-
-/* LMI registers base address and register offsets */
-#define LMI_BASE_ADDR 0x6000
-#define CFG_REG (LMI_BASE_ADDR + 0x0)
-#define LTSSM_SHIFT 24
-#define LTSSM_MASK 0x3f
-#define LTSSM_L0 0x10
-#define LTSSM_DISABLED 0x20
-#define VENDOR_ID_REG (LMI_BASE_ADDR + 0x44)
-
-/* PCIe core controller registers */
-#define CTRL_CORE_BASE_ADDR 0x18000
-#define CTRL_CONFIG_REG (CTRL_CORE_BASE_ADDR + 0x0)
-#define CTRL_MODE_SHIFT 0x0
-#define CTRL_MODE_MASK 0x1
-#define PCIE_CORE_MODE_DIRECT 0x0
-#define PCIE_CORE_MODE_COMMAND 0x1
-
-/* Transaction types */
-#define PCIE_CONFIG_RD_TYPE0 0x8
-#define PCIE_CONFIG_RD_TYPE1 0x9
-#define PCIE_CONFIG_WR_TYPE0 0xa
-#define PCIE_CONFIG_WR_TYPE1 0xb
+/* PIO registers */
+#define ADVK_PIO_BASE_ADDR 0x4000
+#define ADVK_PIO_CTRL (ADVK_PIO_BASE_ADDR + 0x0)
+#define ADVK_PIO_CTRL_TYPE_MASK GENMASK(3, 0)
+#define ADVK_PIO_CTRL_TYPE_SHIFT 0
+#define ADVK_PIO_CTRL_TYPE_RD_TYPE0 0x8
+#define ADVK_PIO_CTRL_TYPE_RD_TYPE1 0x9
+#define ADVK_PIO_CTRL_TYPE_WR_TYPE0 0xa
+#define ADVK_PIO_CTRL_TYPE_WR_TYPE1 0xb
+#define ADVK_PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
+#define ADVK_PIO_STAT (ADVK_PIO_BASE_ADDR + 0x4)
+#define ADVK_PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
+#define ADVK_PIO_COMPLETION_STATUS_SHIFT 7
+#define ADVK_PIO_COMPLETION_STATUS_OK 0
+#define ADVK_PIO_COMPLETION_STATUS_UR 1
+#define ADVK_PIO_COMPLETION_STATUS_CRS 2
+#define ADVK_PIO_COMPLETION_STATUS_CA 4
+#define ADVK_PIO_NON_POSTED_REQ BIT(10)
+#define ADVK_PIO_ERR_STATUS BIT(11)
+#define ADVK_PIO_ADDR_LS (ADVK_PIO_BASE_ADDR + 0x8)
+#define ADVK_PIO_ADDR_MS (ADVK_PIO_BASE_ADDR + 0xc)
+#define ADVK_PIO_WR_DATA (ADVK_PIO_BASE_ADDR + 0x10)
+#define ADVK_PIO_WR_DATA_STRB (ADVK_PIO_BASE_ADDR + 0x14)
+#define ADVK_PIO_RD_DATA (ADVK_PIO_BASE_ADDR + 0x18)
+#define ADVK_PIO_START (ADVK_PIO_BASE_ADDR + 0x1c)
+#define ADVK_PIO_ISR (ADVK_PIO_BASE_ADDR + 0x20)
+
+/* Global Control registers */
+#define ADVK_GLOBAL_CTRL_BASE_ADDR 0x4800
+#define ADVK_GLOBAL_CTRL0 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x0)
+#define ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK GENMASK(1, 0)
+#define ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT 0
+#define ADVK_GLOBAL_CTRL0_SPEED_GEN_1 0
+#define ADVK_GLOBAL_CTRL0_SPEED_GEN_2 1
+#define ADVK_GLOBAL_CTRL0_SPEED_GEN_3 2
+#define ADVK_GLOBAL_CTRL0_IS_RC BIT(2)
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK GENMASK(4, 3)
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT 3
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_1 0
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_2 1
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_4 2
+#define ADVK_GLOBAL_CTRL0_LANE_COUNT_8 3
+#define ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN BIT(6)
+#define ADVK_GLOBAL_CTRL2 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x8)
+#define ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN BIT(5)
+#define ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN BIT(6)
+
+/* PCIe window configuration registers */
+#define ADVK_OB_WIN_BASE_ADDR 0x4c00
+#define ADVK_OB_WIN_BLOCK_SIZE 0x20
+#define ADVK_OB_WIN_COUNT 8
+#define ADVK_OB_WIN_REG_ADDR(win, offset) (ADVK_OB_WIN_BASE_ADDR + ADVK_OB_WIN_BLOCK_SIZE * (win) + (offset))
+#define ADVK_OB_WIN_MATCH_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x00)
+#define ADVK_OB_WIN_ENABLE BIT(0)
+#define ADVK_OB_WIN_MATCH_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x04)
+#define ADVK_OB_WIN_REMAP_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x08)
+#define ADVK_OB_WIN_REMAP_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x0c)
+#define ADVK_OB_WIN_MASK_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x10)
+#define ADVK_OB_WIN_MASK_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x14)
+#define ADVK_OB_WIN_ACTIONS(win) ADVK_OB_WIN_REG_ADDR(win, 0x18)
+#define ADVK_OB_WIN_DEFAULT_ACTIONS (ADVK_OB_WIN_ACTIONS(ADVK_OB_WIN_COUNT-1) + 0x4)
+#define ADVK_OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
+#define ADVK_OB_WIN_FUNC_NUM_SHIFT 24
+#define ADVK_OB_WIN_FUNC_NUM_ENABLE BIT(23)
+#define ADVK_OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
+#define ADVK_OB_WIN_BUS_NUM_BITS_SHIFT 20
+#define ADVK_OB_WIN_MSG_CODE_ENABLE BIT(22)
+#define ADVK_OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
+#define ADVK_OB_WIN_MSG_CODE_SHIFT 14
+#define ADVK_OB_WIN_MSG_PAYLOAD_LEN BIT(12)
+#define ADVK_OB_WIN_ATTR_ENABLE BIT(11)
+#define ADVK_OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
+#define ADVK_OB_WIN_ATTR_TC_SHIFT 8
+#define ADVK_OB_WIN_ATTR_RELAXED BIT(7)
+#define ADVK_OB_WIN_ATTR_NOSNOOP BIT(6)
+#define ADVK_OB_WIN_ATTR_POISON BIT(5)
+#define ADVK_OB_WIN_ATTR_IDO BIT(4)
+#define ADVK_OB_WIN_TYPE_MASK GENMASK(3, 0)
+#define ADVK_OB_WIN_TYPE_SHIFT 0
+#define ADVK_OB_WIN_TYPE_MEM 0x0
+#define ADVK_OB_WIN_TYPE_IO 0x4
+#define ADVK_OB_WIN_TYPE_CONFIG_TYPE0 0x8
+#define ADVK_OB_WIN_TYPE_CONFIG_TYPE1 0x9
+#define ADVK_OB_WIN_TYPE_MSG 0xc
+
+/* Local Management Interface registers */
+#define ADVK_LMI_BASE_ADDR 0x6000
+#define ADVK_LMI_PHY_CFG0 (ADVK_LMI_BASE_ADDR + 0x0)
+#define ADVK_LMI_PHY_CFG0_LTSSM_MASK GENMASK(29, 24)
+#define ADVK_LMI_PHY_CFG0_LTSSM_SHIFT 24
+#define ADVK_LMI_PHY_CFG0_LTSSM_L0 0x10
+#define ADVK_LMI_PHY_CFG0_LTSSM_DISABLED 0x20
+#define ADVK_LMI_VENDOR_ID (ADVK_LMI_BASE_ADDR + 0x44)
+
+/* Core Control registers */
+#define ADVK_CORE_CTRL_BASE_ADDR 0x18000
+#define ADVK_CORE_CTRL_CONFIG (ADVK_CORE_CTRL_BASE_ADDR + 0x0)
+#define ADVK_CORE_CTRL_CONFIG_COMMAND_MODE BIT(0)
/* PCIe Retries & Timeout definitions */
#define PIO_MAX_RETRIES 1500
@@ -154,7 +145,7 @@
#define LINK_MAX_RETRIES 10
#define LINK_WAIT_TIMEOUT 100000
-#define CFG_RD_CRS_VAL 0xFFFF0001
+#define CFG_RD_CRS_VAL 0xFFFF0001
/**
* struct pcie_advk - Advk PCIe controller state
@@ -234,8 +225,8 @@ static int pcie_advk_wait_pio(struct pcie_advk *pcie)
uint count;
for (count = 1; count <= PIO_MAX_RETRIES; count++) {
- start = advk_readl(pcie, PIO_START);
- isr = advk_readl(pcie, PIO_ISR);
+ start = advk_readl(pcie, ADVK_PIO_START);
+ isr = advk_readl(pcie, ADVK_PIO_ISR);
if (!start && isr)
return count;
/*
@@ -267,29 +258,29 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
unsigned int status;
char *strcomp_status, *str_posted;
- reg = advk_readl(pcie, PIO_STAT);
- status = (reg & PIO_COMPLETION_STATUS_MASK) >>
- PIO_COMPLETION_STATUS_SHIFT;
+ reg = advk_readl(pcie, ADVK_PIO_STAT);
+ status = (reg & ADVK_PIO_COMPLETION_STATUS_MASK) >>
+ ADVK_PIO_COMPLETION_STATUS_SHIFT;
switch (status) {
- case PIO_COMPLETION_STATUS_OK:
- if (reg & PIO_ERR_STATUS) {
+ case ADVK_PIO_COMPLETION_STATUS_OK:
+ if (reg & ADVK_PIO_ERR_STATUS) {
strcomp_status = "COMP_ERR";
ret = -EFAULT;
break;
}
/* Get the read result */
if (read_val)
- *read_val = advk_readl(pcie, PIO_RD_DATA);
+ *read_val = advk_readl(pcie, ADVK_PIO_RD_DATA);
/* No error */
strcomp_status = NULL;
ret = 0;
break;
- case PIO_COMPLETION_STATUS_UR:
+ case ADVK_PIO_COMPLETION_STATUS_UR:
strcomp_status = "UR";
ret = -EOPNOTSUPP;
break;
- case PIO_COMPLETION_STATUS_CRS:
+ case ADVK_PIO_COMPLETION_STATUS_CRS:
if (allow_crs && read_val) {
/* For reading, CRS is not an error status. */
*read_val = CFG_RD_CRS_VAL;
@@ -300,7 +291,7 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
ret = -EAGAIN;
}
break;
- case PIO_COMPLETION_STATUS_CA:
+ case ADVK_PIO_COMPLETION_STATUS_CA:
strcomp_status = "CA";
ret = -ECANCELED;
break;
@@ -313,14 +304,14 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
if (!strcomp_status)
return ret;
- if (reg & PIO_NON_POSTED_REQ)
+ if (reg & ADVK_PIO_NON_POSTED_REQ)
str_posted = "Non-posted";
else
str_posted = "Posted";
dev_dbg(pcie->dev, "%s PIO Response Status: %s, %#x @ %#x\n",
str_posted, strcomp_status, reg,
- advk_readl(pcie, PIO_ADDR_LS));
+ advk_readl(pcie, ADVK_PIO_ADDR_LS));
return ret;
}
@@ -418,7 +409,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
*/
allow_crs = (offset == PCI_VENDOR_ID) && (size == PCI_SIZE_32) && pcie->cfgcrssve;
- if (advk_readl(pcie, PIO_START)) {
+ if (advk_readl(pcie, ADVK_PIO_START)) {
dev_err(pcie->dev,
"Previous PIO read/write transfer is still running\n");
if (allow_crs) {
@@ -430,28 +421,28 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
}
/* Program the control register */
- reg = advk_readl(pcie, PIO_CTRL);
- reg &= ~PIO_CTRL_TYPE_MASK;
+ reg = advk_readl(pcie, ADVK_PIO_CTRL);
+ reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
if (busno == pcie->sec_busno)
- reg |= PCIE_CONFIG_RD_TYPE0;
+ reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
else
- reg |= PCIE_CONFIG_RD_TYPE1;
- advk_writel(pcie, reg, PIO_CTRL);
+ reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
+ advk_writel(pcie, reg, ADVK_PIO_CTRL);
/* Program the address registers */
reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
- advk_writel(pcie, reg, PIO_ADDR_LS);
- advk_writel(pcie, 0, PIO_ADDR_MS);
+ advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
+ advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
/* Program the data strobe */
- advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
+ advk_writel(pcie, 0xf, ADVK_PIO_WR_DATA_STRB);
retry_count = 0;
retry:
/* Start the transfer */
- advk_writel(pcie, 1, PIO_ISR);
- advk_writel(pcie, 1, PIO_START);
+ advk_writel(pcie, 1, ADVK_PIO_ISR);
+ advk_writel(pcie, 1, ADVK_PIO_START);
ret = pcie_advk_wait_pio(pcie);
if (ret < 0) {
@@ -582,43 +573,43 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
return 0;
}
- if (advk_readl(pcie, PIO_START)) {
+ if (advk_readl(pcie, ADVK_PIO_START)) {
dev_err(pcie->dev,
"Previous PIO read/write transfer is still running\n");
return -EAGAIN;
}
/* Program the control register */
- reg = advk_readl(pcie, PIO_CTRL);
- reg &= ~PIO_CTRL_TYPE_MASK;
+ reg = advk_readl(pcie, ADVK_PIO_CTRL);
+ reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
if (busno == pcie->sec_busno)
- reg |= PCIE_CONFIG_WR_TYPE0;
+ reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
else
- reg |= PCIE_CONFIG_WR_TYPE1;
- advk_writel(pcie, reg, PIO_CTRL);
+ reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
+ advk_writel(pcie, reg, ADVK_PIO_CTRL);
/* Program the address registers */
reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
- advk_writel(pcie, reg, PIO_ADDR_LS);
- advk_writel(pcie, 0, PIO_ADDR_MS);
+ advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
+ advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
dev_dbg(pcie->dev, "\tPIO req. - addr = 0x%08x\n", reg);
/* Program the data register */
reg = pci_conv_size_to_32(0, value, offset, size);
- advk_writel(pcie, reg, PIO_WR_DATA);
+ advk_writel(pcie, reg, ADVK_PIO_WR_DATA);
dev_dbg(pcie->dev, "\tPIO req. - val = 0x%08x\n", reg);
/* Program the data strobe */
reg = pcie_calc_datastrobe(offset, size);
- advk_writel(pcie, reg, PIO_WR_DATA_STRB);
+ advk_writel(pcie, reg, ADVK_PIO_WR_DATA_STRB);
dev_dbg(pcie->dev, "\tPIO req. - strb = 0x%02x\n", reg);
retry_count = 0;
retry:
/* Start the transfer */
- advk_writel(pcie, 1, PIO_ISR);
- advk_writel(pcie, 1, PIO_START);
+ advk_writel(pcie, 1, ADVK_PIO_ISR);
+ advk_writel(pcie, 1, ADVK_PIO_START);
ret = pcie_advk_wait_pio(pcie);
if (ret < 0)
@@ -645,9 +636,9 @@ static int pcie_advk_link_up(struct pcie_advk *pcie)
{
u32 val, ltssm_state;
- val = advk_readl(pcie, CFG_REG);
- ltssm_state = (val >> LTSSM_SHIFT) & LTSSM_MASK;
- return ltssm_state >= LTSSM_L0 && ltssm_state < LTSSM_DISABLED;
+ val = advk_readl(pcie, ADVK_LMI_PHY_CFG0);
+ ltssm_state = (val & ADVK_LMI_PHY_CFG0_LTSSM_MASK) >> ADVK_LMI_PHY_CFG0_LTSSM_SHIFT;
+ return ltssm_state >= ADVK_LMI_PHY_CFG0_LTSSM_L0 && ltssm_state < ADVK_LMI_PHY_CFG0_LTSSM_DISABLED;
}
/**
@@ -687,25 +678,25 @@ static void pcie_advk_set_ob_win(struct pcie_advk *pcie, u8 win_num,
phys_addr_t match, phys_addr_t remap,
phys_addr_t mask, u32 actions)
{
- advk_writel(pcie, OB_WIN_ENABLE |
- lower_32_bits(match), OB_WIN_MATCH_LS(win_num));
- advk_writel(pcie, upper_32_bits(match), OB_WIN_MATCH_MS(win_num));
- advk_writel(pcie, lower_32_bits(remap), OB_WIN_REMAP_LS(win_num));
- advk_writel(pcie, upper_32_bits(remap), OB_WIN_REMAP_MS(win_num));
- advk_writel(pcie, lower_32_bits(mask), OB_WIN_MASK_LS(win_num));
- advk_writel(pcie, upper_32_bits(mask), OB_WIN_MASK_MS(win_num));
- advk_writel(pcie, actions, OB_WIN_ACTIONS(win_num));
+ advk_writel(pcie, ADVK_OB_WIN_ENABLE |
+ lower_32_bits(match), ADVK_OB_WIN_MATCH_LS(win_num));
+ advk_writel(pcie, upper_32_bits(match), ADVK_OB_WIN_MATCH_MS(win_num));
+ advk_writel(pcie, lower_32_bits(remap), ADVK_OB_WIN_REMAP_LS(win_num));
+ advk_writel(pcie, upper_32_bits(remap), ADVK_OB_WIN_REMAP_MS(win_num));
+ advk_writel(pcie, lower_32_bits(mask), ADVK_OB_WIN_MASK_LS(win_num));
+ advk_writel(pcie, upper_32_bits(mask), ADVK_OB_WIN_MASK_MS(win_num));
+ advk_writel(pcie, actions, ADVK_OB_WIN_ACTIONS(win_num));
}
static void pcie_advk_disable_ob_win(struct pcie_advk *pcie, u8 win_num)
{
- advk_writel(pcie, 0, OB_WIN_MATCH_LS(win_num));
- advk_writel(pcie, 0, OB_WIN_MATCH_MS(win_num));
- advk_writel(pcie, 0, OB_WIN_REMAP_LS(win_num));
- advk_writel(pcie, 0, OB_WIN_REMAP_MS(win_num));
- advk_writel(pcie, 0, OB_WIN_MASK_LS(win_num));
- advk_writel(pcie, 0, OB_WIN_MASK_MS(win_num));
- advk_writel(pcie, 0, OB_WIN_ACTIONS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_LS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_MS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_LS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_MS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_MASK_LS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_MASK_MS(win_num));
+ advk_writel(pcie, 0, ADVK_OB_WIN_ACTIONS(win_num));
}
static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
@@ -729,7 +720,7 @@ static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
* because lower 16 bits of mask must be zero. Remapped address
* may have set only bits from the mask.
*/
- while (*wins < OB_WIN_COUNT && size > 0) {
+ while (*wins < ADVK_OB_WIN_COUNT && size > 0) {
/* Calculate the largest aligned window size */
win_size = (1ULL << (fls64(size) - 1)) |
(phys_start ? (1ULL << __ffs64(phys_start)) : 0);
@@ -774,24 +765,23 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
u32 reg;
/* Set to Direct mode */
- reg = advk_readl(pcie, CTRL_CONFIG_REG);
- reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT);
- reg |= ((PCIE_CORE_MODE_DIRECT & CTRL_MODE_MASK) << CTRL_MODE_SHIFT);
- advk_writel(pcie, reg, CTRL_CONFIG_REG);
+ reg = advk_readl(pcie, ADVK_CORE_CTRL_CONFIG);
+ reg &= ~ADVK_CORE_CTRL_CONFIG_COMMAND_MODE;
+ advk_writel(pcie, reg, ADVK_CORE_CTRL_CONFIG);
/* Set PCI global control register to RC mode */
- reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- reg |= (IS_RC_MSK << IS_RC_SHIFT);
- advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
+ reg |= ADVK_GLOBAL_CTRL0_IS_RC;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
/*
* Replace incorrect PCI vendor id value 0x1b4b by correct value 0x11ab.
- * VENDOR_ID_REG contains vendor id in low 16 bits and subsystem vendor
+ * ADVK_LMI_VENDOR_ID contains vendor id in low 16 bits and subsystem vendor
* id in high 16 bits. Updating this register changes readback value of
- * read-only vendor id bits in PCIE_CORE_DEV_ID_REG register. Workaround
+ * read-only vendor id bits in Root Port PCI_VENDOR_ID register. Workaround
* for erratum 4.1: "The value of device and vendor ID is incorrect".
*/
- advk_writel(pcie, 0x11ab11ab, VENDOR_ID_REG);
+ advk_writel(pcie, 0x11ab11ab, ADVK_LMI_VENDOR_ID);
/*
* Change Class Code of PCI Bridge device to PCI Bridge (0x600400),
@@ -836,26 +826,26 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
/* Program PCIe Control 2 to disable strict ordering */
- reg = PCIE_CORE_CTRL2_RESERVED |
- PCIE_CORE_CTRL2_TD_ENABLE;
- advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
+ reg &= ~ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
/* Set GEN2 */
- reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- reg &= ~PCIE_GEN_SEL_MSK;
- reg |= SPEED_GEN_2;
- advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
+ reg &= ~ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK;
+ reg |= ADVK_GLOBAL_CTRL0_SPEED_GEN_2 << ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
/* Set lane X1 */
- reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- reg &= ~LANE_CNT_MSK;
- reg |= LANE_COUNT_1;
- advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
+ reg &= ~ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK;
+ reg |= ADVK_GLOBAL_CTRL0_LANE_COUNT_1 << ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
/* Enable link training */
- reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- reg |= LINK_TRAINING_EN;
- advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
+ reg |= ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
/*
* Enable AXI address window location generation:
@@ -867,9 +857,9 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
* access when default outbound window configuration
* is set for memory access.
*/
- reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
- reg |= PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE;
- advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
+ reg |= ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
/*
* Bypass the address window mapping for PIO:
@@ -877,16 +867,16 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
* info over AXI interface by PIO registers, the
* address window is not required.
*/
- reg = advk_readl(pcie, PIO_CTRL);
- reg |= PIO_CTRL_ADDR_WIN_DISABLE;
- advk_writel(pcie, reg, PIO_CTRL);
+ reg = advk_readl(pcie, ADVK_PIO_CTRL);
+ reg |= ADVK_PIO_CTRL_ADDR_WIN_DISABLE;
+ advk_writel(pcie, reg, ADVK_PIO_CTRL);
/*
* Set memory access in Default User Field so it
* is not required to configure PCIe address for
* transparent memory access.
*/
- advk_writel(pcie, OB_WIN_TYPE_MEM, OB_WIN_DEFAULT_ACTIONS);
+ advk_writel(pcie, ADVK_OB_WIN_TYPE_MEM, ADVK_OB_WIN_DEFAULT_ACTIONS);
/*
* Configure PCIe address windows for non-memory or
@@ -896,14 +886,14 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
wins = 0;
pci_get_regions(pcie->dev, &io, &mem, &pref);
if (io)
- pcie_advk_set_ob_region(pcie, &wins, io, OB_WIN_TYPE_IO);
+ pcie_advk_set_ob_region(pcie, &wins, io, ADVK_OB_WIN_TYPE_IO);
if (mem && mem->phys_start != mem->bus_start)
- pcie_advk_set_ob_region(pcie, &wins, mem, OB_WIN_TYPE_MEM);
+ pcie_advk_set_ob_region(pcie, &wins, mem, ADVK_OB_WIN_TYPE_MEM);
if (pref && pref->phys_start != pref->bus_start)
- pcie_advk_set_ob_region(pcie, &wins, pref, OB_WIN_TYPE_MEM);
+ pcie_advk_set_ob_region(pcie, &wins, pref, ADVK_OB_WIN_TYPE_MEM);
/* Disable remaining PCIe outbound windows */
- for (i = ((wins >= 0) ? wins : 0); i < OB_WIN_COUNT; i++)
+ for (i = ((wins >= 0) ? wins : 0); i < ADVK_OB_WIN_COUNT; i++)
pcie_advk_disable_ob_win(pcie, i);
if (wins == -1)
@@ -971,16 +961,16 @@ static int pcie_advk_remove(struct udevice *dev)
u32 reg;
int i;
- for (i = 0; i < OB_WIN_COUNT; i++)
+ for (i = 0; i < ADVK_OB_WIN_COUNT; i++)
pcie_advk_disable_ob_win(pcie, i);
reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
- reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- reg &= ~LINK_TRAINING_EN;
- advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+ reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
+ reg &= ~ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
+ advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr()
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
@ 2022-02-10 13:53 ` Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
2022-02-10 13:53 ` [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus Pali Rohár
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Pali Rohár @ 2022-02-10 13:53 UTC (permalink / raw)
To: Stefan Roese, Marek Behún; +Cc: u-boot
There is only one base address, so use dev_read_addr() instead of dev_read_addr_index().
Signed-off-by: Pali Rohár <pali@kernel.org>
---
drivers/pci/pci-aardvark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 8e3b13b49ea0..6e65c0e1558c 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -991,7 +991,7 @@ static int pcie_advk_of_to_plat(struct udevice *dev)
struct pcie_advk *pcie = dev_get_priv(dev);
/* Get the register base address */
- pcie->base = (void *)dev_read_addr_index(dev, 0);
+ pcie->base = (void *)dev_read_addr(dev);
if ((fdt_addr_t)pcie->base == FDT_ADDR_T_NONE)
return -EINVAL;
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
2022-02-10 13:53 ` [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr() Pali Rohár
@ 2022-02-10 13:53 ` Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
2022-02-15 9:20 ` [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Stefan Roese
2022-02-17 15:35 ` Stefan Roese
4 siblings, 2 replies; 12+ messages in thread
From: Pali Rohár @ 2022-02-10 13:53 UTC (permalink / raw)
To: Stefan Roese, Marek Behún; +Cc: u-boot
Writing to the PCI_PRIMARY_BUS register of the root port should not change
bus number on which is root port present.
This PCI_PRIMARY_BUS register is used only for correct configuration of
legacy PCI stuff, like forwarding of PCI special cycles between buses.
Aardvark HW does not support PCI special cycles, so it does not have HW
register for PCI_PRIMARY_BUS and therefore it does not matter what is
stored in this register.
So fix this issue and do not use PCI_PRIMARY_BUS register in pci-aardvark.c
driver for moving root bus of the root port.
After this change there is no reason for storing bus number (zero) into
first_busno variable, so remove this variable.
Signed-off-by: Pali Rohár <pali@kernel.org>
Fixes: cb056005dc67 ("arm: a37xx: pci: Add support for accessing PCI Bridge on root bus")
---
drivers/pci/pci-aardvark.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 6e65c0e1558c..1eb257ea8b4a 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -151,8 +151,6 @@
* struct pcie_advk - Advk PCIe controller state
*
* @base: The base address of the register space.
- * @first_busno: Bus number of the PCIe root-port.
- * This may vary depending on the PCIe setup.
* @sec_busno: Bus number for the device behind the PCIe root-port.
* @dev: The pointer to PCI uclass device.
* @reset_gpio: GPIO descriptor for PERST.
@@ -162,7 +160,6 @@
*/
struct pcie_advk {
void *base;
- int first_busno;
int sec_busno;
struct udevice *dev;
struct gpio_desc reset_gpio;
@@ -194,8 +191,8 @@ static inline uint advk_readl(struct pcie_advk *pcie, uint reg)
static bool pcie_advk_addr_valid(struct pcie_advk *pcie,
int busno, u8 dev, u8 func)
{
- /* On the primary (local) bus there is only one PCI Bridge */
- if (busno == pcie->first_busno && (dev != 0 || func != 0))
+ /* On the root bus there is only one PCI Bridge */
+ if (busno == 0 && (dev != 0 || func != 0))
return false;
/*
@@ -353,17 +350,17 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
}
/*
- * The configuration space of the PCI Bridge on primary (first) bus is
+ * The configuration space of the PCI Bridge on the root bus (zero) is
* not accessible via PIO transfers like all other PCIe devices. PCI
* Bridge config registers are available directly in Aardvark memory
* space starting at offset zero. The PCI Bridge config space is of
* Type 0, but the BAR registers (including ROM BAR) don't have the same
* meaning as in the PCIe specification. Therefore do not access BAR
* registers and non-common registers (those which have different
- * meaning for Type 0 and Type 1 config space) of the primary PCI Bridge
+ * meaning for Type 0 and Type 1 config space) of the PCI Bridge
* and instead read their content from driver virtual cfgcache[].
*/
- if (busno == pcie->first_busno) {
+ if (busno == 0) {
if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
data = pcie->cfgcache[(offset - 0x10) / 4];
else
@@ -543,7 +540,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
* zero. Type 1 specific registers are not available, so we write their
* content only into driver virtual cfgcache[].
*/
- if (busno == pcie->first_busno) {
+ if (busno == 0) {
if ((offset >= 0x10 && offset < 0x34) ||
(offset >= 0x38 && offset < 0x3c)) {
data = pcie->cfgcache[(offset - 0x10) / 4];
@@ -560,9 +557,6 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
}
- if (offset == PCI_PRIMARY_BUS)
- pcie->first_busno = data & 0xff;
-
if (offset == PCI_SECONDARY_BUS ||
(offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
pcie->sec_busno = (data >> 8) & 0xff;
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
` (2 preceding siblings ...)
2022-02-10 13:53 ` [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus Pali Rohár
@ 2022-02-15 9:20 ` Stefan Roese
2022-02-17 15:35 ` Stefan Roese
4 siblings, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-15 9:20 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> PCI config space of the aardvark PCIe Root Port is available only in
> internal aardvark memory space starting at offset 0x0. PCI Express
> registers (PCI_EXP_*) start at offset 0xc0. And Advanced Error Reporting
> registers (PCI_ERR_*) start at offset 0x100.
>
> Replace custom aardvark register macros by standard PCI macros from
> include/pci.h file with fixed offset.
>
> Some DEVCTL and AER macros are not defined in include/pci.h file, so define
> them in the same way as in linux uapi header file pci_regs.h.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 82 ++++++++++++++------------------------
> include/pci.h | 24 +++++++++++
> 2 files changed, 54 insertions(+), 52 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 22b6d8b62865..ad4edd715bd6 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -35,28 +35,10 @@
> #include <linux/delay.h>
> #include <linux/ioport.h>
>
> -/* PCIe core registers */
> -#define PCIE_CORE_CMD_STATUS_REG 0x4
> -#define PCIE_CORE_CMD_IO_ACCESS_EN BIT(0)
> -#define PCIE_CORE_CMD_MEM_ACCESS_EN BIT(1)
> -#define PCIE_CORE_CMD_MEM_IO_REQ_EN BIT(2)
> -#define PCIE_CORE_DEV_REV_REG 0x8
> -#define PCIE_CORE_EXP_ROM_BAR_REG 0x30
> -#define PCIE_CORE_PCIEXP_CAP_OFF 0xc0
> -#define PCIE_CORE_DEV_CTRL_STATS_REG 0xc8
> -#define PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE (0 << 4)
> -#define PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE (0 << 11)
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE 0x2
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT 5
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE 0x2
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT 12
> -#define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0
> -#define PCIE_CORE_LINK_TRAINING BIT(5)
> -#define PCIE_CORE_ERR_CAPCTL_REG 0x118
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX BIT(5)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN BIT(6)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK BIT(7)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV BIT(8)
> +/* PCIe Root Port register offsets */
> +#define ADVK_ROOT_PORT_PCI_CFG_OFF 0x0
> +#define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
> +#define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
>
> /* PIO registers base address and register offsets */
> #define PIO_BASE_ADDR 0x4000
> @@ -394,7 +376,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
> data = pcie->cfgcache[(offset - 0x10) / 4];
> else
> - data = advk_readl(pcie, offset & ~3);
> + data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
>
> if ((offset & ~3) == (PCI_HEADER_TYPE & ~3)) {
> /*
> @@ -406,14 +388,13 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> data |= PCI_HEADER_TYPE_BRIDGE << 16;
> }
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL) {
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL) {
> /* CRSSVE bit is stored only in cache */
> if (pcie->cfgcrssve)
> data |= PCI_EXP_RTCTL_CRSSVE;
> }
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF +
> - (PCI_EXP_RTCAP & ~3)) {
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + (PCI_EXP_RTCAP & ~3)) {
> /* CRS is emulated below, so set CRSVIS capability */
> data |= PCI_EXP_RTCAP_CRSVIS << 16;
> }
> @@ -583,9 +564,9 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> data = 0x0;
> pcie->cfgcache[(offset - 0x10) / 4] = data;
> } else {
> - data = advk_readl(pcie, offset & ~3);
> + data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> data = pci_conv_size_to_32(data, value, offset, size);
> - advk_writel(pcie, data, offset & ~3);
> + advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> }
>
> if (offset == PCI_PRIMARY_BUS)
> @@ -595,7 +576,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> (offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
> pcie->sec_busno = (data >> 8) & 0xff;
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL)
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL)
> pcie->cfgcrssve = data & PCI_EXP_RTCTL_CRSSVE;
>
> return 0;
> @@ -834,26 +815,25 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * Type 1 registers is redirected to the virtual cfgcache[] buffer,
> * which avoids changing unrelated registers.
> */
> - reg = advk_readl(pcie, PCIE_CORE_DEV_REV_REG);
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
> reg &= ~0xffffff00;
> reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
> - advk_writel(pcie, reg, PCIE_CORE_DEV_REV_REG);
> -
> - /* Set Advanced Error Capabilities and Control PF0 register */
> - reg = PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHECK |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV;
> - advk_writel(pcie, reg, PCIE_CORE_ERR_CAPCTL_REG);
> -
> - /* Set PCIe Device Control and Status 1 PF0 register */
> - reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
> - (PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE <<
> - PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT) |
> - (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE <<
> - PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT) |
> - PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE;
> - advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
> +
> + /* Enable generation and checking of ECRC on PCIe Root Port */
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
> + reg |= PCI_ERR_CAP_ECRC_GENE | PCI_ERR_CAP_ECRC_CHKE;
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
> +
> + /* Set PCIe Device Control register on PCIe Root Port */
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
> + reg &= ~PCI_EXP_DEVCTL_RELAX_EN;
> + reg &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
> + reg &= ~PCI_EXP_DEVCTL_PAYLOAD;
> + reg &= ~PCI_EXP_DEVCTL_READRQ;
> + reg |= PCI_EXP_DEVCTL_PAYLOAD_512B;
> + reg |= PCI_EXP_DEVCTL_READRQ_512B;
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
>
> /* Program PCIe Control 2 to disable strict ordering */
> reg = PCIE_CORE_CTRL2_RESERVED |
> @@ -994,11 +974,9 @@ static int pcie_advk_remove(struct udevice *dev)
> for (i = 0; i < OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> - reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
> - reg &= ~(PCIE_CORE_CMD_MEM_ACCESS_EN |
> - PCIE_CORE_CMD_IO_ACCESS_EN |
> - PCIE_CORE_CMD_MEM_IO_REQ_EN);
> - advk_writel(pcie, reg, PCIE_CORE_CMD_STATUS_REG);
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
> + reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
>
> reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> reg &= ~LINK_TRAINING_EN;
> diff --git a/include/pci.h b/include/pci.h
> index 9e7910b271b8..673c95c6bb79 100644
> --- a/include/pci.h
> +++ b/include/pci.h
> @@ -484,6 +484,22 @@
> #define PCI_EXP_DEVCAP 4 /* Device capabilities */
> #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */
> #define PCI_EXP_DEVCTL 8 /* Device Control */
> +#define PCI_EXP_DEVCTL_PAYLOAD 0x00e0 /* Max_Payload_Size */
> +#define PCI_EXP_DEVCTL_PAYLOAD_128B 0x0000 /* 128 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_256B 0x0020 /* 256 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_512B 0x0040 /* 512 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_1024B 0x0060 /* 1024 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_2048B 0x0080 /* 2048 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_4096B 0x00a0 /* 4096 Bytes */
> +#define PCI_EXP_DEVCTL_RELAX_EN 0x0010 /* Enable relaxed ordering */
> +#define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 /* Enable No Snoop */
> +#define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */
> +#define PCI_EXP_DEVCTL_READRQ_128B 0x0000 /* 128 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_256B 0x1000 /* 256 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_512B 0x2000 /* 512 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_2048B 0x4000 /* 2048 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_4096B 0x5000 /* 4096 Bytes */
> #define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
> #define PCI_EXP_LNKCAP 12 /* Link Capabilities */
> #define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */
> @@ -522,6 +538,14 @@
> #define PCI_EXP_LNKCTL2_TLS_5_0GT 0x0002 /* Target Link Speed 5.0GT/s */
> #define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003 /* Target Link Speed 8.0GT/s */
>
> +/* Advanced Error Reporting */
> +#define PCI_ERR_CAP 24 /* Advanced Error Capabilities */
> +#define PCI_ERR_CAP_FEP(x) ((x) & 31) /* First Error Pointer */
> +#define PCI_ERR_CAP_ECRC_GENC 0x00000020 /* ECRC Generation Capable */
> +#define PCI_ERR_CAP_ECRC_GENE 0x00000040 /* ECRC Generation Enable */
> +#define PCI_ERR_CAP_ECRC_CHKC 0x00000080 /* ECRC Check Capable */
> +#define PCI_ERR_CAP_ECRC_CHKE 0x00000100 /* ECRC Check Enable */
> +
> /* Single Root I/O Virtualization Registers */
> #define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */
> #define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
@ 2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:35 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-15 9:21 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> Remove "PCI_" prefix from all macros which are aardvark specific to not
> conflict with macros defined in global include file pci.h. Instead add
> "ADVK_" prefix for them so it is visible that they are aardvark specific.
>
> After "ADVK_" prefix append keyword which describes register group, so it
> would be clear to which register each macro value belongs.
>
> Rename some macros for consistency with other macros.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 394 ++++++++++++++++++-------------------
> 1 file changed, 192 insertions(+), 202 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index ad4edd715bd6..8e3b13b49ea0 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -40,113 +40,104 @@
> #define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
> #define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
>
> -/* PIO registers base address and register offsets */
> -#define PIO_BASE_ADDR 0x4000
> -#define PIO_CTRL (PIO_BASE_ADDR + 0x0)
> -#define PIO_CTRL_TYPE_MASK GENMASK(3, 0)
> -#define PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
> -#define PIO_STAT (PIO_BASE_ADDR + 0x4)
> -#define PIO_COMPLETION_STATUS_SHIFT 7
> -#define PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
> -#define PIO_COMPLETION_STATUS_OK 0
> -#define PIO_COMPLETION_STATUS_UR 1
> -#define PIO_COMPLETION_STATUS_CRS 2
> -#define PIO_COMPLETION_STATUS_CA 4
> -#define PIO_NON_POSTED_REQ BIT(10)
> -#define PIO_ERR_STATUS BIT(11)
> -#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)
> -#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)
> -#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
> -#define PIO_WR_DATA_STRB (PIO_BASE_ADDR + 0x14)
> -#define PIO_RD_DATA (PIO_BASE_ADDR + 0x18)
> -#define PIO_START (PIO_BASE_ADDR + 0x1c)
> -#define PIO_ISR (PIO_BASE_ADDR + 0x20)
> -
> -/* Aardvark Control registers */
> -#define CONTROL_BASE_ADDR 0x4800
> -#define PCIE_CORE_CTRL0_REG (CONTROL_BASE_ADDR + 0x0)
> -#define PCIE_GEN_SEL_MSK 0x3
> -#define PCIE_GEN_SEL_SHIFT 0x0
> -#define SPEED_GEN_1 0
> -#define SPEED_GEN_2 1
> -#define SPEED_GEN_3 2
> -#define IS_RC_MSK 1
> -#define IS_RC_SHIFT 2
> -#define LANE_CNT_MSK 0x18
> -#define LANE_CNT_SHIFT 0x3
> -#define LANE_COUNT_1 (0 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_2 (1 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_4 (2 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_8 (3 << LANE_CNT_SHIFT)
> -#define LINK_TRAINING_EN BIT(6)
> -#define PCIE_CORE_CTRL2_REG (CONTROL_BASE_ADDR + 0x8)
> -#define PCIE_CORE_CTRL2_RESERVED 0x7
> -#define PCIE_CORE_CTRL2_TD_ENABLE BIT(4)
> -#define PCIE_CORE_CTRL2_STRICT_ORDER_ENABLE BIT(5)
> -#define PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE BIT(6)
> -
> -/* PCIe window configuration */
> -#define OB_WIN_BASE_ADDR 0x4c00
> -#define OB_WIN_BLOCK_SIZE 0x20
> -#define OB_WIN_COUNT 8
> -#define OB_WIN_REG_ADDR(win, offset) (OB_WIN_BASE_ADDR + \
> - OB_WIN_BLOCK_SIZE * (win) + \
> - (offset))
> -#define OB_WIN_MATCH_LS(win) OB_WIN_REG_ADDR(win, 0x00)
> -#define OB_WIN_ENABLE BIT(0)
> -#define OB_WIN_MATCH_MS(win) OB_WIN_REG_ADDR(win, 0x04)
> -#define OB_WIN_REMAP_LS(win) OB_WIN_REG_ADDR(win, 0x08)
> -#define OB_WIN_REMAP_MS(win) OB_WIN_REG_ADDR(win, 0x0c)
> -#define OB_WIN_MASK_LS(win) OB_WIN_REG_ADDR(win, 0x10)
> -#define OB_WIN_MASK_MS(win) OB_WIN_REG_ADDR(win, 0x14)
> -#define OB_WIN_ACTIONS(win) OB_WIN_REG_ADDR(win, 0x18)
> -#define OB_WIN_DEFAULT_ACTIONS (OB_WIN_ACTIONS(OB_WIN_COUNT-1) + 0x4)
> -#define OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
> -#define OB_WIN_FUNC_NUM_SHIFT 24
> -#define OB_WIN_FUNC_NUM_ENABLE BIT(23)
> -#define OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
> -#define OB_WIN_BUS_NUM_BITS_SHIFT 20
> -#define OB_WIN_MSG_CODE_ENABLE BIT(22)
> -#define OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
> -#define OB_WIN_MSG_CODE_SHIFT 14
> -#define OB_WIN_MSG_PAYLOAD_LEN BIT(12)
> -#define OB_WIN_ATTR_ENABLE BIT(11)
> -#define OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
> -#define OB_WIN_ATTR_TC_SHIFT 8
> -#define OB_WIN_ATTR_RELAXED BIT(7)
> -#define OB_WIN_ATTR_NOSNOOP BIT(6)
> -#define OB_WIN_ATTR_POISON BIT(5)
> -#define OB_WIN_ATTR_IDO BIT(4)
> -#define OB_WIN_TYPE_MASK GENMASK(3, 0)
> -#define OB_WIN_TYPE_SHIFT 0
> -#define OB_WIN_TYPE_MEM 0x0
> -#define OB_WIN_TYPE_IO 0x4
> -#define OB_WIN_TYPE_CONFIG_TYPE0 0x8
> -#define OB_WIN_TYPE_CONFIG_TYPE1 0x9
> -#define OB_WIN_TYPE_MSG 0xc
> -
> -/* LMI registers base address and register offsets */
> -#define LMI_BASE_ADDR 0x6000
> -#define CFG_REG (LMI_BASE_ADDR + 0x0)
> -#define LTSSM_SHIFT 24
> -#define LTSSM_MASK 0x3f
> -#define LTSSM_L0 0x10
> -#define LTSSM_DISABLED 0x20
> -#define VENDOR_ID_REG (LMI_BASE_ADDR + 0x44)
> -
> -/* PCIe core controller registers */
> -#define CTRL_CORE_BASE_ADDR 0x18000
> -#define CTRL_CONFIG_REG (CTRL_CORE_BASE_ADDR + 0x0)
> -#define CTRL_MODE_SHIFT 0x0
> -#define CTRL_MODE_MASK 0x1
> -#define PCIE_CORE_MODE_DIRECT 0x0
> -#define PCIE_CORE_MODE_COMMAND 0x1
> -
> -/* Transaction types */
> -#define PCIE_CONFIG_RD_TYPE0 0x8
> -#define PCIE_CONFIG_RD_TYPE1 0x9
> -#define PCIE_CONFIG_WR_TYPE0 0xa
> -#define PCIE_CONFIG_WR_TYPE1 0xb
> +/* PIO registers */
> +#define ADVK_PIO_BASE_ADDR 0x4000
> +#define ADVK_PIO_CTRL (ADVK_PIO_BASE_ADDR + 0x0)
> +#define ADVK_PIO_CTRL_TYPE_MASK GENMASK(3, 0)
> +#define ADVK_PIO_CTRL_TYPE_SHIFT 0
> +#define ADVK_PIO_CTRL_TYPE_RD_TYPE0 0x8
> +#define ADVK_PIO_CTRL_TYPE_RD_TYPE1 0x9
> +#define ADVK_PIO_CTRL_TYPE_WR_TYPE0 0xa
> +#define ADVK_PIO_CTRL_TYPE_WR_TYPE1 0xb
> +#define ADVK_PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
> +#define ADVK_PIO_STAT (ADVK_PIO_BASE_ADDR + 0x4)
> +#define ADVK_PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
> +#define ADVK_PIO_COMPLETION_STATUS_SHIFT 7
> +#define ADVK_PIO_COMPLETION_STATUS_OK 0
> +#define ADVK_PIO_COMPLETION_STATUS_UR 1
> +#define ADVK_PIO_COMPLETION_STATUS_CRS 2
> +#define ADVK_PIO_COMPLETION_STATUS_CA 4
> +#define ADVK_PIO_NON_POSTED_REQ BIT(10)
> +#define ADVK_PIO_ERR_STATUS BIT(11)
> +#define ADVK_PIO_ADDR_LS (ADVK_PIO_BASE_ADDR + 0x8)
> +#define ADVK_PIO_ADDR_MS (ADVK_PIO_BASE_ADDR + 0xc)
> +#define ADVK_PIO_WR_DATA (ADVK_PIO_BASE_ADDR + 0x10)
> +#define ADVK_PIO_WR_DATA_STRB (ADVK_PIO_BASE_ADDR + 0x14)
> +#define ADVK_PIO_RD_DATA (ADVK_PIO_BASE_ADDR + 0x18)
> +#define ADVK_PIO_START (ADVK_PIO_BASE_ADDR + 0x1c)
> +#define ADVK_PIO_ISR (ADVK_PIO_BASE_ADDR + 0x20)
> +
> +/* Global Control registers */
> +#define ADVK_GLOBAL_CTRL_BASE_ADDR 0x4800
> +#define ADVK_GLOBAL_CTRL0 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x0)
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK GENMASK(1, 0)
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT 0
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_1 0
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_2 1
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_3 2
> +#define ADVK_GLOBAL_CTRL0_IS_RC BIT(2)
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK GENMASK(4, 3)
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT 3
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_1 0
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_2 1
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_4 2
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_8 3
> +#define ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN BIT(6)
> +#define ADVK_GLOBAL_CTRL2 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x8)
> +#define ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN BIT(5)
> +#define ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN BIT(6)
> +
> +/* PCIe window configuration registers */
> +#define ADVK_OB_WIN_BASE_ADDR 0x4c00
> +#define ADVK_OB_WIN_BLOCK_SIZE 0x20
> +#define ADVK_OB_WIN_COUNT 8
> +#define ADVK_OB_WIN_REG_ADDR(win, offset) (ADVK_OB_WIN_BASE_ADDR + ADVK_OB_WIN_BLOCK_SIZE * (win) + (offset))
> +#define ADVK_OB_WIN_MATCH_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x00)
> +#define ADVK_OB_WIN_ENABLE BIT(0)
> +#define ADVK_OB_WIN_MATCH_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x04)
> +#define ADVK_OB_WIN_REMAP_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x08)
> +#define ADVK_OB_WIN_REMAP_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x0c)
> +#define ADVK_OB_WIN_MASK_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x10)
> +#define ADVK_OB_WIN_MASK_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x14)
> +#define ADVK_OB_WIN_ACTIONS(win) ADVK_OB_WIN_REG_ADDR(win, 0x18)
> +#define ADVK_OB_WIN_DEFAULT_ACTIONS (ADVK_OB_WIN_ACTIONS(ADVK_OB_WIN_COUNT-1) + 0x4)
> +#define ADVK_OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
> +#define ADVK_OB_WIN_FUNC_NUM_SHIFT 24
> +#define ADVK_OB_WIN_FUNC_NUM_ENABLE BIT(23)
> +#define ADVK_OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
> +#define ADVK_OB_WIN_BUS_NUM_BITS_SHIFT 20
> +#define ADVK_OB_WIN_MSG_CODE_ENABLE BIT(22)
> +#define ADVK_OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
> +#define ADVK_OB_WIN_MSG_CODE_SHIFT 14
> +#define ADVK_OB_WIN_MSG_PAYLOAD_LEN BIT(12)
> +#define ADVK_OB_WIN_ATTR_ENABLE BIT(11)
> +#define ADVK_OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
> +#define ADVK_OB_WIN_ATTR_TC_SHIFT 8
> +#define ADVK_OB_WIN_ATTR_RELAXED BIT(7)
> +#define ADVK_OB_WIN_ATTR_NOSNOOP BIT(6)
> +#define ADVK_OB_WIN_ATTR_POISON BIT(5)
> +#define ADVK_OB_WIN_ATTR_IDO BIT(4)
> +#define ADVK_OB_WIN_TYPE_MASK GENMASK(3, 0)
> +#define ADVK_OB_WIN_TYPE_SHIFT 0
> +#define ADVK_OB_WIN_TYPE_MEM 0x0
> +#define ADVK_OB_WIN_TYPE_IO 0x4
> +#define ADVK_OB_WIN_TYPE_CONFIG_TYPE0 0x8
> +#define ADVK_OB_WIN_TYPE_CONFIG_TYPE1 0x9
> +#define ADVK_OB_WIN_TYPE_MSG 0xc
> +
> +/* Local Management Interface registers */
> +#define ADVK_LMI_BASE_ADDR 0x6000
> +#define ADVK_LMI_PHY_CFG0 (ADVK_LMI_BASE_ADDR + 0x0)
> +#define ADVK_LMI_PHY_CFG0_LTSSM_MASK GENMASK(29, 24)
> +#define ADVK_LMI_PHY_CFG0_LTSSM_SHIFT 24
> +#define ADVK_LMI_PHY_CFG0_LTSSM_L0 0x10
> +#define ADVK_LMI_PHY_CFG0_LTSSM_DISABLED 0x20
> +#define ADVK_LMI_VENDOR_ID (ADVK_LMI_BASE_ADDR + 0x44)
> +
> +/* Core Control registers */
> +#define ADVK_CORE_CTRL_BASE_ADDR 0x18000
> +#define ADVK_CORE_CTRL_CONFIG (ADVK_CORE_CTRL_BASE_ADDR + 0x0)
> +#define ADVK_CORE_CTRL_CONFIG_COMMAND_MODE BIT(0)
>
> /* PCIe Retries & Timeout definitions */
> #define PIO_MAX_RETRIES 1500
> @@ -154,7 +145,7 @@
> #define LINK_MAX_RETRIES 10
> #define LINK_WAIT_TIMEOUT 100000
>
> -#define CFG_RD_CRS_VAL 0xFFFF0001
> +#define CFG_RD_CRS_VAL 0xFFFF0001
>
> /**
> * struct pcie_advk - Advk PCIe controller state
> @@ -234,8 +225,8 @@ static int pcie_advk_wait_pio(struct pcie_advk *pcie)
> uint count;
>
> for (count = 1; count <= PIO_MAX_RETRIES; count++) {
> - start = advk_readl(pcie, PIO_START);
> - isr = advk_readl(pcie, PIO_ISR);
> + start = advk_readl(pcie, ADVK_PIO_START);
> + isr = advk_readl(pcie, ADVK_PIO_ISR);
> if (!start && isr)
> return count;
> /*
> @@ -267,29 +258,29 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> unsigned int status;
> char *strcomp_status, *str_posted;
>
> - reg = advk_readl(pcie, PIO_STAT);
> - status = (reg & PIO_COMPLETION_STATUS_MASK) >>
> - PIO_COMPLETION_STATUS_SHIFT;
> + reg = advk_readl(pcie, ADVK_PIO_STAT);
> + status = (reg & ADVK_PIO_COMPLETION_STATUS_MASK) >>
> + ADVK_PIO_COMPLETION_STATUS_SHIFT;
>
> switch (status) {
> - case PIO_COMPLETION_STATUS_OK:
> - if (reg & PIO_ERR_STATUS) {
> + case ADVK_PIO_COMPLETION_STATUS_OK:
> + if (reg & ADVK_PIO_ERR_STATUS) {
> strcomp_status = "COMP_ERR";
> ret = -EFAULT;
> break;
> }
> /* Get the read result */
> if (read_val)
> - *read_val = advk_readl(pcie, PIO_RD_DATA);
> + *read_val = advk_readl(pcie, ADVK_PIO_RD_DATA);
> /* No error */
> strcomp_status = NULL;
> ret = 0;
> break;
> - case PIO_COMPLETION_STATUS_UR:
> + case ADVK_PIO_COMPLETION_STATUS_UR:
> strcomp_status = "UR";
> ret = -EOPNOTSUPP;
> break;
> - case PIO_COMPLETION_STATUS_CRS:
> + case ADVK_PIO_COMPLETION_STATUS_CRS:
> if (allow_crs && read_val) {
> /* For reading, CRS is not an error status. */
> *read_val = CFG_RD_CRS_VAL;
> @@ -300,7 +291,7 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> ret = -EAGAIN;
> }
> break;
> - case PIO_COMPLETION_STATUS_CA:
> + case ADVK_PIO_COMPLETION_STATUS_CA:
> strcomp_status = "CA";
> ret = -ECANCELED;
> break;
> @@ -313,14 +304,14 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> if (!strcomp_status)
> return ret;
>
> - if (reg & PIO_NON_POSTED_REQ)
> + if (reg & ADVK_PIO_NON_POSTED_REQ)
> str_posted = "Non-posted";
> else
> str_posted = "Posted";
>
> dev_dbg(pcie->dev, "%s PIO Response Status: %s, %#x @ %#x\n",
> str_posted, strcomp_status, reg,
> - advk_readl(pcie, PIO_ADDR_LS));
> + advk_readl(pcie, ADVK_PIO_ADDR_LS));
>
> return ret;
> }
> @@ -418,7 +409,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> */
> allow_crs = (offset == PCI_VENDOR_ID) && (size == PCI_SIZE_32) && pcie->cfgcrssve;
>
> - if (advk_readl(pcie, PIO_START)) {
> + if (advk_readl(pcie, ADVK_PIO_START)) {
> dev_err(pcie->dev,
> "Previous PIO read/write transfer is still running\n");
> if (allow_crs) {
> @@ -430,28 +421,28 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> }
>
> /* Program the control register */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg &= ~PIO_CTRL_TYPE_MASK;
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
> if (busno == pcie->sec_busno)
> - reg |= PCIE_CONFIG_RD_TYPE0;
> + reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
> else
> - reg |= PCIE_CONFIG_RD_TYPE1;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /* Program the address registers */
> reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
> - advk_writel(pcie, reg, PIO_ADDR_LS);
> - advk_writel(pcie, 0, PIO_ADDR_MS);
> + advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
> + advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
>
> /* Program the data strobe */
> - advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
> + advk_writel(pcie, 0xf, ADVK_PIO_WR_DATA_STRB);
>
> retry_count = 0;
>
> retry:
> /* Start the transfer */
> - advk_writel(pcie, 1, PIO_ISR);
> - advk_writel(pcie, 1, PIO_START);
> + advk_writel(pcie, 1, ADVK_PIO_ISR);
> + advk_writel(pcie, 1, ADVK_PIO_START);
>
> ret = pcie_advk_wait_pio(pcie);
> if (ret < 0) {
> @@ -582,43 +573,43 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> return 0;
> }
>
> - if (advk_readl(pcie, PIO_START)) {
> + if (advk_readl(pcie, ADVK_PIO_START)) {
> dev_err(pcie->dev,
> "Previous PIO read/write transfer is still running\n");
> return -EAGAIN;
> }
>
> /* Program the control register */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg &= ~PIO_CTRL_TYPE_MASK;
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
> if (busno == pcie->sec_busno)
> - reg |= PCIE_CONFIG_WR_TYPE0;
> + reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
> else
> - reg |= PCIE_CONFIG_WR_TYPE1;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /* Program the address registers */
> reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
> - advk_writel(pcie, reg, PIO_ADDR_LS);
> - advk_writel(pcie, 0, PIO_ADDR_MS);
> + advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
> + advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
> dev_dbg(pcie->dev, "\tPIO req. - addr = 0x%08x\n", reg);
>
> /* Program the data register */
> reg = pci_conv_size_to_32(0, value, offset, size);
> - advk_writel(pcie, reg, PIO_WR_DATA);
> + advk_writel(pcie, reg, ADVK_PIO_WR_DATA);
> dev_dbg(pcie->dev, "\tPIO req. - val = 0x%08x\n", reg);
>
> /* Program the data strobe */
> reg = pcie_calc_datastrobe(offset, size);
> - advk_writel(pcie, reg, PIO_WR_DATA_STRB);
> + advk_writel(pcie, reg, ADVK_PIO_WR_DATA_STRB);
> dev_dbg(pcie->dev, "\tPIO req. - strb = 0x%02x\n", reg);
>
> retry_count = 0;
>
> retry:
> /* Start the transfer */
> - advk_writel(pcie, 1, PIO_ISR);
> - advk_writel(pcie, 1, PIO_START);
> + advk_writel(pcie, 1, ADVK_PIO_ISR);
> + advk_writel(pcie, 1, ADVK_PIO_START);
>
> ret = pcie_advk_wait_pio(pcie);
> if (ret < 0)
> @@ -645,9 +636,9 @@ static int pcie_advk_link_up(struct pcie_advk *pcie)
> {
> u32 val, ltssm_state;
>
> - val = advk_readl(pcie, CFG_REG);
> - ltssm_state = (val >> LTSSM_SHIFT) & LTSSM_MASK;
> - return ltssm_state >= LTSSM_L0 && ltssm_state < LTSSM_DISABLED;
> + val = advk_readl(pcie, ADVK_LMI_PHY_CFG0);
> + ltssm_state = (val & ADVK_LMI_PHY_CFG0_LTSSM_MASK) >> ADVK_LMI_PHY_CFG0_LTSSM_SHIFT;
> + return ltssm_state >= ADVK_LMI_PHY_CFG0_LTSSM_L0 && ltssm_state < ADVK_LMI_PHY_CFG0_LTSSM_DISABLED;
> }
>
> /**
> @@ -687,25 +678,25 @@ static void pcie_advk_set_ob_win(struct pcie_advk *pcie, u8 win_num,
> phys_addr_t match, phys_addr_t remap,
> phys_addr_t mask, u32 actions)
> {
> - advk_writel(pcie, OB_WIN_ENABLE |
> - lower_32_bits(match), OB_WIN_MATCH_LS(win_num));
> - advk_writel(pcie, upper_32_bits(match), OB_WIN_MATCH_MS(win_num));
> - advk_writel(pcie, lower_32_bits(remap), OB_WIN_REMAP_LS(win_num));
> - advk_writel(pcie, upper_32_bits(remap), OB_WIN_REMAP_MS(win_num));
> - advk_writel(pcie, lower_32_bits(mask), OB_WIN_MASK_LS(win_num));
> - advk_writel(pcie, upper_32_bits(mask), OB_WIN_MASK_MS(win_num));
> - advk_writel(pcie, actions, OB_WIN_ACTIONS(win_num));
> + advk_writel(pcie, ADVK_OB_WIN_ENABLE |
> + lower_32_bits(match), ADVK_OB_WIN_MATCH_LS(win_num));
> + advk_writel(pcie, upper_32_bits(match), ADVK_OB_WIN_MATCH_MS(win_num));
> + advk_writel(pcie, lower_32_bits(remap), ADVK_OB_WIN_REMAP_LS(win_num));
> + advk_writel(pcie, upper_32_bits(remap), ADVK_OB_WIN_REMAP_MS(win_num));
> + advk_writel(pcie, lower_32_bits(mask), ADVK_OB_WIN_MASK_LS(win_num));
> + advk_writel(pcie, upper_32_bits(mask), ADVK_OB_WIN_MASK_MS(win_num));
> + advk_writel(pcie, actions, ADVK_OB_WIN_ACTIONS(win_num));
> }
>
> static void pcie_advk_disable_ob_win(struct pcie_advk *pcie, u8 win_num)
> {
> - advk_writel(pcie, 0, OB_WIN_MATCH_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MATCH_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_REMAP_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_REMAP_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MASK_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MASK_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_ACTIONS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MASK_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MASK_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_ACTIONS(win_num));
> }
>
> static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
> @@ -729,7 +720,7 @@ static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
> * because lower 16 bits of mask must be zero. Remapped address
> * may have set only bits from the mask.
> */
> - while (*wins < OB_WIN_COUNT && size > 0) {
> + while (*wins < ADVK_OB_WIN_COUNT && size > 0) {
> /* Calculate the largest aligned window size */
> win_size = (1ULL << (fls64(size) - 1)) |
> (phys_start ? (1ULL << __ffs64(phys_start)) : 0);
> @@ -774,24 +765,23 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> u32 reg;
>
> /* Set to Direct mode */
> - reg = advk_readl(pcie, CTRL_CONFIG_REG);
> - reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT);
> - reg |= ((PCIE_CORE_MODE_DIRECT & CTRL_MODE_MASK) << CTRL_MODE_SHIFT);
> - advk_writel(pcie, reg, CTRL_CONFIG_REG);
> + reg = advk_readl(pcie, ADVK_CORE_CTRL_CONFIG);
> + reg &= ~ADVK_CORE_CTRL_CONFIG_COMMAND_MODE;
> + advk_writel(pcie, reg, ADVK_CORE_CTRL_CONFIG);
>
> /* Set PCI global control register to RC mode */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg |= (IS_RC_MSK << IS_RC_SHIFT);
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg |= ADVK_GLOBAL_CTRL0_IS_RC;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /*
> * Replace incorrect PCI vendor id value 0x1b4b by correct value 0x11ab.
> - * VENDOR_ID_REG contains vendor id in low 16 bits and subsystem vendor
> + * ADVK_LMI_VENDOR_ID contains vendor id in low 16 bits and subsystem vendor
> * id in high 16 bits. Updating this register changes readback value of
> - * read-only vendor id bits in PCIE_CORE_DEV_ID_REG register. Workaround
> + * read-only vendor id bits in Root Port PCI_VENDOR_ID register. Workaround
> * for erratum 4.1: "The value of device and vendor ID is incorrect".
> */
> - advk_writel(pcie, 0x11ab11ab, VENDOR_ID_REG);
> + advk_writel(pcie, 0x11ab11ab, ADVK_LMI_VENDOR_ID);
>
> /*
> * Change Class Code of PCI Bridge device to PCI Bridge (0x600400),
> @@ -836,26 +826,26 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
>
> /* Program PCIe Control 2 to disable strict ordering */
> - reg = PCIE_CORE_CTRL2_RESERVED |
> - PCIE_CORE_CTRL2_TD_ENABLE;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
> + reg &= ~ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
>
> /* Set GEN2 */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~PCIE_GEN_SEL_MSK;
> - reg |= SPEED_GEN_2;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK;
> + reg |= ADVK_GLOBAL_CTRL0_SPEED_GEN_2 << ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /* Set lane X1 */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~LANE_CNT_MSK;
> - reg |= LANE_COUNT_1;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK;
> + reg |= ADVK_GLOBAL_CTRL0_LANE_COUNT_1 << ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /* Enable link training */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg |= LINK_TRAINING_EN;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg |= ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /*
> * Enable AXI address window location generation:
> @@ -867,9 +857,9 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * access when default outbound window configuration
> * is set for memory access.
> */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
> - reg |= PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
> + reg |= ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
>
> /*
> * Bypass the address window mapping for PIO:
> @@ -877,16 +867,16 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * info over AXI interface by PIO registers, the
> * address window is not required.
> */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg |= PIO_CTRL_ADDR_WIN_DISABLE;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_ADDR_WIN_DISABLE;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /*
> * Set memory access in Default User Field so it
> * is not required to configure PCIe address for
> * transparent memory access.
> */
> - advk_writel(pcie, OB_WIN_TYPE_MEM, OB_WIN_DEFAULT_ACTIONS);
> + advk_writel(pcie, ADVK_OB_WIN_TYPE_MEM, ADVK_OB_WIN_DEFAULT_ACTIONS);
>
> /*
> * Configure PCIe address windows for non-memory or
> @@ -896,14 +886,14 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> wins = 0;
> pci_get_regions(pcie->dev, &io, &mem, &pref);
> if (io)
> - pcie_advk_set_ob_region(pcie, &wins, io, OB_WIN_TYPE_IO);
> + pcie_advk_set_ob_region(pcie, &wins, io, ADVK_OB_WIN_TYPE_IO);
> if (mem && mem->phys_start != mem->bus_start)
> - pcie_advk_set_ob_region(pcie, &wins, mem, OB_WIN_TYPE_MEM);
> + pcie_advk_set_ob_region(pcie, &wins, mem, ADVK_OB_WIN_TYPE_MEM);
> if (pref && pref->phys_start != pref->bus_start)
> - pcie_advk_set_ob_region(pcie, &wins, pref, OB_WIN_TYPE_MEM);
> + pcie_advk_set_ob_region(pcie, &wins, pref, ADVK_OB_WIN_TYPE_MEM);
>
> /* Disable remaining PCIe outbound windows */
> - for (i = ((wins >= 0) ? wins : 0); i < OB_WIN_COUNT; i++)
> + for (i = ((wins >= 0) ? wins : 0); i < ADVK_OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> if (wins == -1)
> @@ -971,16 +961,16 @@ static int pcie_advk_remove(struct udevice *dev)
> u32 reg;
> int i;
>
> - for (i = 0; i < OB_WIN_COUNT; i++)
> + for (i = 0; i < ADVK_OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
> reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
> advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
>
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~LINK_TRAINING_EN;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> return 0;
> }
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr()
2022-02-10 13:53 ` [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr() Pali Rohár
@ 2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-15 9:21 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> There is only one base address, so use dev_read_addr() instead of dev_read_addr_index().
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 8e3b13b49ea0..6e65c0e1558c 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -991,7 +991,7 @@ static int pcie_advk_of_to_plat(struct udevice *dev)
> struct pcie_advk *pcie = dev_get_priv(dev);
>
> /* Get the register base address */
> - pcie->base = (void *)dev_read_addr_index(dev, 0);
> + pcie->base = (void *)dev_read_addr(dev);
> if ((fdt_addr_t)pcie->base == FDT_ADDR_T_NONE)
> return -EINVAL;
>
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus
2022-02-10 13:53 ` [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus Pali Rohár
@ 2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-15 9:21 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> Writing to the PCI_PRIMARY_BUS register of the root port should not change
> bus number on which is root port present.
>
> This PCI_PRIMARY_BUS register is used only for correct configuration of
> legacy PCI stuff, like forwarding of PCI special cycles between buses.
>
> Aardvark HW does not support PCI special cycles, so it does not have HW
> register for PCI_PRIMARY_BUS and therefore it does not matter what is
> stored in this register.
>
> So fix this issue and do not use PCI_PRIMARY_BUS register in pci-aardvark.c
> driver for moving root bus of the root port.
>
> After this change there is no reason for storing bus number (zero) into
> first_busno variable, so remove this variable.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Fixes: cb056005dc67 ("arm: a37xx: pci: Add support for accessing PCI Bridge on root bus")
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 6e65c0e1558c..1eb257ea8b4a 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -151,8 +151,6 @@
> * struct pcie_advk - Advk PCIe controller state
> *
> * @base: The base address of the register space.
> - * @first_busno: Bus number of the PCIe root-port.
> - * This may vary depending on the PCIe setup.
> * @sec_busno: Bus number for the device behind the PCIe root-port.
> * @dev: The pointer to PCI uclass device.
> * @reset_gpio: GPIO descriptor for PERST.
> @@ -162,7 +160,6 @@
> */
> struct pcie_advk {
> void *base;
> - int first_busno;
> int sec_busno;
> struct udevice *dev;
> struct gpio_desc reset_gpio;
> @@ -194,8 +191,8 @@ static inline uint advk_readl(struct pcie_advk *pcie, uint reg)
> static bool pcie_advk_addr_valid(struct pcie_advk *pcie,
> int busno, u8 dev, u8 func)
> {
> - /* On the primary (local) bus there is only one PCI Bridge */
> - if (busno == pcie->first_busno && (dev != 0 || func != 0))
> + /* On the root bus there is only one PCI Bridge */
> + if (busno == 0 && (dev != 0 || func != 0))
> return false;
>
> /*
> @@ -353,17 +350,17 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> }
>
> /*
> - * The configuration space of the PCI Bridge on primary (first) bus is
> + * The configuration space of the PCI Bridge on the root bus (zero) is
> * not accessible via PIO transfers like all other PCIe devices. PCI
> * Bridge config registers are available directly in Aardvark memory
> * space starting at offset zero. The PCI Bridge config space is of
> * Type 0, but the BAR registers (including ROM BAR) don't have the same
> * meaning as in the PCIe specification. Therefore do not access BAR
> * registers and non-common registers (those which have different
> - * meaning for Type 0 and Type 1 config space) of the primary PCI Bridge
> + * meaning for Type 0 and Type 1 config space) of the PCI Bridge
> * and instead read their content from driver virtual cfgcache[].
> */
> - if (busno == pcie->first_busno) {
> + if (busno == 0) {
> if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
> data = pcie->cfgcache[(offset - 0x10) / 4];
> else
> @@ -543,7 +540,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> * zero. Type 1 specific registers are not available, so we write their
> * content only into driver virtual cfgcache[].
> */
> - if (busno == pcie->first_busno) {
> + if (busno == 0) {
> if ((offset >= 0x10 && offset < 0x34) ||
> (offset >= 0x38 && offset < 0x3c)) {
> data = pcie->cfgcache[(offset - 0x10) / 4];
> @@ -560,9 +557,6 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> }
>
> - if (offset == PCI_PRIMARY_BUS)
> - pcie->first_busno = data & 0xff;
> -
> if (offset == PCI_SECONDARY_BUS ||
> (offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
> pcie->sec_busno = (data >> 8) & 0xff;
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
` (3 preceding siblings ...)
2022-02-15 9:20 ` [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Stefan Roese
@ 2022-02-17 15:35 ` Stefan Roese
4 siblings, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-17 15:35 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> PCI config space of the aardvark PCIe Root Port is available only in
> internal aardvark memory space starting at offset 0x0. PCI Express
> registers (PCI_EXP_*) start at offset 0xc0. And Advanced Error Reporting
> registers (PCI_ERR_*) start at offset 0x100.
>
> Replace custom aardvark register macros by standard PCI macros from
> include/pci.h file with fixed offset.
>
> Some DEVCTL and AER macros are not defined in include/pci.h file, so define
> them in the same way as in linux uapi header file pci_regs.h.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 82 ++++++++++++++------------------------
> include/pci.h | 24 +++++++++++
> 2 files changed, 54 insertions(+), 52 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 22b6d8b62865..ad4edd715bd6 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -35,28 +35,10 @@
> #include <linux/delay.h>
> #include <linux/ioport.h>
>
> -/* PCIe core registers */
> -#define PCIE_CORE_CMD_STATUS_REG 0x4
> -#define PCIE_CORE_CMD_IO_ACCESS_EN BIT(0)
> -#define PCIE_CORE_CMD_MEM_ACCESS_EN BIT(1)
> -#define PCIE_CORE_CMD_MEM_IO_REQ_EN BIT(2)
> -#define PCIE_CORE_DEV_REV_REG 0x8
> -#define PCIE_CORE_EXP_ROM_BAR_REG 0x30
> -#define PCIE_CORE_PCIEXP_CAP_OFF 0xc0
> -#define PCIE_CORE_DEV_CTRL_STATS_REG 0xc8
> -#define PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE (0 << 4)
> -#define PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE (0 << 11)
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE 0x2
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT 5
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE 0x2
> -#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT 12
> -#define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0
> -#define PCIE_CORE_LINK_TRAINING BIT(5)
> -#define PCIE_CORE_ERR_CAPCTL_REG 0x118
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX BIT(5)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN BIT(6)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK BIT(7)
> -#define PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV BIT(8)
> +/* PCIe Root Port register offsets */
> +#define ADVK_ROOT_PORT_PCI_CFG_OFF 0x0
> +#define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
> +#define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
>
> /* PIO registers base address and register offsets */
> #define PIO_BASE_ADDR 0x4000
> @@ -394,7 +376,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
> data = pcie->cfgcache[(offset - 0x10) / 4];
> else
> - data = advk_readl(pcie, offset & ~3);
> + data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
>
> if ((offset & ~3) == (PCI_HEADER_TYPE & ~3)) {
> /*
> @@ -406,14 +388,13 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> data |= PCI_HEADER_TYPE_BRIDGE << 16;
> }
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL) {
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL) {
> /* CRSSVE bit is stored only in cache */
> if (pcie->cfgcrssve)
> data |= PCI_EXP_RTCTL_CRSSVE;
> }
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF +
> - (PCI_EXP_RTCAP & ~3)) {
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + (PCI_EXP_RTCAP & ~3)) {
> /* CRS is emulated below, so set CRSVIS capability */
> data |= PCI_EXP_RTCAP_CRSVIS << 16;
> }
> @@ -583,9 +564,9 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> data = 0x0;
> pcie->cfgcache[(offset - 0x10) / 4] = data;
> } else {
> - data = advk_readl(pcie, offset & ~3);
> + data = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> data = pci_conv_size_to_32(data, value, offset, size);
> - advk_writel(pcie, data, offset & ~3);
> + advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> }
>
> if (offset == PCI_PRIMARY_BUS)
> @@ -595,7 +576,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> (offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
> pcie->sec_busno = (data >> 8) & 0xff;
>
> - if ((offset & ~3) == PCIE_CORE_PCIEXP_CAP_OFF + PCI_EXP_RTCTL)
> + if ((offset & ~3) == ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_RTCTL)
> pcie->cfgcrssve = data & PCI_EXP_RTCTL_CRSSVE;
>
> return 0;
> @@ -834,26 +815,25 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * Type 1 registers is redirected to the virtual cfgcache[] buffer,
> * which avoids changing unrelated registers.
> */
> - reg = advk_readl(pcie, PCIE_CORE_DEV_REV_REG);
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
> reg &= ~0xffffff00;
> reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
> - advk_writel(pcie, reg, PCIE_CORE_DEV_REV_REG);
> -
> - /* Set Advanced Error Capabilities and Control PF0 register */
> - reg = PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHECK |
> - PCIE_CORE_ERR_CAPCTL_ECRC_CHECK_RCV;
> - advk_writel(pcie, reg, PCIE_CORE_ERR_CAPCTL_REG);
> -
> - /* Set PCIe Device Control and Status 1 PF0 register */
> - reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
> - (PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE <<
> - PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SIZE_SHIFT) |
> - (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE <<
> - PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT) |
> - PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE;
> - advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
> +
> + /* Enable generation and checking of ECRC on PCIe Root Port */
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
> + reg |= PCI_ERR_CAP_ECRC_GENE | PCI_ERR_CAP_ECRC_CHKE;
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_ERR_OFF + PCI_ERR_CAP);
> +
> + /* Set PCIe Device Control register on PCIe Root Port */
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
> + reg &= ~PCI_EXP_DEVCTL_RELAX_EN;
> + reg &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
> + reg &= ~PCI_EXP_DEVCTL_PAYLOAD;
> + reg &= ~PCI_EXP_DEVCTL_READRQ;
> + reg |= PCI_EXP_DEVCTL_PAYLOAD_512B;
> + reg |= PCI_EXP_DEVCTL_READRQ_512B;
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
>
> /* Program PCIe Control 2 to disable strict ordering */
> reg = PCIE_CORE_CTRL2_RESERVED |
> @@ -994,11 +974,9 @@ static int pcie_advk_remove(struct udevice *dev)
> for (i = 0; i < OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> - reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
> - reg &= ~(PCIE_CORE_CMD_MEM_ACCESS_EN |
> - PCIE_CORE_CMD_IO_ACCESS_EN |
> - PCIE_CORE_CMD_MEM_IO_REQ_EN);
> - advk_writel(pcie, reg, PCIE_CORE_CMD_STATUS_REG);
> + reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
> + reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
> + advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
>
> reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> reg &= ~LINK_TRAINING_EN;
> diff --git a/include/pci.h b/include/pci.h
> index 9e7910b271b8..673c95c6bb79 100644
> --- a/include/pci.h
> +++ b/include/pci.h
> @@ -484,6 +484,22 @@
> #define PCI_EXP_DEVCAP 4 /* Device capabilities */
> #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */
> #define PCI_EXP_DEVCTL 8 /* Device Control */
> +#define PCI_EXP_DEVCTL_PAYLOAD 0x00e0 /* Max_Payload_Size */
> +#define PCI_EXP_DEVCTL_PAYLOAD_128B 0x0000 /* 128 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_256B 0x0020 /* 256 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_512B 0x0040 /* 512 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_1024B 0x0060 /* 1024 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_2048B 0x0080 /* 2048 Bytes */
> +#define PCI_EXP_DEVCTL_PAYLOAD_4096B 0x00a0 /* 4096 Bytes */
> +#define PCI_EXP_DEVCTL_RELAX_EN 0x0010 /* Enable relaxed ordering */
> +#define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 /* Enable No Snoop */
> +#define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */
> +#define PCI_EXP_DEVCTL_READRQ_128B 0x0000 /* 128 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_256B 0x1000 /* 256 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_512B 0x2000 /* 512 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_2048B 0x4000 /* 2048 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_4096B 0x5000 /* 4096 Bytes */
> #define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
> #define PCI_EXP_LNKCAP 12 /* Link Capabilities */
> #define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */
> @@ -522,6 +538,14 @@
> #define PCI_EXP_LNKCTL2_TLS_5_0GT 0x0002 /* Target Link Speed 5.0GT/s */
> #define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003 /* Target Link Speed 8.0GT/s */
>
> +/* Advanced Error Reporting */
> +#define PCI_ERR_CAP 24 /* Advanced Error Capabilities */
> +#define PCI_ERR_CAP_FEP(x) ((x) & 31) /* First Error Pointer */
> +#define PCI_ERR_CAP_ECRC_GENC 0x00000020 /* ECRC Generation Capable */
> +#define PCI_ERR_CAP_ECRC_GENE 0x00000040 /* ECRC Generation Enable */
> +#define PCI_ERR_CAP_ECRC_CHKC 0x00000080 /* ECRC Check Capable */
> +#define PCI_ERR_CAP_ECRC_CHKE 0x00000100 /* ECRC Check Enable */
> +
> /* Single Root I/O Virtualization Registers */
> #define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */
> #define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
2022-02-15 9:21 ` Stefan Roese
@ 2022-02-17 15:35 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-17 15:35 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> Remove "PCI_" prefix from all macros which are aardvark specific to not
> conflict with macros defined in global include file pci.h. Instead add
> "ADVK_" prefix for them so it is visible that they are aardvark specific.
>
> After "ADVK_" prefix append keyword which describes register group, so it
> would be clear to which register each macro value belongs.
>
> Rename some macros for consistency with other macros.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 394 ++++++++++++++++++-------------------
> 1 file changed, 192 insertions(+), 202 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index ad4edd715bd6..8e3b13b49ea0 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -40,113 +40,104 @@
> #define ADVK_ROOT_PORT_PCI_EXP_OFF 0xc0
> #define ADVK_ROOT_PORT_PCI_ERR_OFF 0x100
>
> -/* PIO registers base address and register offsets */
> -#define PIO_BASE_ADDR 0x4000
> -#define PIO_CTRL (PIO_BASE_ADDR + 0x0)
> -#define PIO_CTRL_TYPE_MASK GENMASK(3, 0)
> -#define PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
> -#define PIO_STAT (PIO_BASE_ADDR + 0x4)
> -#define PIO_COMPLETION_STATUS_SHIFT 7
> -#define PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
> -#define PIO_COMPLETION_STATUS_OK 0
> -#define PIO_COMPLETION_STATUS_UR 1
> -#define PIO_COMPLETION_STATUS_CRS 2
> -#define PIO_COMPLETION_STATUS_CA 4
> -#define PIO_NON_POSTED_REQ BIT(10)
> -#define PIO_ERR_STATUS BIT(11)
> -#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)
> -#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)
> -#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
> -#define PIO_WR_DATA_STRB (PIO_BASE_ADDR + 0x14)
> -#define PIO_RD_DATA (PIO_BASE_ADDR + 0x18)
> -#define PIO_START (PIO_BASE_ADDR + 0x1c)
> -#define PIO_ISR (PIO_BASE_ADDR + 0x20)
> -
> -/* Aardvark Control registers */
> -#define CONTROL_BASE_ADDR 0x4800
> -#define PCIE_CORE_CTRL0_REG (CONTROL_BASE_ADDR + 0x0)
> -#define PCIE_GEN_SEL_MSK 0x3
> -#define PCIE_GEN_SEL_SHIFT 0x0
> -#define SPEED_GEN_1 0
> -#define SPEED_GEN_2 1
> -#define SPEED_GEN_3 2
> -#define IS_RC_MSK 1
> -#define IS_RC_SHIFT 2
> -#define LANE_CNT_MSK 0x18
> -#define LANE_CNT_SHIFT 0x3
> -#define LANE_COUNT_1 (0 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_2 (1 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_4 (2 << LANE_CNT_SHIFT)
> -#define LANE_COUNT_8 (3 << LANE_CNT_SHIFT)
> -#define LINK_TRAINING_EN BIT(6)
> -#define PCIE_CORE_CTRL2_REG (CONTROL_BASE_ADDR + 0x8)
> -#define PCIE_CORE_CTRL2_RESERVED 0x7
> -#define PCIE_CORE_CTRL2_TD_ENABLE BIT(4)
> -#define PCIE_CORE_CTRL2_STRICT_ORDER_ENABLE BIT(5)
> -#define PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE BIT(6)
> -
> -/* PCIe window configuration */
> -#define OB_WIN_BASE_ADDR 0x4c00
> -#define OB_WIN_BLOCK_SIZE 0x20
> -#define OB_WIN_COUNT 8
> -#define OB_WIN_REG_ADDR(win, offset) (OB_WIN_BASE_ADDR + \
> - OB_WIN_BLOCK_SIZE * (win) + \
> - (offset))
> -#define OB_WIN_MATCH_LS(win) OB_WIN_REG_ADDR(win, 0x00)
> -#define OB_WIN_ENABLE BIT(0)
> -#define OB_WIN_MATCH_MS(win) OB_WIN_REG_ADDR(win, 0x04)
> -#define OB_WIN_REMAP_LS(win) OB_WIN_REG_ADDR(win, 0x08)
> -#define OB_WIN_REMAP_MS(win) OB_WIN_REG_ADDR(win, 0x0c)
> -#define OB_WIN_MASK_LS(win) OB_WIN_REG_ADDR(win, 0x10)
> -#define OB_WIN_MASK_MS(win) OB_WIN_REG_ADDR(win, 0x14)
> -#define OB_WIN_ACTIONS(win) OB_WIN_REG_ADDR(win, 0x18)
> -#define OB_WIN_DEFAULT_ACTIONS (OB_WIN_ACTIONS(OB_WIN_COUNT-1) + 0x4)
> -#define OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
> -#define OB_WIN_FUNC_NUM_SHIFT 24
> -#define OB_WIN_FUNC_NUM_ENABLE BIT(23)
> -#define OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
> -#define OB_WIN_BUS_NUM_BITS_SHIFT 20
> -#define OB_WIN_MSG_CODE_ENABLE BIT(22)
> -#define OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
> -#define OB_WIN_MSG_CODE_SHIFT 14
> -#define OB_WIN_MSG_PAYLOAD_LEN BIT(12)
> -#define OB_WIN_ATTR_ENABLE BIT(11)
> -#define OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
> -#define OB_WIN_ATTR_TC_SHIFT 8
> -#define OB_WIN_ATTR_RELAXED BIT(7)
> -#define OB_WIN_ATTR_NOSNOOP BIT(6)
> -#define OB_WIN_ATTR_POISON BIT(5)
> -#define OB_WIN_ATTR_IDO BIT(4)
> -#define OB_WIN_TYPE_MASK GENMASK(3, 0)
> -#define OB_WIN_TYPE_SHIFT 0
> -#define OB_WIN_TYPE_MEM 0x0
> -#define OB_WIN_TYPE_IO 0x4
> -#define OB_WIN_TYPE_CONFIG_TYPE0 0x8
> -#define OB_WIN_TYPE_CONFIG_TYPE1 0x9
> -#define OB_WIN_TYPE_MSG 0xc
> -
> -/* LMI registers base address and register offsets */
> -#define LMI_BASE_ADDR 0x6000
> -#define CFG_REG (LMI_BASE_ADDR + 0x0)
> -#define LTSSM_SHIFT 24
> -#define LTSSM_MASK 0x3f
> -#define LTSSM_L0 0x10
> -#define LTSSM_DISABLED 0x20
> -#define VENDOR_ID_REG (LMI_BASE_ADDR + 0x44)
> -
> -/* PCIe core controller registers */
> -#define CTRL_CORE_BASE_ADDR 0x18000
> -#define CTRL_CONFIG_REG (CTRL_CORE_BASE_ADDR + 0x0)
> -#define CTRL_MODE_SHIFT 0x0
> -#define CTRL_MODE_MASK 0x1
> -#define PCIE_CORE_MODE_DIRECT 0x0
> -#define PCIE_CORE_MODE_COMMAND 0x1
> -
> -/* Transaction types */
> -#define PCIE_CONFIG_RD_TYPE0 0x8
> -#define PCIE_CONFIG_RD_TYPE1 0x9
> -#define PCIE_CONFIG_WR_TYPE0 0xa
> -#define PCIE_CONFIG_WR_TYPE1 0xb
> +/* PIO registers */
> +#define ADVK_PIO_BASE_ADDR 0x4000
> +#define ADVK_PIO_CTRL (ADVK_PIO_BASE_ADDR + 0x0)
> +#define ADVK_PIO_CTRL_TYPE_MASK GENMASK(3, 0)
> +#define ADVK_PIO_CTRL_TYPE_SHIFT 0
> +#define ADVK_PIO_CTRL_TYPE_RD_TYPE0 0x8
> +#define ADVK_PIO_CTRL_TYPE_RD_TYPE1 0x9
> +#define ADVK_PIO_CTRL_TYPE_WR_TYPE0 0xa
> +#define ADVK_PIO_CTRL_TYPE_WR_TYPE1 0xb
> +#define ADVK_PIO_CTRL_ADDR_WIN_DISABLE BIT(24)
> +#define ADVK_PIO_STAT (ADVK_PIO_BASE_ADDR + 0x4)
> +#define ADVK_PIO_COMPLETION_STATUS_MASK GENMASK(9, 7)
> +#define ADVK_PIO_COMPLETION_STATUS_SHIFT 7
> +#define ADVK_PIO_COMPLETION_STATUS_OK 0
> +#define ADVK_PIO_COMPLETION_STATUS_UR 1
> +#define ADVK_PIO_COMPLETION_STATUS_CRS 2
> +#define ADVK_PIO_COMPLETION_STATUS_CA 4
> +#define ADVK_PIO_NON_POSTED_REQ BIT(10)
> +#define ADVK_PIO_ERR_STATUS BIT(11)
> +#define ADVK_PIO_ADDR_LS (ADVK_PIO_BASE_ADDR + 0x8)
> +#define ADVK_PIO_ADDR_MS (ADVK_PIO_BASE_ADDR + 0xc)
> +#define ADVK_PIO_WR_DATA (ADVK_PIO_BASE_ADDR + 0x10)
> +#define ADVK_PIO_WR_DATA_STRB (ADVK_PIO_BASE_ADDR + 0x14)
> +#define ADVK_PIO_RD_DATA (ADVK_PIO_BASE_ADDR + 0x18)
> +#define ADVK_PIO_START (ADVK_PIO_BASE_ADDR + 0x1c)
> +#define ADVK_PIO_ISR (ADVK_PIO_BASE_ADDR + 0x20)
> +
> +/* Global Control registers */
> +#define ADVK_GLOBAL_CTRL_BASE_ADDR 0x4800
> +#define ADVK_GLOBAL_CTRL0 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x0)
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK GENMASK(1, 0)
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT 0
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_1 0
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_2 1
> +#define ADVK_GLOBAL_CTRL0_SPEED_GEN_3 2
> +#define ADVK_GLOBAL_CTRL0_IS_RC BIT(2)
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK GENMASK(4, 3)
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT 3
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_1 0
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_2 1
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_4 2
> +#define ADVK_GLOBAL_CTRL0_LANE_COUNT_8 3
> +#define ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN BIT(6)
> +#define ADVK_GLOBAL_CTRL2 (ADVK_GLOBAL_CTRL_BASE_ADDR + 0x8)
> +#define ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN BIT(5)
> +#define ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN BIT(6)
> +
> +/* PCIe window configuration registers */
> +#define ADVK_OB_WIN_BASE_ADDR 0x4c00
> +#define ADVK_OB_WIN_BLOCK_SIZE 0x20
> +#define ADVK_OB_WIN_COUNT 8
> +#define ADVK_OB_WIN_REG_ADDR(win, offset) (ADVK_OB_WIN_BASE_ADDR + ADVK_OB_WIN_BLOCK_SIZE * (win) + (offset))
> +#define ADVK_OB_WIN_MATCH_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x00)
> +#define ADVK_OB_WIN_ENABLE BIT(0)
> +#define ADVK_OB_WIN_MATCH_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x04)
> +#define ADVK_OB_WIN_REMAP_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x08)
> +#define ADVK_OB_WIN_REMAP_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x0c)
> +#define ADVK_OB_WIN_MASK_LS(win) ADVK_OB_WIN_REG_ADDR(win, 0x10)
> +#define ADVK_OB_WIN_MASK_MS(win) ADVK_OB_WIN_REG_ADDR(win, 0x14)
> +#define ADVK_OB_WIN_ACTIONS(win) ADVK_OB_WIN_REG_ADDR(win, 0x18)
> +#define ADVK_OB_WIN_DEFAULT_ACTIONS (ADVK_OB_WIN_ACTIONS(ADVK_OB_WIN_COUNT-1) + 0x4)
> +#define ADVK_OB_WIN_FUNC_NUM_MASK GENMASK(31, 24)
> +#define ADVK_OB_WIN_FUNC_NUM_SHIFT 24
> +#define ADVK_OB_WIN_FUNC_NUM_ENABLE BIT(23)
> +#define ADVK_OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20)
> +#define ADVK_OB_WIN_BUS_NUM_BITS_SHIFT 20
> +#define ADVK_OB_WIN_MSG_CODE_ENABLE BIT(22)
> +#define ADVK_OB_WIN_MSG_CODE_MASK GENMASK(21, 14)
> +#define ADVK_OB_WIN_MSG_CODE_SHIFT 14
> +#define ADVK_OB_WIN_MSG_PAYLOAD_LEN BIT(12)
> +#define ADVK_OB_WIN_ATTR_ENABLE BIT(11)
> +#define ADVK_OB_WIN_ATTR_TC_MASK GENMASK(10, 8)
> +#define ADVK_OB_WIN_ATTR_TC_SHIFT 8
> +#define ADVK_OB_WIN_ATTR_RELAXED BIT(7)
> +#define ADVK_OB_WIN_ATTR_NOSNOOP BIT(6)
> +#define ADVK_OB_WIN_ATTR_POISON BIT(5)
> +#define ADVK_OB_WIN_ATTR_IDO BIT(4)
> +#define ADVK_OB_WIN_TYPE_MASK GENMASK(3, 0)
> +#define ADVK_OB_WIN_TYPE_SHIFT 0
> +#define ADVK_OB_WIN_TYPE_MEM 0x0
> +#define ADVK_OB_WIN_TYPE_IO 0x4
> +#define ADVK_OB_WIN_TYPE_CONFIG_TYPE0 0x8
> +#define ADVK_OB_WIN_TYPE_CONFIG_TYPE1 0x9
> +#define ADVK_OB_WIN_TYPE_MSG 0xc
> +
> +/* Local Management Interface registers */
> +#define ADVK_LMI_BASE_ADDR 0x6000
> +#define ADVK_LMI_PHY_CFG0 (ADVK_LMI_BASE_ADDR + 0x0)
> +#define ADVK_LMI_PHY_CFG0_LTSSM_MASK GENMASK(29, 24)
> +#define ADVK_LMI_PHY_CFG0_LTSSM_SHIFT 24
> +#define ADVK_LMI_PHY_CFG0_LTSSM_L0 0x10
> +#define ADVK_LMI_PHY_CFG0_LTSSM_DISABLED 0x20
> +#define ADVK_LMI_VENDOR_ID (ADVK_LMI_BASE_ADDR + 0x44)
> +
> +/* Core Control registers */
> +#define ADVK_CORE_CTRL_BASE_ADDR 0x18000
> +#define ADVK_CORE_CTRL_CONFIG (ADVK_CORE_CTRL_BASE_ADDR + 0x0)
> +#define ADVK_CORE_CTRL_CONFIG_COMMAND_MODE BIT(0)
>
> /* PCIe Retries & Timeout definitions */
> #define PIO_MAX_RETRIES 1500
> @@ -154,7 +145,7 @@
> #define LINK_MAX_RETRIES 10
> #define LINK_WAIT_TIMEOUT 100000
>
> -#define CFG_RD_CRS_VAL 0xFFFF0001
> +#define CFG_RD_CRS_VAL 0xFFFF0001
>
> /**
> * struct pcie_advk - Advk PCIe controller state
> @@ -234,8 +225,8 @@ static int pcie_advk_wait_pio(struct pcie_advk *pcie)
> uint count;
>
> for (count = 1; count <= PIO_MAX_RETRIES; count++) {
> - start = advk_readl(pcie, PIO_START);
> - isr = advk_readl(pcie, PIO_ISR);
> + start = advk_readl(pcie, ADVK_PIO_START);
> + isr = advk_readl(pcie, ADVK_PIO_ISR);
> if (!start && isr)
> return count;
> /*
> @@ -267,29 +258,29 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> unsigned int status;
> char *strcomp_status, *str_posted;
>
> - reg = advk_readl(pcie, PIO_STAT);
> - status = (reg & PIO_COMPLETION_STATUS_MASK) >>
> - PIO_COMPLETION_STATUS_SHIFT;
> + reg = advk_readl(pcie, ADVK_PIO_STAT);
> + status = (reg & ADVK_PIO_COMPLETION_STATUS_MASK) >>
> + ADVK_PIO_COMPLETION_STATUS_SHIFT;
>
> switch (status) {
> - case PIO_COMPLETION_STATUS_OK:
> - if (reg & PIO_ERR_STATUS) {
> + case ADVK_PIO_COMPLETION_STATUS_OK:
> + if (reg & ADVK_PIO_ERR_STATUS) {
> strcomp_status = "COMP_ERR";
> ret = -EFAULT;
> break;
> }
> /* Get the read result */
> if (read_val)
> - *read_val = advk_readl(pcie, PIO_RD_DATA);
> + *read_val = advk_readl(pcie, ADVK_PIO_RD_DATA);
> /* No error */
> strcomp_status = NULL;
> ret = 0;
> break;
> - case PIO_COMPLETION_STATUS_UR:
> + case ADVK_PIO_COMPLETION_STATUS_UR:
> strcomp_status = "UR";
> ret = -EOPNOTSUPP;
> break;
> - case PIO_COMPLETION_STATUS_CRS:
> + case ADVK_PIO_COMPLETION_STATUS_CRS:
> if (allow_crs && read_val) {
> /* For reading, CRS is not an error status. */
> *read_val = CFG_RD_CRS_VAL;
> @@ -300,7 +291,7 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> ret = -EAGAIN;
> }
> break;
> - case PIO_COMPLETION_STATUS_CA:
> + case ADVK_PIO_COMPLETION_STATUS_CA:
> strcomp_status = "CA";
> ret = -ECANCELED;
> break;
> @@ -313,14 +304,14 @@ static int pcie_advk_check_pio_status(struct pcie_advk *pcie,
> if (!strcomp_status)
> return ret;
>
> - if (reg & PIO_NON_POSTED_REQ)
> + if (reg & ADVK_PIO_NON_POSTED_REQ)
> str_posted = "Non-posted";
> else
> str_posted = "Posted";
>
> dev_dbg(pcie->dev, "%s PIO Response Status: %s, %#x @ %#x\n",
> str_posted, strcomp_status, reg,
> - advk_readl(pcie, PIO_ADDR_LS));
> + advk_readl(pcie, ADVK_PIO_ADDR_LS));
>
> return ret;
> }
> @@ -418,7 +409,7 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> */
> allow_crs = (offset == PCI_VENDOR_ID) && (size == PCI_SIZE_32) && pcie->cfgcrssve;
>
> - if (advk_readl(pcie, PIO_START)) {
> + if (advk_readl(pcie, ADVK_PIO_START)) {
> dev_err(pcie->dev,
> "Previous PIO read/write transfer is still running\n");
> if (allow_crs) {
> @@ -430,28 +421,28 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> }
>
> /* Program the control register */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg &= ~PIO_CTRL_TYPE_MASK;
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
> if (busno == pcie->sec_busno)
> - reg |= PCIE_CONFIG_RD_TYPE0;
> + reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
> else
> - reg |= PCIE_CONFIG_RD_TYPE1;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_TYPE_RD_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /* Program the address registers */
> reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
> - advk_writel(pcie, reg, PIO_ADDR_LS);
> - advk_writel(pcie, 0, PIO_ADDR_MS);
> + advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
> + advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
>
> /* Program the data strobe */
> - advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
> + advk_writel(pcie, 0xf, ADVK_PIO_WR_DATA_STRB);
>
> retry_count = 0;
>
> retry:
> /* Start the transfer */
> - advk_writel(pcie, 1, PIO_ISR);
> - advk_writel(pcie, 1, PIO_START);
> + advk_writel(pcie, 1, ADVK_PIO_ISR);
> + advk_writel(pcie, 1, ADVK_PIO_START);
>
> ret = pcie_advk_wait_pio(pcie);
> if (ret < 0) {
> @@ -582,43 +573,43 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> return 0;
> }
>
> - if (advk_readl(pcie, PIO_START)) {
> + if (advk_readl(pcie, ADVK_PIO_START)) {
> dev_err(pcie->dev,
> "Previous PIO read/write transfer is still running\n");
> return -EAGAIN;
> }
>
> /* Program the control register */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg &= ~PIO_CTRL_TYPE_MASK;
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg &= ~ADVK_PIO_CTRL_TYPE_MASK;
> if (busno == pcie->sec_busno)
> - reg |= PCIE_CONFIG_WR_TYPE0;
> + reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE0 << ADVK_PIO_CTRL_TYPE_SHIFT;
> else
> - reg |= PCIE_CONFIG_WR_TYPE1;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_TYPE_WR_TYPE1 << ADVK_PIO_CTRL_TYPE_SHIFT;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /* Program the address registers */
> reg = PCIE_ECAM_OFFSET(busno, PCI_DEV(bdf), PCI_FUNC(bdf), (offset & ~0x3));
> - advk_writel(pcie, reg, PIO_ADDR_LS);
> - advk_writel(pcie, 0, PIO_ADDR_MS);
> + advk_writel(pcie, reg, ADVK_PIO_ADDR_LS);
> + advk_writel(pcie, 0, ADVK_PIO_ADDR_MS);
> dev_dbg(pcie->dev, "\tPIO req. - addr = 0x%08x\n", reg);
>
> /* Program the data register */
> reg = pci_conv_size_to_32(0, value, offset, size);
> - advk_writel(pcie, reg, PIO_WR_DATA);
> + advk_writel(pcie, reg, ADVK_PIO_WR_DATA);
> dev_dbg(pcie->dev, "\tPIO req. - val = 0x%08x\n", reg);
>
> /* Program the data strobe */
> reg = pcie_calc_datastrobe(offset, size);
> - advk_writel(pcie, reg, PIO_WR_DATA_STRB);
> + advk_writel(pcie, reg, ADVK_PIO_WR_DATA_STRB);
> dev_dbg(pcie->dev, "\tPIO req. - strb = 0x%02x\n", reg);
>
> retry_count = 0;
>
> retry:
> /* Start the transfer */
> - advk_writel(pcie, 1, PIO_ISR);
> - advk_writel(pcie, 1, PIO_START);
> + advk_writel(pcie, 1, ADVK_PIO_ISR);
> + advk_writel(pcie, 1, ADVK_PIO_START);
>
> ret = pcie_advk_wait_pio(pcie);
> if (ret < 0)
> @@ -645,9 +636,9 @@ static int pcie_advk_link_up(struct pcie_advk *pcie)
> {
> u32 val, ltssm_state;
>
> - val = advk_readl(pcie, CFG_REG);
> - ltssm_state = (val >> LTSSM_SHIFT) & LTSSM_MASK;
> - return ltssm_state >= LTSSM_L0 && ltssm_state < LTSSM_DISABLED;
> + val = advk_readl(pcie, ADVK_LMI_PHY_CFG0);
> + ltssm_state = (val & ADVK_LMI_PHY_CFG0_LTSSM_MASK) >> ADVK_LMI_PHY_CFG0_LTSSM_SHIFT;
> + return ltssm_state >= ADVK_LMI_PHY_CFG0_LTSSM_L0 && ltssm_state < ADVK_LMI_PHY_CFG0_LTSSM_DISABLED;
> }
>
> /**
> @@ -687,25 +678,25 @@ static void pcie_advk_set_ob_win(struct pcie_advk *pcie, u8 win_num,
> phys_addr_t match, phys_addr_t remap,
> phys_addr_t mask, u32 actions)
> {
> - advk_writel(pcie, OB_WIN_ENABLE |
> - lower_32_bits(match), OB_WIN_MATCH_LS(win_num));
> - advk_writel(pcie, upper_32_bits(match), OB_WIN_MATCH_MS(win_num));
> - advk_writel(pcie, lower_32_bits(remap), OB_WIN_REMAP_LS(win_num));
> - advk_writel(pcie, upper_32_bits(remap), OB_WIN_REMAP_MS(win_num));
> - advk_writel(pcie, lower_32_bits(mask), OB_WIN_MASK_LS(win_num));
> - advk_writel(pcie, upper_32_bits(mask), OB_WIN_MASK_MS(win_num));
> - advk_writel(pcie, actions, OB_WIN_ACTIONS(win_num));
> + advk_writel(pcie, ADVK_OB_WIN_ENABLE |
> + lower_32_bits(match), ADVK_OB_WIN_MATCH_LS(win_num));
> + advk_writel(pcie, upper_32_bits(match), ADVK_OB_WIN_MATCH_MS(win_num));
> + advk_writel(pcie, lower_32_bits(remap), ADVK_OB_WIN_REMAP_LS(win_num));
> + advk_writel(pcie, upper_32_bits(remap), ADVK_OB_WIN_REMAP_MS(win_num));
> + advk_writel(pcie, lower_32_bits(mask), ADVK_OB_WIN_MASK_LS(win_num));
> + advk_writel(pcie, upper_32_bits(mask), ADVK_OB_WIN_MASK_MS(win_num));
> + advk_writel(pcie, actions, ADVK_OB_WIN_ACTIONS(win_num));
> }
>
> static void pcie_advk_disable_ob_win(struct pcie_advk *pcie, u8 win_num)
> {
> - advk_writel(pcie, 0, OB_WIN_MATCH_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MATCH_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_REMAP_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_REMAP_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MASK_LS(win_num));
> - advk_writel(pcie, 0, OB_WIN_MASK_MS(win_num));
> - advk_writel(pcie, 0, OB_WIN_ACTIONS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MATCH_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_REMAP_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MASK_LS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_MASK_MS(win_num));
> + advk_writel(pcie, 0, ADVK_OB_WIN_ACTIONS(win_num));
> }
>
> static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
> @@ -729,7 +720,7 @@ static void pcie_advk_set_ob_region(struct pcie_advk *pcie, int *wins,
> * because lower 16 bits of mask must be zero. Remapped address
> * may have set only bits from the mask.
> */
> - while (*wins < OB_WIN_COUNT && size > 0) {
> + while (*wins < ADVK_OB_WIN_COUNT && size > 0) {
> /* Calculate the largest aligned window size */
> win_size = (1ULL << (fls64(size) - 1)) |
> (phys_start ? (1ULL << __ffs64(phys_start)) : 0);
> @@ -774,24 +765,23 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> u32 reg;
>
> /* Set to Direct mode */
> - reg = advk_readl(pcie, CTRL_CONFIG_REG);
> - reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT);
> - reg |= ((PCIE_CORE_MODE_DIRECT & CTRL_MODE_MASK) << CTRL_MODE_SHIFT);
> - advk_writel(pcie, reg, CTRL_CONFIG_REG);
> + reg = advk_readl(pcie, ADVK_CORE_CTRL_CONFIG);
> + reg &= ~ADVK_CORE_CTRL_CONFIG_COMMAND_MODE;
> + advk_writel(pcie, reg, ADVK_CORE_CTRL_CONFIG);
>
> /* Set PCI global control register to RC mode */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg |= (IS_RC_MSK << IS_RC_SHIFT);
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg |= ADVK_GLOBAL_CTRL0_IS_RC;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /*
> * Replace incorrect PCI vendor id value 0x1b4b by correct value 0x11ab.
> - * VENDOR_ID_REG contains vendor id in low 16 bits and subsystem vendor
> + * ADVK_LMI_VENDOR_ID contains vendor id in low 16 bits and subsystem vendor
> * id in high 16 bits. Updating this register changes readback value of
> - * read-only vendor id bits in PCIE_CORE_DEV_ID_REG register. Workaround
> + * read-only vendor id bits in Root Port PCI_VENDOR_ID register. Workaround
> * for erratum 4.1: "The value of device and vendor ID is incorrect".
> */
> - advk_writel(pcie, 0x11ab11ab, VENDOR_ID_REG);
> + advk_writel(pcie, 0x11ab11ab, ADVK_LMI_VENDOR_ID);
>
> /*
> * Change Class Code of PCI Bridge device to PCI Bridge (0x600400),
> @@ -836,26 +826,26 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_EXP_OFF + PCI_EXP_DEVCTL);
>
> /* Program PCIe Control 2 to disable strict ordering */
> - reg = PCIE_CORE_CTRL2_RESERVED |
> - PCIE_CORE_CTRL2_TD_ENABLE;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
> + reg &= ~ADVK_GLOBAL_CTRL2_STRICT_ORDER_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
>
> /* Set GEN2 */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~PCIE_GEN_SEL_MSK;
> - reg |= SPEED_GEN_2;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_SPEED_GEN_MASK;
> + reg |= ADVK_GLOBAL_CTRL0_SPEED_GEN_2 << ADVK_GLOBAL_CTRL0_SPEED_GEN_SHIFT;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /* Set lane X1 */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~LANE_CNT_MSK;
> - reg |= LANE_COUNT_1;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_LANE_COUNT_MASK;
> + reg |= ADVK_GLOBAL_CTRL0_LANE_COUNT_1 << ADVK_GLOBAL_CTRL0_LANE_COUNT_SHIFT;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /* Enable link training */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg |= LINK_TRAINING_EN;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg |= ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> /*
> * Enable AXI address window location generation:
> @@ -867,9 +857,9 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * access when default outbound window configuration
> * is set for memory access.
> */
> - reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
> - reg |= PCIE_CORE_CTRL2_ADDRWIN_MAP_ENABLE;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL2);
> + reg |= ADVK_GLOBAL_CTRL2_ADDRWIN_MAP_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL2);
>
> /*
> * Bypass the address window mapping for PIO:
> @@ -877,16 +867,16 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> * info over AXI interface by PIO registers, the
> * address window is not required.
> */
> - reg = advk_readl(pcie, PIO_CTRL);
> - reg |= PIO_CTRL_ADDR_WIN_DISABLE;
> - advk_writel(pcie, reg, PIO_CTRL);
> + reg = advk_readl(pcie, ADVK_PIO_CTRL);
> + reg |= ADVK_PIO_CTRL_ADDR_WIN_DISABLE;
> + advk_writel(pcie, reg, ADVK_PIO_CTRL);
>
> /*
> * Set memory access in Default User Field so it
> * is not required to configure PCIe address for
> * transparent memory access.
> */
> - advk_writel(pcie, OB_WIN_TYPE_MEM, OB_WIN_DEFAULT_ACTIONS);
> + advk_writel(pcie, ADVK_OB_WIN_TYPE_MEM, ADVK_OB_WIN_DEFAULT_ACTIONS);
>
> /*
> * Configure PCIe address windows for non-memory or
> @@ -896,14 +886,14 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
> wins = 0;
> pci_get_regions(pcie->dev, &io, &mem, &pref);
> if (io)
> - pcie_advk_set_ob_region(pcie, &wins, io, OB_WIN_TYPE_IO);
> + pcie_advk_set_ob_region(pcie, &wins, io, ADVK_OB_WIN_TYPE_IO);
> if (mem && mem->phys_start != mem->bus_start)
> - pcie_advk_set_ob_region(pcie, &wins, mem, OB_WIN_TYPE_MEM);
> + pcie_advk_set_ob_region(pcie, &wins, mem, ADVK_OB_WIN_TYPE_MEM);
> if (pref && pref->phys_start != pref->bus_start)
> - pcie_advk_set_ob_region(pcie, &wins, pref, OB_WIN_TYPE_MEM);
> + pcie_advk_set_ob_region(pcie, &wins, pref, ADVK_OB_WIN_TYPE_MEM);
>
> /* Disable remaining PCIe outbound windows */
> - for (i = ((wins >= 0) ? wins : 0); i < OB_WIN_COUNT; i++)
> + for (i = ((wins >= 0) ? wins : 0); i < ADVK_OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> if (wins == -1)
> @@ -971,16 +961,16 @@ static int pcie_advk_remove(struct udevice *dev)
> u32 reg;
> int i;
>
> - for (i = 0; i < OB_WIN_COUNT; i++)
> + for (i = 0; i < ADVK_OB_WIN_COUNT; i++)
> pcie_advk_disable_ob_win(pcie, i);
>
> reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
> reg &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
> advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_COMMAND);
>
> - reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
> - reg &= ~LINK_TRAINING_EN;
> - advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
> + reg = advk_readl(pcie, ADVK_GLOBAL_CTRL0);
> + reg &= ~ADVK_GLOBAL_CTRL0_LINK_TRAINING_EN;
> + advk_writel(pcie, reg, ADVK_GLOBAL_CTRL0);
>
> return 0;
> }
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr()
2022-02-10 13:53 ` [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr() Pali Rohár
2022-02-15 9:21 ` Stefan Roese
@ 2022-02-17 15:36 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-17 15:36 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> There is only one base address, so use dev_read_addr() instead of dev_read_addr_index().
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 8e3b13b49ea0..6e65c0e1558c 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -991,7 +991,7 @@ static int pcie_advk_of_to_plat(struct udevice *dev)
> struct pcie_advk *pcie = dev_get_priv(dev);
>
> /* Get the register base address */
> - pcie->base = (void *)dev_read_addr_index(dev, 0);
> + pcie->base = (void *)dev_read_addr(dev);
> if ((fdt_addr_t)pcie->base == FDT_ADDR_T_NONE)
> return -EINVAL;
>
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus
2022-02-10 13:53 ` [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus Pali Rohár
2022-02-15 9:21 ` Stefan Roese
@ 2022-02-17 15:36 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2022-02-17 15:36 UTC (permalink / raw)
To: Pali Rohár, Marek Behún; +Cc: u-boot
On 2/10/22 14:53, Pali Rohár wrote:
> Writing to the PCI_PRIMARY_BUS register of the root port should not change
> bus number on which is root port present.
>
> This PCI_PRIMARY_BUS register is used only for correct configuration of
> legacy PCI stuff, like forwarding of PCI special cycles between buses.
>
> Aardvark HW does not support PCI special cycles, so it does not have HW
> register for PCI_PRIMARY_BUS and therefore it does not matter what is
> stored in this register.
>
> So fix this issue and do not use PCI_PRIMARY_BUS register in pci-aardvark.c
> driver for moving root bus of the root port.
>
> After this change there is no reason for storing bus number (zero) into
> first_busno variable, so remove this variable.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Fixes: cb056005dc67 ("arm: a37xx: pci: Add support for accessing PCI Bridge on root bus")
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> drivers/pci/pci-aardvark.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 6e65c0e1558c..1eb257ea8b4a 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -151,8 +151,6 @@
> * struct pcie_advk - Advk PCIe controller state
> *
> * @base: The base address of the register space.
> - * @first_busno: Bus number of the PCIe root-port.
> - * This may vary depending on the PCIe setup.
> * @sec_busno: Bus number for the device behind the PCIe root-port.
> * @dev: The pointer to PCI uclass device.
> * @reset_gpio: GPIO descriptor for PERST.
> @@ -162,7 +160,6 @@
> */
> struct pcie_advk {
> void *base;
> - int first_busno;
> int sec_busno;
> struct udevice *dev;
> struct gpio_desc reset_gpio;
> @@ -194,8 +191,8 @@ static inline uint advk_readl(struct pcie_advk *pcie, uint reg)
> static bool pcie_advk_addr_valid(struct pcie_advk *pcie,
> int busno, u8 dev, u8 func)
> {
> - /* On the primary (local) bus there is only one PCI Bridge */
> - if (busno == pcie->first_busno && (dev != 0 || func != 0))
> + /* On the root bus there is only one PCI Bridge */
> + if (busno == 0 && (dev != 0 || func != 0))
> return false;
>
> /*
> @@ -353,17 +350,17 @@ static int pcie_advk_read_config(const struct udevice *bus, pci_dev_t bdf,
> }
>
> /*
> - * The configuration space of the PCI Bridge on primary (first) bus is
> + * The configuration space of the PCI Bridge on the root bus (zero) is
> * not accessible via PIO transfers like all other PCIe devices. PCI
> * Bridge config registers are available directly in Aardvark memory
> * space starting at offset zero. The PCI Bridge config space is of
> * Type 0, but the BAR registers (including ROM BAR) don't have the same
> * meaning as in the PCIe specification. Therefore do not access BAR
> * registers and non-common registers (those which have different
> - * meaning for Type 0 and Type 1 config space) of the primary PCI Bridge
> + * meaning for Type 0 and Type 1 config space) of the PCI Bridge
> * and instead read their content from driver virtual cfgcache[].
> */
> - if (busno == pcie->first_busno) {
> + if (busno == 0) {
> if ((offset >= 0x10 && offset < 0x34) || (offset >= 0x38 && offset < 0x3c))
> data = pcie->cfgcache[(offset - 0x10) / 4];
> else
> @@ -543,7 +540,7 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> * zero. Type 1 specific registers are not available, so we write their
> * content only into driver virtual cfgcache[].
> */
> - if (busno == pcie->first_busno) {
> + if (busno == 0) {
> if ((offset >= 0x10 && offset < 0x34) ||
> (offset >= 0x38 && offset < 0x3c)) {
> data = pcie->cfgcache[(offset - 0x10) / 4];
> @@ -560,9 +557,6 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf,
> advk_writel(pcie, data, ADVK_ROOT_PORT_PCI_CFG_OFF + (offset & ~3));
> }
>
> - if (offset == PCI_PRIMARY_BUS)
> - pcie->first_busno = data & 0xff;
> -
> if (offset == PCI_SECONDARY_BUS ||
> (offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))
> pcie->sec_busno = (data >> 8) & 0xff;
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-02-17 15:37 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-10 13:53 [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Pali Rohár
2022-02-10 13:53 ` [PATCH u-boot-marvell 2/4] arm: a37xx: pci: Cleanup macro names Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:35 ` Stefan Roese
2022-02-10 13:53 ` [PATCH u-boot-marvell 3/4] arm: a37xx: pci: Use dev_read_addr() Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
2022-02-10 13:53 ` [PATCH u-boot-marvell 4/4] arm: a37xx: pci: Ensure that root port is always on root zero bus Pali Rohár
2022-02-15 9:21 ` Stefan Roese
2022-02-17 15:36 ` Stefan Roese
2022-02-15 9:20 ` [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h Stefan Roese
2022-02-17 15:35 ` Stefan Roese
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.