PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"

This reverts commit 53e4d30dd666d7f83598957ee4a415eefb47c9a6.

It was found that it caused unneeded problems (see
http://bugzilla.kernel.org/show_bug.cgi?id=7082 for details of one such
issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index 6d5ace845e445b2eca6a25452e100e380e0467b4..cdfcf971098b642c7d68c3141f4a93fcf82869a4 100644 (file)
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -343,7 +343,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 
 void pcibios_disable_device (struct pci_dev *dev)
 {
-       pcibios_disable_resources(dev);
        if (pcibios_disable_irq)
                pcibios_disable_irq(dev);
 }

diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 10154a2cac6895d6073973f3e12ef95d18bee247..98580292f0d4d8a1005500fa6d6335839427018b 100644 (file)
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -242,15 +242,6 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
        return 0;
 }
 
-void pcibios_disable_resources(struct pci_dev *dev)
-{
-       u16 cmd;
-
-       pci_read_config_word(dev, PCI_COMMAND, &cmd);
-       cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
-       pci_write_config_word(dev, PCI_COMMAND, cmd);
-}
-
 /*
  *  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.

diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index ad065cebd7b9e1d94fb665c147d01cc90f36412d..a0a25180b61a93b974d4e5918d85960a4093dd9d 100644 (file)
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -43,7 +43,6 @@ extern unsigned int pcibios_max_latency;
 
 void pcibios_resource_survey(void);
 int pcibios_enable_resources(struct pci_dev *, int);
-void pcibios_disable_resources(struct pci_dev *);
 
 /* pci-pc.c */