[PATCH u-boot-next 03/12] pci: mpc85xx: Use PCI_CONF1_EXT_ADDRESS() macro

[Simon Glass]

Hi Pali,

On Fri, 26 Nov 2021 at 03:43, Pali Rohár <pali at kernel.org> wrote:
>
> PCI mpc85xx driver uses extended format of Config Address for PCI
> Configuration Mechanism #1.
>
> So use new U-Boot macro PCI_CONF1_EXT_ADDRESS().
>
> Signed-off-by: Pali Rohár <pali at kernel.org>
> ---
>  drivers/pci/pci_mpc85xx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>

nit below

>
> diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
> index 574cb784a893..1e180ee289b0 100644
> --- a/drivers/pci/pci_mpc85xx.c
> +++ b/drivers/pci/pci_mpc85xx.c
> @@ -23,7 +23,7 @@ static int mpc85xx_pci_dm_read_config(const struct udevice *dev, pci_dev_t bdf,
>         struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
>         u32 addr;
>
> -       addr = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
> +       addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
>         out_be32(priv->cfg_addr, addr);
>         sync();
>         *value = pci_conv_32_to_size(in_le32(priv->cfg_data), offset, size);
> @@ -38,7 +38,7 @@ static int mpc85xx_pci_dm_write_config(struct udevice *dev, pci_dev_t bdf,
>         struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
>         u32 addr;
>
> -       addr = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
> +       addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);

It seems annoying to have to separate these out just to have the macro
put them back together. Perhaps add a version of the macro that takes
bdf as a parameter?

>         out_be32(priv->cfg_addr, addr);
>         sync();
>         out_le32(priv->cfg_data, pci_conv_size_to_32(0, value, offset, size));
> --
> 2.20.1
>

Regards,
Simon