From: Takao Indoh <indou.takao@jp.fujitsu.com>
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 <indou.takao@jp.fujitsu.com>,
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
Subject: [PATCH v7 1/5] x86, pci: add dummy pci device for early stage
Date: Tue, 27 Nov 2012 09:42:34 +0900 (JST) [thread overview]
Message-ID: <20121127004154.3604.89729.sendpatchset@tindoh.g01.fujitsu.local> (raw)
In-Reply-To: <20121127004144.3604.61708.sendpatchset@tindoh.g01.fujitsu.local>
So we can pass pci_dev *dev to reuse some generic pci functions.
The original patch was written by Yinghai Lu.
Signed-off-by: Takao Indoh <indou.takao@jp.fujitsu.com>
---
arch/x86/include/asm/pci-direct.h | 2 +
arch/x86/pci/early.c | 74 +++++++++++++++++++++++++++++++++++++
2 files changed, 76 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..024def7 100644
--- a/arch/x86/pci/early.c
+++ b/arch/x86/pci/early.c
@@ -109,3 +109,77 @@ 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 = PCI_SLOT(devfn);
+ func = PCI_FUNC(devfn);
+ 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 = PCI_SLOT(devfn);
+ func = PCI_FUNC(devfn);
+ 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;
+
+__init struct pci_dev *get_early_pci_dev(int num, int slot, int func)
+{
+ struct pci_dev *pdev;
+
+ pdev = &pci_early_dev;
+ memset(pdev, 0, sizeof(*pdev));
+
+ pdev->bus = &pci_early_bus,
+ pdev->dev.init_name = pci_early_init_name;
+ pdev->bus->number = num;
+ pdev->devfn = PCI_DEVFN(slot, func);
+ sprintf((char *)pdev->dev.init_name, "%02x:%02x.%01x", num, slot, func);
+
+ return pdev;
+}
--
1.7.1
next prev parent reply other threads:[~2012-11-27 0:42 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 0:42 [PATCH v7 0/5] Reset PCIe devices to address DMA problem on kdump with iommu Takao Indoh
2012-11-27 0:42 ` Takao Indoh [this message]
2012-11-27 0:42 ` [PATCH v7 2/5] PCI: Define the maximum number of PCI function Takao Indoh
2012-11-27 0:42 ` [PATCH v7 3/5] Make reset_devices available at early stage Takao Indoh
2012-11-27 0:43 ` [PATCH v7 4/5] x86, pci: Reset PCIe devices at boot time Takao Indoh
2012-11-27 0:43 ` [PATCH v7 5/5] x86, pci: Enable PCI INTx when MSI is disabled Takao Indoh
2012-11-30 15:49 ` [PATCH v7 0/5] Reset PCIe devices to address DMA problem on kdump with iommu MUNEDA Takahiro
2012-12-21 16:19 ` Yinghai Lu
2013-01-07 19:09 ` Thomas Renninger
2013-01-07 20:16 ` Yinghai Lu
2013-01-08 0:42 ` Thomas Renninger
2013-01-08 3:04 ` Yinghai Lu
2013-01-08 16:47 ` [PATCH] Only reset e820 once, even with multiple memmap=exactmap params Thomas Renninger
2013-01-08 17:19 ` Yinghai Lu
2013-01-10 3:21 ` Thomas Renninger
2013-01-10 14:26 ` Vivek Goyal
2013-01-10 16:53 ` Yinghai Lu
2013-01-10 17:01 ` Vivek Goyal
2013-01-10 17:11 ` Yinghai Lu
2013-01-10 23:34 ` Yinghai Lu
2013-01-11 12:33 ` [PATCH] x86 e820: only void usable memory areas in memmap=exactmap case Thomas Renninger
2013-01-11 16:16 ` Yinghai Lu
2013-01-11 18:24 ` Thomas Renninger
2013-01-11 19:59 ` Yinghai Lu
2013-01-11 20:06 ` H. Peter Anvin
2013-01-11 21:09 ` Yinghai Lu
2013-01-11 22:16 ` H. Peter Anvin
2013-01-12 11:31 ` Thomas Renninger
2013-01-12 17:07 ` Yinghai Lu
2013-01-14 2:08 ` Thomas Renninger
2013-01-14 2:43 ` Yinghai Lu
2013-01-14 15:05 ` Thomas Renninger
2013-01-14 19:04 ` Yinghai Lu
2013-01-15 0:54 ` Thomas Renninger
2013-01-15 4:45 ` Yinghai Lu
2013-01-22 15:21 ` Thomas Renninger
2013-01-08 16:50 ` [PATCH v7 0/5] Reset PCIe devices to address DMA problem on kdump with iommu Thomas Renninger
2013-01-08 17:27 ` Yinghai Lu
2013-01-09 2:32 ` Thomas Renninger
2013-01-09 4:39 ` Takao Indoh
2013-01-21 1:11 ` Takao Indoh
2013-01-23 0:47 ` Thomas Renninger
2013-01-24 0:23 ` Takao Indoh
2013-01-29 1:14 ` Thomas Renninger
2013-01-30 5:01 ` Takao Indoh
2013-03-04 0:56 ` Takao Indoh
2013-03-04 22:00 ` Don Dutile
2013-03-05 0:56 ` Takao Indoh
[not found] ` <CAK4g67ZEUfCqqpa1-4wkN4+OXZYQqLTiJC+6OpwVWVLfO2_7xQ@mail.gmail.com>
2012-12-21 10:37 ` Takao Indoh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121127004154.3604.89729.sendpatchset@tindoh.g01.fujitsu.local \
--to=indou.takao@jp.fujitsu.com \
--cc=andi@firstfloor.org \
--cc=bhelgaas@google.com \
--cc=ddutile@redhat.com \
--cc=hbabu@us.ibm.com \
--cc=hpa@zytor.com \
--cc=ishii.hironobu@jp.fujitsu.com \
--cc=kexec@lists.infradead.org \
--cc=khalid@gonehiking.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tokunaga.keiich@jp.fujitsu.com \
--cc=vgoyal@redhat.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).