From patchwork Tue Oct 18 08:25:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 683572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3syp7769jdz9sBr for ; Tue, 18 Oct 2016 19:25:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684AbcJRIZx (ORCPT ); Tue, 18 Oct 2016 04:25:53 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:48308 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbcJRIZw (ORCPT ); Tue, 18 Oct 2016 04:25:52 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1bwPiX-0001Ur-Mt; Tue, 18 Oct 2016 10:25:49 +0200 From: Lucas Stach To: Bjorn Helgaas Cc: Jingoo Han , Pratyush Anand , linux-pci@vger.kernel.org, Gary Bisson , kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: [PATCH resend] PCI: designware: fix register access before host init Date: Tue, 18 Oct 2016 10:25:49 +0200 Message-Id: <20161018082549.10905-1-l.stach@pengutronix.de> X-Mailer: git-send-email 2.9.3 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The function used to determine if iATU unroll is available will read a RC register. This is not possible and will result in a system hang if the RC is still in reset, so it is only safe to call this function after host_init() has been called. Fixes: a0601a470537 (PCI: designware: Add iATU Unroll feature) Reported-by: Gary Bisson Tested-by: Gary Bisson Signed-off-by: Lucas Stach Acked-by: Jingoo Han Tested-by: Fabio Estevam --- drivers/pci/host/pcie-designware.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 035f50c03281..74510508fafc 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -637,11 +637,11 @@ int dw_pcie_host_init(struct pcie_port *pp) } } - pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp); - if (pp->ops->host_init) pp->ops->host_init(pp); + pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp); + pp->root_bus_nr = pp->busn->start; if (IS_ENABLED(CONFIG_PCI_MSI)) { bus = pci_scan_root_bus_msi(pp->dev, pp->root_bus_nr,