aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinliang Liu <xinliang.liu@linaro.org>2017-10-12 14:39:06 +0800
committerDaniel Thompson <daniel@redfelineninja.org.uk>2017-11-22 11:55:27 +0000
commit3c790a5e7e91a94cb2a8cac16d04a73623ba9d26 (patch)
treed145c8108332117af7e3a235ca11cf22d0f7a80b
parent1c63f4ddda26818888e7a66d204d1cdee35dfa3e (diff)
Workaround to set D03 console parameter
This a workaroud for bug: https://bugs.linaro.org/show_bug.cgi?id=2661 D03 has no standard SPCR uart device. Set console=ttyS0,115200 at early arch init. Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
-rw-r--r--drivers/irqchip/irq-gic-v3.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 59af8a66ae4a..d3741b7e5b0c 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -28,6 +28,7 @@
#include <linux/of_irq.h>
#include <linux/percpu.h>
#include <linux/slab.h>
+#include <linux/console.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic-common.h>
@@ -1449,8 +1450,13 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
* Workaround for D03, disable virt timer interrupt
* mapping because GIC on D03 don't support that
*/
- if (!strncmp(oem_id, "HISI", 4) && !strncmp(oem_table_id, "HIP06", 5))
+ if (!strncmp(oem_id, "HISI", 4) &&
+ !strncmp(oem_table_id, "HIP06", 5)) {
gic_v3_kvm_info.hisi_vtimer_quirk = true;
+
+ /* set console=ttyS0,115200 */
+ add_preferred_console("ttyS", 0, "115200");
+ }
}
static int __init acpi_parse_madt(struct acpi_table_header *table)