|
 |
26ba25 |
From 40a88676cdb22e844dce24c1745b6004a8cf7806 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
Date: Thu, 26 Apr 2018 02:54:07 +0000
|
|
|
26ba25 |
Subject: Remove ich9_uhci123_irqpin_override
|
|
|
26ba25 |
|
|
|
26ba25 |
As we do not support RHEL 6 compatibility we remove this hack.
|
|
|
26ba25 |
|
|
|
26ba25 |
This hack was introduced in RHEL 7.1 for BZ 1085701 and 1103581 (Guest
|
|
|
26ba25 |
hits call trace migrate from RHEL6.5 to RHEL7.0 host with -M 6.1
|
|
|
26ba25 |
& balloon & uhci device) by commits 8061ffe65490 and 42a193d925b3,
|
|
|
26ba25 |
and was backported to RHEL 7.0 as 0day fix (BZ 1090981,
|
|
|
26ba25 |
commit 48addb5b5b3b).
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
hw/usb/hcd-uhci.c | 13 +------------
|
|
|
26ba25 |
include/hw/usb.h | 3 ---
|
|
|
26ba25 |
2 files changed, 1 insertion(+), 15 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
|
|
|
26ba25 |
index 86d6ab8..9d7b9df 100644
|
|
|
26ba25 |
--- a/hw/usb/hcd-uhci.c
|
|
|
26ba25 |
+++ b/hw/usb/hcd-uhci.c
|
|
|
26ba25 |
@@ -152,8 +152,6 @@ typedef struct UHCI_QH {
|
|
|
26ba25 |
uint32_t el_link;
|
|
|
26ba25 |
} UHCI_QH;
|
|
|
26ba25 |
|
|
|
26ba25 |
-bool ich9_uhci123_irqpin_override;
|
|
|
26ba25 |
-
|
|
|
26ba25 |
static void uhci_async_cancel(UHCIAsync *async);
|
|
|
26ba25 |
static void uhci_queue_fill(UHCIQueue *q, UHCI_TD *td);
|
|
|
26ba25 |
static void uhci_resume(void *opaque);
|
|
|
26ba25 |
@@ -1222,16 +1220,7 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
|
|
|
26ba25 |
/* TODO: reset value should be 0. */
|
|
|
26ba25 |
pci_conf[USB_SBRN] = USB_RELEASE_1; // release number
|
|
|
26ba25 |
|
|
|
26ba25 |
- if (ich9_uhci123_irqpin_override &&
|
|
|
26ba25 |
- u->info.vendor_id == PCI_VENDOR_ID_INTEL &&
|
|
|
26ba25 |
- (u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI1 ||
|
|
|
26ba25 |
- u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI2 ||
|
|
|
26ba25 |
- u->info.device_id == PCI_DEVICE_ID_INTEL_82801I_UHCI3)) {
|
|
|
26ba25 |
- fprintf(stderr, "RHEL-6 compat: %s: irq_pin = 3\n", u->info.name);
|
|
|
26ba25 |
- irq_pin = 3;
|
|
|
26ba25 |
- } else {
|
|
|
26ba25 |
- irq_pin = u->info.irq_pin;
|
|
|
26ba25 |
- }
|
|
|
26ba25 |
+ irq_pin = u->info.irq_pin;
|
|
|
26ba25 |
pci_config_set_interrupt_pin(pci_conf, irq_pin + 1);
|
|
|
26ba25 |
|
|
|
26ba25 |
if (s->masterbus) {
|
|
|
26ba25 |
diff --git a/include/hw/usb.h b/include/hw/usb.h
|
|
|
26ba25 |
index 5b3fb1f..b943ec9 100644
|
|
|
26ba25 |
--- a/include/hw/usb.h
|
|
|
26ba25 |
+++ b/include/hw/usb.h
|
|
|
26ba25 |
@@ -607,9 +607,6 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id,
|
|
|
26ba25 |
uint8_t interface_protocol);
|
|
|
26ba25 |
|
|
|
26ba25 |
|
|
|
26ba25 |
-/* hcd-uhci.c -- RHEL-6 machine type compatibility */
|
|
|
26ba25 |
-extern bool ich9_uhci123_irqpin_override;
|
|
|
26ba25 |
-
|
|
|
26ba25 |
/* hcd-xhci.c -- rhel7.0.0 machine type compatibility */
|
|
|
26ba25 |
extern bool migrate_cve_2014_5263_xhci_fields;
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|