From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web09.9575.1583395815425319667 for ; Thu, 05 Mar 2020 00:10:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Q3UttIGZ; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f65.google.com with SMTP id g134so5099610wme.3 for ; Thu, 05 Mar 2020 00:10:15 -0800 (PST) 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=a6IlZO4QOjYynBqucEbeIg43D4MNEP0Ow3VHKZzfRTU=; b=Q3UttIGZSjipRJNfesu0hjT9NOEeCSCqZKyf9LjIccS12p9Li291ESnOAGXqer+yYG OynrjwXcLZsBeLuSl8/Vgz6bYwayHz+cRSeYu086PJa32Va88FyvDduKjLxNlcaHAF8m D1PnUoNn9lL+vZ6VQzdarUKBacUf+BhYiblJo0bW45dZ7vCAI+3Je12rgG+e3Z0Ah2kZ +ukaHYPmFppw90HNBOa0YVTz3bPPbjKgpcSgQPd4DnWSnbI9YuHw1edwnhtNLFowIJ/1 H8p3GRVxfUAgfqJOoQ9wT4+wlxQUVCxf6BSAtINbJjdwRF9Aii732CeRmdh3/TTClz3Z fwZA== 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=a6IlZO4QOjYynBqucEbeIg43D4MNEP0Ow3VHKZzfRTU=; b=ghQ1QfV0bSdiOAb5aa2jy4UCZoqQv/8vKT58Guub4ePv4hba3ycwEw83CoCrLdOYs4 ZaU7wJHzK++FnpedCU2eVTcKCZbV6txr5fZI6h/PP0n1S/RJvcYE14fsBXXSLEKNPhm+ pQvzwjIJufFXuOdUT2jWs99RcaljzvVYg7/vNvqsCOJHbGp3mHVUWYhcADH+mYc/RQDq jCvYv6lmOWdAGQp6ZumcTDW/boc9MxyDpZX/NpegToaNY+fvYl4QeiwpO9E5Dh6pq7P7 IlrU3nJg6Zjj3A/a0a9zSFOPPk2w4dl84TTBxGoNPQkxSS1GRRvy1e+AtDMt02+7qQrd L4cQ== X-Gm-Message-State: ANhLgQ2RFsZ4Nan9A76UwP/XECrixw46TBmDSEx+wmwLABihJtukqNfL /K7agirVUIYTncXHQDqMM/lUYo/9Wg4cue2akROOcQ== X-Google-Smtp-Source: ADFU+vvSbIoi03iQBZROTkYThEbv1SRAGChFNrewqq9bxVlh+UFOYZNaHwhDCb/iQwcoj7ASqaDtV9GxU5zjk6BKcQE= X-Received: by 2002:a1c:9d43:: with SMTP id g64mr7864883wme.62.1583395813567; Thu, 05 Mar 2020 00:10:13 -0800 (PST) MIME-Version: 1.0 References: <20200305075545.449-1-awarkentin@vmware.com> In-Reply-To: <20200305075545.449-1-awarkentin@vmware.com> From: "Ard Biesheuvel" Date: Thu, 5 Mar 2020 09:10:02 +0100 Message-ID: Subject: Re: [edk2][PATCH 1/1] ArmPlatformPkg/PrePi: fix IS_XIP To: Andrei Warkentin Cc: "devel@edk2.groups.io" , "leif@nuviainc.com" , "pete@akeo.ie" , "philmd@redhat.com" Content-Type: text/plain; charset="UTF-8" On Thu, 5 Mar 2020 at 08:56, Andrei Warkentin wrote: > > This wasn't correctly testing for FD to be outside RAM, > when RAM base immediately follows the FD. > > This is part of some cleanup for RPi4 in edk2-platform. > > Signed-off-by: Andrei Warkentin Reviewed-by: Ard Biesheuvel Thanks Andrei. I'll put this on the pile of ArmPkg/ArmPlatformPkg fixes I intend to merge today or tomorrow. > --- > ArmPlatformPkg/PrePi/PrePi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c > index 2bb1449581..74284f1883 100644 > --- a/ArmPlatformPkg/PrePi/PrePi.c > +++ b/ArmPlatformPkg/PrePi/PrePi.c > @@ -22,7 +22,7 @@ > #include "PrePi.h" > > #define IS_XIP() (((UINT64)FixedPcdGet64 (PcdFdBaseAddress) > mSystemMemoryEnd) || \ > - ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet64 (PcdSystemMemoryBase))) > + ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= FixedPcdGet64 (PcdSystemMemoryBase))) > > UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) + > FixedPcdGet64(PcdSystemMemorySize) - 1; > -- > 2.17.1 >