Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v6.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull pci fixes from Bjorn Helgaas:
- Revert a simplification that broke pci-tegra due to a masking error
- Update MAINTAINERS for Kishon's email address change and TI
DRA7XX/J721E maintainer change
* tag 'pci-v6.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
MAINTAINERS: Update Kishon's email address in PCI endpoint subsystem
MAINTAINERS: Add Vignesh Raghavendra as maintainer of TI DRA7XX/J721E PCI driver
Revert "PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro"
+10
-5
+2
-2
MAINTAINERS
+2
-2
MAINTAINERS
···
15849
15849
F: drivers/pci/controller/dwc/*designware*
15850
15850
15851
15851
PCI DRIVER FOR TI DRA7XX/J721E
15852
-
M: Kishon Vijay Abraham I <kishon@ti.com>
15852
+
M: Vignesh Raghavendra <vigneshr@ti.com>
15853
15853
L: linux-omap@vger.kernel.org
15854
15854
L: linux-pci@vger.kernel.org
15855
15855
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
···
15866
15866
F: drivers/pci/controller/pci-v3-semi.c
15867
15867
15868
15868
PCI ENDPOINT SUBSYSTEM
15869
-
M: Kishon Vijay Abraham I <kishon@ti.com>
15870
15869
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
15871
15870
R: Krzysztof Wilczyński <kw@linux.com>
15872
15871
R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
15872
+
R: Kishon Vijay Abraham I <kishon@kernel.org>
15873
15873
L: linux-pci@vger.kernel.org
15874
15874
S: Supported
15875
15875
Q: https://patchwork.kernel.org/project/linux-pci/list/
+8
-3
drivers/pci/controller/pci-tegra.c
+8
-3
drivers/pci/controller/pci-tegra.c
···
415
415
* address (access to which generates correct config transaction) falls in
416
416
* this 4 KiB region.
417
417
*/
418
+
static unsigned int tegra_pcie_conf_offset(u8 bus, unsigned int devfn,
419
+
unsigned int where)
420
+
{
421
+
return ((where & 0xf00) << 16) | (bus << 16) | (PCI_SLOT(devfn) << 11) |
422
+
(PCI_FUNC(devfn) << 8) | (where & 0xff);
423
+
}
424
+
418
425
static void __iomem *tegra_pcie_map_bus(struct pci_bus *bus,
419
426
unsigned int devfn,
420
427
int where)
···
443
436
unsigned int offset;
444
437
u32 base;
445
438
446
-
offset = PCI_CONF1_EXT_ADDRESS(bus->number, PCI_SLOT(devfn),
447
-
PCI_FUNC(devfn), where) &
448
-
~PCI_CONF1_ENABLE;
439
+
offset = tegra_pcie_conf_offset(bus->number, devfn, where);
449
440
450
441
/* move 4 KiB window to offset within the FPCI region */
451
442
base = 0xfe100000 + ((offset & ~(SZ_4K - 1)) >> 8);