Re: [PATCH u-boot-next 4/4] pci: pci_octeontx: Use PCIE_ECAM_OFFSET() macro

Stefan Roese
2021-12-16T14:02:29Z

On 11/24/21 18:00, Pali Rohár wrote:
> Replace custom driver macros by PCIE_ECAM_OFFSET() macro from pci.h
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
> ---
> drivers/pci/pci_octeontx.c | 61 +++++++++++++-------------------------
> 1 file changed, 20 insertions(+), 41 deletions(-)

Nice diffstat.

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c
> index 46855c5cd3a3..875cf7f7115d 100644
> --- a/drivers/pci/pci_octeontx.c
> +++ b/drivers/pci/pci_octeontx.c
> @@ -49,25 +49,6 @@ struct octeontx_pci {
> struct resource bus;
> };
>
> -static uintptr_t octeontx_cfg_addr(struct octeontx_pci *pcie,
> - int bus_offs, int shift_offs,
> - pci_dev_t bdf, uint offset)
> -{
> - u32 bus, dev, func;
> - uintptr_t address;
> -
> - bus = PCI_BUS(bdf) + bus_offs;
> - dev = PCI_DEV(bdf);
> - func = PCI_FUNC(bdf);
> -
> - address = (bus << (20 + shift_offs)) |
> - (dev << (15 + shift_offs)) |
> - (func << (12 + shift_offs)) | offset;
> - address += pcie->cfg.start;
> -
> - return address;
> -}
> -
> static ulong readl_size(uintptr_t addr, enum pci_size_t size)
> {
> ulong val;
> @@ -123,9 +104,9 @@ static int octeontx_ecam_read_config(const struct udevice *bus, pci_dev_t bdf,
> struct pci_controller *hose = dev_get_uclass_priv(bus);
> uintptr_t address;
>
> - address = octeontx_cfg_addr(pcie, pcie->bus.start - hose->first_busno,
> - 0, bdf, offset);
> - *valuep = readl_size(address, size);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + pcie->bus.start - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), offset);
> + *valuep = readl_size(pcie->cfg.start + address, size);
>
> debug("%02x.%02x.%02x: u%d %x -> %lx\n",
> PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), size, offset, *valuep);
> @@ -141,9 +122,9 @@ static int octeontx_ecam_write_config(struct udevice *bus, pci_dev_t bdf,
> struct pci_controller *hose = dev_get_uclass_priv(bus);
> uintptr_t address;
>
> - address = octeontx_cfg_addr(pcie, pcie->bus.start - hose->first_busno,
> - 0, bdf, offset);
> - writel_size(address, size, value);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + pcie->bus.start - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), offset);
> + writel_size(pcie->cfg.start + address, size, value);
>
> debug("%02x.%02x.%02x: u%d %x <- %lx\n",
> PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), size, offset, value);
> @@ -162,17 +143,16 @@ static int octeontx_pem_read_config(const struct udevice *bus, pci_dev_t bdf,
> u8 pri_bus = pcie->bus.start + 1 - hose->first_busno;
> u32 bus_offs = (pri_bus << 16) | (pri_bus << 8) | (pri_bus << 0);
>
> - address = octeontx_cfg_addr(pcie, 1 - hose->first_busno, 4,
> - bdf, 0);
> -
> *valuep = pci_conv_32_to_size(~0UL, offset, size);
>
> if (octeontx_bdf_invalid(bdf))
> return -EPERM;
>
> - *valuep = readl_size(address + offset, size);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + 1 - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), 0) << 4;
> + *valuep = readl_size(pcie->cfg.start + address + offset, size);
>
> - hdrtype = readb(address + PCI_HEADER_TYPE);
> + hdrtype = readb(pcie->cfg.start + address + PCI_HEADER_TYPE);
> if (hdrtype == PCI_HEADER_TYPE_BRIDGE &&
> offset >= PCI_PRIMARY_BUS &&
> offset <= PCI_SUBORDINATE_BUS &&
> @@ -193,9 +173,10 @@ static int octeontx_pem_write_config(struct udevice *bus, pci_dev_t bdf,
> u8 pri_bus = pcie->bus.start + 1 - hose->first_busno;
> u32 bus_offs = (pri_bus << 16) | (pri_bus << 8) | (pri_bus << 0);
>
> - address = octeontx_cfg_addr(pcie, 1 - hose->first_busno, 4, bdf, 0);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + 1 - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), 0) << 4;
>
> - hdrtype = readb(address + PCI_HEADER_TYPE);
> + hdrtype = readb(pcie->cfg.start + address + PCI_HEADER_TYPE);
> if (hdrtype == PCI_HEADER_TYPE_BRIDGE &&
> offset >= PCI_PRIMARY_BUS &&
> offset <= PCI_SUBORDINATE_BUS &&
> @@ -205,7 +186,7 @@ static int octeontx_pem_write_config(struct udevice *bus, pci_dev_t bdf,
> if (octeontx_bdf_invalid(bdf))
> return -EPERM;
>
> - writel_size(address + offset, size, value);
> + writel_size(pcie->cfg.start + address + offset, size, value);
>
> debug("%02x.%02x.%02x: u%d %x (%lx) <- %lx\n",
> PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), size, offset,
> @@ -222,15 +203,14 @@ static int octeontx2_pem_read_config(const struct udevice *bus, pci_dev_t bdf,
> struct pci_controller *hose = dev_get_uclass_priv(bus);
> uintptr_t address;
>
> - address = octeontx_cfg_addr(pcie, 1 - hose->first_busno, 0,
> - bdf, 0);
> -
> *valuep = pci_conv_32_to_size(~0UL, offset, size);
>
> if (octeontx_bdf_invalid(bdf))
> return -EPERM;
>
> - *valuep = readl_size(address + offset, size);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + 1 - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), offset);
> + *valuep = readl_size(pcie->cfg.start + address, size);
>
> debug("%02x.%02x.%02x: u%d %x (%lx) -> %lx\n",
> PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), size, offset,
> @@ -247,13 +227,12 @@ static int octeontx2_pem_write_config(struct udevice *bus, pci_dev_t bdf,
> struct pci_controller *hose = dev_get_uclass_priv(bus);
> uintptr_t address;
>
> - address = octeontx_cfg_addr(pcie, 1 - hose->first_busno, 0,
> - bdf, 0);
> -
> if (octeontx_bdf_invalid(bdf))
> return -EPERM;
>
> - writel_size(address + offset, size, value);
> + address = PCIE_ECAM_OFFSET(PCI_BUS(bdf) + 1 - hose->first_busno,
> + PCI_DEV(bdf), PCI_FUNC(bdf), offset);
> + writel_size(pcie->cfg.start + address, size, value);
>
> debug("%02x.%02x.%02x: u%d %x (%lx) <- %lx\n",
> PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), size, offset,
>

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