From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (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 443EA2117FD4D for ; Tue, 5 Jun 2018 05:16:34 -0700 (PDT) Received: by mail-wr0-x242.google.com with SMTP id 94-v6so2183771wrf.5 for ; Tue, 05 Jun 2018 05:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ji9BtsEpr0w2bOkramF+LgFp8w7jiYWcWTUmIfx+//o=; b=YlAt235b76nolfTl+eADPtAhj51K0Jf5vfGcw59ZtjhIO99z04MEXNS8ajZoWFuOVr 8itpSGgSfcToPftakgEDqTq9iIJ4Q/RicRmdTpCNKT6DttXpWUkc6CVEGU84J2XCpP9v l9O3Pl118gb6J3ia6tlajztIWgpL5OTQ6FDeA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ji9BtsEpr0w2bOkramF+LgFp8w7jiYWcWTUmIfx+//o=; b=V9nthr7gXUAWeL+tFFFYkKJkSmv5mDYZTNmJksOKmRKtS6fq62e4NRxEEcdcNDCvvQ qTFmG2wkB4qXWVsl61Dqb3ZtIkhiM68XvzsP6getNup2FZi8Rd+5mXp4tMFyRPD3z5i+ 9vRjsUlkKlxsznTz8ABX3EEjZY5PtN2BHHxzTSqEINkTvyM0IRqOa5tu+rwMzi44JbMW snPzxY1uidpVmo8gETKEOzGrdNLmlcj49kc54QyMFJp+LtiD6oSclna0hqDEl/26Asnm 6ob8cQmd1n2VWC7uprNMSK7rE/y/QHfOYgog/M6StYK32cqTO+6THIw/hN35/dM/KDex jdFg== X-Gm-Message-State: ALKqPweBjHlXP5aYO0AaiD5Y9ZelEB58jYnJO4a2N+kJDtIL6dbZTuvw 75KbIzaDgUTilKD5SecYEZ0TTQ== X-Google-Smtp-Source: ADUXVKKkZmmoQx6gq2biDJeJeeG6UkdcgJa4mQXWWm6GlOaYZcVFh7Z2wkXRas0hYTts5XozLk+eug== X-Received: by 2002:adf:9f4a:: with SMTP id f10-v6mr18800695wrg.216.1528200992801; Tue, 05 Jun 2018 05:16:32 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id i46-v6sm42685673wra.36.2018.06.05.05.16.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 05:16:30 -0700 (PDT) Date: Tue, 5 Jun 2018 13:16:29 +0100 From: Leif Lindholm To: Thomas Abraham Cc: AlexeiFedorov , nd@arm.com, Arvind Chauhan , Ard Biesheuvel , edk2-devel@lists.01.org, Stephanie.Hughes-Fitt@arm.com Message-ID: <20180605121629.7prvohhrgipck7p2@bivouac.eciton.net> References: <1527083494-26148-1-git-send-email-Alexei.Fedorov@arm.com> <20180531213411.tndxn5oltr5vtsa2@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v1] Platform/ARM: Declare FVP Generic Timer Frame #1 as Non-secure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 12:16:34 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jun 04, 2018 at 06:44:33PM +0530, Thomas Abraham wrote: > On Fri, Jun 1, 2018 at 3:04 AM, Leif Lindholm wrote: > > On Wed, May 23, 2018 at 02:51:34PM +0100, AlexeiFedorov wrote: > >> From: Alexei Fedorov > >> > >> Programming Reference for Base FVPs describes 2 Generic Memory-mapped > >> Timer frames with Non-secure access permitted to frame #1. > >> However ACPI GTDT lists both timer frames #0 and #1 with > >> Secure Timer flag being set in GTx Common Flags field: > >> #define FVP_GTX_COMMON_FLAGS > >> (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE) > >> Declaring both timer frames as Secure prevents OS running > >> in Non-secure state from accessing Generic Timer frame #1. > >> > >> This patch fixes the above issue by removal of FVP_GTX_COMMON_FLAGS > >> and adding two FVP_GTX_COMMON_FLAGS_S and FVP_GTX_COMMON_FLAGS_NS > >> definitions used for Secure frame #0 and Non-secure frame #1 > >> accordingly. > >> > >> Contributed-under: TianoCore Contribution Agreement 1.1 > >> Signed-off-by: Alexei Fedorov > > > > The patch looks good to me, so if Thomas agrees: > > Reviewed-by: Leif Lindholm > > > > Thomas? > > Verified that frame #1 can be marked as accessible from non-secure mode. > > Reviewed-by: Thomas Abraham Thanks! Pushed as 9bb89f3323. / Leif > > > > / > > Leif > > > >> --- > >> All the changes can be reviewed at: > >> https://github.com/AlexeiFedorov/edk2-platforms/tree/262_gtdt_timer_frame_ns_v1 > >> > >> Notes: > >> v1: > >> - remove FVP_GTX_COMMON_FLAGS [Alexei] > >> - define FVP_GTX_COMMON_FLAGS_S and FVP_GTX_COMMON_FLAGS_NS [Alexei] > >> - use FVP_GTX_COMMON_FLAGS_S for timer frame #0 and [Alexei] > >> FVP_GTX_COMMON_FLAGS_NS for frame #1 > >> > >> Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc | 9 +++++---- > >> 1 file changed, 5 insertions(+), 4 deletions(-) > >> > >> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc > >> index 1cb4b498300cf1a08514835677154eace1dd1803..7a0b2b686ec849a8385ac5793e5d5855b9ba83ca 100644 > >> --- a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc > >> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc > >> @@ -1,7 +1,7 @@ > >> /** @file > >> * Generic Timer Description Table (GTDT) > >> * > >> -* Copyright (c) 2012 - 2017, ARM Limited. All rights reserved. > >> +* Copyright (c) 2012 - 2018, ARM Limited. All rights reserved. > >> * Copyright (c) 2016, Linaro Ltd. All rights reserved > >> * > >> * This program and the accompanying materials > >> @@ -61,7 +61,8 @@ > >> #define GTX_TIMER_SAVE_CONTEXT EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY > >> #define GTX_TIMER_LOSE_CONTEXT 0 > >> > >> -#define FVP_GTX_COMMON_FLAGS (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE) > >> +#define FVP_GTX_COMMON_FLAGS_S (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE) > >> +#define FVP_GTX_COMMON_FLAGS_NS (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_NON_SECURE) > >> > >> #define FVP_SBSA_WATCHDOG_REFRESH_BASE 0x000000002a450000 > >> #define FVP_SBSA_WATCHDOG_CONTROL_BASE 0x000000002a440000 > >> @@ -136,7 +137,7 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { > >> FVP_GTX_TIMER_FLAGS, // UINT32 GTxPhysicalTimerFlags > >> 0, // UINT32 GTxVirtualTimerGSIV > >> 0, // UINT32 GTxVirtualTimerFlags > >> - FVP_GTX_COMMON_FLAGS // UINT32 GTxCommonFlags > >> + FVP_GTX_COMMON_FLAGS_S // UINT32 GTxCommonFlags > >> }, > >> { > >> 1, // UINT8 GTFrameNumber > >> @@ -149,7 +150,7 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { > >> FVP_GTX_TIMER_FLAGS, // UINT32 GTxPhysicalTimerFlags > >> 0, // UINT32 GTxVirtualTimerGSIV > >> 0, // UINT32 GTxVirtualTimerFlags > >> - FVP_GTX_COMMON_FLAGS // UINT32 GTxCommonFlags > >> + FVP_GTX_COMMON_FLAGS_NS // UINT32 GTxCommonFlags > >> } > >> }, > >> #if (FVP_WATCHDOG_COUNT != 0) > >> -- > >> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' > >> > >> > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel