Module Name: src
Committed By: martin
Date: Sun Aug 4 19:24:18 UTC 2019
Modified Files:
src/sys/arch/arm/acpi [netbsd-9]: acpi_platform.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #17):
sys/arch/arm/acpi/acpi_platform.c: revision 1.16
Ignore AccessWidth (PL011 and SBSA console always needs 32-bit access)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/arm/acpi/acpi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/acpi/acpi_platform.c
diff -u src/sys/arch/arm/acpi/acpi_platform.c:1.15 src/sys/arch/arm/acpi/acpi_platform.c:1.15.2.1
--- src/sys/arch/arm/acpi/acpi_platform.c:1.15 Wed Jul 24 19:37:52 2019
+++ src/sys/arch/arm/acpi/acpi_platform.c Sun Aug 4 19:24:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.15 2019/07/24 19:37:52 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.15.2.1 2019/08/04 19:24:18 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.15 2019/07/24 19:37:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.15.2.1 2019/08/04 19:24:18 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -278,12 +278,7 @@ acpi_platform_startup(void)
plcom_console.pi_iot = &arm_generic_bs_tag;
plcom_console.pi_iobase = spcr->SerialPort.Address;
plcom_console.pi_size = PL011COM_UART_SIZE;
- if (spcr->InterfaceType == ACPI_DBG2_ARM_SBSA_32BIT) {
- plcom_console.pi_flags = PLC_FLAG_32BIT_ACCESS;
- } else {
- plcom_console.pi_flags = ACPI_ACCESS_BIT_WIDTH(spcr->SerialPort.AccessWidth) == 8 ?
- 0 : PLC_FLAG_32BIT_ACCESS;
- }
+ plcom_console.pi_flags = PLC_FLAG_32BIT_ACCESS;
plcomcnattach(&plcom_console, baud_rate, 0, TTYDEF_CFLAG, -1);
break;
