svn commit: r189402 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/pci

[John Baldwin]

Author: jhb
Date: Thu Mar  5 15:46:41 2009
New Revision: 189402
URL: http://svn.freebsd.org/changeset/base/189402

Log:
  MFC: Don't throw away the upper 32-bits of the HT MSI address window.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/pci/pci.c

Modified: stable/7/sys/dev/pci/pci.c
==============================================================================
--- stable/7/sys/dev/pci/pci.c	Thu Mar  5 15:33:04 2009	(r189401)
+++ stable/7/sys/dev/pci/pci.c	Thu Mar  5 15:46:41 2009	(r189402)
@@ -554,7 +554,7 @@ pci_read_extcap(device_t pcib, pcicfgreg
 					addr = REG(ptr + PCIR_HTMSI_ADDRESS_HI,
 					    4);
 					addr <<= 32;
-					addr = REG(ptr + PCIR_HTMSI_ADDRESS_LO,
+					addr |= REG(ptr + PCIR_HTMSI_ADDRESS_LO,
 					    4);
 					if (addr != MSI_INTEL_ADDR_BASE)
 						device_printf(pcib,