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

Commit 0cdbe30f authored by Yuji Shimada's avatar Yuji Shimada Committed by Jesse Barnes
Browse files

PCI: don't corrupt enable_cnt when doing manual resource alignment 



This patch fixes breakage of of enable_cnt in quirk_resource_alignment.

Currently, quirk_resource_alignment calls pci_disable_device.
pci_disable_device decrements enable_cnt, so that enable_cnt becomes -1.

The patch disables memory decoding, writing command register directly.
So enable_cnt is not broken.

Signed-off-by: default avatarYuji Shimada <shimada-yxb@necst.nec.co.jp>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 5446a6bd

drivers/pci/quirks.c

+9 −5
Original line number Diff line number Diff line
@@ -36,17 +36,18 @@ EXPORT_SYMBOL(pcie_mch_quirk); 


#ifdef CONFIG_PCI_QUIRKS

/*

 * This quirk function disables the device and releases resources

 * which is specified by kernel's boot parameter 'pci=resource_alignment='.

 * This quirk function disables memory decoding and releases memory resources

 * of the device specified by kernel's boot parameter 'pci=resource_alignment='.

 * It also rounds up size to specified alignment.

 * Later on, the kernel will assign page-aligned memory resource back

 * to that device.

 * to the device.

 */

static void __devinit quirk_resource_alignment(struct pci_dev *dev)

{

	int i;

	struct resource *r;

	resource_size_t align, size;

	u16 command;



	if (!pci_is_reassigndev(dev))

		return;
@@ -58,8 +59,11 @@ static void __devinit quirk_resource_alignment(struct pci_dev *dev) 
		return;

	}



	dev_info(&dev->dev, "Disabling device and release resources.\n");

	pci_disable_device(dev);

	dev_info(&dev->dev,

		"Disabling memory decoding and releasing memory resources.\n");

	pci_read_config_word(dev, PCI_COMMAND, &command);

	command &= ~PCI_COMMAND_MEMORY;

	pci_write_config_word(dev, PCI_COMMAND, command);



	align = pci_specified_resource_alignment(dev);

	for (i=0; i < PCI_BRIDGE_RESOURCES; i++) {