This patch removes the HP vendor specific WLAN device and subsystem

ID check.

This was a workaround in the passthrough code to allow the WLAN
card to work w/in an HVM that did not have the correct SMBIOS
information. The patch to hvmloader to pass in the correct SMBIOS
strings makes this special HP check/mod uneeded.

 Committer: Ross Philipson <ross.philipson@citrix.com>

 On branch remove_wlan_hpcheck
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   hw/pass-through.c

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 253b3c1abc68114f92d015b407d79fa4de4e458f..39f44b999fe5383b7252e2fdf1710f71b81fc062 100644 (file)
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -1788,25 +1788,6 @@ static uint32_t pt_common_reg_init(struct pt_dev *ptdev,
     return reg->init_val;
 }
 
-/* platform specific helper for identifying Intel WLAN cards */
-static int pt_wlan_device_check(uint32_t vendor_id, uint32_t device_id)
-{
-    if (vendor_id == 0x8086)
-    {
-           switch (device_id) {
-           case 0x4227:
-           case 0x4230:
-           case 0x4233:
-           case 0x4236:
-           case 0x4237:
-           case 0x423B:
-           case 0x423D:
-               return 1;
-           }
-    }
-    return 0;
-}
-
 /* initialize Device ID register value */
 static uint32_t pt_deviceid_reg_init(struct pt_dev *ptdev,
         struct pt_reg_info_tbl *reg, uint32_t real_offset)
@@ -1818,9 +1799,7 @@ static uint32_t pt_deviceid_reg_init(struct pt_dev *ptdev,
     val = pci_read_long(pci_dev, PCI_VENDOR_ID);
     reg->init_val = ((val >> 16) & 0x0000FFFF);
 
-    /* Intel WLAN device filtering */
-    if (pt_wlan_device_check((val & 0x0000FFFF), ((val >> 16) & 0x0000FFFF)))
-        reg->init_val = 0x4235; /* reset Device ID to one that does not cause the OEM auth checks */           
+    /* filter device id values here */
 
     return reg->init_val;
 }
@@ -1836,12 +1815,7 @@ static uint32_t pt_subsystemid_reg_init(struct pt_dev *ptdev,
     val = pci_read_word(pci_dev, PCI_SUBSYSTEM_ID);
     reg->init_val = (val & 0x0000FFFF);
 
-    /* read the Vendor and Device IDs */
-    val = pci_read_long(pci_dev, PCI_VENDOR_ID);
-
-    /* Intel WLAN device filtering */
-    if (pt_wlan_device_check((val & 0x0000FFFF), ((val >> 16) & 0x0000FFFF)))
-        reg->init_val = 0x1001; /* reset Subsystem ID to one that does not cause the OEM auth checks */                
+    /* filter subsystem id here */
 
     return reg->init_val;
 }