lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 099/134] PCI,parisc: Enable 64-bit bus addresses on PA-RISC
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Helge Deller <deller@gmx.de>

    commit e02a653e15d8d32e9e768fd99a3271aafe5c5d77 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 45ea2a5fed6dacb9bb0558d8b21eacc1c45d5bb4
    ("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>
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/parisc/lba_pci.c | 7 +++++--
    drivers/pci/Kconfig | 2 +-
    2 files changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/parisc/lba_pci.c
    +++ b/drivers/parisc/lba_pci.c
    @@ -1556,8 +1556,11 @@ lba_driver_probe(struct parisc_device *d
    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);

    --- a/drivers/pci/Kconfig
    +++ b/drivers/pci/Kconfig
    @@ -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



    \
     
     \ /
      Last update: 2015-09-26 23:21    [W:2.903 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site