From patchwork Thu Sep 17 22:02:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 519040 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 8667214027C for ; Fri, 18 Sep 2015 08:02:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kmj4R41O; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbbIQWC6 (ORCPT ); Thu, 17 Sep 2015 18:02:58 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:35434 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751981AbbIQWCX (ORCPT ); Thu, 17 Sep 2015 18:02:23 -0400 Received: by igbkq10 with SMTP id kq10so5559307igb.0; Thu, 17 Sep 2015 15:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PoNQ3fzdnaqD0QfPAbQt1RsoLgQwJ8aTE8Pu2mDuq1A=; b=kmj4R41Obj0md0ZaGy8RCk91cbbRNrVvV3YDoI6KV2mYL1Lr6psqzZKPFaDhzFxRzj jWHTawExWBYirs8eQetGoPxIg6YV+7yGxNskUxRV2oa5YIpahnfnXQauFFPOokP8H7ph EXS/kiIfbXYt+FcJ/Piqba3h4lcZh2v8l2VzK2/ob+AXaYYZfdFU/hjvbhCkxrLghf14 N20IdL/jEilfTazapwuh3kKNGzvSgYH7TbF0w9MuHyc59m378UCgxp+Voj76/VmGENh0 9gnPRtJKkpX51qFQwt6qtB5B6B7/WdJLYBD7eNRz2QqRDBLeyG6R7cS5LK9Mi6yZF1e/ bAzw== X-Received: by 10.50.124.39 with SMTP id mf7mr28642126igb.36.1442527342370; Thu, 17 Sep 2015 15:02:22 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.194.ptr.us.xo.net. [64.2.3.194]) by smtp.gmail.com with ESMTPSA id 98sm2248981ioi.22.2015.09.17.15.02.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Sep 2015 15:02:20 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id t8HM2I09001243; Thu, 17 Sep 2015 15:02:18 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t8HM2IHg001241; Thu, 17 Sep 2015 15:02:18 -0700 From: David Daney To: linux-kernel@vger.kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Will Deacon , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Marc Zyngier Cc: David Daney Subject: [PATCH v2 5/5] PCI: generic: Pass proper starting bus number to pci_scan_root_bus(). Date: Thu, 17 Sep 2015 15:02:12 -0700 Message-Id: <1442527332-1174-6-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1442527332-1174-1-git-send-email-ddaney.cavm@gmail.com> References: <1442527332-1174-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: David Daney If the bus is being configured with a bus-range that does not start at zero, pass that starting bus number to pci_scan_root_bus(). Passing the incorrect value of zero causes attempted config accesses outside of the supported range, which cascades to an OOPs spew and eventual kernel panic. Acked-by: Will Deacon Signed-off-by: David Daney --- No change from v1. drivers/pci/host/pci-host-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c index 0a9c453..e364232 100644 --- a/drivers/pci/host/pci-host-generic.c +++ b/drivers/pci/host/pci-host-generic.c @@ -259,7 +259,7 @@ static int gen_pci_probe(struct platform_device *pdev) if (!pci_has_flag(PCI_PROBE_ONLY)) pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS); - bus = pci_scan_root_bus(dev, 0, + bus = pci_scan_root_bus(dev, pci->cfg.bus_range->start, &pci->cfg.ops.ops, pci, &pci->resources); if (!bus) { dev_err(dev, "Scanning rootbus failed");