diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-12 20:49:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-12 20:49:39 -0500 |
| commit | a02af84e03e018d7cd08bb3070cbe5517004712b (patch) | |
| tree | aeea10cced79093b8cb35974c410d1c2604e69ba /drivers/pci/pci_msc01.c | |
| parent | f0c91296015a5976a7b4a6c01892a404c18ced83 (diff) | |
| parent | 2a67bf65dd6c362487f416878348398d1842ae6b (diff) | |
Merge branch '2022-01-12-pci-updates'
- PCI code clean up and bug fixes from Pali
Diffstat (limited to 'drivers/pci/pci_msc01.c')
| -rw-r--r-- | drivers/pci/pci_msc01.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c index 2f1b688fc32..8d363d60498 100644 --- a/drivers/pci/pci_msc01.c +++ b/drivers/pci/pci_msc01.c @@ -34,16 +34,13 @@ static int msc01_config_access(struct msc01_pci_controller *msc01, void *cfgdata = msc01->base + MSC01_PCI_CFGDATA_OFS; unsigned int bus = PCI_BUS(bdf); unsigned int dev = PCI_DEV(bdf); - unsigned int devfn = PCI_DEV(bdf) << 3 | PCI_FUNC(bdf); + unsigned int func = PCI_FUNC(bdf); /* clear abort status */ __raw_writel(aborts, intstat); /* setup address */ - __raw_writel((bus << MSC01_PCI_CFGADDR_BNUM_SHF) | - (dev << MSC01_PCI_CFGADDR_DNUM_SHF) | - (devfn << MSC01_PCI_CFGADDR_FNUM_SHF) | - ((where / 4) << MSC01_PCI_CFGADDR_RNUM_SHF), + __raw_writel((PCI_CONF1_ADDRESS(bus, dev, func, where) & ~PCI_CONF1_ENABLE), msc01->base + MSC01_PCI_CFGADDR_OFS); /* perform access */ |