From nobody Wed Dec 25 01:23:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 150999245139780.78325576044949; Mon, 6 Nov 2017 10:20:51 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 48AD62035D0EF; Mon, 6 Nov 2017 10:16:51 -0800 (PST) Received: from mail-wr0-x229.google.com (mail-wr0-x229.google.com [IPv6:2a00:1450:400c:c0c::229]) (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 5FCD5202E5CD3 for ; Mon, 6 Nov 2017 10:16:49 -0800 (PST) Received: by mail-wr0-x229.google.com with SMTP id u97so2037579wrc.1 for ; Mon, 06 Nov 2017 10:20:48 -0800 (PST) Received: from localhost.localdomain ([105.129.222.2]) by smtp.gmail.com with ESMTPSA id w206sm4516507wmd.36.2017.11.06.10.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 10:20:45 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::229; helo=mail-wr0-x229.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=39Xt8VJkgW5AUb5977JXcdPQPjvrM3OR0Gj4WVs6aWM=; b=NepNJu9efw9tjzJ1L/Z/fwOEAW07hz8kyZIPpV2aNGICWPWEjz9nhVBFsZlLr2S5yH LRrXSGhWeJzrXXoHLm/0ExQRT9O95rMgjJ42tZsLun/wLIrkyDy4NYCeaok5p66tPDNd QWabHumMJ5pTa+CoWPv/dC7aSIhPkUb6q42ls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=39Xt8VJkgW5AUb5977JXcdPQPjvrM3OR0Gj4WVs6aWM=; b=XlRkGBzmPmOB3AESF+eayJlWHMzjoYplhxLFkzd5V0KmqCTPPCZPRVnnlXtC4BnWzZ ybSplXCqP/7xPpilYn+EAsYduQQBsgAsDow3MfoPdpGG3eSSZKi7isLvnY2JizMKT31E 7b0RHidvcR5LdKIbnN05JvETg8I+IV6A+Bc0TwgmzytIviD0gMjGjWZkBQKNGhr06WDc Bh7sUVB2zpen9n8uxrxBDAXo6pEFRn8J0sl1LNPYG9jwYq8EQ5vYm6NJCYLR6jx/8yuj i3liY06eUlXl5c34rf8fpZikYJWK2iji3bdJ5ZJGACpiw3VKL2/xzN0eyAA7r6wVwuLq Qo6A== X-Gm-Message-State: AMCzsaUeDILoH6kO28kuAG59ldBUJyKV02hpPRu+DSSGedbxtoc/QIvh +5j5po+adZQ8pfrFwccu7os85aW/8s4= X-Google-Smtp-Source: ABhQp+SqhJ4JogJDrpvzZs5R5C6yKAdvPztPw82jUDsfJRtA0L10tAjeWy/jXsKrT4G3fTdxa2dvOg== X-Received: by 10.223.187.143 with SMTP id q15mr12569333wrg.184.1509992446303; Mon, 06 Nov 2017 10:20:46 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Mon, 6 Nov 2017 18:20:36 +0000 Message-Id: <20171106182038.16750-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171106182038.16750-1-ard.biesheuvel@linaro.org> References: <20171106182038.16750-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 1/3] EmbeddedPkg/RealTimeClockRuntimeDxe: move common functionality into core 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" RealTimeClockRuntimeDxe defers the hardware/platform specific handling of reading/setting the hardware clock to RealTimeClockLib, but for unknown reasons, it also defers common functionality such as input validation and recording the timezone and DST settings (which are informational only and not managed by hardware) This has led to a lot of duplication in implementations of RealTimeClockLib as well as TimeBaseLib, to the point where each library implementation has its own set of UEFI variables to record the timezone and DST settings. This makes little sense, and so let's update RealTimeClockRuntimeDxe now to allow future implementations to rely on the core driver to take care of these things. Note that reading the timezone and DST settings occurs before calling into the library, so we can phase out this behavior gradually from library implementations in EDK2, edk2-platforms or out of tree. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c | 171 ++++= +++++++++++++++- EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf | 11 +- 2 files changed, 171 insertions(+), 11 deletions(-) diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Embedded= Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c index f1e067c0b59e..6b7cc876fa33 100644 --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c @@ -1,10 +1,8 @@ /** @file Implement EFI RealTimeClock runtime services via RTC Lib. =20 - Currently this driver does not support runtime virtual calling. - - Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+ Copyright (c) 2017, Linaro, Ltd. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -17,14 +15,116 @@ **/ =20 #include +#include +#include #include #include -#include +#include #include =20 EFI_HANDLE mHandle =3D NULL; =20 +// +// These values can be set by SetTime () and need to be returned by GetTim= e () +// but cannot usually be kept by the RTC hardware, so we store them in a U= EFI +// variable instead. +// +typedef struct { + INT16 TimeZone; + UINT8 Daylight; +} NON_VOLATILE_TIME_SETTINGS; + +STATIC CONST CHAR16 mTimeSettingsVariableName[] =3D L"RtcTimeSettings"; +STATIC NON_VOLATILE_TIME_SETTINGS mTimeSettings; + +STATIC +BOOLEAN +IsValidTimeZone ( + IN INT16 TimeZone + ) +{ + return TimeZone =3D=3D EFI_UNSPECIFIED_TIMEZONE || + (TimeZone >=3D -1440 && TimeZone <=3D 1440); +} + +STATIC +BOOLEAN +IsValidDaylight ( + IN INT8 Daylight + ) +{ + return Daylight =3D=3D 0 || + Daylight =3D=3D EFI_TIME_ADJUST_DAYLIGHT || + Daylight =3D=3D (EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT); +} =20 +STATIC +BOOLEAN +EFIAPI +IsLeapYear ( + IN EFI_TIME *Time + ) +{ + if (Time->Year % 4 =3D=3D 0) { + if (Time->Year % 100 =3D=3D 0) { + if (Time->Year % 400 =3D=3D 0) { + return TRUE; + } else { + return FALSE; + } + } else { + return TRUE; + } + } else { + return FALSE; + } +} + +STATIC CONST INTN mDayOfMonth[12] =3D { + 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +}; + +STATIC +BOOLEAN +EFIAPI +IsDayValid ( + IN EFI_TIME *Time + ) +{ + ASSERT (Time->Day >=3D 1); + ASSERT (Time->Day <=3D mDayOfMonth[Time->Month - 1]); + ASSERT (Time->Month !=3D 2 || (IsLeapYear (Time) && Time->Day <=3D 29)); + + if (Time->Day < 1 || + Time->Day > mDayOfMonth[Time->Month - 1] || + (Time->Month =3D=3D 2 && (!IsLeapYear (Time) && Time->Day > 28))) { + return FALSE; + } + return TRUE; +} + +STATIC +BOOLEAN +EFIAPI +IsTimeValid( + IN EFI_TIME *Time + ) +{ + // Check the input parameters are within the range specified by UEFI + if (Time->Year < 1900 || + Time->Year > 9999 || + Time->Month < 1 || + Time->Month > 12 || + !IsDayValid (Time) || + Time->Hour > 23 || + Time->Minute > 59 || + Time->Second > 59 || + !IsValidTimeZone (Time->TimeZone) || + !IsValidDaylight (Time->Daylight)) { + return FALSE; + } + return TRUE; +} =20 /** Returns the current time and date information, and the time-keeping capa= bilities @@ -43,9 +143,20 @@ EFI_STATUS EFIAPI GetTime ( OUT EFI_TIME *Time, - OUT EFI_TIME_CAPABILITIES *Capabilities + OUT EFI_TIME_CAPABILITIES *Capabilities ) { + if (Time =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // Set these first so the RealTimeClockLib implementation + // can override them based on its own settings. + // + Time->TimeZone =3D mTimeSettings.TimeZone; + Time->Daylight =3D mTimeSettings.Daylight; + return LibGetTime (Time, Capabilities); } =20 @@ -67,7 +178,41 @@ SetTime ( IN EFI_TIME *Time ) { - return LibSetTime (Time); + EFI_STATUS Status; + BOOLEAN TimeSettingsChanged; + + if (Time =3D=3D NULL || !IsTimeValid (Time)) { + return EFI_INVALID_PARAMETER; + } + + TimeSettingsChanged =3D FALSE; + if (mTimeSettings.TimeZone !=3D Time->TimeZone || + mTimeSettings.Daylight !=3D Time->Daylight) { + + mTimeSettings.TimeZone =3D Time->TimeZone; + mTimeSettings.Daylight =3D Time->Daylight; + TimeSettingsChanged =3D TRUE; + } + + Status =3D LibSetTime (Time); + if (EFI_ERROR (Status)) { + return Status; + } + + if (TimeSettingsChanged) { + Status =3D EfiSetVariable ( + (CHAR16 *)mTimeSettingsVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS, + sizeof (mTimeSettings), + (VOID *)&mTimeSettings); + if (EFI_ERROR (Status)) { + return EFI_DEVICE_ERROR; + } + } + return EFI_SUCCESS; } =20 =20 @@ -138,12 +283,26 @@ InitializeRealTimeClock ( ) { EFI_STATUS Status; + UINTN Size; =20 Status =3D LibRtcInitialize (ImageHandle, SystemTable); if (EFI_ERROR (Status)) { return Status; } =20 + Size =3D sizeof (mTimeSettings); + Status =3D EfiGetVariable ((CHAR16 *)mTimeSettingsVariableName, + &gEfiCallerIdGuid, NULL, &Size, (VOID *)&mTimeSettings); + if (EFI_ERROR (Status) || + !IsValidTimeZone (mTimeSettings.TimeZone) || + !IsValidDaylight (mTimeSettings.Daylight)) { + DEBUG ((DEBUG_WARN, "%a: using default timezone/daylight settings\n", + __FUNCTION__)); + + mTimeSettings.TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; + mTimeSettings.Daylight =3D 0; + } + SystemTable->RuntimeServices->GetTime =3D GetTime; SystemTable->RuntimeServices->SetTime =3D SetTime; SystemTable->RuntimeServices->GetWakeupTime =3D GetWakeupTime; diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.in= f b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf index 186d4610bd42..d0520392f145 100644 --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf @@ -1,8 +1,8 @@ #/** @file -# Reset Architectural Protocol Driver as defined in PI +# Real Time Clock Architectural Protocol Driver as defined in PI # -# This Reset module simulates system reset by process exit on NT. -# Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, Linaro, Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -31,10 +31,11 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec =20 [LibraryClasses] - UefiBootServicesTableLib - UefiDriverEntryPoint DebugLib RealTimeClockLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiRuntimeLib =20 [Protocols] gEfiRealTimeClockArchProtocolGuid --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Wed Dec 25 01:23:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1509992453650425.57612961932034; Mon, 6 Nov 2017 10:20:53 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 864D92035D100; Mon, 6 Nov 2017 10:16:53 -0800 (PST) Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::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 D6D5B202E5CD3 for ; Mon, 6 Nov 2017 10:16:51 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id z3so16129957wme.5 for ; Mon, 06 Nov 2017 10:20:50 -0800 (PST) Received: from localhost.localdomain ([105.129.222.2]) by smtp.gmail.com with ESMTPSA id w206sm4516507wmd.36.2017.11.06.10.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 10:20:47 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+MtxWu5k97u4fFpId2rBd7+wyIyXc7r8y8e8ZVZcPVw=; b=Ri119B2HvoheS2EwMHj1rAUxcI476uBcFa3xA3YdDJQU73j4TOqHxj7Ffj8GifSqmn N55au8Qnu0Qu8dlaa7CcnpBSNKxywMrZpVr+XiIjs8kblUvkfgsu7Uz1uoMyCFPO4k7t AVthJH9eMSD54i+CKVpChoQ/eInZU4YTKBx28= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+MtxWu5k97u4fFpId2rBd7+wyIyXc7r8y8e8ZVZcPVw=; b=qKT9j/Q4hw2vAEqsI86qd4w7FSb8wt78dazjy0B464yAmRROcefyLOaSyS2Ws6eNV4 HxkgxmrTcPdtJ+ojPs8xOADiggywfg9ui71Rh8z7t5OnhRmpp8j8l5DzKf1QfqLkf9j2 urZVjJdco5SeS6jWr8e/BpC9z3WD+dZpekYd7mYsr/ZreAm8vchlFd7aPUTccV6UJV70 ESTgBM3TRw0YWh0ENkgSP/2jOGk/9Clb+MMAtGq+NiSRPZ5WgvUfBGooRjXQp2kobt6u RU+FSRIkbI/hGKA8sYGFRZ0H/hQ1feVPmZ2cPVoFmL54eQGSVulCVS/Y2+09WHcKornK DQkA== X-Gm-Message-State: AJaThX4EAtSjvPvzoxz4rm1piSzKUONzgUYM9+ZZurjrepmAxluSqmX5 98+My+DrmOlcK8L4IIYxq5HuzNcW+UU= X-Google-Smtp-Source: ABhQp+Qkqiai4OsdKqTcd2Nzpx6SEBamImgDr6jR6kGjwAev72qhzA/FrGGhECY+6YLQH0Ge48Vk5Q== X-Received: by 10.28.147.17 with SMTP id v17mr6417224wmd.9.1509992448461; Mon, 06 Nov 2017 10:20:48 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Mon, 6 Nov 2017 18:20:37 +0000 Message-Id: <20171106182038.16750-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171106182038.16750-1-ard.biesheuvel@linaro.org> References: <20171106182038.16750-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 2/3] ArmPlatformPkg/PL031RealTimeClockLib: remove validation and DST handling 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This library, which is intended to encapsulate the hardware specifics of the ARM PL031 RTC, also implements its own input validation routines and record the timezone and DST settings in its own set of EFI variables. This functionality has recently been added to the core driver, so let's remove it here. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 186= ++------------------ 1 file changed, 15 insertions(+), 171 deletions(-) diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeCloc= kLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib= .c index 41ebcb95ab85..f1eb0deb3249 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -40,8 +40,6 @@ =20 #include =20 -STATIC CONST CHAR16 mTimeZoneVariableName[] =3D L"PL031RtcTimeZo= ne"; -STATIC CONST CHAR16 mDaylightVariableName[] =3D L"PL031RtcDaylig= ht"; STATIC BOOLEAN mPL031Initialized =3D FALSE; STATIC EFI_EVENT mRtcVirtualAddrChangeEvent; STATIC UINTN mPL031RtcBase; @@ -134,15 +132,12 @@ LibGetTime ( { EFI_STATUS Status =3D EFI_SUCCESS; UINT32 EpochSeconds; - INT16 TimeZone; - UINT8 Daylight; - UINTN Size; =20 // Initialize the hardware if not already done if (!mPL031Initialized) { Status =3D InitializePL031 (); if (EFI_ERROR (Status)) { - goto EXIT; + return Status; } } =20 @@ -156,7 +151,7 @@ LibGetTime ( Status =3D EFI_SUCCESS; } else if (EFI_ERROR (Status)) { // Battery backed up hardware RTC exists but could not be read due to = error. Abort. - goto EXIT; + return Status; } else { // Battery backed up hardware RTC exists and we read the time correctl= y from it. // Now sync the PL031 to the new time. @@ -165,107 +160,18 @@ LibGetTime ( =20 // Ensure Time is a valid pointer if (Time =3D=3D NULL) { - Status =3D EFI_INVALID_PARAMETER; - goto EXIT; + return EFI_INVALID_PARAMETER; } =20 - // Get the current time zone information from non-volatile storage - Size =3D sizeof (TimeZone); - Status =3D EfiGetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - NULL, - &Size, - (VOID *)&TimeZone - ); - - if (EFI_ERROR (Status)) { - ASSERT(Status !=3D EFI_INVALID_PARAMETER); - ASSERT(Status !=3D EFI_BUFFER_TOO_SMALL); - - if (Status !=3D EFI_NOT_FOUND) - goto EXIT; - - // The time zone variable does not exist in non-volatile storage, so c= reate it. - Time->TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; - // Store it - Status =3D EfiSetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_A= CCESS | EFI_VARIABLE_RUNTIME_ACCESS, - Size, - (VOID *)&(Time->TimeZone) - ); - if (EFI_ERROR (Status)) { - DEBUG (( - EFI_D_ERROR, - "LibGetTime: Failed to save %s variable to non-volatile storage, S= tatus =3D %r\n", - mTimeZoneVariableName, - Status - )); - goto EXIT; - } - } else { - // Got the time zone - Time->TimeZone =3D TimeZone; - - // Check TimeZone bounds: -1440 to 1440 or 2047 - if (((Time->TimeZone < -1440) || (Time->TimeZone > 1440)) - && (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE)) { - Time->TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; - } - - // Adjust for the correct time zone - if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { - EpochSeconds +=3D Time->TimeZone * SEC_PER_MIN; - } + // Adjust for the correct time zone + if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds +=3D Time->TimeZone * SEC_PER_MIN; } =20 - // Get the current daylight information from non-volatile storage - Size =3D sizeof (Daylight); - Status =3D EfiGetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - NULL, - &Size, - (VOID *)&Daylight - ); - - if (EFI_ERROR (Status)) { - ASSERT(Status !=3D EFI_INVALID_PARAMETER); - ASSERT(Status !=3D EFI_BUFFER_TOO_SMALL); - - if (Status !=3D EFI_NOT_FOUND) - goto EXIT; - - // The daylight variable does not exist in non-volatile storage, so cr= eate it. - Time->Daylight =3D 0; - // Store it - Status =3D EfiSetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_A= CCESS | EFI_VARIABLE_RUNTIME_ACCESS, - Size, - (VOID *)&(Time->Daylight) - ); - if (EFI_ERROR (Status)) { - DEBUG (( - EFI_D_ERROR, - "LibGetTime: Failed to save %s variable to non-volatile storage, S= tatus =3D %r\n", - mDaylightVariableName, - Status - )); - goto EXIT; - } - } else { - // Got the daylight information - Time->Daylight =3D Daylight; - - // Adjust for the correct period - if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGH= T) { - // Convert to adjusted time, i.e. spring forwards one hour - EpochSeconds +=3D SEC_PER_HOUR; - } + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGHT)= { + // Convert to adjusted time, i.e. spring forwards one hour + EpochSeconds +=3D SEC_PER_HOUR; } =20 // Convert from internal 32-bit time to UEFI time @@ -281,8 +187,7 @@ LibGetTime ( Capabilities->SetsToZero =3D FALSE; } =20 - EXIT: - return Status; + return EFI_SUCCESS; } =20 =20 @@ -305,37 +210,19 @@ LibSetTime ( EFI_STATUS Status; UINTN EpochSeconds; =20 - // Check the input parameters are within the range specified by UEFI - if ((Time->Year < 1900) || - (Time->Year > 9999) || - (Time->Month < 1 ) || - (Time->Month > 12 ) || - (!IsDayValid (Time) ) || - (Time->Hour > 23 ) || - (Time->Minute > 59 ) || - (Time->Second > 59 ) || - (Time->Nanosecond > 999999999) || - (!((Time->TimeZone =3D=3D EFI_UNSPECIFIED_TIMEZONE) || ((Time->Time= Zone >=3D -1440) && (Time->TimeZone <=3D 1440)))) || - (Time->Daylight & (~(EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGH= T))) - ) { - Status =3D EFI_INVALID_PARAMETER; - goto EXIT; - } - // Because the PL031 is a 32-bit counter counting seconds, // the maximum time span is just over 136 years. // Time is stored in Unix Epoch format, so it starts in 1970, // Therefore it can not exceed the year 2106. if ((Time->Year < 1970) || (Time->Year >=3D 2106)) { - Status =3D EFI_UNSUPPORTED; - goto EXIT; + return EFI_UNSUPPORTED; } =20 // Initialize the hardware if not already done if (!mPL031Initialized) { Status =3D InitializePL031 (); if (EFI_ERROR (Status)) { - goto EXIT; + return Status; } } =20 @@ -346,8 +233,6 @@ LibSetTime ( EpochSeconds -=3D Time->TimeZone * SEC_PER_MIN; } =20 - // TODO: Automatic Daylight activation - // Adjust for the correct period if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGHT)= { // Convert to un-adjusted time, i.e. fall back one hour @@ -364,54 +249,13 @@ LibSetTime ( Status =3D ArmPlatformSysConfigSet (SYS_CFG_RTC, EpochSeconds); if ((EFI_ERROR (Status)) && (Status !=3D EFI_UNSUPPORTED)){ // Any status message except SUCCESS and UNSUPPORTED indicates a hardw= are failure. - goto EXIT; + return Status; } =20 - // Set the PL031 MmioWrite32 (mPL031RtcBase + PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); =20 - // The accesses to Variable Services can be very slow, because we may be= writing to Flash. - // Do this after having set the RTC. - - // Save the current time zone information into non-volatile storage - Status =3D EfiSetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACC= ESS | EFI_VARIABLE_RUNTIME_ACCESS, - sizeof (Time->TimeZone), - (VOID *)&(Time->TimeZone) - ); - if (EFI_ERROR (Status)) { - DEBUG (( - EFI_D_ERROR, - "LibSetTime: Failed to save %s variable to non-volatile storage, S= tatus =3D %r\n", - mTimeZoneVariableName, - Status - )); - goto EXIT; - } - - // Save the current daylight information into non-volatile storage - Status =3D EfiSetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACC= ESS | EFI_VARIABLE_RUNTIME_ACCESS, - sizeof(Time->Daylight), - (VOID *)&(Time->Daylight) - ); - if (EFI_ERROR (Status)) { - DEBUG (( - EFI_D_ERROR, - "LibSetTime: Failed to save %s variable to non-volatile storage, Sta= tus =3D %r\n", - mDaylightVariableName, - Status - )); - goto EXIT; - } - - EXIT: - return Status; + return EFI_SUCCESS; } =20 =20 --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Wed Dec 25 01:23:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1509992456478458.2037137977567; Mon, 6 Nov 2017 10:20:56 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C90912035D106; Mon, 6 Nov 2017 10:16:54 -0800 (PST) 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 601F32035D0FD for ; Mon, 6 Nov 2017 10:16:53 -0800 (PST) Received: by mail-wr0-x242.google.com with SMTP id 4so5270300wrt.0 for ; Mon, 06 Nov 2017 10:20:52 -0800 (PST) Received: from localhost.localdomain ([105.129.222.2]) by smtp.gmail.com with ESMTPSA id w206sm4516507wmd.36.2017.11.06.10.20.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 10:20:49 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SeiuGvicd4VwFrfYng7sMSU/xLSAdX4v0UP5ySAu51M=; b=YBLpYmPW2yORhQlN8ImXQqWkOmwkNk8wk/iw3LVT6zF1isoo6ss6DJ5b8vKmO8VooT YZMn9qAM9smxcbDw2YEHTxFVq078JKSAyOHSEZbcur4D3/vrB1EwMlaEkRR2xkCO8fMa ueg6nzomirwfh6QZ6EwXAqjDOpWJh7/Cu3dhc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SeiuGvicd4VwFrfYng7sMSU/xLSAdX4v0UP5ySAu51M=; b=RA8Hb2QRXvWloWkMzkVpC+ztIMiBFzJstlfpFZVVg1m16pTOUugvYSzzL38Xu7K1AX 3R1AOUrDwYqW7cc37Gnj9FieDj85rG5aeKFrrTHaVR5vhjHaqN99EToDUx+KOjlmFXp8 D0nQD6JJZn0gEVIeTgaFOtdssdpyi/OOV7BDEijxEMS6ClQx/HPttRXh3yjJ5fv2Iw9j 53Tt8q86UFO2mcxRX6RxNED8BP/a/Gf9V6HP/Yd9dFV1aLyf+o+/rsuxtPH3qG88qIOA WwwXnk0UCT47xcDagy737aXglhNsJzN3giPNcO/8MsOUT0zacSxF9G74HHOapG/R/Wc0 Hbjw== X-Gm-Message-State: AJaThX5N2wWqV2naJYWiSr+BRVgFNb2WMqO32OY6bqqq0qN4wTL5hMhU f9B6pFkUpC2jghsyVgyPsOwwkI4t8u4= X-Google-Smtp-Source: ABhQp+T5ogyJeqmfksrBJJ5VbKW8lY6V9S+HH7tukms490ET5Z79dD5QGhAUnsrpxyQyw82f7OeOGA== X-Received: by 10.223.174.74 with SMTP id u10mr4740860wrd.267.1509992450478; Mon, 06 Nov 2017 10:20:50 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Mon, 6 Nov 2017 18:20:38 +0000 Message-Id: <20171106182038.16750-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171106182038.16750-1-ard.biesheuvel@linaro.org> References: <20171106182038.16750-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 3/3] ArmPlatformPkg/PL031RealTimeClockLib: ignore DST setting when timezone is set 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" According to the UEFI spec, the timezone setting which the platform needs to record in addition to the actual date and time already reflects the current DST setting. In other words, moving the clock from standard time to daylight saving time also involves adding or subtracting 60 minutes from the timezone setting, as well as flicking the EFI_TIME_IN_DAYLIGHT bit in the DST setting. This means we need to disregard the DST setting if the timezone is specified, and only add or subtract the additional hour if we are on local time. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 12 = ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeCloc= kLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib= .c index f1eb0deb3249..459dcc0a0519 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -164,12 +164,10 @@ LibGetTime ( } =20 // Adjust for the correct time zone + // The timezone setting also reflects the DST setting of the clock if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { EpochSeconds +=3D Time->TimeZone * SEC_PER_MIN; - } - - // Adjust for the correct period - if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGHT)= { + } else if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DA= YLIGHT) { // Convert to adjusted time, i.e. spring forwards one hour EpochSeconds +=3D SEC_PER_HOUR; } @@ -229,12 +227,10 @@ LibSetTime ( EpochSeconds =3D EfiTimeToEpoch (Time); =20 // Adjust for the correct time zone, i.e. convert to UTC time zone + // The timezone setting also reflects the DST setting of the clock if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { EpochSeconds -=3D Time->TimeZone * SEC_PER_MIN; - } - - // Adjust for the correct period - if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGHT)= { + } else if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DA= YLIGHT) { // Convert to un-adjusted time, i.e. fall back one hour EpochSeconds -=3D SEC_PER_HOUR; } --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel