Page MenuHomeFreeBSD
Files F151139337

D7426.diff
No OneTemporary
Actions

D7426.diff
View Options

Index: head/sys/dev/pci/pci_pci.c
===================================================================
--- head/sys/dev/pci/pci_pci.c
+++ head/sys/dev/pci/pci_pci.c
@@ -1057,7 +1057,7 @@
pcib_pcie_hotplug_update(struct pcib_softc *sc, uint16_t val, uint16_t mask,
bool schedule_task)
{
- bool card_inserted;
+ bool card_inserted, ei_engaged;
/* Clear DETACHING if Present Detect has cleared. */
if ((sc->pcie_slot_sta & (PCIEM_SLOT_STA_PDC | PCIEM_SLOT_STA_PDS)) ==
@@ -1094,8 +1094,8 @@
*/
if (sc->pcie_slot_cap & PCIEM_SLOT_CAP_EIP) {
mask |= PCIEM_SLOT_CTL_EIC;
- if (card_inserted !=
- !(sc->pcie_slot_sta & PCIEM_SLOT_STA_EIS))
+ ei_engaged = (sc->pcie_slot_sta & PCIEM_SLOT_STA_EIS) != 0;
+ if (card_inserted != ei_engaged)
val |= PCIEM_SLOT_CTL_EIC;
}
@@ -1122,7 +1122,7 @@
pcib_pcie_hotplug_command(sc, val, mask);
/*
- * During attach the child "pci" device is added sychronously;
+ * During attach the child "pci" device is added synchronously;
* otherwise, the task is scheduled to manage the child
* device.
*/
Index: head/usr.sbin/pciconf/cap.c
===================================================================
--- head/usr.sbin/pciconf/cap.c
+++ head/usr.sbin/pciconf/cap.c
@@ -529,10 +529,13 @@
if (cap & PCIEM_SLOT_CAP_APB)
printf(" Attn Button");
if (cap & PCIEM_SLOT_CAP_PCP)
- printf(" PC(%s)", ctl & PCIEM_SLOT_CTL_PCC ? "on" : "off");
+ printf(" PC(%s)", ctl & PCIEM_SLOT_CTL_PCC ? "off" : "on");
if (cap & PCIEM_SLOT_CAP_MRLSP)
printf(" MRL(%s)", sta & PCIEM_SLOT_STA_MRLSS ? "open" :
"closed");
+ if (cap & PCIEM_SLOT_CAP_EIP)
+ printf(" EI(%s)", sta & PCIEM_SLOT_STA_EIS ? "engaged" :
+ "disengaged");
}
static void

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 8:48 AM (10 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30986224
Default Alt Text
D7426.diff (1 KB)

Event Timeline