svn commit: r284503 - stable/10/sys/dev/pci

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jun 17 07:41:53 2015
New Revision: 284503
URL: https://svnweb.freebsd.org/changeset/base/284503

Log:
  MFC r284012:
  Disable VGA PCI interrupts until a chipset driver is loaded for VGA
  PCI devices. Else unhandled display adapter interrupts might freeze
  the CPU or consume a lot of CPU.
  
  PR:	156596

Modified:
  stable/10/sys/dev/pci/vga_pci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/pci/vga_pci.c
==============================================================================
--- stable/10/sys/dev/pci/vga_pci.c	Wed Jun 17 07:38:50 2015	(r284502)
+++ stable/10/sys/dev/pci/vga_pci.c	Wed Jun 17 07:41:53 2015	(r284503)
@@ -125,6 +125,13 @@ vga_pci_is_boot_display(device_t dev)
 	if ((config & (PCIM_CMD_PORTEN | PCIM_CMD_MEMEN)) == 0)
 		return (0);
 
+	/*
+	 * Disable interrupts until a chipset driver is loaded for
+	 * this PCI device. Else unhandled display adapter interrupts
+	 * might freeze the CPU.
+	 */
+	pci_write_config(dev, PCIR_COMMAND, config | PCIM_CMD_INTxDIS, 2);
+
 	/* This video card is the boot display: record its unit number. */
 	vga_pci_default_unit = unit;
 	device_set_flags(dev, 1);