Skip to contentSkip to conversation

pci: correctly initialize a structure

PATCH Applied Shaohua Li 2 participants 2 messages Dec 18, 2007 – Dec 21, 2007 PCI

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 2/3 pci: correctly initialize a structure

save_state->cap_nr should be correctly set, otherwise we can't find the saved cap at resume.

drivers/pci/pci.c +2 -0
Index: linux/drivers/pci/pci.c
===================================================================
@@ -569,6 +569,7 @@ static int pci_save_pcie_state(struct pc
 	pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &cap[i++]);
 	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;
 	pci_add_saved_cap(dev, save_state);
 	return 0;
 }
@@ -612,6 +613,7 @@ static int pci_save_pcix_state(struct pc
 	cap = (u16 *)&save_state->data[0];
 
 	pci_read_config_word(dev, pos + PCI_X_CMD, &cap[i++]);
+	save_state->cap_nr = PCI_CAP_ID_PCIX;
 	pci_add_saved_cap(dev, save_state);
 	return 0;
 }
#1 lore raw

patch pci-correctly-initialize-a-structure-for-pcie_save_pcix_state.patch added to gregkh-2.6 tree

This is a note to let you know that I've just added the patch titled

Subject: PCI: correctly initialize a structure for pcie_save_pcix_state()

to my gregkh-2.6 tree. Its filename is

pci-correctly-initialize-a-structure-for-pcie_save_pcix_state.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Mon Dec 17 18:02:37 2007

From: Shaohua Li <[email protected]>
Date: Tue, 18 Dec 2007 09:56:56 +0800
Subject: PCI: correctly initialize a structure for pcie_save_pcix_state()
To: lkml <[email protected]>
Cc: Andrew Morton <[email protected]>, Greg KH <[email protected]>
Message-ID: <[email protected]>

save_state->cap_nr should be correctly set, otherwise we can't find the saved cap at resume.

---
 drivers/pci/pci.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/pci/pci.c +2 -0
@@ -587,6 +587,7 @@ static int pci_save_pcie_state(struct pc
 	pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &cap[i++]);
 	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;
 	pci_add_saved_cap(dev, save_state);
 	return 0;
 }
@@ -630,6 +631,7 @@ static int pci_save_pcix_state(struct pc
 	cap = (u16 *)&save_state->data[0];
 
 	pci_read_config_word(dev, pos + PCI_X_CMD, &cap[i++]);
+	save_state->cap_nr = PCI_CAP_ID_PCIX;
 	pci_add_saved_cap(dev, save_state);
 	return 0;
 }

Patches currently in gregkh-2.6 which might be from [email protected] are

driver/kobject-change-drivers-cpuidle-sysfs.c-to-use-kobject_init_and_add.patch pci/pcie-port-driver-correctly-detect-native-pme-feature.patch pci/pcie-utilize-pcie-transaction-pending-bit.patch pci/pci-add-pci-quirk-function-for-some-chipsets.patch pci/pci-avoid-save-the-same-type-of-cap-multiple-times.patch pci/pci-correctly-initialize-a-structure-for-pcie_save_pcix_state.patch pci/pci-fix-typo-in-pci_save_pcix_state.patch