Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e02a653e authored by Helge Deller's avatar Helge Deller
Browse files

PCI,parisc: Enable 64-bit bus addresses on PA-RISC 



Commit 3a9ad0b4 ("PCI: Add pci_bus_addr_t") unconditionally introduced usage of
64-bit PCI bus addresses on all 64-bit platforms which broke PA-RISC.

It turned out that due to enabling the 64-bit addresses, the PCI logic decided
to use the GMMIO instead of the LMMIO region. This commit simply disables
registering the GMMIO and thus we fall back to use the LMMIO region as before.

Reverts commit 45ea2a5f
("PCI: Don't use 64-bit bus addresses on PA-RISC")

To: linux-parisc@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Meelis Roos <mroos@linux.ee>
Cc: stable@vger.kernel.org  # v3.19+
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 38d9029a

drivers/parisc/lba_pci.c

+5 −2
Original line number Diff line number Diff line
@@ -1555,8 +1555,11 @@ lba_driver_probe(struct parisc_device *dev) 
	if (lba_dev->hba.lmmio_space.flags)

		pci_add_resource_offset(&resources, &lba_dev->hba.lmmio_space,

					lba_dev->hba.lmmio_space_offset);

	if (lba_dev->hba.gmmio_space.flags)

		pci_add_resource(&resources, &lba_dev->hba.gmmio_space);

	if (lba_dev->hba.gmmio_space.flags) {

		/* pci_add_resource(&resources, &lba_dev->hba.gmmio_space); */

		pr_warn("LBA: Not registering GMMIO space %pR\n",

			&lba_dev->hba.gmmio_space);

	}



	pci_add_resource(&resources, &lba_dev->hba.bus_num);

drivers/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# PCI configuration

#

config PCI_BUS_ADDR_T_64BIT

	def_bool y if (ARCH_DMA_ADDR_T_64BIT || (64BIT && !PARISC))

	def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT)

	depends on PCI



config PCI_MSI