From: Stefan Roese <sr@denx.de>
To: "Pali Rohár" <pali@kernel.org>, "Marek Behún" <marek.behun@nic.cz>
Cc: u-boot@lists.denx.de
Subject: Re: [PATCH u-boot-marvell 1/4] arm: a37xx: pci: Use standard register macros from pci.h
Date: Thu, 17 Feb 2022 16:35:43 +0100 [thread overview]
Message-ID: <9ac614b0-ae4c-83b6-e0ed-66a0d3021012@denx.de> (raw)
In-Reply-To: <20220210135345.28452-1-pali@kernel.org>
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
prev parent reply other threads:[~2022-02-17 15:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ac614b0-ae4c-83b6-e0ed-66a0d3021012@denx.de \
--to=sr@denx.de \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.