rpms/kernel/FC-3 jwltest-pci-d3hot-d0.patch,1.1.4.1,1.1.4.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 7 20:03:25 UTC 2005
Author: linville
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv10881
Modified Files:
Tag: private-linville-fc3-jwltest-21-branch
jwltest-pci-d3hot-d0.patch
Log Message:
jwltest-pci-d3hot-d0.patch:
drivers/pci/pci.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----
drivers/pci/setup-res.c | 2 -
include/linux/pci.h | 2 +
3 files changed, 51 insertions(+), 5 deletions(-)
Index: jwltest-pci-d3hot-d0.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/Attic/jwltest-pci-d3hot-d0.patch,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- jwltest-pci-d3hot-d0.patch 7 Jul 2005 19:57:14 -0000 1.1.4.1
+++ jwltest-pci-d3hot-d0.patch 7 Jul 2005 20:03:09 -0000 1.1.4.2
@@ -1,5 +1,5 @@
---- linux-2.6.11/include/linux/pci.h.orig 2005-07-06 17:25:42.585098463 -0400
-+++ linux-2.6.11/include/linux/pci.h 2005-07-06 17:27:38.774608150 -0400
+--- linux-2.6.11/include/linux/pci.h.orig 2005-07-07 15:59:04.994249756 -0400
++++ linux-2.6.11/include/linux/pci.h 2005-07-07 15:59:54.192699929 -0400
@@ -225,6 +225,7 @@
#define PCI_PM_CAP_PME_D3cold 0x8000 /* PME# from D3 (cold) */
#define PCI_PM_CTRL 4 /* PM control and status register */
@@ -8,9 +8,28 @@
#define PCI_PM_CTRL_PME_ENABLE 0x0100 /* PME pin enable */
#define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00 /* Data select (??) */
#define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000 /* Data scale (??) */
---- linux-2.6.11/drivers/pci/pci.c.orig 2005-07-06 17:27:20.089099256 -0400
-+++ linux-2.6.11/drivers/pci/pci.c 2005-07-06 17:27:38.771608550 -0400
-@@ -227,6 +227,59 @@ pci_find_parent_resource(const struct pc
+@@ -811,6 +812,7 @@ void pci_clear_mwi(struct pci_dev *dev);
+ int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
+ int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask);
+ int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
++void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
+ int pci_assign_resource(struct pci_dev *dev, int i);
+
+ /* ROM control related routines */
+--- linux-2.6.11/drivers/pci/setup-res.c.orig 2005-03-02 02:38:25.000000000 -0500
++++ linux-2.6.11/drivers/pci/setup-res.c 2005-07-07 15:59:13.956056664 -0400
+@@ -33,7 +33,7 @@
+ #endif
+
+
+-static void
++void
+ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
+ {
+ struct pci_bus_region region;
+--- linux-2.6.11/drivers/pci/pci.c.orig 2005-07-07 15:59:04.996249490 -0400
++++ linux-2.6.11/drivers/pci/pci.c 2005-07-07 15:59:13.955056797 -0400
+@@ -227,6 +227,37 @@ pci_find_parent_resource(const struct pc
}
/**
@@ -40,37 +59,15 @@
+ return;
+ }
+
-+ for (i = 0; i < numres; i ++) {
-+ struct pci_bus_region region;
-+ u32 val;
-+ int reg;
-+
-+ if (!dev->resource[i].flags)
-+ continue;
-+
-+ pcibios_resource_to_bus(dev, ®ion, &dev->resource[i]);
-+
-+ val = region.start
-+ | (dev->resource[i].flags & PCI_REGION_FLAG_MASK);
-+
-+ reg = PCI_BASE_ADDRESS_0 + (i * 4);
-+
-+ pci_write_config_dword(dev, reg, val);
-+
-+ if ((val & (PCI_BASE_ADDRESS_SPACE
-+ | PCI_BASE_ADDRESS_MEM_TYPE_MASK))
-+ == (PCI_BASE_ADDRESS_SPACE_MEMORY
-+ | PCI_BASE_ADDRESS_MEM_TYPE_64)) {
-+ pci_write_config_dword(dev, reg + 4, 0);
-+ }
-+ }
++ for (i = 0; i < numres; i ++)
++ pci_update_resource(dev, &dev->resource[i], i);
+}
+
+/**
* pci_set_power_state - Set the power state of a PCI device
* @dev: PCI device to be suspended
* @state: PCI power state (D0, D1, D2, D3hot, D3cold) we're entering
-@@ -244,7 +297,7 @@ pci_find_parent_resource(const struct pc
+@@ -244,7 +275,7 @@ pci_find_parent_resource(const struct pc
int
pci_set_power_state(struct pci_dev *dev, pci_power_t state)
{
@@ -79,7 +76,7 @@
u16 pmcsr, pmc;
/* bound the state we're entering */
-@@ -283,14 +336,17 @@ pci_set_power_state(struct pci_dev *dev,
+@@ -283,14 +314,17 @@ pci_set_power_state(struct pci_dev *dev,
return -EIO;
}
@@ -100,7 +97,7 @@
pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
pmcsr |= state;
}
-@@ -306,6 +362,16 @@ pci_set_power_state(struct pci_dev *dev,
+@@ -306,6 +340,16 @@ pci_set_power_state(struct pci_dev *dev,
udelay(200);
dev->current_state = state;
More information about the fedora-cvs-commits
mailing list