Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6851ecc6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit 53e4d30d.

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2de6c39f

arch/i386/pci/common.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/i386/pci/i386.c

+0 −9
Original line number Diff line number Diff line
@@ -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.

arch/i386/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */