From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@linaro.org header.s=google header.b=j8eB4aT+;
 spf=pass (domain: linaro.org, ip: 209.85.166.68, mailfrom: ard.biesheuvel@linaro.org)
Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68])
 by groups.io with SMTP; Mon, 15 Apr 2019 15:37:29 -0700
Received: by mail-io1-f68.google.com with SMTP id p16so16051255iod.2
        for <devel@edk2.groups.io>; Mon, 15 Apr 2019 15:37:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linaro.org; s=google;
        h=mime-version:references:in-reply-to:from:date:message-id:subject:to
         :cc;
        bh=r8abhssbA0QvOYI8oDO2gt1VkDodYlclQbxPsaZiK/o=;
        b=j8eB4aT+baTW5gfp3g2IchG94MkxZdChYdDlIe0Prv5j+Ag19CCaVOJ75qzX+YFkaO
         J2Y8RRF7Jrq/pUcIQT9erSybn7rq+cCp2LTbj45+EpIRHHb9RI8LUpYw2bfRU4eD+RCO
         v1XNKtsg+8PK+ErfAcbU4TZ/7FFsG0TFIUc9HEcRZFrd7vWShQZ1CRl4DDVdUrEdc0Ug
         Z5gtM/WF42eayreCVjCF4JkvZV3dpuL8T64+Bdx+kJ7WnaIRJAUG4PD/FXA2BklPNxXn
         zuLCfiEdO2K0/qpvuVLuLsS9RVIcTi9n4/vE2y7xlTNTZygZfhvWRuhyMnS6M6AGFnyn
         /Pcw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=r8abhssbA0QvOYI8oDO2gt1VkDodYlclQbxPsaZiK/o=;
        b=E9Brm/Zp2iTHH6Du4yH4JpIkqtX1Cc/nusvZmptKu3yJL3djtKlJB4f/wLlDaJL1rx
         6O2lmwmkRf1K5kdrAPATJqCXw5+yJLi/XD5dCfH4W9GIVACX+1KpJgGAcUN3LISXoikq
         ATxjvIJUfPbTSSMHu0tWtdIPUZuNsidlVXX2AaRxiQP0Bo/Qgu5WeTFkrlFD2oo/i38u
         QMXHO87rfu6guI5ATDcAzwI2xkc0RZm8C23jWZUokfhDM6WciutFtXMDgPhHCgLRfycg
         qbvdcP3fJwN0f1J+Mwq6i0aV44EnpbS05J0q3gclC7xb3ESyrjHIT8lD01Fa5ejMLIZN
         uqlQ==
X-Gm-Message-State: APjAAAVoQtAZkf1JxOYQFYw8UyaWm91zSvjrJwRZdefX9Sorfj2IC+zn
	kOMSnPvhgYMR5yjkJkxa4ppl9lbp5mBv+ubQwr37Ow==
X-Google-Smtp-Source: APXvYqxUQL+5ymCEvDluH38BQlrmcIwqRpmNa7TnRd04kUSabqon1ixH+LVd8DluwcC2sY2amlaJ4d/AzbcahEGFkMc=
X-Received: by 2002:a6b:3b07:: with SMTP id i7mr2072355ioa.230.1555367848143;
 Mon, 15 Apr 2019 15:37:28 -0700 (PDT)
MIME-Version: 1.0
References: <1555341591-28692-1-git-send-email-mw@semihalf.com>
In-Reply-To: <1555341591-28692-1-git-send-email-mw@semihalf.com>
From: "Ard Biesheuvel" <ard.biesheuvel@linaro.org>
Date: Mon, 15 Apr 2019 15:37:16 -0700
Message-ID: <CAKv+Gu9_r2Nke4prYr999mQ6NaEADEPT9RQOOfNZPB9d6qBd0Q@mail.gmail.com>
Subject: Re: [edk2-platforms: PATCH] Marvell/Armada7k8k: Set SPCR RegisterBitWidth back to 32
To: Marcin Wojtas <mw@semihalf.com>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>, Leif Lindholm <leif.lindholm@linaro.org>, 
	=?UTF-8?B?SmFuIETEhWJyb8Wb?= <jsd@semihalf.com>, 
	Grzegorz Jaszczyk <jaz@semihalf.com>, Kostya Porotchkin <kostap@marvell.com>, 
	Jeremy Linton <jeremy.linton@arm.com>, Jici Gao <Jici.Gao@arm.com>, kettenis@jive.eu
Content-Type: text/plain; charset="UTF-8"

On Mon, 15 Apr 2019 at 08:20, Marcin Wojtas <mw@semihalf.com> wrote:
>
> 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 <kettenis@jive.eu>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as dc31a7feb81a..e25adb5da09b

> ---
>  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
>