mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 12:40:53 +07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"
This commit is contained in:
commit
a0d2db2658
@ -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);
|
||||
}
|
||||
|
@ -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.
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -19,7 +19,7 @@ config PCI_MSI
|
||||
|
||||
config PCI_MULTITHREAD_PROBE
|
||||
bool "PCI Multi-threaded probe (EXPERIMENTAL)"
|
||||
depends on PCI && EXPERIMENTAL
|
||||
depends on PCI && EXPERIMENTAL && BROKEN
|
||||
help
|
||||
Say Y here if you want the PCI core to spawn a new thread for
|
||||
every PCI device that is probed. This can cause a huge
|
||||
|
Loading…
Reference in New Issue
Block a user