From patchwork Mon Nov 6 18:20:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 118078 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3061294qgn; Mon, 6 Nov 2017 10:20:52 -0800 (PST) X-Google-Smtp-Source: ABhQp+Tj9lWn4cbV0R1HYFBSUTg6Wsqk3fuShrh1kv/w01QV6rvWwRqP84X4GDoAKW3rpoIwASPq X-Received: by 10.159.235.147 with SMTP id f19mr15605342plr.42.1509992452746; Mon, 06 Nov 2017 10:20:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509992452; cv=none; d=google.com; s=arc-20160816; b=XdyW8c/7cRzdXSGlG6r8floFdFAdUyVIm3bJi4PB+DkEzvBAUG+Zvdn0phwXhJX2Ap cgkFemZatHxHqhi73o4xptQdZJHzGlq0j5REpDIXZE0FCxrGLByZ3wErjqjWJ5BP/f1d aLH4hMt26F76hjrrivsBjusCCE25iU8QfzD2PXB1xqGy/EwpsKbIynBDdjXip3ITsLHr qZsa8WlYEzrygEehyJBzNYlXPJ3eMvL+ET48acbSrJXuvn0W/tZHTfR6Auu0b4SsjCyu 1yVWYvC5scA/YElYxxluNBNDZJuSTHX2a9SLKRkJFtedfk9S+zXRCR7ZMLQiTvO1C8rM uLLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=El+A5ReazBw9wv4R2I7lz4IiWpAR24TIdS5TmXDMImg=; b=cNFqK6ADpZy5mG4nEc/W2SE7LCfxyzb1zAepyuyO6fy/thhmW1skJgxDB2V8aH65Ix 70zd3+it2RM0uw76ff8arcU1+Vg0RQQu7HUvGT/+4Qcg4r8/yVXqpqGaEx0Ak7kWeX9Y 8ogwbp9wwZD4oR6FRK3mepGW5Fl/9uP0aKR5NB2QeiyJNYnPrf67DjLPwZyfA6rWUgY4 HzVcFy+Ukalo4l/eNyU29zsEQ5ZzYDvxssUF2SgqztS1QfNHE5qyJf3QjycMqjqrFCBN bpXZFecF/qJeDxI/+NqJhfrJsIHzoapec6Lx1J/l+jSe0asKFH/E5X7ZOae01SoUypKP NNZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ri119B2H; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id x5si10720144plv.273.2017.11.06.10.20.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 10:20:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ri119B2H; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.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 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) 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-Received: by 10.28.147.17 with SMTP id v17mr6417224wmd.9.1509992448461; 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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 10:20:47 -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 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 186 ++------------------ 1 file changed, 15 insertions(+), 171 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.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 @@ #include -STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone"; -STATIC CONST CHAR16 mDaylightVariableName[] = L"PL031RtcDaylight"; STATIC BOOLEAN mPL031Initialized = FALSE; STATIC EFI_EVENT mRtcVirtualAddrChangeEvent; STATIC UINTN mPL031RtcBase; @@ -134,15 +132,12 @@ LibGetTime ( { EFI_STATUS Status = EFI_SUCCESS; UINT32 EpochSeconds; - INT16 TimeZone; - UINT8 Daylight; - UINTN Size; // Initialize the hardware if not already done if (!mPL031Initialized) { Status = InitializePL031 (); if (EFI_ERROR (Status)) { - goto EXIT; + return Status; } } @@ -156,7 +151,7 @@ LibGetTime ( Status = 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 correctly from it. // Now sync the PL031 to the new time. @@ -165,107 +160,18 @@ LibGetTime ( // Ensure Time is a valid pointer if (Time == NULL) { - Status = EFI_INVALID_PARAMETER; - goto EXIT; + return EFI_INVALID_PARAMETER; } - // Get the current time zone information from non-volatile storage - Size = sizeof (TimeZone); - Status = EfiGetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - NULL, - &Size, - (VOID *)&TimeZone - ); - - if (EFI_ERROR (Status)) { - ASSERT(Status != EFI_INVALID_PARAMETER); - ASSERT(Status != EFI_BUFFER_TOO_SMALL); - - if (Status != EFI_NOT_FOUND) - goto EXIT; - - // The time zone variable does not exist in non-volatile storage, so create it. - Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; - // Store it - Status = EfiSetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | 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, Status = %r\n", - mTimeZoneVariableName, - Status - )); - goto EXIT; - } - } else { - // Got the time zone - Time->TimeZone = TimeZone; - - // Check TimeZone bounds: -1440 to 1440 or 2047 - if (((Time->TimeZone < -1440) || (Time->TimeZone > 1440)) - && (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE)) { - Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; - } - - // Adjust for the correct time zone - if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { - EpochSeconds += Time->TimeZone * SEC_PER_MIN; - } + // Adjust for the correct time zone + if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds += Time->TimeZone * SEC_PER_MIN; } - // Get the current daylight information from non-volatile storage - Size = sizeof (Daylight); - Status = EfiGetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - NULL, - &Size, - (VOID *)&Daylight - ); - - if (EFI_ERROR (Status)) { - ASSERT(Status != EFI_INVALID_PARAMETER); - ASSERT(Status != EFI_BUFFER_TOO_SMALL); - - if (Status != EFI_NOT_FOUND) - goto EXIT; - - // The daylight variable does not exist in non-volatile storage, so create it. - Time->Daylight = 0; - // Store it - Status = EfiSetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | 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, Status = %r\n", - mDaylightVariableName, - Status - )); - goto EXIT; - } - } else { - // Got the daylight information - Time->Daylight = Daylight; - - // Adjust for the correct period - if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { - // Convert to adjusted time, i.e. spring forwards one hour - EpochSeconds += SEC_PER_HOUR; - } + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { + // Convert to adjusted time, i.e. spring forwards one hour + EpochSeconds += SEC_PER_HOUR; } // Convert from internal 32-bit time to UEFI time @@ -281,8 +187,7 @@ LibGetTime ( Capabilities->SetsToZero = FALSE; } - EXIT: - return Status; + return EFI_SUCCESS; } @@ -305,37 +210,19 @@ LibSetTime ( EFI_STATUS Status; UINTN EpochSeconds; - // 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 == EFI_UNSPECIFIED_TIMEZONE) || ((Time->TimeZone >= -1440) && (Time->TimeZone <= 1440)))) || - (Time->Daylight & (~(EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT))) - ) { - Status = 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 >= 2106)) { - Status = EFI_UNSUPPORTED; - goto EXIT; + return EFI_UNSUPPORTED; } // Initialize the hardware if not already done if (!mPL031Initialized) { Status = InitializePL031 (); if (EFI_ERROR (Status)) { - goto EXIT; + return Status; } } @@ -346,8 +233,6 @@ LibSetTime ( EpochSeconds -= Time->TimeZone * SEC_PER_MIN; } - // TODO: Automatic Daylight activation - // Adjust for the correct period if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { // Convert to un-adjusted time, i.e. fall back one hour @@ -364,54 +249,13 @@ LibSetTime ( Status = ArmPlatformSysConfigSet (SYS_CFG_RTC, EpochSeconds); if ((EFI_ERROR (Status)) && (Status != EFI_UNSUPPORTED)){ // Any status message except SUCCESS and UNSUPPORTED indicates a hardware failure. - goto EXIT; + return Status; } - // Set the PL031 MmioWrite32 (mPL031RtcBase + PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); - // 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 = EfiSetVariable ( - (CHAR16 *)mTimeZoneVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | 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, Status = %r\n", - mTimeZoneVariableName, - Status - )); - goto EXIT; - } - - // Save the current daylight information into non-volatile storage - Status = EfiSetVariable ( - (CHAR16 *)mDaylightVariableName, - &gEfiCallerIdGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | 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, Status = %r\n", - mDaylightVariableName, - Status - )); - goto EXIT; - } - - EXIT: - return Status; + return EFI_SUCCESS; }