From patchwork Wed Jan 9 20:43:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1955321 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AE6FDDF2EB for ; Wed, 9 Jan 2013 20:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934259Ab3AIUrA (ORCPT ); Wed, 9 Jan 2013 15:47:00 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:62776 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934192Ab3AIUnf (ORCPT ); Wed, 9 Jan 2013 15:43:35 -0500 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LsOqW-1Sr51v3ThY-011uaj; Wed, 09 Jan 2013 21:43:24 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id EFDAA2A2813C; Wed, 9 Jan 2013 21:43:22 +0100 (CET) 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 T1oMvoPxR2rG; Wed, 9 Jan 2013 21:43:21 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 660172A2814A; Wed, 9 Jan 2013 21:43:16 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id 1903A1007FA; Wed, 9 Jan 2013 21:43:12 +0100 (CET) From: Thierry Reding To: linux-tegra@vger.kernel.org Cc: Grant Likely , Rob Herring , Russell King , Stephen Warren , Bjorn Helgaas , Andrew Murray , Jason Gunthorpe , Arnd Bergmann , Thomas Petazzoni , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Subject: [PATCH 07/14] ARM: pci: Allow passing per-controller private data Date: Wed, 9 Jan 2013 21:43:07 +0100 Message-Id: <1357764194-12677-8-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1357764194-12677-1-git-send-email-thierry.reding@avionic-design.de> References: <1357764194-12677-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:zLy3uHxgi0lWtkU6dlZRykrK7CS/ABTiF8VUeNP7JYR xBZAufCHLW6G1jrx4AZXw6hp/9yCLInN4f+TZvp3J7L3/Ibjo+ gaJwaGiWme1LvM8QmBMX7H6nVlpbmU71dEfzbHu4ie6jhnHt9y qjXOl8ZOiDN6FjehloKEgDqUxZLF2ph/xmSYMtCHQMgM81hxg3 FTA3S6oH+N4zO2NlEoxg/TlO58a+jEDBhIb9BXIygqdLhANUMc TEpSCCe5sefOhuOJHShKXbrIvhp3CUy7uFrBVmpc7qNmd7yEv9 yQqV8BfUtztxMlX9+8lEIG69uWWgJ1WYh88dGcVYcEZuyqHZZD 0g1a0xn1+93ruumnB0c60lpTo31yDA/PdchGzY95Kp72aMqngD biWps6Vn3oqOVTpUFVYb66IyHk/8y33LO6tNXNj6frlWchRViQ EzLoF 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 --- 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 db9fedb..5cf2e97 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -23,6 +23,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 da7b0c9..a1f73b5 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -464,6 +464,9 @@ static void 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) {