Page MenuHomeFreeBSD
Files F142333175

D49222.id151930.diff
No OneTemporary
Actions

D49222.id151930.diff
View Options

diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -212,6 +212,7 @@
DEVPRINTF((cbdev, "Warning: Bogus CIS ignored\n"));
pci_cfg_save(dinfo->pci.cfg.dev, &dinfo->pci, 0);
pci_cfg_restore(dinfo->pci.cfg.dev, &dinfo->pci);
+ pci_clear_pme(child);
cardbus_device_setup_regs(&dinfo->pci.cfg);
pci_add_resources(cbdev, child, 1, dinfo->mprefetchable);
pci_print_verbose(&dinfo->pci);
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -2933,6 +2933,24 @@
return (result);
}
+/* Clear any active PME# and disable PME# generation. */
+void
+pci_clear_pme(device_t dev)
+{
+ struct pci_devinfo *dinfo = device_get_ivars(dev);
+ pcicfgregs *cfg = &dinfo->cfg;
+ uint16_t status;
+
+ if (cfg->pp.pp_location != 0) {
+ status = pci_read_config(dev, dinfo->cfg.pp.pp_location +
+ PCIR_POWER_STATUS, 2);
+ status &= ~PCIM_PSTAT_PMEENABLE;
+ status |= PCIM_PSTAT_PME;
+ pci_write_config(dev, dinfo->cfg.pp.pp_location +
+ PCIR_POWER_STATUS, status, 2);
+ }
+}
+
/*
* Some convenience functions for PCI device drivers.
*/
@@ -4470,6 +4488,7 @@
resource_list_init(&dinfo->resources);
pci_cfg_save(dev, dinfo, 0);
pci_cfg_restore(dev, dinfo);
+ pci_clear_pme(dev);
pci_print_verbose(dinfo);
pci_add_resources(bus, dev, 0, 0);
if (pci_enable_mps_tune)
@@ -4660,6 +4679,7 @@
dinfo = device_get_ivars(child);
pci_cfg_restore(child, dinfo);
+ pci_clear_pme(child);
if (!device_is_attached(child))
pci_cfg_save(child, dinfo, 1);
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -684,6 +684,7 @@
void pci_save_state(device_t dev);
int pci_set_max_read_req(device_t dev, int size);
int pci_power_reset(device_t dev);
+void pci_clear_pme(device_t dev);
uint32_t pcie_read_config(device_t dev, int reg, int width);
void pcie_write_config(device_t dev, int reg, uint32_t value, int width);
uint32_t pcie_adjust_config(device_t dev, int reg, uint32_t mask,

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 5:06 PM (6 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27749919
Default Alt Text
D49222.id151930.diff (2 KB)

Event Timeline