From patchwork Tue Nov 13 09:07:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takao Indoh X-Patchwork-Id: 1732861 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 269D0DF230 for ; Tue, 13 Nov 2012 09:07:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754089Ab2KMJHi (ORCPT ); Tue, 13 Nov 2012 04:07:38 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:53089 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979Ab2KMJHf (ORCPT ); Tue, 13 Nov 2012 04:07:35 -0500 Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id B4BB43EE0C5; Tue, 13 Nov 2012 18:07:34 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 9B2BA45DE56; Tue, 13 Nov 2012 18:07:34 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 79FAA45DE54; Tue, 13 Nov 2012 18:07:34 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 61BD81DB8049; Tue, 13 Nov 2012 18:07:34 +0900 (JST) Received: from m1001.s.css.fujitsu.com (m1001.s.css.fujitsu.com [10.240.81.139]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 1BDC61DB8046; Tue, 13 Nov 2012 18:07:34 +0900 (JST) Received: from m1001.css.fujitsu.com (m1001 [127.0.0.1]) by m1001.s.css.fujitsu.com (Postfix) with ESMTP id E4E3461161; Tue, 13 Nov 2012 18:07:33 +0900 (JST) Received: from [10.124.101.134] (unknown [10.124.101.134]) by m1001.s.css.fujitsu.com (Postfix) with ESMTP id 58261610D8; Tue, 13 Nov 2012 18:07:33 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 From: Takao Indoh To: linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org Cc: tokunaga.keiich@jp.fujitsu.com, kexec@lists.infradead.org, hbabu@us.ibm.com, andi@firstfloor.org, ddutile@redhat.com, Takao Indoh , ishii.hironobu@jp.fujitsu.com, hpa@zytor.com, bhelgaas@google.com, tglx@linutronix.de, yinghai@kernel.org, mingo@redhat.com, vgoyal@redhat.com, khalid@gonehiking.org Message-Id: <20121113090222.1180.36111.sendpatchset@indoh> In-Reply-To: <20121113090212.1180.12233.sendpatchset@indoh> References: <20121113090212.1180.12233.sendpatchset@indoh> Subject: [PATCH v6 1/5] x86, pci: add dummy pci device for early stage Date: Tue, 13 Nov 2012 18:07:33 +0900 (JST) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Yinghai Lu So we can pass pci_dev *dev to reuse some generic pci functions. Signed-off-by: Yinghai Lu Signed-off-by: Takao Indoh --- arch/x86/include/asm/pci-direct.h | 2 + arch/x86/pci/early.c | 75 +++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/pci-direct.h b/arch/x86/include/asm/pci-direct.h index b1e7a45..b6360d3 100644 --- a/arch/x86/include/asm/pci-direct.h +++ b/arch/x86/include/asm/pci-direct.h @@ -18,4 +18,6 @@ extern int early_pci_allowed(void); extern unsigned int pci_early_dump_regs; extern void early_dump_pci_device(u8 bus, u8 slot, u8 func); extern void early_dump_pci_devices(void); + +struct pci_dev *get_early_pci_dev(int num, int slot, int func); #endif /* _ASM_X86_PCI_DIRECT_H */ diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index d1067d5..aea6b2b 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c @@ -109,3 +109,78 @@ void early_dump_pci_devices(void) } } } + +static __init int +early_pci_read(struct pci_bus *bus, unsigned int devfn, int where, + int size, u32 *value) +{ + int num, slot, func; + + num = bus->number; + slot = devfn >> 3; + func = devfn & 7; + switch (size) { + case 1: + *value = read_pci_config_byte(num, slot, func, where); + break; + case 2: + *value = read_pci_config_16(num, slot, func, where); + break; + case 4: + *value = read_pci_config(num, slot, func, where); + break; + } + + return 0; +} + +static __init int +early_pci_write(struct pci_bus *bus, unsigned int devfn, int where, + int size, u32 value) +{ + int num, slot, func; + + num = bus->number; + slot = devfn >> 3; + func = devfn & 7; + switch (size) { + case 1: + write_pci_config_byte(num, slot, func, where, (u8)value); + break; + case 2: + write_pci_config_16(num, slot, func, where, (u16)value); + break; + case 4: + write_pci_config(num, slot, func, where, (u32)value); + break; + } + + return 0; +} + +static __initdata struct pci_ops pci_early_ops = { + .read = early_pci_read, + .write = early_pci_write, +}; +static __initdata struct pci_bus pci_early_bus = { + .ops = &pci_early_ops, +}; +static __initdata char pci_early_init_name[8]; +static __initdata struct pci_dev pci_early_dev = { + .bus = &pci_early_bus, + .dev = { + .init_name = pci_early_init_name, + }, +}; + +__init struct pci_dev *get_early_pci_dev(int num, int slot, int func) +{ + struct pci_dev *pdev; + + pdev = &pci_early_dev; + pdev->devfn = (slot<<3) | (func & 7); + pdev->bus->number = num; + sprintf((char *)pdev->dev.init_name, "%02x:%02x.%01x", num, slot, func); + + return pdev; +}