svn commit: r359517 - stable/12/sys/x86/x86

[Konstantin Belousov]

Author: kib
Date: Wed Apr  1 16:01:03 2020
New Revision: 359517
URL: https://svnweb.freebsd.org/changeset/base/359517

Log:
  MFC r359093:
  Do not spuriously re-enable disabled io_apic pin on EOI for some configurations.

Modified:
  stable/12/sys/x86/x86/io_apic.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/x86/io_apic.c
==============================================================================
--- stable/12/sys/x86/x86/io_apic.c	Wed Apr  1 15:59:26 2020	(r359516)
+++ stable/12/sys/x86/x86/io_apic.c	Wed Apr  1 16:01:03 2020	(r359517)
@@ -194,8 +194,11 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked)
 		low1 |= IOART_TRGREDG | IOART_INTMSET;
 		ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
 		    low1);
+		low1 = src->io_lowreg;
+		if (src->io_masked != 0)
+			low1 |= IOART_INTMSET;
 		ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
-		    src->io_lowreg);
+		    low1);
 		if (!locked)
 			mtx_unlock_spin(&icu_lock);
 	}