From: Jake Moilanen <moilanen@austin•ibm.com>
To: linuxppc-dev@ozlabs•org
Cc: paulus@samba•org
Subject: [PATCH 1/2] Base pSeries PCIe support
Date: Fri, 31 Mar 2006 16:05:45 -0600 [thread overview]
Message-ID: <20060331160545.db3fa210.moilanen@austin.ibm.com> (raw)
In-Reply-To: <20060331160203.f2bf8b53.moilanen@austin.ibm.com>
Added recognition of device_type: "pciex" and made PCIe portdrv
buildable on PPC64.
Signed-off-by: Jake Moilanen <moilanen@austin•ibm.com>
---
Index: 2.6.16/arch/powerpc/Kconfig
===================================================================
--- 2.6.16.orig/arch/powerpc/Kconfig 2006-03-31 15:11:20.000000000 -0600
+++ 2.6.16/arch/powerpc/Kconfig 2006-03-31 15:15:35.000000000 -0600
@@ -808,6 +808,8 @@
endchoice
+source "drivers/pci/pcie/Kconfig"
+
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
Index: 2.6.16/arch/powerpc/kernel/pci_64.c
===================================================================
--- 2.6.16.orig/arch/powerpc/kernel/pci_64.c 2006-03-31 15:11:20.000000000 -0600
+++ 2.6.16/arch/powerpc/kernel/pci_64.c 2006-03-31 15:15:35.000000000 -0600
@@ -395,7 +395,7 @@
dev->current_state = 4; /* unknown power state */
- if (!strcmp(type, "pci")) {
+ if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
/* a PCI-PCI bridge */
dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
dev->rom_base_reg = PCI_ROM_ADDRESS1;
Index: 2.6.16/arch/powerpc/kernel/rtas_pci.c
===================================================================
--- 2.6.16.orig/arch/powerpc/kernel/rtas_pci.c 2006-03-31 15:11:20.000000000 -0600
+++ 2.6.16/arch/powerpc/kernel/rtas_pci.c 2006-03-31 15:15:35.000000000 -0600
@@ -315,7 +315,8 @@
for (node = of_get_next_child(root, NULL);
node != NULL;
node = of_get_next_child(root, node)) {
- if (node->type == NULL || strcmp(node->type, "pci") != 0)
+
+ if (node->type == NULL || ((strcmp(node->type, "pci") != 0) && (strcmp(node->type, "pciex") != 0)))
continue;
phb = pcibios_alloc_controller(node);
next prev parent reply other threads:[~2006-03-31 22:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-31 22:02 [PATCH 0/2] Base pSeries PCIe support Jake Moilanen
2006-03-31 22:05 ` Jake Moilanen [this message]
2006-03-31 22:15 ` [PATCH 1/2] " Dave Hansen
2006-03-31 22:18 ` Jake Moilanen
2006-04-12 4:06 ` Christoph Hellwig
2006-03-31 22:13 ` [PATCH 2/2] " Jake Moilanen
2006-03-31 22:48 ` Olof Johansson
2006-03-31 23:08 ` Olof Johansson
2006-04-01 8:36 ` Paul Mackerras
2006-04-01 22:57 ` Jake Moilanen
2006-04-10 15:39 ` Jake Moilanen
2006-04-11 21:31 ` Benjamin Herrenschmidt
2006-04-01 8:38 ` Paul Mackerras
2006-04-12 4:05 ` Christoph Hellwig
2006-03-31 22:28 ` [PATCH 0/2] " Arnd Bergmann
2006-03-31 22:35 ` Jake Moilanen
2006-03-31 22:39 ` Doug Maxey
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=20060331160545.db3fa210.moilanen@austin.ibm.com \
--to=moilanen@austin$(echo .)ibm.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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