Module Name: src Committed By: jmcneill Date: Fri Aug 2 19:49:17 UTC 2019
Modified Files: src/sys/arch/arm/acpi: acpi_platform.c Log Message: Ignore AccessWidth (PL011 and SBSA console always needs 32-bit access) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 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.16 --- 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 Fri Aug 2 19:49:17 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.16 2019/08/02 19:49:17 jmcneill 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.16 2019/08/02 19:49:17 jmcneill 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;