From patchwork Fri Nov 10 08:09:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 118511 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1905847edl; Fri, 10 Nov 2017 00:09:43 -0800 (PST) X-Google-Smtp-Source: ABhQp+SEdTcHMNuSOjuhf2spXq2Z8NB4eCzNSba2ZvMOCa/pWotVhRMqDQabGMZSXR2WhhiUMDxI X-Received: by 10.84.233.200 with SMTP id m8mr3287303pln.424.1510301383293; Fri, 10 Nov 2017 00:09:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510301383; cv=none; d=google.com; s=arc-20160816; b=QPtw5YDPzYlCA7cILj7+BxkcVejmRvmoxcsSYMhfa1uWxk2hL3pi1RGG87KKxClU4X I7nn3/j9oLIs8bQg6+Ske5Zuqhz/+y48bNmHLRM9YG02yfrKEOwWT0pV+upbOprH73kO hGlSh6CTBC1jHXRc1yyPX+fiLFNlSdwltV/2Aqy1jbN63zv9H8WHZCIanS+LtUI98AA4 pPDRP+ZD271NG70Dk2w78Z/70knsy+giLCqZfMYUFqrscuBvrwiEWcBaNpVAI/kxQvuG 8hqabmOlOEwEid+MA23tNsm7PnGPfqyGGKMt3c1OPyQjIKvy2kEzeUTsvO/q79W4CQOz WXhw== 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=FwOyHxqDo5G6xMqCXFgq8Y1J58aNO1ixLWro2w2uwkE=; b=t4f9UdVqaZqiQHAGFs+DWRCw+2o3KMjw6Yc0ccAD6TjSFsaFuCj3LyldRknxEtC22a wKt1d9NQvWZjPhv10yNAoPp4xX7F/2Grso/xb9kiqN7sageZiep7p4OI0vH9CstXCVwb muVkWM+lfDfYPdxLvN1GYrc3rrrgIvUmXKgRPZ+ihHHkx6wz4cQaD23SFWRiIhcNqw9u hj/ShO2dIaNtKB8SqDztu8WCCTf8SeJEviImeK3M04gAT0kQsEw0gz8SPc2lsodjE5ss CLvbsjYI5R08MYLAlO7asKQ1UOgXiMrHAgn/rpa5Xyjy46vaOhqT8HafP9tiC717dT/6 /k7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UNSJ1vkM; 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 p8si8627571pll.156.2017.11.10.00.09.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 00:09:43 -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=UNSJ1vkM; 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 9505A2034EE1B; Fri, 10 Nov 2017 00:05:39 -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:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 E464521B00DC6 for ; Fri, 10 Nov 2017 00:05:37 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id u97so7874609wrc.1 for ; Fri, 10 Nov 2017 00:09:40 -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=DifeIMCd42PU9CGSxHavXHknOiv/acksEUW5/6L6nrk=; b=UNSJ1vkMpfdOzPm0YWHS1E2iR+uh/zVQ2lXIRZZrcNR0mbKLQBJYHZkKSvsLsFkoXR prYC7MnKqlU3YP6TCWMBf8yWnI4tJGrDhfvtPy80LQey+szbTBEaYZbKH5r1kRfG4XDH mzw4SC2r0C/aWOsQArk/bZfChbizZo1R6dSCI= 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=DifeIMCd42PU9CGSxHavXHknOiv/acksEUW5/6L6nrk=; b=jmBMERceENqWGJ69+Tw2VEGSRsA0vP3PJDPgaAaJaezYFnAVq5FDgXARIYr7RRfTDA aDYd0hCj527WsIHt751CB5rsxrp6oEeE72Ktth9AD9MYCnhzIYvIdYRpNxsacx+QTEZb +7pcYuBHEBDzqXMUjjF1A4LqCOkKPC5E3Rz9wARubJKVPLyIUk4ZN907Km2/USivJmn7 ze7r8wHmJ/L85F6kJq9lPTskkJxMrM3CCmxayxAQwr83+gJrlGfeAQAC5ZpzBfT/nbA3 mmsQkdaXIml4WysMhU3vG6M/gqhyxUgp2fz10xszOh0vmGYHTWZMU4aHv0OnwM/GJTVN znkA== X-Gm-Message-State: AJaThX5AYE160P0joGgLsmAoSF/zcttiiJ03A7gchFfzOi8TbR4uxIng 7u8OWcIGuoUODyB7OR01dRE2CEQHzHs= X-Received: by 10.223.160.41 with SMTP id k38mr2797494wrk.252.1510301378946; Fri, 10 Nov 2017 00:09:38 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id r23sm4133884wrc.93.2017.11.10.00.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 00:09:38 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Fri, 10 Nov 2017 08:09:24 +0000 Message-Id: <20171110080925.28599-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171110080925.28599-1-ard.biesheuvel@linaro.org> References: <20171110080925.28599-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 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 Reviewed-by: Leif Lindholm --- 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 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; }