|
 |
383d26 |
From 098bbd9ed847849834ff1f21766d23ea240c5bf0 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Andrew Jones <drjones@redhat.com>
|
|
|
383d26 |
Date: Mon, 1 Aug 2016 14:27:09 +0200
|
|
|
383d26 |
Subject: RHEL-only: hw/char/pl011: fix SBSA reset
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Andrew Jones <drjones@redhat.com>
|
|
|
383d26 |
Message-id: <1470061629-6395-1-git-send-email-drjones@redhat.com>
|
|
|
383d26 |
Patchwork-id: 71697
|
|
|
383d26 |
O-Subject: [AArch64 RHEL-7.3 qemu-kvm-rhev PATCH] RHEL-only: hw/char/pl011: fix SBSA reset
|
|
|
383d26 |
Bugzilla: 1266048
|
|
|
383d26 |
RH-Acked-by: Auger Eric <eric.auger@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
When booting Linux with an SBSA UART, e.g. when booting mach-virt
|
|
|
383d26 |
with ACPI, if the user types on the console during boot, then when
|
|
|
383d26 |
the login prompt appears she won't be able to log in. This is
|
|
|
383d26 |
because during boot the SBSA UART needs to be reset, but the SBSA
|
|
|
383d26 |
specification doesn't provide registers to enable/disable the FIFOs.
|
|
|
383d26 |
This patch observes a couple registers the SBSA UART does write to
|
|
|
383d26 |
in order to attempt to guess when a reset is needed, and then do it.
|
|
|
383d26 |
We risk losing some characters from the FIFO if the guess is wrong,
|
|
|
383d26 |
but the risk of that should be quite low.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 15ee295534f654d6b6ba9499cdd380aa9c954920)
|
|
|
383d26 |
(cherry picked from commit 49be481336c227fdad2f7edc02fa088f3d88c9a2)
|
|
|
383d26 |
(cherry picked from commit 9fcede24f35378e2c9113440a692d2c96cc94865)
|
|
|
383d26 |
(cherry picked from commit b721e7ff2bdd42b0a786b8630c1ba8b1d3560da3)
|
|
|
383d26 |
(cherry picked from commit 88f3eb70f909b03ed18074aadd12f32f28ad8437)
|
|
|
383d26 |
---
|
|
|
383d26 |
hw/char/pl011.c | 12 ++++++++++++
|
|
|
383d26 |
1 file changed, 12 insertions(+)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
|
|
|
383d26 |
index 2aa277f..23fe047 100644
|
|
|
383d26 |
--- a/hw/char/pl011.c
|
|
|
383d26 |
+++ b/hw/char/pl011.c
|
|
|
383d26 |
@@ -209,6 +209,18 @@ static void pl011_write(void *opaque, hwaddr offset,
|
|
|
383d26 |
pl011_update(s);
|
|
|
383d26 |
break;
|
|
|
383d26 |
case 17: /* UARTICR */
|
|
|
383d26 |
+ /*
|
|
|
383d26 |
+ * RHEL-only, fixes BZ1266048
|
|
|
383d26 |
+ *
|
|
|
383d26 |
+ * Look for the "signature" of a driver init or shutdown in
|
|
|
383d26 |
+ * order to know that we need to reset the SBSA UART. Yes,
|
|
|
383d26 |
+ * this is hacky, but as SBSA drivers aren't required to write
|
|
|
383d26 |
+ * UARTLCR_H or UARTCR, then we don't have much choice...
|
|
|
383d26 |
+ */
|
|
|
383d26 |
+ if (s->int_enabled == 0 && value == 0xffff) {
|
|
|
383d26 |
+ s->read_count = 0;
|
|
|
383d26 |
+ s->read_pos = 0;
|
|
|
383d26 |
+ }
|
|
|
383d26 |
s->int_level &= ~value;
|
|
|
383d26 |
pl011_update(s);
|
|
|
383d26 |
break;
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|