Skip to content
Browse files

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

commit e02a653 upstream.

Commit 3a9ad0b ("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 45ea2a5
("PCI: Don't use 64-bit bus addresses on PA-RISC")

Cc: Bjorn Helgaas <>
Cc: Meelis Roos <>
Signed-off-by: Helge Deller <>
Signed-off-by: Greg Kroah-Hartman <>
  • Loading branch information...
hdeller authored and gregkh committed Sep 2, 2015
1 parent 1a64393 commit 645305df79c555470ab6728561314ea852e2612f
Showing with 6 additions and 3 deletions.
  1. +5 −2 drivers/parisc/lba_pci.c
  2. +1 −1 drivers/pci/Kconfig
@@ -1556,8 +1556,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,
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",

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

@@ -2,7 +2,7 @@
# PCI configuration
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

0 comments on commit 645305d

Please sign in to comment.
You can’t perform that action at this time.