Commit 017fc480 authored by Shaohua Li's avatar Shaohua Li Committed by Greg Kroah-Hartman
Browse files

PCI: avoid save the same type of cap multiple times 



Avoid adding the same type of cap multiple times, otherwise we will see dead loop.

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ec0a3a27

drivers/pci/pci.c

+10 −2
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int pci_save_pcie_state(struct pci_dev *dev) 
	int pos, i = 0;

	struct pci_cap_saved_state *save_state;

	u16 *cap;

	int found = 0;



	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	if (pos <= 0)
@@ -577,6 +578,8 @@ static int pci_save_pcie_state(struct pci_dev *dev) 
	save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP);

	if (!save_state)

		save_state = kzalloc(sizeof(*save_state) + sizeof(u16) * 4, GFP_KERNEL);

	else

		found = 1;

	if (!save_state) {

		dev_err(&dev->dev, "Out of memory in pci_save_pcie_state\n");

		return -ENOMEM;
@@ -588,6 +591,7 @@ static int pci_save_pcie_state(struct pci_dev *dev) 
	pci_read_config_word(dev, pos + PCI_EXP_SLTCTL, &cap[i++]);

	pci_read_config_word(dev, pos + PCI_EXP_RTCTL, &cap[i++]);

	save_state->cap_nr = PCI_CAP_ID_EXP;

	if (!found)

		pci_add_saved_cap(dev, save_state);

	return 0;

}
@@ -616,6 +620,7 @@ static int pci_save_pcix_state(struct pci_dev *dev) 
	int pos, i = 0;

	struct pci_cap_saved_state *save_state;

	u16 *cap;

	int found = 0;



	pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);

	if (pos <= 0)
@@ -624,6 +629,8 @@ static int pci_save_pcix_state(struct pci_dev *dev) 
	save_state = pci_find_saved_cap(dev, PCI_CAP_ID_PCIX);

	if (!save_state)

		save_state = kzalloc(sizeof(*save_state) + sizeof(u16), GFP_KERNEL);

	else

		found = 1;

	if (!save_state) {

		dev_err(&dev->dev, "Out of memory in pci_save_pcie_state\n");

		return -ENOMEM;
@@ -632,6 +639,7 @@ static int pci_save_pcix_state(struct pci_dev *dev) 


	pci_read_config_word(dev, pos + PCI_X_CMD, &cap[i++]);

	save_state->cap_nr = PCI_CAP_ID_PCIX;

	if (!found)

		pci_add_saved_cap(dev, save_state);

	return 0;

}