diff options
| author | Robert Mustacchi <rm@joyent.com> | 2019-01-28 17:33:59 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-01-28 17:40:36 -0500 |
| commit | 918e0d92ec24e67f572737a68faf135dc6409d26 (patch) | |
| tree | 3f2026b87a397e1e518e7a019e900efa2e84c8eb /usr/src/uts/i86xpv | |
| parent | 666e8af970029746a2a6532e68d14e14ccdde700 (diff) | |
| download | illumos-joyent-918e0d92ec24e67f572737a68faf135dc6409d26.tar.gz | |
10284 Socket CMCI mismatch can lead to boot hang
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/i86xpv')
| -rw-r--r-- | usr/src/uts/i86xpv/io/psm/xpv_psm.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/i86xpv/io/psm/xpv_uppc.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/i86xpv/io/psm/xpv_psm.c b/usr/src/uts/i86xpv/io/psm/xpv_psm.c index 7f1ac2170a..bc0ab7748d 100644 --- a/usr/src/uts/i86xpv/io/psm/xpv_psm.c +++ b/usr/src/uts/i86xpv/io/psm/xpv_psm.c @@ -1678,6 +1678,7 @@ static struct psm_ops xen_psm_ops = { (int (*)(void))NULL, /* psm_get_pir_ipivect */ (void (*)(processorid_t))NULL, /* psm_send_pir_ipi */ + (void (*)(processorid_t, boolean_t))NULL /* psm_cmci_setup */ }; static struct psm_info xen_psm_info = { diff --git a/usr/src/uts/i86xpv/io/psm/xpv_uppc.c b/usr/src/uts/i86xpv/io/psm/xpv_uppc.c index fa6a079826..4cc89b0108 100644 --- a/usr/src/uts/i86xpv/io/psm/xpv_uppc.c +++ b/usr/src/uts/i86xpv/io/psm/xpv_uppc.c @@ -650,7 +650,7 @@ xen_uppc_acpi_translate_pci_irq(dev_info_t *dip, int busid, int devid, if (status == ACPI_PSM_SUCCESS) { acpi_new_irq_cache_ent(busid, devid, ipin, *pci_irqp, intr_flagp, &acpipsmlnk); - psm_set_elcr(*pci_irqp, 1); /* set IRQ to PCI mode */ + psm_set_elcr(*pci_irqp, 1); /* set IRQ to PCI mode */ XEN_UPPC_VERBOSE_IRQ((CE_CONT, "!xVM_uppc: [ACPI] " "new irq %d for device %s, instance #%d\n", @@ -738,7 +738,7 @@ xen_uppc_translate_irq(dev_info_t *dip, int irqno) /* FALLTHRU to common case - returning irqno */ } else { /* non-PCI; assumes ISA-style edge-triggered */ - psm_set_elcr(irqno, 0); /* set IRQ to ISA mode */ + psm_set_elcr(irqno, 0); /* set IRQ to ISA mode */ XEN_UPPC_VERBOSE_IRQ((CE_CONT, "!xVM_uppc: non-pci," "irqno %d device %s instance %d\n", irqno, @@ -897,6 +897,7 @@ static struct psm_ops xen_uppc_ops = { (int (*)(void))NULL, /* psm_get_pir_ipivect */ (void (*)(processorid_t))NULL, /* psm_send_pir_ipi */ + (void (*)(processorid_t, boolean_t))NULL /* psm_cmci_setup */ }; static struct psm_info xen_uppc_info = { |