From patchwork Wed Sep 2 16:17:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 7113041 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 44DA69F380 for ; Wed, 2 Sep 2015 16:17:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 702BE204E2 for ; Wed, 2 Sep 2015 16:17:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F86120546 for ; Wed, 2 Sep 2015 16:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755234AbbIBQRm (ORCPT ); Wed, 2 Sep 2015 12:17:42 -0400 Received: from mout.gmx.net ([212.227.17.20]:56934 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754560AbbIBQRm (ORCPT ); Wed, 2 Sep 2015 12:17:42 -0400 Received: from ls3530.box ([92.203.6.179]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0MMkgl-1ZbsTx0apr-008cD0; Wed, 02 Sep 2015 18:17:34 +0200 Date: Wed, 2 Sep 2015 18:17:29 +0200 From: Helge Deller To: linux-parisc@vger.kernel.org Cc: James Bottomley , linux-pci@vger.kernel.org, Bjorn Helgaas , Meelis Roos Subject: [PATCH] PCI,parisc: Enable 64-bit bus addresses on PA-RISC Message-ID: <20150902161729.GA2444@ls3530.box> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:xEVg9mKlZxHGrWKJ8le8bxhzODNgNkiQN0spFjNpsXAzAl+cJLb Cy7eTveHGF5swAYinMG+Pjnh+lnnuwwMxIb36JaCoudyTp5WaiI5wz9+LNwk8E7pinqOW1C qTtzZO8Dj2gTVz3efkEqq34vKjd9T56Mv7GtsHF7MuVw3efO8hPJpWdSpPRoOQu6pHX0622 S8O1lJ8VbWaVRXSrSWFYQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:wd7oIR8Eink=:WqvocSxrJjUZNVtpFEISYt oMy+rL/86oRz1lBdFbTIIsO79Ho3OoSWm1imO8wgB9c44bnEXGT227SwhBhvR01WIku/PDsE3 P1KhNfFu25XH5IwNJPVzwQ3wJrohU47+hdVhYSet4epoWOyhPRMfxfyUzdBVjbkeWxFfJxzWV gZyyLjSXOJ/NXIyuJuSyyYUHW8+Dr/eCVf7+cq3P85RnLecFs7d3m6oLw3dRmp4EjClYTubMQ pDZXZwe0q7iAUyDl0DQlzy/YByJyIRoKZDtEVDUFd8jEDtHwhCKxcp2utcOUaBDEUsVq0I7cd xeHbchj2VurhdYAjJ6burH3aKLh+3evLBd3Kel3px5tBXHGhYisRbsROKwSMvnI3+ovr/8OWc olHfoLJ33ankbnbHgbWcwbHbl2dUFO0aiYfAFbdMwO0NTE3O+6NbjZrfVHcYFn8FGYjRgWG0P RuTdvmNt4BWVTjwUbZ3M9drbsA2HAp1OZbdgpF3Pw/zDKEVfdCBZ1UJm2UOvNUNRh5n3U7Tat siN0EoEDGu3x8AuFa09Ez257cTem7DRwJLguUWM6B9H4abt/xP72iucg/lZEefVdQr/BfXyDz 6Zaq7PMXVJjme8um2a277SwYy96elcWfLVRLeEr+GIzECf+kZpqrSqM4r3Y6KKeve9sMS4ZmP EiIqwSiRrktDIJPdPYL+JNKplrqTzR41YonqahWY3akmEG9R94vhdT9tIR/eW9cKNrbPENrN2 QxTKMoffKsA5mt63 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Meelis Roos Cc: stable@vger.kernel.org # v3.19+ Signed-off-by: Helge Deller --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index dceb9dd..a32c1f6 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -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, 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); diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 944f500..73de4ef 100644 --- 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