From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e33.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 6344CDE3B9 for ; Thu, 26 Jun 2008 06:17:29 +1000 (EST) Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e33.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id m5PKHPsg005939 for ; Wed, 25 Jun 2008 16:17:25 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.0) with ESMTP id m5PKHPHs176576 for ; Wed, 25 Jun 2008 14:17:25 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m5PKHOkR017402 for ; Wed, 25 Jun 2008 14:17:25 -0600 Date: Wed, 25 Jun 2008 15:17:21 -0500 From: Robert Jennings To: paulus@samba.org Subject: [PATCH 08/18 v2] powerpc: Do not probe PCI buses or eBus devices if CMO is enabled Message-ID: <20080625201721.GJ17020@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20080625201202.GB17020@linux.vnet.ibm.com> Cc: Brian King , linuxppc-dev@ozlabs.org, David Darrington List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , =46rom: Brian King The Cooperative Memory Overcommit (CMO) on System p does not currently support native PCI devices or eBus devices when enabled. Prevent PCI bus probe and eBus device probe if the feature is enabled. Signed-off-by: Brian King Signed-off-by: Robert Jennings --- arch/powerpc/kernel/ibmebus.c | 6 ++++++ arch/powerpc/platforms/pseries/setup.c | 4 ++++ 2 files changed, 10 insertions(+) Index: b/arch/powerpc/kernel/ibmebus.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c @@ -45,6 +45,7 @@ #include #include #include +#include =20 static struct device ibmebus_bus_device =3D { /* fake "parent" device */ .bus_id =3D "ibmebus", @@ -332,6 +333,11 @@ static int __init ibmebus_bus_init(void) { int err; =20 + if (firmware_has_feature(FW_FEATURE_CMO)) { + printk(KERN_WARNING "Not probing eBus since CMO is enabled\n"); + return 0; + } + printk(KERN_INFO "IBM eBus Device Driver\n"); =20 err =3D of_bus_type_init(&ibmebus_bus_type, "ibmebus"); Index: b/arch/powerpc/platforms/pseries/setup.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -539,6 +539,10 @@ static void pseries_shared_idle_sleep(vo =20 static int pSeries_pci_probe_mode(struct pci_bus *bus) { + if (firmware_has_feature(FW_FEATURE_CMO)) { + dev_warn(&bus->dev, "Not probing PCI bus since CMO is enabled\n"); + return PCI_PROBE_NONE; + } if (firmware_has_feature(FW_FEATURE_LPAR)) return PCI_PROBE_DEVTREE; return PCI_PROBE_NORMAL;