From patchwork Wed Jul 15 16:54:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 495910 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 9C8C71402B6 for ; Thu, 16 Jul 2015 02:56:41 +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=YE9KNZjv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753271AbbGOQy6 (ORCPT ); Wed, 15 Jul 2015 12:54:58 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:34948 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753252AbbGOQy5 (ORCPT ); Wed, 15 Jul 2015 12:54:57 -0400 Received: by iecuq6 with SMTP id uq6so38001620iec.2; Wed, 15 Jul 2015 09:54:56 -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=OSO1yELWlZNJNWwKszNaaRoAd4Thl2fbtKxpaO10jzM=; b=YE9KNZjvzNTC2veV4LBOcijfgjIYdVfsFyXAEYLXrMKyyLH0qJOrzT9m4mU8EojQ5l L/J2u8SYZViZeCg3PFb2JGTQvAJk7pvM82eHp9VQ4a7v+1lBxA1Goo6Zkav5TxBGst4b veoblfoLpdgHmJaiVBfykR4QvBkCOPhtRvu5NtHM5+mwvimZ3lxS9AeG7jvD8r+cXS0B NQc7IQXm4/BnGSolPHWAPfBrvm2dCLciSmZJamLxZF1fLM1tjfr04ntThnA5b2icNoVy TxPU/T2yA7zslsj4fubbKBwTH2Yo9FkHqMJEfeAgUC09jlGjEjARwfQAO3wxoyH6rqMr sLNw== X-Received: by 10.50.17.104 with SMTP id n8mr27783205igd.21.1436979296906; Wed, 15 Jul 2015 09:54:56 -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 bd7sm1088291igb.19.2015.07.15.09.54.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Jul 2015 09:54:55 -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 t6FGsrMl008219; Wed, 15 Jul 2015 09:54:53 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t6FGsrIt008218; Wed, 15 Jul 2015 09:54:53 -0700 From: David Daney To: linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , Bjorn Helgaas , linux-pci@vger.kernel.org, Thomas Gleixner , Jason Cooper Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH 1/5] pci: Add is_pcierc element to struct pci_bus Date: Wed, 15 Jul 2015 09:54:41 -0700 Message-Id: <1436979285-8177-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1436979285-8177-1-git-send-email-ddaney.cavm@gmail.com> References: <1436979285-8177-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 ... and use is to force only_one_child() to return true. Needed because the ThunderX PCIe RC cannot be identified by existing methods. Signed-off-by: David Daney --- drivers/pci/probe.c | 2 ++ include/linux/pci.h | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cefd636..11ec2e7 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1643,6 +1643,8 @@ static int only_one_child(struct pci_bus *bus) { struct pci_dev *parent = bus->self; + if (bus->is_pcierc) + return 1; if (!parent || !pci_is_pcie(parent)) return 0; if (pci_pcie_type(parent) == PCI_EXP_TYPE_ROOT_PORT) diff --git a/include/linux/pci.h b/include/linux/pci.h index 8a0321a..1f1ce73 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -473,6 +473,7 @@ struct pci_bus { struct bin_attribute *legacy_io; /* legacy I/O for this bus */ struct bin_attribute *legacy_mem; /* legacy mem */ unsigned int is_added:1; + unsigned int is_pcierc:1; }; #define to_pci_bus(n) container_of(n, struct pci_bus, dev)