From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::232; helo=mail-it0-x232.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7361422152383 for ; Mon, 4 Dec 2017 07:50:43 -0800 (PST) Received: by mail-it0-x232.google.com with SMTP id z6so13853989iti.4 for ; Mon, 04 Dec 2017 07:55:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=W7jCjeBDTmcXXY+ggCGgYMJhg5bT+j9AFTMfuMlQYoo=; b=Ni+X99HlfchV/wuAmUUlxA3/veAarRXjDpt09vF+8wI5KFj6BQ/TCP1fsAZurd4yAU ljwmjKUlJ34rLtgeiBEX3fYUHXAlKMt9mkZeBSEdyOxy76MLyysU7QmDl/OuhgC3gIdz VABP0em3oJOjX22IOkLGx3w9YMnFlkSNMOHPY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=W7jCjeBDTmcXXY+ggCGgYMJhg5bT+j9AFTMfuMlQYoo=; b=nBrhEYzegznteBAE0xeSuZpFrSHHF1999QBOWfq+2H/nku6nIButhBMO+QlbEAaZuE 91S3QVdizkjk4q5wZkFWwKP/Dknc9VgLYaLPnoIFjX45RCz3SQNirVzDpNcULBVCAe1m QuoEw63mC66xs3gHFJ6gMLgt/l6kyltSwnr2+TQTSPJCSZXfwYcbij8g8BFLfRKSU+/2 J+oZI4URSACBOMIlhjjt6MZsb9W04ya/Bm1GeJnGKlts1SZ/OFL5G4OEuG98gm/6mKGY J+tOJhZtpZuS2ntOREYVIZUKf4cyck6oT7pbALbeF0TwkxpABpjSyA3tvDKC6XJTjZEV /Ptw== X-Gm-Message-State: AJaThX6BaQo70mseyMfq7QjmtpypiAbCbvj9ftxBxNbX6B2luohDocT8 4fyMYM/T320DU0JXlcMIfnafIOZ8nptRWeeRXAFKEQ== X-Google-Smtp-Source: AGs4zMYvZCdIMQ+LjBhkjfiVt82twnq8o2clSbWtE0pE5h4VbWs9EU9ITnLCjUmSVDfeAHGJXCmrTCb+9FqUZIhrXk0= X-Received: by 10.107.151.142 with SMTP id z136mr25006888iod.248.1512402912674; Mon, 04 Dec 2017 07:55:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Mon, 4 Dec 2017 07:55:12 -0800 (PST) In-Reply-To: References: <20171130203114.19464-1-ard.biesheuvel@linaro.org> From: Ard Biesheuvel Date: Mon, 4 Dec 2017 15:55:12 +0000 Message-ID: To: Julien Grall Cc: "edk2-devel@lists.01.org" , Laszlo Ersek Subject: Re: [PATCH RFT] ArmVirtPkg/ArmVirtXen: move from Intel to generic BDS X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2017 15:50:43 -0000 Content-Type: text/plain; charset="UTF-8" On 4 December 2017 at 15:52, Ard Biesheuvel wrote: > On 4 December 2017 at 15:19, Julien Grall wrote: >> Hi Ard, >> >> On 30/11/17 20:31, Ard Biesheuvel wrote: >>> ArmVirtXen is the only remaining consumer of ArmPlatformPkg's >>> PlatformIntelBdsLib implementation, which is tightly coupled to the >>> deprecated Intel BDS. So move ArmVirtXen to the generic BDS as well, >>> allowing us to get rid of PlatformIntelBdsLib entirely. >> >> It was in my list of UEFI part I wanted to look next :). >> I tested it and hit the following assert: >> >> ASSERT [BdsDxe] /home/julieng/works/edk2/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c(502): 0 == 4 >> >> Looking at the ArmVirtQemu.dsc, I made the below modification. >> When I tried the version protected by TTY_ENABLE, the ASSERT was >> still present. >> >> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc >> index ae43d59901..bc76a780be 100644 >> --- a/ArmVirtPkg/ArmVirtXen.dsc >> +++ b/ArmVirtPkg/ArmVirtXen.dsc >> @@ -81,6 +81,10 @@ >> # Size of the region used by UEFI in permanent memory (Reserved 64MB) >> gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 >> >> + ## Default Terminal Type^M >> + ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM^M >> + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4^M >> +^M >> # >> # ARM Virtual Architectural Timer >> # >> >> My knowledge in UEFI is still limited, so I would appreciate any >> feedbacks here. >> > > My bad. > > Could you please try with this applied on top? > > diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc > index 11e073287a84..5ddcfceef9dc 100644 > --- a/ArmVirtPkg/ArmVirtXen.dsc > +++ b/ArmVirtPkg/ArmVirtXen.dsc > @@ -88,6 +88,13 @@ [PcdsFixedAtBuild.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, > 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, > 0x68, 0xD0, 0xB4, 0xD1 } > > + ## Default Terminal Type > + ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM > + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 > + > + # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID > + gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, > 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, > 0xef, 0x94} > + > [PcdsPatchableInModule.common] > # > # This will be overridden in the code > > (and don't bother with the -D TTY_TERMINAL, it will be the default anyway) Hmm, looking again, what you tried should actually be equivalent. Could you try a clean rebuild please? Thanks.