From patchwork Thu Sep 4 02:09:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 36675 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4822E2039B for ; Thu, 4 Sep 2014 02:10:40 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf88448817pab.4 for ; Wed, 03 Sep 2014 19:10:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=6AqHh669MqhOCTau4wO9t+vncThe+S9uBdW914YeV70=; b=T+J18pkfLuu1spucjf7a4aQ2ns440xq0ehkX0oNfZVQdZrXAuatkW+lnnLDIkpBSwO 0Cucdkgb6Cl9NCdDxEvo48Pu6SzsXn+5zWjpR8vFQSzex1VsbYq+2YEI9LGnzMfQeWqa 3Jebozo2zEYIQKaFVPcWDrpyJ5cne9CcRcUbtjaS8rp62LZERk0kQBQXFx+lvcwYd3JG PsIJsOfIIDt4RqmEWOeMVXl2O8YagwHdysLZND1K9sp6Lcgl87GLEnMFMChVupAzArsu Y6rWcj0af+k+4OS3dX/zQK7utKhDnpkAXqN+cXQ20ImwN0qxBz139CqvkKTVMElOeCEB ud8A== X-Gm-Message-State: ALoCoQmYqHQWc96GhTTuy//T0h/STbwpKtn2sw+d5kj2FlUZWp41q8bi6/LAn9wcA2g+EulLRtNy X-Received: by 10.66.193.227 with SMTP id hr3mr905703pac.0.1409796636636; Wed, 03 Sep 2014 19:10:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.45 with SMTP id l42ls107706qga.61.gmail; Wed, 03 Sep 2014 19:10:36 -0700 (PDT) X-Received: by 10.52.138.210 with SMTP id qs18mr861851vdb.18.1409796636457; Wed, 03 Sep 2014 19:10:36 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id zs4si2168627vdb.65.2014.09.03.19.10.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 19:10:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so9899211vcb.36 for ; Wed, 03 Sep 2014 19:10:36 -0700 (PDT) X-Received: by 10.52.36.80 with SMTP id o16mr832567vdj.58.1409796636384; Wed, 03 Sep 2014 19:10:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp767296vcb; Wed, 3 Sep 2014 19:10:36 -0700 (PDT) X-Received: by 10.50.85.74 with SMTP id f10mr1755302igz.4.1409796635875; Wed, 03 Sep 2014 19:10:35 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id hb8si4181046igb.63.2014.09.03.19.10.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Sep 2014 19:10:35 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XPMVI-0008Ry-FW; Thu, 04 Sep 2014 02:10:28 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XPMVE-0008Rf-LI for edk2-devel@lists.sourceforge.net; Thu, 04 Sep 2014 02:10:24 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=lersek@redhat.com; helo=mx1.redhat.com; Received: from mx1.redhat.com ([209.132.183.28]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1XPMVD-0006Lt-R6 for edk2-devel@lists.sourceforge.net; Thu, 04 Sep 2014 02:10:24 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s842AD1g029887 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 3 Sep 2014 22:10:13 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8429wjh009610; Wed, 3 Sep 2014 22:10:11 -0400 From: Laszlo Ersek To: ard.biesheuvel@linaro.org, edk2-devel@lists.sourceforge.net, olivier.martin@arm.com, peter.maydell@linaro.org, christoffer.dall@linaro.org, ilias.biris@linaro.org, leif.lindholm@linaro.org, michael.casadevall@linaro.org Date: Thu, 4 Sep 2014 04:09:52 +0200 Message-Id: <1409796596-12615-6-git-send-email-lersek@redhat.com> In-Reply-To: <1409796596-12615-1-git-send-email-lersek@redhat.com> References: <1409743096-14919-24-git-send-email-ard.biesheuvel@linaro.org> <1409796596-12615-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Spam-Score: -3.2 (---) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1XPMVD-0006Lt-R6 Subject: [edk2] [PATCH 5/9] ArmVirtualizationPlatformLib: stash dynamic UART base in a HOB in the PEI code X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 In this patch we stash the dynamic UART base in a HOB, for the DXE CORE only. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- .../ArmVirtualizationPlatformLib.inf | 4 ++++ .../Library/ArmVirtualizationPlatformLib/Virt.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf index 241766b..09b0123 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf +++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf @@ -34,6 +34,7 @@ PrintLib FdtLib SerialPortLib + HobLib [Sources.common] Virt.c @@ -61,3 +62,6 @@ gArmTokenSpaceGuid.PcdArmPrimaryCore gArmTokenSpaceGuid.PcdFdBaseAddress gArmTokenSpaceGuid.PcdFdSize + +[Guids] + gEarlyPL011BaseAddressGuid diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c index c10ef91..9056510 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c +++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c @@ -2,6 +2,7 @@ * * Copyright (c) 2011-2013, ARM Limited. All rights reserved. * Copyright (c) 2014, Linaro Limited. All rights reserved. +* Copyright (c) 2014, Red Hat, Inc. * * * This program and the accompanying materials @@ -20,6 +21,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include /** Return the current Boot Mode @@ -71,6 +78,7 @@ ArmPlatformInitializeSystemMemory ( UINT64 NewBase; UINT64 NewSize; BOOLEAN HaveMemory, HaveUART; + UINT64 *HobData; NewBase = 0; NewSize = 0; @@ -78,6 +86,10 @@ ArmPlatformInitializeSystemMemory ( HaveMemory = FALSE; HaveUART = FALSE; + HobData = BuildGuidHob (&gEarlyPL011BaseAddressGuid, sizeof *HobData); + ASSERT (HobData != NULL); + *HobData = 0; + DeviceTreeBase = (VOID *)(UINTN)FixedPcdGet64 (PcdDeviceTreeInitialBaseAddress); ASSERT (DeviceTreeBase != NULL); @@ -155,6 +167,8 @@ ArmPlatformInitializeSystemMemory ( DEBUG ((EFI_D_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase)); PcdSet64 (PcdPL011BaseAddress, UartBase); + *HobData = UartBase; + HaveUART = TRUE; continue; }