From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=CVC8JprT; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.195, mailfrom: mw@semihalf.com) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by groups.io with SMTP; Mon, 15 Apr 2019 08:20:18 -0700 Received: by mail-lj1-f195.google.com with SMTP id y6so16007731ljd.12 for ; Mon, 15 Apr 2019 08:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=lOww3AauZT6ITBVyBl7+HMjDCfLks/cx1RCf7PLjBZw=; b=CVC8JprT+QHOwIs3yjp3mKG9zvuSNpPOrAijZrcw+9Rwfrf3juXM4fywlZuR7qhswa PovxA/+EgPfnvsTqLwaei3wSzjPqlDRTdYxUtUpRqlisR8JLxjVdAy1+p70W8JsnwWXO 2Po14hVjc491fe4LmQJosGHyhiqzt2MLHbfceFTW+vVdUYu0Uu3gAy/kxlxNoZ/iIlP+ 9oukGgWBC+g5/KDI5WqMr1bgexphPQPDOM85kd4ZhAvqdBrpZZaMmN1hCinQu0QsTox+ /kwTfJ7czi5puzIyQovVnKWelehidJ4TYN0SVQ2LMR3iqtYyAaGFMEYP3FEjgTEC8pYm Uh8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lOww3AauZT6ITBVyBl7+HMjDCfLks/cx1RCf7PLjBZw=; b=gEXZsleQVBVs0vdyuGBhP7RuwhbReAdsydY5dPnXzshm9ka85z8jWIyqPS+Vs72rsF hvAzN46sYdnoS73wxB+5o2o0irRnCRTnMbVl4RaYRAZ2zaDYBvofAOl7PVey4dI884MC p9zlMiAPY2TUxscBwrL3k+MVJxoWos5RfWGmJB41+Z3bHVZSE1QY/BFQ4vGuDnoI+Nv1 vIjPgzTeKgWzxQwgLRrD7QUwf2o1fXViYQKgJePRmejlLD13YJ9Ftnfj+uNJJunBhpSn rbdYmqsaW574WQSbhTKGrcsbnmE1HVJHwnDrfk5i6aKuutOcfPTeIoPTmngp2s6AkWNu DLnQ== X-Gm-Message-State: APjAAAVTl9owfFOFqCe9mc522lHi7USx9y4u0SFgrunAZmqIkh/taLbr UhwAoUR9P+0heHd7xe+KlzI4iG9/dbDOTA== X-Google-Smtp-Source: APXvYqwvhD6B/OpLk2Y6wjBp/p/4FPFU8zHfhtxMi//AMFCTX4P2yMQmCNJF1xQMhY+zzyTVkvzYfw== X-Received: by 2002:a2e:9a02:: with SMTP id o2mr12943856lji.179.1555341616318; Mon, 15 Apr 2019 08:20:16 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id f15sm10137972ljm.47.2019.04.15.08.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Apr 2019 08:20:15 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, jeremy.linton@arm.com, Jici.Gao@arm.com, kettenis@jive.eu Subject: [edk2-platforms: PATCH] Marvell/Armada7k8k: Set SPCR RegisterBitWidth back to 32 Date: Mon, 15 Apr 2019 17:19:51 +0200 Message-Id: <1555341591-28692-1-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 Recent modification of the Armada7k8k SPCR to ARM_GAS8 broke the OpenBSD booting with ACPI, as the initial console could mistakenly interpret (with the reg-shift=0), that the registers are 8-bits apart. Fix that by restoring 32-bit register width, however leaving the AccessSize field EFI_ACPI_5_0_BYTE. This way the HW is described more proper way, and the latest Linux is still capable of booting without additional commandline parameters. Contributed-under: TianoCore Contribution Agreement 1.1 Suggested-by: Mark Kettenis Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc index 556b2ee..1c7c842 100644 --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc @@ -21,6 +21,8 @@ #include "AcpiHeader.h" +#define MV_UART_AS32(Address) { EFI_ACPI_5_0_SYSTEM_MEMORY, 32, 0, EFI_ACPI_5_0_BYTE, Address } + EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = { __ACPI_HEADER(EFI_ACPI_6_1_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE, @@ -30,7 +32,7 @@ EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = { { EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE }, // Reserved1[3] - ARM_GAS8 (FixedPcdGet64(PcdSerialRegisterBase)), // BaseAddress + MV_UART_AS32 (FixedPcdGet64(PcdSerialRegisterBase)), // BaseAddress EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC, // InterruptType 0, // Irq 51, // GlobalSystemInterrupt -- 2.7.4