From: Rajesh Shah <rajesh.shah@intel.com>
To: gregkh@suse.de, ak@suse.de, linux-pci@atrey.karlin.mff.cuni.cz
Cc: linux-kernel@vger.kernel.org, akpm@osdl.org
Subject: i386/x86_84: disable PCI resource decode on device disable
Date: Wed, 3 May 2006 15:27:47 -0700 [thread overview]
Message-ID: <20060503152747.A29327@unix-os.sc.intel.com> (raw)
When a PCI device is disabled via pci_disable_device(), it's still
left decoding its BAR resource ranges even though its driver
will have likely released those regions (and may even have
unloaded). pci_enable_device() already explicitly enables
BAR resource decode for the device being enabled. This patch
disables resource decode for the PCI device being disabled,
making it symmetric with the enable call.
I saw this while doing something else, not because of a
problem report. Still, seems to be the correct thing to do.
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
arch/i386/pci/common.c | 1 +
arch/i386/pci/i386.c | 9 +++++++++
arch/i386/pci/pci.h | 1 +
3 files changed, 11 insertions(+)
Index: linux-2.6.17-rc3-git7/arch/i386/pci/common.c
===================================================================
--- linux-2.6.17-rc3-git7.orig/arch/i386/pci/common.c
+++ linux-2.6.17-rc3-git7/arch/i386/pci/common.c
@@ -288,6 +288,7 @@ int pcibios_enable_device(struct pci_dev
void pcibios_disable_device (struct pci_dev *dev)
{
+ pcibios_disable_resources(dev);
if (pcibios_disable_irq)
pcibios_disable_irq(dev);
}
Index: linux-2.6.17-rc3-git7/arch/i386/pci/i386.c
===================================================================
--- linux-2.6.17-rc3-git7.orig/arch/i386/pci/i386.c
+++ linux-2.6.17-rc3-git7/arch/i386/pci/i386.c
@@ -242,6 +242,15 @@ int pcibios_enable_resources(struct pci_
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.
Index: linux-2.6.17-rc3-git7/arch/i386/pci/pci.h
===================================================================
--- linux-2.6.17-rc3-git7.orig/arch/i386/pci/pci.h
+++ linux-2.6.17-rc3-git7/arch/i386/pci/pci.h
@@ -35,6 +35,7 @@ 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 */
next reply other threads:[~2006-05-03 22:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-03 22:27 Rajesh Shah [this message]
2006-05-04 3:16 ` Dave Airlie
2006-05-04 9:44 ` Antonino A. Daplas
2006-05-04 20:01 ` Rajesh Shah
2006-05-04 20:33 ` Matthew Wilcox
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=20060503152747.A29327@unix-os.sc.intel.com \
--to=rajesh.shah@intel.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
/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
Powered by JetHome