From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g5t0009.atlanta.hp.com (g5t0009.atlanta.hp.com [15.192.0.46]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bastion.smtp.hp.com", Issuer "RSA Data Security, Inc." (verified OK)) by ozlabs.org (Postfix) with ESMTP id 83FE3DE148 for ; Wed, 5 Mar 2008 05:56:30 +1100 (EST) Message-Id: <20080304185820.723623873@ldl.fc.hp.com> References: <20080304185646.864917286@ldl.fc.hp.com> Date: Tue, 04 Mar 2008 11:56:51 -0700 From: Bjorn Helgaas To: linux-pci@atrey.karlin.mff.cuni.cz To: linux-arch@vger.kernel.org Subject: [patch 05/16] frv: use generic pci_enable_resources() Cc: Chris Zankel , Grant Grundler , linux-parisc@vger.kernel.org, Matthew Wilcox , Kyle McMartin , linuxppc-dev@ozlabs.org, Paul Mackerras , linux-arm-kernel@lists.arm.linux.org.uk, Russell King List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Use the generic pci_enable_resources() instead of the arch-specific code. Unlike this arch-specific code, the generic version: - checks PCI_NUM_RESOURCES (11), not 6, resources - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set - skips ROM resources unless IORESOURCE_ROM_ENABLE is set - checks for resource collisions with "!r->parent" Signed-off-by: Bjorn Helgaas Index: work8/arch/frv/mb93090-mb00/pci-frv.c =================================================================== --- work8.orig/arch/frv/mb93090-mb00/pci-frv.c 2008-03-04 10:03:11.000000000 -0700 +++ work8/arch/frv/mb93090-mb00/pci-frv.c 2008-03-04 10:03:25.000000000 -0700 @@ -231,38 +231,6 @@ pcibios_assign_resources(); } -int pcibios_enable_resources(struct pci_dev *dev, int mask) -{ - u16 cmd, old_cmd; - int idx; - struct resource *r; - - pci_read_config_word(dev, PCI_COMMAND, &cmd); - old_cmd = cmd; - for(idx=0; idx<6; idx++) { - /* Only set up the requested stuff */ - if (!(mask & (1<resource[idx]; - if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); - return -EINVAL; - } - if (r->flags & IORESOURCE_IO) - cmd |= PCI_COMMAND_IO; - if (r->flags & IORESOURCE_MEM) - cmd |= PCI_COMMAND_MEMORY; - } - if (dev->resource[PCI_ROM_RESOURCE].start) - cmd |= PCI_COMMAND_MEMORY; - if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); - pci_write_config_word(dev, PCI_COMMAND, cmd); - } - return 0; -} - /* * If we set up a device for bus mastering, we need to check the latency * timer as certain crappy BIOSes forget to set it properly. Index: work8/arch/frv/mb93090-mb00/pci-frv.h =================================================================== --- work8.orig/arch/frv/mb93090-mb00/pci-frv.h 2008-03-04 10:03:29.000000000 -0700 +++ work8/arch/frv/mb93090-mb00/pci-frv.h 2008-03-04 10:03:33.000000000 -0700 @@ -31,7 +31,6 @@ extern unsigned int pcibios_max_latency; void pcibios_resource_survey(void); -int pcibios_enable_resources(struct pci_dev *, int); /* pci-vdk.c */ Index: work8/arch/frv/mb93090-mb00/pci-vdk.c =================================================================== --- work8.orig/arch/frv/mb93090-mb00/pci-vdk.c 2008-03-04 10:03:37.000000000 -0700 +++ work8/arch/frv/mb93090-mb00/pci-vdk.c 2008-03-04 10:03:45.000000000 -0700 @@ -465,7 +465,7 @@ { int err; - if ((err = pcibios_enable_resources(dev, mask)) < 0) + if ((err = pci_enable_resources(dev, mask)) < 0) return err; if (!dev->msi_enabled) pcibios_enable_irq(dev); --