Page MenuHomeFreeBSD
Files F145068135

D49222.1777321454.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D49222.1777321454.diff
View Options

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1790,6 +1790,7 @@
panic.9 KERNEL_PANICKED.9
MLINKS+=pci.9 pci_alloc_msi.9 \
pci.9 pci_alloc_msix.9 \
+ pci.9 pci_clear_pme.9 \
pci.9 pci_disable_busmaster.9 \
pci.9 pci_disable_io.9 \
pci.9 pci_enable_busmaster.9 \
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -30,6 +30,7 @@
.Nm pci ,
.Nm pci_alloc_msi ,
.Nm pci_alloc_msix ,
+.Nm pci_clear_pme ,
.Nm pci_disable_busmaster ,
.Nm pci_disable_io ,
.Nm pci_enable_busmaster ,
@@ -81,6 +82,8 @@
.Fn pci_alloc_msi "device_t dev" "int *count"
.Ft int
.Fn pci_alloc_msix "device_t dev" "int *count"
+.Ft void
+.Fn pci_clear_pme "device_t dev"
.Ft int
.Fn pci_disable_busmaster "device_t dev"
.Ft int
@@ -670,6 +673,11 @@
.Er EOPNOTSUPP .
.Pp
The
+.Fn pci_clear_pme
+function is used to clear any pending PME# signal and disable generation
+of power management events.
+.Pp
+The
.Fn pci_iov_attach
function is used to advertise that the given device
.Pq and associated device driver
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
@@ -2936,6 +2936,22 @@
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_cap != 0) {
+ status = pci_read_config(dev, dinfo->cfg.pp.pp_status, 2);
+ status &= ~PCIM_PSTAT_PMEENABLE;
+ status |= PCIM_PSTAT_PME;
+ pci_write_config(dev, dinfo->cfg.pp.pp_status, status, 2);
+ }
+}
+
/*
* Some convenience functions for PCI device drivers.
*/
@@ -4472,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)
@@ -4662,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
@@ -686,6 +686,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, Apr 27, 8:24 PM (19 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28443508
Default Alt Text
D49222.1777321454.diff (3 KB)

Event Timeline