Skip to content

Commit 247ffc6

Browse files
palitrini
authored andcommitted
pci: mpc85xx: Use PCI_CONF1_EXT_ADDRESS() macro
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@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org>
1 parent 2b29d79 commit 247ffc6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/pci/pci_mpc85xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static int mpc85xx_pci_dm_read_config(const struct udevice *dev, pci_dev_t bdf,
2323
struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
2424
u32 addr;
2525

26-
addr = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
26+
addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
2727
out_be32(priv->cfg_addr, addr);
2828
sync();
2929
*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,
3838
struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
3939
u32 addr;
4040

41-
addr = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
41+
addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
4242
out_be32(priv->cfg_addr, addr);
4343
sync();
4444
out_le32(priv->cfg_data, pci_conv_size_to_32(0, value, offset, size));

0 commit comments

Comments
 (0)