From patchwork Mon Jun 11 15:05:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 164196 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 6B5C7100828 for ; Tue, 12 Jun 2012 01:05:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755578Ab2FKPFc (ORCPT ); Mon, 11 Jun 2012 11:05:32 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:52137 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755176Ab2FKPF2 (ORCPT ); Mon, 11 Jun 2012 11:05:28 -0400 Received: from benhur.adnet.avionic-design.de (p548E0634.dip0.t-ipconnect.de [84.142.6.52]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MBv9P-1SlYxQ37LD-00AJFp; Mon, 11 Jun 2012 17:05:25 +0200 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id 687202C4122; Mon, 11 Jun 2012 17:05:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 91C982A281BB; Mon, 11 Jun 2012 17:05:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q2Opo0Zj2ixb; Mon, 11 Jun 2012 17:05:21 +0200 (CEST) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 415B72A28173; Mon, 11 Jun 2012 17:05:21 +0200 (CEST) From: Thierry Reding To: linux-tegra@vger.kernel.org Cc: Jesse Barnes , linux-pci@vger.kernel.org, Grant Likely , Rob Herring , devicetree-discuss@lists.ozlabs.org, Russell King , linux-arm-kernel@lists.infradead.org, Colin Cross , Olof Johansson , Stephen Warren Subject: [PATCH v2 03/10] ARM: pci: Allow passing per-controller private data Date: Mon, 11 Jun 2012 17:05:11 +0200 Message-Id: <1339427118-32263-4-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> References: <1339427118-32263-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:K2T7C7L/iS07AjRciXcpR4Bxsn117L43U3zavI+zOtI MfXO0HDKTJDbdKp4Boh8HEFVe3Amb8Lp/PorPlnJc0+xw1Dfch RCIjk8jIIXDV7PaKj+9yP7+vOFet9TgJZABLMhpJxUxNue8osx upp+X8DGSJTMvyTKy/+NwM038dRnTbiaZopyDJiE4mXKmJEKDU OG0Ad4j1hT5S/eI+EXHcq/rqQo8khoi+UHwK1GRHQ5ZD3mrkCv mdfRVEnCfWKbjJAK/BcPSYeKinRBv61iG1i6SHHa43bDL/oNVU /+xIHDZjGgU9k66fJolokcVIDh6lJSvBmpUg/9GTa/qT6i+l/7 2BujyEMnagjAQL8jig986KYpX3rEWsc+b2fyDacq4EW4G1T+1g 0LdEQzvoQ1UyqqXYAXZUaXjGWgoPbunSEtu920jr40Ag6QL+3t KyOVD Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In order to allow drivers to specify private data for each controller, this commit adds a private_data field to the struct hw_pci. This field is an array of nr_controllers pointers that will be used to initialize the private_data field of the corresponding controller's pci_sys_data structure. Signed-off-by: Thierry Reding --- Changes in v2: - new patch --- arch/arm/include/asm/mach/pci.h | 1 + arch/arm/kernel/bios32.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 26c511f..736cb8d 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -21,6 +21,7 @@ struct hw_pci { #endif struct pci_ops *ops; int nr_controllers; + void **private_data; int (*setup)(int nr, struct pci_sys_data *); struct pci_bus *(*scan)(int nr, struct pci_sys_data *); void (*preinit)(void); diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index c9d28dd..04858c6 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -442,6 +442,9 @@ static void __devinit pcibios_init_hw(struct hw_pci *hw, struct list_head *head) sys->map_irq = hw->map_irq; INIT_LIST_HEAD(&sys->resources); + if (hw->private_data) + sys->private_data = hw->private_data[nr]; + ret = hw->setup(nr, sys); if (ret > 0) {