From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109540+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109540+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101802; cv=none; d=zohomail.com; s=zohoarc; b=O/oS45OyEinCP9OhQ3RGCDeCJReFksjpHTizrF4Rk5CbDXuXVGaBb5iXHAnRmgpCgt/NNcKkCZp2BYraTyXcKYqhSNmpOgXbY3k+90affGuqOdq4uH5ZbB3MvJV6czEg1iHB+UBRq8bET2rs+AtytZgzYb38v1kObLFCjYEiYkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101802; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=/n+rZMfQ4lmWIcWw9+j+7XSl02A7H9Dl+A9xHumn8Zg=; b=TfDaFGq8An68TMKao/whdiiRirT86i3JowKrNJ9Lk3W+0ZhUpK6FQImW2gv4oJgYaZhGH6Rp+iNEJbJdtoOIS7NcTLBlgVJpkgTnWWV6oaJKm8Bhehvh446ewtMoLnFlXCS+PwA0+jiV4E8rjQ185AtJqdcwwsUUM4QkFoPVQWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109540+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101802145300.9722398242552; Thu, 12 Oct 2023 02:10:02 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=/n+rZMfQ4lmWIcWw9+j+7XSl02A7H9Dl+A9xHumn8Zg=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101801; v=1; b=fbOMSKq/C+JH79+cOJrAIbhfCcawXTtnXNCuZpp+DW6IFxSapLxQ3Bdyzj2F+Ix0KPQSeYeD n3fhYulvga9oJR8S+U8lGGusbnIROR6LKmMnue9IplITzABmJsmNFUlEwKm1yrJRSJvX5CdF+Aw jayHjuVM0JrcXs5j5KTbsFyg= X-Received: by 127.0.0.2 with SMTP id cyYQYY1788612xP98NWZZeJR; Thu, 12 Oct 2023 02:10:01 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.7182.1697101801186827871 for ; Thu, 12 Oct 2023 02:10:01 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-73-Jd1dOggPPwOXK5xZXdIdXw-1; Thu, 12 Oct 2023 05:09:56 -0400 X-MC-Unique: Jd1dOggPPwOXK5xZXdIdXw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4057C29A9D46; Thu, 12 Oct 2023 09:09:56 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60BB340C6F79; Thu, 12 Oct 2023 09:09:55 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 01/19] Hisilicon: enable NOOPT builds Date: Thu, 12 Oct 2023 11:09:32 +0200 Message-Id: <20231012090950.108577-2-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: dHDXZ5j2CNm59H5JYL48KXdLx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101803455100003 Content-Type: text/plain; charset="utf-8"; x-default="true" There's no reason for not supporting NOOPT in the Hisilicon platform DSCs, and there is a reason for supporting them: build-only testing. Add NOOPT wherever it's missing, and stick to a consistent order wherever NOOPT already exists. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Platform/Hisilicon/D03/D03.dsc | 2 +- Platform/Hisilicon/D05/D05.dsc | 2 +- Platform/Hisilicon/D06/D06.dsc | 2 +- Platform/Hisilicon/HiKey/HiKey.dsc | 2 +- Platform/Hisilicon/HiKey960/HiKey960.dsc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 0c17815d716d..aa62ae4e3aa1 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -19,7 +19,7 @@ [Defines] DSC_SPECIFICATION =3D 0x00010005 OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) SUPPORTED_ARCHITECTURES =3D AARCH64 - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index e01f6e335f09..05cc0614b8fb 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -19,7 +19,7 @@ [Defines] DSC_SPECIFICATION =3D 0x00010019 OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) SUPPORTED_ARCHITECTURES =3D AARCH64 - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf DEFINE EDK2_SKIP_PEICORE=3D0 diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index 2c5afa5b0e8d..da2005b7ab6b 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -19,7 +19,7 @@ [Defines] DSC_SPECIFICATION =3D 0x0001001A OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) SUPPORTED_ARCHITECTURES =3D AARCH64 - BUILD_TARGETS =3D DEBUG|NOOPT|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/= HiKey.dsc index 375b29375d75..c26df673afe9 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -16,7 +16,7 @@ [Defines] DSC_SPECIFICATION =3D 0x00010019 OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) SUPPORTED_ARCHITECTURES =3D AARCH64 - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/= HiKey960/HiKey960.dsc index 1d09e3f5da74..9e7c209716bc 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc @@ -16,7 +16,7 @@ [Defines] DSC_SPECIFICATION =3D 0x00010019 OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) SUPPORTED_ARCHITECTURES =3D AARCH64 - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109540): https://edk2.groups.io/g/devel/message/109540 Mute This Topic: https://groups.io/mt/101914649/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109542+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109542+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101803; cv=none; d=zohomail.com; s=zohoarc; b=ii1J6lxWEb7f38kV+Z9i5o1wkEssTbkFX57a+55OiwK6VdXoqXwvveb2QNcTDFj2kBYtynE6Grxuj74YlPTxtMaIFgrTWITy5ATKS+2Uz7dG1omF2VV+CnsyJJda9eHothrD4pEE96ElMizqG59tT77kDCNLhmkAS5cUkIBDwa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101803; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=bQ8Eg2W27tHRujHm8uxP9Yx3rQpYDo4c3Pr6mS5nJSI=; b=Ac+7wG3ClJ2X1mSQ3Q7b2ODCM/XvuHlRnEfYVKHIeaALiBju6psyjZzQ12mwQCdRTrZzlbeGRAZFTBwLZeKGWdTzL40iGiohQXHLYkf9x32LH8ACt3XXldoTzHcyX3blD4RIWLu6wZ8meFL00/VZGeQUAS/6wMMV8TdyCtE/aSk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109542+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101803758619.5938177509795; Thu, 12 Oct 2023 02:10:03 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=bQ8Eg2W27tHRujHm8uxP9Yx3rQpYDo4c3Pr6mS5nJSI=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101803; v=1; b=Ksnlg5ZjUW4shOQ9mZV3pCafHjKbXt7yZL7dD1siTg8kW6MxwgWmHKI5cO+lK0z5AYA1y2cZ aakYao0L8T9nQmJ8TNghdP1nsPcHTOeF2T0Xcq/hVpAioNRmEhS/8V0Zv5uGaE7Nr2IrASYlv7H xWojfccAe4YlryD48/dzELs4= X-Received: by 127.0.0.2 with SMTP id I0ZGYY1788612xaCUS4qID2F; Thu, 12 Oct 2023 02:10:03 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.7184.1697101802395440409 for ; Thu, 12 Oct 2023 02:10:02 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-XqLisXpVPTaX4KFtTQUbjA-1; Thu, 12 Oct 2023 05:09:57 -0400 X-MC-Unique: XqLisXpVPTaX4KFtTQUbjA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 629ED101A597; Thu, 12 Oct 2023 09:09:57 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 832AF40C6F79; Thu, 12 Oct 2023 09:09:56 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 02/19] Hisilicon/FlashFvbDxe: fix PcdNorFlashCheckBlockLocked token space GUID Date: Thu, 12 Oct 2023 11:09:33 +0200 Message-Id: <20231012090950.108577-3-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 5ZK8vGkOeJREj4SrZyCO6Bs1x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101805379100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Edk2 commit cc650a0378f8 ("ArmPlatformPkg: Retire NorFlashDxe driver", 2022-11-06) removed PcdNorFlashCheckBlockLocked from "gArmPlatformTokenSpaceGuid"; edk2-platforms commit d7b286ae5f53 ("Platform/ARM: clone NorFlashDxe from ArmPlatformPkg", 2022-10-19) provided it in the *different* namespace "gPlatformArmTokenSpaceGuid" (notice that "Arm" and "Platform" are in the opposite order). However, the dependency in "FlashFvbDxe.inf" was not updated. Found when trying to build: - Platform/Hisilicon/D03/D03.dsc - Platform/Hisilicon/D05/D05.dsc - Platform/Hisilicon/D06/D06.fdf Update the token space GUID reference. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silico= n/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf index 1119361e7726..3600e101b600 100644 --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf @@ -24,7 +24,7 @@ [Sources.common] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec + Platform/ARM/ARM.dec Silicon/Hisilicon/HisiPkg.dec =20 [LibraryClasses] @@ -56,7 +56,7 @@ [Pcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize =20 - gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked + gPlatformArmTokenSpaceGuid.PcdNorFlashCheckBlockLocked gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress =20 [Depex] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109542): https://edk2.groups.io/g/devel/message/109542 Mute This Topic: https://groups.io/mt/101914651/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109548+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109548+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101812; cv=none; d=zohomail.com; s=zohoarc; b=Zkt7F5gTGdACjW6ZKaDZ2hfcrfcELt2VHCpnG7BM5+Qn+kVJhgl7BIaQg1OM8V/7FAif81/Iu0QsRR3UsrwRS/6UzsMV6zELdJuwVPyb3yjKL3houzLqVfj7v+C3Jrg9PFZ0bc0FOlwNoIKYdV5+gGmrEf9seFtW+f0k/xbC/vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101812; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=JG3WySCAEUYtQcFH+g4Dc+77sEuACu2KRtemVxEoVdE=; b=irwqPJmHKMxzmic6xZqGqzVk220u+tjXcqFcQsHXML85QFgu+H+RuSnaB7n+V7MgK+UDOpmEs8nSMGeu87HOtMeQrn8SQZWQQAIZw0DCeQL8OCqD9IzNbylZSswkR2hwhrd5hHcpe1m3oCMlwjD6vciZeUD2sc7TmrnIjCtShbg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109548+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101812475808.1000041490715; Thu, 12 Oct 2023 02:10:12 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=JG3WySCAEUYtQcFH+g4Dc+77sEuACu2KRtemVxEoVdE=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101812; v=1; b=JkqXDVMwaf7/ic50uqgybfQngN8ZWBE7BoSY0aeuc8MEVa8EM4PHn/HL5isTfWeuzllzXna+ lwQ4NoJ8ji6FpUQInY7eNR3VwEDBjeZFd3KzooLIqGIEaqewnEQ2xtmahqm+tmnVYGxaH3foNm3 b80BKaoxcs1MQ87VyOB5PtUU= X-Received: by 127.0.0.2 with SMTP id uYTlYY1788612xGukL5ekd3B; Thu, 12 Oct 2023 02:10:12 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.7081.1697101811566106897 for ; Thu, 12 Oct 2023 02:10:11 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-94-UwPrSNtnNu2nmruiweyzOg-1; Thu, 12 Oct 2023 05:09:58 -0400 X-MC-Unique: UwPrSNtnNu2nmruiweyzOg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8580628EA702; Thu, 12 Oct 2023 09:09:58 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id A51E640C6F7F; Thu, 12 Oct 2023 09:09:57 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Leif Lindholm , Ard Biesheuvel , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 03/19] Hisilicon.dsc.inc: resolve VariableFlashInfoLib Date: Thu, 12 Oct 2023 11:09:34 +0200 Message-Id: <20231012090950.108577-4-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: mBZAC7Dlapwm6ZWYo8CHEhggx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101813498100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Since edk2 commit 8db39c60cdf3 ("MdeModulePkg/FaultTolerantWrite: Consume Variable Flash Info", 2022-05-19), the Hisilicon platforms (D03, D05, D06, HiKey, HiKey960) must have been broken; they don't resolve the new VariableFlashInfoLib class to the (only) BaseVariableFlashInfoLib instance. Do that now. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Hisilicon.dsc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisili= con.dsc.inc index b12efd7f031b..85dca9ab8d0d 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -92,6 +92,7 @@ [LibraryClasses.common] =20 VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf + VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseV= ariableFlashInfoLib.inf =20 ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCusto= mDecompressLib.inf -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109548): https://edk2.groups.io/g/devel/message/109548 Mute This Topic: https://groups.io/mt/101914657/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109543+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109543+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101804; cv=none; d=zohomail.com; s=zohoarc; b=A9mP7FvAojR0v526KchfvIoLmVLNQDupo1viYEZP3Ym7bigrRYnITahX2E5lFbgKTB/bUxyY3qJa1z22Ds1mXZLpstE3KGPoyXuQqSA23az8mbaFWPop/Gc8IneVeZQBNGw0pHqwOn/xXIz5zXusJtY27Opa52zRPDSNSr4O8RQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101804; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=Z5F2PrtFTwNhdPNrOnYOb3mp6+JpOwumAIdeRxwpkSk=; b=EyA9esKknSgWOj6qjeWl+WjzMRaNn0sAQyZrennJ7muG+wDluJL+jmhbAJWdYrPEqHVC5JTBE33gBzucJWZ8tbSZjeu+pQutJ3PnlPrtM1lMmv1UID3zZVZVD31lMh16/HGrHFfDyznPyLfsYEjUD7Q5pjR6Bl946AZC0XMmnik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109543+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101804253117.72589242188883; Thu, 12 Oct 2023 02:10:04 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Z5F2PrtFTwNhdPNrOnYOb3mp6+JpOwumAIdeRxwpkSk=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101803; v=1; b=Wn/nXpW8nlVyo02YAD+mn3eAcC6kECgjBpvovKqKz9bhV9RU6qcBZ8RQqR4OgybmjSdh7up7 sq4rpGaUuHuh+8t/e+OekBI10DMAjMK/1HusF8BH+NearoRh1rVDCVUjzB97DEEdY5RfbRBTOAU RMdtFbWlPVjpYnv+IKwGsO94= X-Received: by 127.0.0.2 with SMTP id WkfkYY1788612xThcvxT9u5B; Thu, 12 Oct 2023 02:10:03 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.7185.1697101802833722214 for ; Thu, 12 Oct 2023 02:10:03 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-627-R-gAmJReMbq8EtBL-TffMg-1; Thu, 12 Oct 2023 05:10:00 -0400 X-MC-Unique: R-gAmJReMbq8EtBL-TffMg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA2C18030CE; Thu, 12 Oct 2023 09:09:59 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id C76B940C6F79; Thu, 12 Oct 2023 09:09:58 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 04/19] Hisilicon: rename OemMiscLib class to HisiOemMiscLib Date: Thu, 12 Oct 2023 11:09:35 +0200 Message-Id: <20231012090950.108577-5-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: k3ltBcAtYZuqGRW8i9S3dsXHx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101805490100014 Content-Type: text/plain; charset="utf-8"; x-default="true" Edk2 commit [1] introduced the library class header to ArmPkg; commit [2] introduced the first OemMiscLib instance to ArmPkg; and commit [3] introduced (retroactively) the library class itself to ArmPkg. Alas, when all these edk2 commits were made, edk2-platforms already had a (Hisilicon-specific) library class called OemMiscLib -- and many of the Hisilicon modules would use both "HisiPkg.dec" and "ArmPkg.dec". Therefore the edk2 OemMiscLib brought about a library class conflict, breaking both edk2-platforms and edk2-non-osi content. Rename the original OemMiscLib class to HisiOemMiscLib, and update all references. This patch is necessary for building the D03, D05, D06, HiKey, and HiKey960 platforms. [1] 2c7c64fc04a0 ("ArmPkg: Add Library/OemMiscLib.h", 2021-02-08) [2] 0e51d7e445e0 ("ArmPkg: Add Universal/Smbios/OemMiscLibNull", 2021-02-08) [3] d03f71dd8be6 ("ArmPkg: Add missing library headers to ArmPkg.dec", 2021-04-28) Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/HisiPkg.dec = | 2 +- Platform/Hisilicon/D03/Library/{OemMiscLib2P =3D> HisiOemMiscLib2P}/BoardF= eature2PHi1610Strings.uni | 0 Platform/Hisilicon/D05/Library/{OemMiscLibD05 =3D> HisiOemMiscLibD05}/Boar= dFeatureD05Strings.uni | 0 Platform/Hisilicon/D06/Library/{OemMiscLibD06 =3D> HisiOemMiscLibD06}/Boar= dFeatureD06Strings.uni | 0 Platform/Hisilicon/D03/D03.dsc = | 2 +- Platform/Hisilicon/D05/D05.dsc = | 2 +- Platform/Hisilicon/D06/D06.dsc = | 2 +- Silicon/Hisilicon/Include/Library/{OemMiscLib.h =3D> HisiOemMiscLib.h} = | 4 ++-- Platform/Hisilicon/D03/Library/{OemMiscLib2P/OemMiscLib2PHi1610.inf =3D> H= isiOemMiscLib2P/HisiOemMiscLib2PHi1610.inf} | 4 ++-- Platform/Hisilicon/D05/Library/{OemMiscLibD05/OemMiscLibD05.inf =3D> HisiO= emMiscLibD05/HisiOemMiscLibD05.inf} | 4 ++-- Platform/Hisilicon/D06/Library/{OemMiscLibD06/OemMiscLibD06.inf =3D> HisiO= emMiscLibD06/HisiOemMiscLibD06.inf} | 4 ++-- Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf = | 2 +- Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf = | 2 +- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe= .inf | 2 +- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf = | 2 +- Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf = | 2 +- Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h = | 2 +- Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h = | 2 +- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h = | 2 +- Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c = | 2 +- Platform/Hisilicon/D03/Library/{OemMiscLib2P =3D> HisiOemMiscLib2P}/BoardF= eature2PHi1610.c | 4 ++-- Platform/Hisilicon/D03/Library/{OemMiscLib2P =3D> HisiOemMiscLib2P}/OemMis= cLib2PHi1610.c | 2 +- Platform/Hisilicon/D05/Library/{OemMiscLibD05 =3D> HisiOemMiscLibD05}/Boar= dFeatureD05.c | 4 ++-- Platform/Hisilicon/D05/Library/{OemMiscLibD05 =3D> HisiOemMiscLibD05}/OemM= iscLibD05.c | 2 +- Platform/Hisilicon/D06/Library/{OemMiscLibD06 =3D> HisiOemMiscLibD06}/Boar= dFeatureD06.c | 4 ++-- Platform/Hisilicon/D06/Library/{OemMiscLibD06 =3D> HisiOemMiscLibD06}/OemM= iscLibD06.c | 2 +- Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c = | 2 +- Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c = | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesign= ationFunction.c | 2 +- Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c = | 2 +- Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib= .c | 2 +- 31 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec index 051b5b8c3d88..e0339f093a9e 100644 --- a/Silicon/Hisilicon/HisiPkg.dec +++ b/Silicon/Hisilicon/HisiPkg.dec @@ -49,7 +49,7 @@ [LibraryClasses] PlatformSysCtrlLib|Include/Library/PlatformSysCtrlLib.h CpldIoLib|Include/Library/CpldIoLib.h OemAddressMapLib|Include/Library/OemAddressMapLib.h - OemMiscLib|Include/Library/OemMiscLib.h + HisiOemMiscLib|Include/Library/HisiOemMiscLib.h I2CLib|Include/Library/I2CLib.h PlatformPciLib|Include/Library/PlatformPciLib.h FdtUpdateLib|Include/Library/FdtUpdateLib.h diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi16= 10Strings.uni b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/BoardFeatur= e2PHi1610Strings.uni similarity index 100% rename from Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi161= 0Strings.uni rename to Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/BoardFeature2PHi1= 610Strings.uni diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05St= rings.uni b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/BoardFeatureD0= 5Strings.uni similarity index 100% rename from Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Str= ings.uni rename to Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/BoardFeatureD05S= trings.uni diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06St= rings.uni b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/BoardFeatureD0= 6Strings.uni similarity index 100% rename from Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Str= ings.uni rename to Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/BoardFeatureD06S= trings.uni diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index aa62ae4e3aa1..66c2bb31a5ef 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -61,7 +61,7 @@ [LibraryClasses.common] TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf RealTimeClockLib|Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/D= S3231RealTimeClockLib.inf =20 - OemMiscLib|Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi161= 0.inf + HisiOemMiscLib|Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/HisiOemMi= scLib2PHi1610.inf OemAddressMapLib|Platform/Hisilicon/D03/Library/OemAddressMap2P/OemAddre= ssMap2PHi1610.inf PlatformSysCtrlLib|Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi= 1610/PlatformSysCtrlLibHi1610.inf =20 diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 05cc0614b8fb..d247e67e92fc 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -68,7 +68,7 @@ [LibraryClasses.common] #D05 RTC hardware is same as D03 RealTimeClockLib|Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/D= S3231RealTimeClockLib.inf =20 - OemMiscLib|Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf + HisiOemMiscLib|Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/HisiOemM= iscLibD05.inf OemAddressMapLib|Platform/Hisilicon/D05/Library/OemAddressMapD05/OemAddr= essMapD05.inf PlatformSysCtrlLib|Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi= 1616/PlatformSysCtrlLibHi1616.inf =20 diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index da2005b7ab6b..f8a8dad01a0e 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -57,7 +57,7 @@ [LibraryClasses.common] TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf RtcHelperLib|Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf RealTimeClockLib|Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83= RealTimeClockLib.inf - OemMiscLib|Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf + HisiOemMiscLib|Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/HisiOemM= iscLibD06.inf OemAddressMapLib|Platform/Hisilicon/D06/Library/OemAddressMapD06/OemAddr= essMapD06.inf PlatformSysCtrlLib|Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi= 1620/PlatformSysCtrlLibHi1620.inf =20 diff --git a/Silicon/Hisilicon/Include/Library/OemMiscLib.h b/Silicon/Hisil= icon/Include/Library/HisiOemMiscLib.h similarity index 93% rename from Silicon/Hisilicon/Include/Library/OemMiscLib.h rename to Silicon/Hisilicon/Include/Library/HisiOemMiscLib.h index 834fb9ceac66..bb040e61703b 100644 --- a/Silicon/Hisilicon/Include/Library/OemMiscLib.h +++ b/Silicon/Hisilicon/Include/Library/HisiOemMiscLib.h @@ -8,8 +8,8 @@ **/ =20 =20 -#ifndef _OEM_MISC_LIB_H_ -#define _OEM_MISC_LIB_H_ +#ifndef HISI_OEM_MISC_LIB_H_ +#define HISI_OEM_MISC_LIB_H_ =20 #include =20 diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610= .inf b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/HisiOemMiscLib2PHi16= 10.inf similarity index 86% rename from Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.= inf rename to Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/HisiOemMiscLib2PH= i1610.inf index ab14597d8b75..a91444c71dcb 100644 --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf +++ b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/HisiOemMiscLib2PHi161= 0.inf @@ -9,11 +9,11 @@ =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D OemMiscLib2P + BASE_NAME =3D HisiOemMiscLib2P FILE_GUID =3D B9CE7465-21A2-4ecd-B347-BBDDBD098CEE MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D OemMiscLib + LIBRARY_CLASS =3D HisiOemMiscLib =20 [Sources.common] BoardFeature2PHi1610.c diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf= b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/HisiOemMiscLibD05.inf similarity index 86% rename from Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf rename to Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/HisiOemMiscLibD0= 5.inf index d471102199ee..f223097ba8d4 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf +++ b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/HisiOemMiscLibD05.inf @@ -9,11 +9,11 @@ =20 [Defines] INF_VERSION =3D 0x00010019 - BASE_NAME =3D OemMiscLibHi1616Evb + BASE_NAME =3D HisiOemMiscLibHi1616Evb FILE_GUID =3D 751C7627-D5F8-499C-AEEEE-C87858759612 MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D OemMiscLib + LIBRARY_CLASS =3D HisiOemMiscLib =20 [Sources.common] BoardFeatureD05.c diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf= b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/HisiOemMiscLibD06.inf similarity index 87% rename from Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf rename to Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/HisiOemMiscLibD0= 6.inf index 59373a968523..0d030950ee54 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf +++ b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/HisiOemMiscLibD06.inf @@ -9,11 +9,11 @@ =20 [Defines] INF_VERSION =3D 0x0001001A - BASE_NAME =3D OemMiscLib + BASE_NAME =3D HisiOemMiscLib FILE_GUID =3D 3002911C-C160-4C46-93BB-782846673EEA MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D OemMiscLib + LIBRARY_CLASS =3D HisiOemMiscLib =20 [Sources.common] BoardFeatureD06.c diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.i= nf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf index 6f2576c61c9d..fb9baf407205 100644 --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf @@ -37,8 +37,8 @@ [LibraryClasses] BaseMemoryLib DebugLib DevicePathLib + HisiOemMiscLib MemoryAllocationLib - OemMiscLib =20 [Pcd] gHisiTokenSpaceGuid.PcdPcieRootBridgeMask diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9= .inf b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf index 7af37f93bd90..279d8487cfe2 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf @@ -29,7 +29,7 @@ [LibraryClasses] DebugLib UefiLib UefiDriverEntryPoint - OemMiscLib + HisiOemMiscLib =20 [Protocols] gEfiSmbiosProtocolGuid diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Processo= rSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Pr= ocessorSubClassDxe.inf index 99eea93b7988..895d72fc040f 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ssDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ssDxe.inf @@ -40,7 +40,7 @@ [LibraryClasses] PcdLib =20 PlatformSysCtrlLib - OemMiscLib + HisiOemMiscLib =20 [Protocols] gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.i= nf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 9c795b5fd401..e574c7209d4f 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -62,7 +62,7 @@ [LibraryClasses] BaseMemoryLib BaseLib DebugLib - OemMiscLib + HisiOemMiscLib UefiBootServicesTableLib UefiRuntimeServicesTableLib UefiDriverEntryPoint diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf = b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf index 25d301f210ba..0a4c1aad307b 100644 --- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf +++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf @@ -36,7 +36,7 @@ [LibraryClasses] TimerLib PcdLib IoLib - OemMiscLib + HisiOemMiscLib =20 [Protocols] #gEfiPcieRootBridgeProtocolGuid diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9= .h b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h index 7194ae589042..1f07c0e1f364 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h +++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h @@ -25,6 +25,6 @@ #include #include #include -#include +#include =20 #endif diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubCl= ass.h b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h index 22c7f6797168..cd47eefc3428 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include =20 // // This is the generated header file which includes whatever needs to be e= xported (strings + IFR) diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Processo= rSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Process= orSubClass.h index 3ce180d21df3..e1c41ab65e4c 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.h +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include =20 // diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/= Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c index 75b6dec34b30..2e50494d974b 100644 --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c @@ -18,7 +18,7 @@ #include #include =20 -#include +#include #include #include =20 diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi16= 10.c b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/BoardFeature2PHi1610= .c similarity index 96% rename from Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi161= 0.c rename to Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/BoardFeature2PHi1= 610.c index 1670cac1d491..5c4f732588bc 100644 --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c +++ b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/BoardFeature2PHi1610.c @@ -14,7 +14,7 @@ #include =20 #include -#include +#include #include #include =20 @@ -181,7 +181,7 @@ OemGetPackages ( return HiiAddPackages ( &gEfiCallerIdGuid, NULL, - OemMiscLib2PStrings, + HisiOemMiscLib2PStrings, NULL, NULL ); diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610= .c b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/OemMiscLib2PHi1610.c similarity index 93% rename from Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c rename to Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/OemMiscLib2PHi161= 0.c index 1d9c3dfd491b..a52a6cff0537 100644 --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c +++ b/Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/OemMiscLib2PHi1610.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c= b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/BoardFeatureD05.c similarity index 95% rename from Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c rename to Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/BoardFeatureD05.c index ac013ca30890..2cda0fd7b6d8 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c +++ b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/BoardFeatureD05.c @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include #include =20 =20 @@ -209,7 +209,7 @@ OemGetPackages ( return HiiAddPackages ( &gEfiCallerIdGuid, NULL, - OemMiscLibHi1616EvbStrings, + HisiOemMiscLibHi1616EvbStrings, NULL, NULL ); diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b= /Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/OemMiscLibD05.c similarity index 92% rename from Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c rename to Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/OemMiscLibD05.c index 2ee15dbc7b43..4cd50c868f8f 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c +++ b/Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/OemMiscLibD05.c @@ -12,10 +12,10 @@ =20 #include #include +#include #include #include #include -#include #include #include #include diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c= b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/BoardFeatureD06.c similarity index 97% rename from Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c rename to Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/BoardFeatureD06.c index 980eabfe3355..01f5e091a855 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c +++ b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/BoardFeatureD06.c @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #include =20 #include @@ -416,7 +416,7 @@ OemGetPackages ( return HiiAddPackages ( &gEfiCallerIdGuid, NULL, - OemMiscLibStrings, + HisiOemMiscLibStrings, NULL, NULL ); diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b= /Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/OemMiscLibD06.c similarity index 94% rename from Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c rename to Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/OemMiscLibD06.c index 1b0a2180c179..0e6e1b39a83d 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c +++ b/Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/OemMiscLibD06.c @@ -12,10 +12,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c= b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c index 1be7de5ccf44..7a2d7b267f03 100644 --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.= c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c index 39f7f6b1a333..72fcf741582a 100644 --- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c +++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c @@ -8,13 +8,13 @@ #include #include #include +#include #include #include #include -#include #include -#include #include +#include =20 #define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET) =20 diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSyst= emSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDx= e/Type09/MiscSystemSlotDesignationFunction.c index 929288519780..3ca0c18a9cee 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotD= esignationFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotD= esignationFunction.c @@ -11,7 +11,7 @@ =20 #include "SmbiosMisc.h" =20 -#include +#include =20 extern SMBIOS_TABLE_TYPE9 MiscSystemSlotDesignationPcie0Data; extern SMBIOS_TABLE_TYPE9 MiscSystemSlotDesignationPcie1Data; diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c b/Sil= icon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c index 954655d47087..7eeb92e6154e 100644 --- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c +++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c @@ -10,7 +10,7 @@ #include "PcieInit.h" #include #include -#include +#include #include =20 =20 diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPc= iPlatformLib.c b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi16= 1xPciPlatformLib.c index 4fb092009a25..350f9611c794 100644 --- a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatfo= rmLib.c +++ b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatfo= rmLib.c @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include #include #include -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109543): https://edk2.groups.io/g/devel/message/109543 Mute This Topic: https://groups.io/mt/101914652/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109544+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109544+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101806; cv=none; d=zohomail.com; s=zohoarc; b=e3rxNoU0snb0zjx43NZ+lGHNnqI14xwYpcpodekuT8v5YKdt3US6moEOoyTgC6zbpBAjUR5MMCngf88wSYJ6sVYD10Kf6WE8uPfEbgbCI0sI0QjCYum9KA1BkB6xio3EPU9d9GB3P+LTIlwxsm4jYHPj/miwPaYjUbgW8GL5AJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101806; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=HL+oemOWz7t3jiN48mOMlHseOj/zT4i0q43v9tXMnrs=; b=MzyiwJygtLav/+d3zoyLjrjtDNO+9OfFm2RxPwJj/BkbDkGwxoqUV0vsAOOMk16jcaD+AVq/ko/G8ttfCkPtg02x9Ihw6QwOpRrYihaw9NeC/y0ilyf098KJpuGBnDO53r7OINvqV1JFjBNVUbg5/JzsNAwhLCeHOg45X8iWK+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109544+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101806253894.842169979296; Thu, 12 Oct 2023 02:10:06 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=HL+oemOWz7t3jiN48mOMlHseOj/zT4i0q43v9tXMnrs=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101805; v=1; b=SyeXbhKF5/w0m1E9tnf8ob9EkrqHYjjBgNkx2hFziTWMUAH+UfAvqDcipyQ5BDuX2JRv8yv+ 6Xzfn3qp+qi0/X7J94bQpKgHss3ImN2EtvvnnZUWiCE0X+w/xklnpQyqHXx+bdxbxd/x4Ik1VZk c1rD2mnXT+e57JBmAznEkmqE= X-Received: by 127.0.0.2 with SMTP id daoIYY1788612x24PL1wJYF7; Thu, 12 Oct 2023 02:10:05 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.7187.1697101805370109746 for ; Thu, 12 Oct 2023 02:10:05 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-iYGnBzeZPv6ZPaCKvHrFgA-1; Thu, 12 Oct 2023 05:10:01 -0400 X-MC-Unique: iYGnBzeZPv6ZPaCKvHrFgA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED2CD3C14767; Thu, 12 Oct 2023 09:10:00 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1846740C6F79; Thu, 12 Oct 2023 09:09:59 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 05/19] Hisilicon: add missing include file to Pptt components Date: Thu, 12 Oct 2023 11:09:36 +0200 Message-Id: <20231012090950.108577-6-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: f7CAEGGHa9ekHVgnnefl4YpFx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101807389100017 Content-Type: text/plain; charset="utf-8"; x-default="true" Some more random bitrot in Hisilicon; must be fixed for building the Hisilicon DSCs. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Hi1616/Pptt/Pptt.h | 1 + Silicon/Hisilicon/Hi1620/Pptt/Pptt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h b/Silicon/Hisilicon/Hi161= 6/Pptt/Pptt.h index a0ad31a990db..29b260d619c5 100644 --- a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h +++ b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h @@ -13,6 +13,7 @@ #define _PPTT_H_ =20 #include +#include #include #include #include diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi162= 0/Pptt/Pptt.h index 30ba5fff65ce..3019ea0e11d3 100644 --- a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h +++ b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h @@ -14,6 +14,7 @@ =20 #include #include +#include #include #include #include -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109544): https://edk2.groups.io/g/devel/message/109544 Mute This Topic: https://groups.io/mt/101914653/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109545+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109545+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101806; cv=none; d=zohomail.com; s=zohoarc; b=GiYVOBhNM2jt8a1CgI8NTudmWZfURJiU997go7k+rDk7oCt1zIwJwIwYQ8YnRp3BDd/ntVGRBn/Uevbhkwa5CdXUR4gsjoM6UbuxcXZCxLNhXzH+2da9TIGBK48834tBXzoR2dgpjQWVBTMQ8Q2FAnTvgAm6FBQJ+xd87k+GU9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101806; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=X99tdfy45N8F3UaJV093SlmE5p6i/qz1z2T+25GTaYk=; b=VuiVlIM0ZwW54R6rAJ4I9CJSOuyc2rKP0QsUDANCHZds1eZsIjWTphsmtxoaz+l/39BamKlg7RbpKLUyOymTAsH/wx2p9dj61p5F1oKNdlSmpgin3U1UbCiXyUjcTIynqJs9jYaW3Uz9czcsu8OlY7YUK2HBWDCJ6B5JC6Tk/o0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109545+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101806908772.8740683840505; Thu, 12 Oct 2023 02:10:06 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=X99tdfy45N8F3UaJV093SlmE5p6i/qz1z2T+25GTaYk=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101806; v=1; b=enzpcD7GBxWwm/EYf0wNflPSmoTiofZX0VL+oLgr5dwLhrS1lCa6cJlMn1iTkSyeVCuc5GzK 0Ll1SbL1SSSC8mMUN0FRbsu4DVZ/cJrGmBqeme/Ta2ZV5POBFVlOyLz8ItA20qfCtEqggCTDPcn KqcHJ9oCa602zhMoL2yGCUlY= X-Received: by 127.0.0.2 with SMTP id 6llTYY1788612xAdJAQKHl6b; Thu, 12 Oct 2023 02:10:06 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7077.1697101805931298246 for ; Thu, 12 Oct 2023 02:10:06 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-675-JtDF3vMrOHCqBMNN_iDXQw-1; Thu, 12 Oct 2023 05:10:02 -0400 X-MC-Unique: JtDF3vMrOHCqBMNN_iDXQw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1935838145A1; Thu, 12 Oct 2023 09:10:02 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A64E40C6F79; Thu, 12 Oct 2023 09:10:01 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 06/19] Hisilicon/Hi1620AcpiTables: fix up ASL Date: Thu, 12 Oct 2023 11:09:37 +0200 Message-Id: <20231012090950.108577-7-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: PYCanFRTc6JLkIHMh8JrDbH4x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101807407100018 Content-Type: text/plain; charset="utf-8"; x-default="true" Recent "iasl" does not accept "Hi1620Iort.asl" any longer: - various "Interrupt" fields are now called "GSIV", - "DeviceID mapping index" has been renamed to "Device ID Mapping Index". Update the field names in "Hi1620Iort.asl"; it's necessary for building the Hisilicon platform DSCs. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl | 60 ++++++++++--= -------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl b/Sil= icon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl index 910e406841c1..5e27ce65b4d2 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl @@ -51,12 +51,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000000 -[0004] DeviceID mapping index : 00000002 +[0004] Device ID Mapping Index : 00000002 =20 [0004] Input base : 00000000 [0004] ID Count : 00004000 @@ -95,12 +95,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000000 -[0004] DeviceID mapping index : 0001 +[0004] Device ID Mapping Index : 0001 =20 [0004] Input base : 00007c00 [0004] ID Count : 00000200 @@ -133,12 +133,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000000 -[0004] DeviceID mapping index : 00000001 +[0004] Device ID Mapping Index : 00000001 =20 [0004] Input base : 00007400 [0004] ID Count : 00000300 @@ -171,12 +171,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000002 -[0004] DeviceID mapping index : 00000002 +[0004] Device ID Mapping Index : 00000002 =20 [0004] Input base : 00008000 [0004] ID Count : 00002000 @@ -215,12 +215,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000002 -[0004] DeviceID mapping index : 0001 +[0004] Device ID Mapping Index : 0001 =20 [0004] Input base : 0000BC00 [0004] ID Count : 00000200 @@ -253,12 +253,12 @@ [0004] Reserved : 00000000 [0008] VATOS Address : 0 [0004] Model : 00000000 -[0004] Event Interrupt : 00000000 -[0004] PRI Interrupt : 00000000 -[0004] GERR Interrupt : 00000000 -[0004] Sync Interrupt : 00000000 +[0004] Event GSIV : 00000000 +[0004] PRI GSIV : 00000000 +[0004] GERR GSIV : 00000000 +[0004] Sync GSIV : 00000000 [0004] Proximity Domain : 00000002 -[0004] DeviceID mapping index : 00000001 +[0004] Device ID Mapping Index : 00000001 =20 [0004] Input base : 0000B400 [0004] ID Count : 00000300 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109545): https://edk2.groups.io/g/devel/message/109545 Mute This Topic: https://groups.io/mt/101914654/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109546+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109546+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101808; cv=none; d=zohomail.com; s=zohoarc; b=OFrZ+LKbsK0ky2b566QJrnTdJCY++K9VhuO4OiOPAPdT97FQ5drM2juGvZPlgTfi9YhTksqYuSZaEkAzLofmdKOvJMiqI75YrcaLRVA6sBGGK8LF4aUELVFyDhye6cV5fczBksJ5vmnOR8iMBmTPACKbytSSazD72lxgqTiz6es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101808; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=uczuGp9SXzp/sZJkSY255VCeWAztkJI4f46cAGuk8NM=; b=WfGbf2BAz6WmSHp+i5CQI1HiKy9I89+79J5c88t5DdFj0BwY51iezIUDcx23GlcdnwFHjrEezA6kIbg46Vq7gFr8uR3JmL9wXhbfewk0FQz+YLu2WMEaY2rF+WbpM+G0f2yD9wIgzMKySRXZnxaLSlPtEjD9ru4lXQGLY5PIdVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109546+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101808823261.2160074674805; Thu, 12 Oct 2023 02:10:08 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=uczuGp9SXzp/sZJkSY255VCeWAztkJI4f46cAGuk8NM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101808; v=1; b=WF9fWdLBUBZTIAridTJuWuNvFTs+AuZJxD1RUPFH+r0Zf5rMkYhPwPT0bxGZWVSdnwU4O00y z6PV+rKTD5y86KsV2GlcJD4tsdcUrjaKxYEXiblSs3WgxFFSnk5YP90HCw6FkY50/LEcY14wTkA JkzY7NmuY4LN3yz6JgxvdM8M= X-Received: by 127.0.0.2 with SMTP id YsS2YY1788612x2PXPQ2dMre; Thu, 12 Oct 2023 02:10:08 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7190.1697101807756119245 for ; Thu, 12 Oct 2023 02:10:07 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-296--o6tpgTMMbGRuN6Oe821XQ-1; Thu, 12 Oct 2023 05:10:03 -0400 X-MC-Unique: -o6tpgTMMbGRuN6Oe821XQ-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39CE9811E8D; Thu, 12 Oct 2023 09:10:03 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AF8040C6F79; Thu, 12 Oct 2023 09:10:02 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 07/19] Hisilicon/ProcessorSubClassDxe: drop conflicting PROCESSOR_STATUS_DATA type Date: Thu, 12 Oct 2023 11:09:38 +0200 Message-Id: <20231012090950.108577-8-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: BkLbb6keaOjIn9P70KKWWan7x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101809399100025 Content-Type: text/plain; charset="utf-8"; x-default="true" Edk2 commit 4e1f316cec3f ("MdePkg: Update IndustryStandard/SmBios.h with processor status data", 2021-02-08) upstreamed the PROCESSOR_STATUS_DATA type, so now the identical typedef in "ProcessorSubClass.h" is superfluous, and conflicts, breaking the Hisilicon DSCs' compilation. Remove it. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h = | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Processo= rSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Process= orSubClass.h index e1c41ab65e4c..7ed6696a1f23 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.h +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.h @@ -68,19 +68,6 @@ typedef union { UINT16 Data; }CACHE_CONFIGURATION; =20 -// -// Processor Status -// -typedef union { - struct { - UINT8 CpuStatus :3; // Indicates the status of the processor. - UINT8 Reserved1 :3; // Reserved for future use. Should be set to= zero. - UINT8 SocketPopulated :1; // Indicates if the processor socket is popu= lated or not. - UINT8 Reserved2 :1; // Reserved for future use. Should be set to= zero. - } Bits; - UINT8 Data; -}PROCESSOR_STATUS_DATA; - // // Processor Characteristics // -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109546): https://edk2.groups.io/g/devel/message/109546 Mute This Topic: https://groups.io/mt/101914655/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109559+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109559+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101831; cv=none; d=zohomail.com; s=zohoarc; b=DUC9bzlpmwPH6qBUNw6vCmKgBhNUE1+43CVSVmIyRKhOkQFKS+eMPCBIWPi1996Pz7Sx3mlBJx7luY2AKqjJAQsxksQgkOo8EQupOaTEf7OJd840XiXYz9ygGNMFA6ONUGiLj1x2C1wcYV1SrImN1Xq9UXUvaNMMuNvmxjjK69Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101831; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=EPOeLxNWXamRn9zIvYFvgMHcHX0K8hKUUQ72cwFiE7o=; b=FqOegWuijSAtNNBRhY1oJNDUfYC3IvwM3AYlqz+i9FCspladKFeeo0HIVQKLRnl6tUmEHzSq0LcQf8rk8mR0eBpytm25+aI8vdYM4S9DjtEL5GWIXhA9m62hiw6LSYAMSZGfTuMyUy3PMexJGejWMLAKxGTTExXhOf5ykJasOdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109559+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101831892652.3112344046101; Thu, 12 Oct 2023 02:10:31 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=EPOeLxNWXamRn9zIvYFvgMHcHX0K8hKUUQ72cwFiE7o=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101831; v=1; b=XaumCp3sDAvCLuW1pZiluwn3BOY0B6pVSCkCKUZB28W0MbnyKodYic5UGkv7Zpv8jMPJCeS7 QRtXHneYmGsIm1D/JC5g5MCcBECua9RnKDi36+MGITmhPacCB7SsBkPt+NQeSt+X/av4tblwZ01 2ArCq/Y8EqD+X0m5Ss6bY8BA= X-Received: by 127.0.0.2 with SMTP id 0DwmYY1788612xM5pRVnKWKB; Thu, 12 Oct 2023 02:10:31 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.7101.1697101830760793659 for ; Thu, 12 Oct 2023 02:10:30 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-338-IR5yf3OfNxeD7asevwIdNw-1; Thu, 12 Oct 2023 05:10:04 -0400 X-MC-Unique: IR5yf3OfNxeD7asevwIdNw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5BF59811E91; Thu, 12 Oct 2023 09:10:04 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C01D40C6F79; Thu, 12 Oct 2023 09:10:03 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 08/19] Hisilicon: drop unused DS3231RealTimeClockLib instance Date: Thu, 12 Oct 2023 11:09:39 +0200 Message-Id: <20231012090950.108577-9-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: HoGzniJYMjbjFYhpVf0X9qxqx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101833601100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Edk2-platforms contains two DS3231RealTimeClockLib instances: - Silicon/Hisilicon/Library/DS3231RealTimeClockLib - Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib The latter is still used (by the D03 and D05 platforms), but the former has not been referenced since commit 478282ea28c7 ("Hisilicon/D02: Remove D02 platform", 2018-08-08). Remove the unused library instance. (There's no reference in edk2-non-osi either.) Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.in= f | 43 -- Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h = | 172 -------- Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c = | 427 -------------------- 3 files changed, 642 deletions(-) diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTim= eClockLib.inf b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231Real= TimeClockLib.inf deleted file mode 100644 index 35042e07ed1f..000000000000 --- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockL= ib.inf +++ /dev/null @@ -1,43 +0,0 @@ -#/** @file -# -# Copyright (c) 2006, Intel Corporation. All rights reserved.
-# Copyright (c) 2011-2013, ARM Ltd. All rights reserved.
-# Copyright (c) 2015, Hisilicon Limited. All rights reserved. -# Copyright (c) 2015, Linaro Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# -# Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/P= L031RealTimeClockLib.inf -# -#**/ - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D DS3231RealTimeClockLib - FILE_GUID =3D 5FD8127D-11E1-488F-8CF1-A143157D6BF0 - MODULE_TYPE =3D BASE - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D RealTimeClockLib - -[Sources.common] - DS3231RealTimeClockLib.c - -[Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - Silicon/Hisilicon/HisiPkg.dec - -[LibraryClasses] - IoLib - UefiLib - DebugLib - PcdLib - I2CLib - TimeBaseLib - TimerLib -# Use EFiAtRuntime to check stage - UefiRuntimeLib - -[Pcd] - diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTim= eClock.h b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeC= lock.h deleted file mode 100644 index da18d0f5589e..000000000000 --- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h +++ /dev/null @@ -1,172 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM Limited. All rights reserved. -* Copyright (c) 2015, Hisilicon Limited. All rights reserved. -* Copyright (c) 2015, Linaro Limited. All rights reserved. -* -* SPDX-License-Identifier: BSD-2-Clause-Patent -* -* Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/P= L031RealTimeClockLib.inf -**/ - - -#ifndef __DS3231_REAL_TIME_CLOCK_H__ -#define __DS3231_REAL_TIME_CLOCK_H__ - -#define DS3231_REGADDR_SECONDS 0x00 -#define DS3231_REGADDR_MIUTES 0x01 -#define DS3231_REGADDR_HOURS 0x02 -#define DS3231_REGADDR_DAY 0x03 -#define DS3231_REGADDR_DATE 0x04 -#define DS3231_REGADDR_MONTH 0x05 -#define DS3231_REGADDR_YEAR 0x06 -#define DS3231_REGADDR_ALARM1SEC 0x07 -#define DS3231_REGADDR_ALARM1MIN 0x08 -#define DS3231_REGADDR_ALARM1HOUR 0x09 -#define DS3231_REGADDR_ALARM1DAY 0x0A -#define DS3231_REGADDR_ALARM2MIN 0x0B -#define DS3231_REGADDR_ALARM2HOUR 0x0C -#define DS3231_REGADDR_ALARM2DAY 0x0D -#define DS3231_REGADDR_CONTROL 0x0E -#define DS3231_REGADDR_STATUS 0x0F -#define DS3231_REGADDR_AGOFFSET 0x10 -#define DS3231_REGADDR_TEMPMSB 0x11 -#define DS3231_REGADDR_TEMPLSB 0x12 - - -typedef union { - struct{ - UINT8 A1IE:1; - UINT8 A2IE:1; - UINT8 INTCN:1; - UINT8 RSV:2; - UINT8 CONV:1; - UINT8 BBSQW:1; - UINT8 EOSC_N:1; - }bits; - UINT8 u8; -}RTC_DS3231_CONTROL; - -typedef union { - struct{ - UINT8 A1F:1; - UINT8 A2F:1; - UINT8 BSY:1; - UINT8 EN32KHZ:2; - UINT8 Rsv:3; - UINT8 OSF:1; - }bits; - UINT8 u8; -}RTC_DS3231_STATUS; - - -typedef union { - struct{ - UINT8 Data:7; - UINT8 Sign:1; - }bits; - UINT8 u8; -}RTC_DS3231_AGOFFSET; - -typedef union { - struct{ - UINT8 Data:7; - UINT8 Sign:1; - }bits; - UINT8 u8; -}RTC_DS3231_TEMPMSB; - - -typedef union { - struct{ - UINT8 Rsv:6; - UINT8 Data:2; - }bits; - UINT8 u8; -}RTC_DS3231_TEMPLSB; - -typedef union { - struct{ - UINT8 Seconds:4; - UINT8 Seconds10:3; - UINT8 Rsv:1; - }bits; - UINT8 u8; -}RTC_DS3231_SECONDS; - -typedef union { - struct{ - UINT8 Minutes:4; - UINT8 Minutes10:3; - UINT8 Rsv:1; - }bits; - UINT8 u8; -}RTC_DS3231_MINUTES; - -typedef union { - struct{ - UINT8 Hour:4; - UINT8 Hours10:1; - UINT8 PM_20Hours:1; - UINT8 Hour24_n:1; - UINT8 Rsv:1; - }bits; - UINT8 u8; -}RTC_DS3231_HOURS; - -typedef union { - struct{ - UINT8 Day:3; - UINT8 Rsv:5; - }bits; - UINT8 u8; -}RTC_DS3231_DAY; - -typedef union { - struct{ - UINT8 Month:4; - UINT8 Month10:1; - UINT8 Rsv:2; - UINT8 Century:1; - }bits; - UINT8 u8; -}RTC_DS3231_MONTH; - -typedef union { - struct{ - UINT8 Year:4; - UINT8 Year10:4; - }bits; - UINT8 u8; -}RTC_DS3231_YEAR; - -typedef union { - struct{ - UINT8 Seconds:4; - UINT8 Seconds10:3; - UINT8 A1M1:1; - }bits; - UINT8 u8; -}RTC_DS3231_ALARM1SEC; - -typedef union { - struct{ - UINT8 Minutes:4; - UINT8 Minutes10:3; - UINT8 A1M2:1; - }bits; - UINT8 u8; -}RTC_DS3231_ALARM1MIN; - -typedef union { - struct{ - UINT8 Hour:4; - UINT8 Hours10:1; - UINT8 PM_20Hours:1; - UINT8 Hours24:1; - UINT8 A1M3:1; - }bits; - UINT8 u8; -}RTC_DS3231_ALARM1HOUR; - -#endif diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTim= eClockLib.c b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTi= meClockLib.c deleted file mode 100644 index 30dc86414232..000000000000 --- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockL= ib.c +++ /dev/null @@ -1,427 +0,0 @@ -/** @file - Implement EFI RealTimeClock runtime services via RTC Lib. - - Currently this driver does not support runtime virtual calling. - - Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
- Copyright (c) 2011-2013, ARM Ltd. All rights reserved.
- Copyright (c) 2015, Hisilicon Limited. All rights reserved.
- Copyright (c) 2015, Linaro Limited. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - - Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL= 031RealTimeClockLib.inf - -**/ - -#include -#include -#include -#include -#include -#include -// Use EfiAtRuntime to check stage -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "DS3231RealTimeClock.h" - -extern I2C_DEVICE gRtcDevice; - -STATIC BOOLEAN mDS3231Initialized =3D FALSE; - -EFI_STATUS -IdentifyDS3231 ( - VOID - ) -{ - EFI_STATUS Status; - - Status =3D EFI_SUCCESS; - return Status; -} - -EFI_STATUS -InitializeDS3231 ( - VOID - ) -{ - EFI_STATUS Status; - I2C_DEVICE Dev; - RTC_DS3231_CONTROL Temp; - RTC_DS3231_HOURS Hours; - - // Prepare the hardware - (VOID)IdentifyDS3231(); - - (VOID)CopyMem (&Dev, &gRtcDevice, sizeof (Dev)); - - Status =3D I2CInit(Dev.Socket,Dev.Port,Normal); - if (EFI_ERROR (Status)) { - goto EXIT; - } - // Ensure interrupts are masked. We do not want RTC interrupts in UEFI - Status =3D I2CRead(&Dev,DS3231_REGADDR_CONTROL,1,&Temp.u8); - if (EFI_ERROR (Status)) { - goto EXIT; - } - Temp.bits.INTCN =3D 0; - Status =3D I2CWrite(&Dev,DS3231_REGADDR_CONTROL,1,&Temp.u8); - if (EFI_ERROR (Status)) { - goto EXIT; - } - - MicroSecondDelay(2000); - Status =3D I2CRead(&Dev,DS3231_REGADDR_HOURS,1,&Hours.u8); - if (EFI_ERROR (Status)) { - goto EXIT; - } - Hours.bits.Hour24_n =3D 0; - Status =3D I2CWrite(&Dev,DS3231_REGADDR_HOURS,1,&Hours.u8); - if (EFI_ERROR (Status)) { - goto EXIT; - } - - - mDS3231Initialized =3D TRUE; - - EXIT: - return Status; -} - - -/** - Returns the current time and date information, and the time-keeping capa= bilities - of the hardware platform. - - @param Time A pointer to storage to receive a snapsho= t of the current time. - @param Capabilities An optional pointer to a buffer to receiv= e the real time clock - device's capabilities. - - @retval EFI_SUCCESS The operation completed successfully. - @retval EFI_INVALID_PARAMETER Time is NULL. - @retval EFI_DEVICE_ERROR The time could not be retrieved due to ha= rdware error. - @retval EFI_SECURITY_VIOLATION The time could not be retrieved due to an= authentication failure. -**/ -EFI_STATUS -EFIAPI -LibGetTime ( - OUT EFI_TIME *Time, - OUT EFI_TIME_CAPABILITIES *Capabilities - ) -{ - EFI_STATUS Status =3D EFI_SUCCESS; - UINT8 Temp; - UINT8 BaseHour =3D 0; - UINT16 BaseYear =3D 1900; - - I2C_DEVICE Dev; - - // Ensure Time is a valid pointer - if (NULL =3D=3D Time) { - return EFI_INVALID_PARAMETER; - } - - // Initialize the hardware if not already done - if (!mDS3231Initialized) { - Status =3D InitializeDS3231 (); - if (EFI_ERROR (Status)) { - return EFI_NOT_READY; - } - } - - (VOID)CopyMem (&Dev, &gRtcDevice, sizeof (Dev)); - - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_MONTH,1,&Temp); - - Time->Month =3D ((Temp>>4)&1)*10+(Temp&0x0F); - - - if(Temp&0x80){ - BaseYear =3D 2000; - } - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_YEAR,1,&Temp); - - Time->Year =3D BaseYear+(Temp>>4) *10 + (Temp&0x0F); - - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_DATE,1,&Temp); - - Time->Day =3D ((Temp>>4)&3) *10 + (Temp&0x0F); - - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_HOURS,1,&Temp); - - BaseHour =3D 0; - if((Temp&0x30) =3D=3D 0x30){ - return EFI_DEVICE_ERROR; - }else if(Temp&0x20){ - BaseHour =3D 20; - }else if(Temp&0x10){ - BaseHour =3D 10; - } - Time->Hour =3D BaseHour + (Temp&0x0F); - - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_MIUTES,1,&Temp); - - Time->Minute =3D ((Temp>>4)&7) * 10 + (Temp&0x0F); - - - Status |=3D I2CRead(&Dev,DS3231_REGADDR_SECONDS,1,&Temp); - - Time->Second =3D (Temp>>4) * 10 + (Temp&0x0F); - - Time->Nanosecond =3D 0; - Time->Daylight =3D 0; - Time->TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; - - if((EFI_ERROR(Status)) || (!IsTimeValid(Time)) || ((Time->Year - BaseYea= r) > 99)) { - return EFI_DEVICE_ERROR; - } - - return EFI_SUCCESS; -} - - -/** - Sets the current local time and date information. - - @param Time A pointer to the current time. - - @retval EFI_SUCCESS The operation completed successfully. - @retval EFI_INVALID_PARAMETER A time field is out of range. - @retval EFI_DEVICE_ERROR The time could not be set due due to hardw= are error. - -**/ -EFI_STATUS -EFIAPI -LibSetTime ( - IN EFI_TIME *Time - ) -{ - EFI_STATUS Status =3D EFI_SUCCESS; - I2C_DEVICE Dev; - UINT8 Temp; - UINT16 BaseYear =3D 1900; - - // Check the input parameters are within the range specified by UEFI - if(!IsTimeValid(Time)){ - return EFI_INVALID_PARAMETER; - } - - // Initialize the hardware if not already done - if (!mDS3231Initialized) { - Status =3D InitializeDS3231 (); - if (EFI_ERROR (Status)) { - goto EXIT; - } - } - - (VOID)CopyMem (&Dev, &gRtcDevice, sizeof (Dev)); - - Temp =3D ((Time->Second/10)<<4) | (Time->Second%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_SECONDS,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - Temp =3D ((Time->Minute/10)<<4) | (Time->Minute%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_MIUTES,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - Temp =3D 0; - if(Time->Hour > 19){ - Temp =3D 2; - } else if(Time->Hour > 9){ - Temp =3D 1; - } - Temp =3D (Temp << 4) | (Time->Hour%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_HOURS,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - Temp =3D ((Time->Day/10)<<4) | (Time->Day%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_DATE,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - Temp =3D 0; - if(Time->Year >=3D 2000){ - Temp =3D 0x8; - BaseYear =3D 2000; - } - - if(Time->Month > 9){ - Temp |=3D 0x1; - } - Temp =3D (Temp<<4) | (Time->Month%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_MONTH,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - Temp =3D (((Time->Year-BaseYear)/10)<<4) | (Time->Year%10); - MicroSecondDelay(1000); - Status =3D I2CWrite(&Dev,DS3231_REGADDR_YEAR,1,&Temp); - if(EFI_ERROR (Status)){ - goto EXIT; - } - - EXIT: - return Status; -} - - -/** - Returns the current wakeup alarm clock setting. - - @param Enabled Indicates if the alarm is currently enable= d or disabled. - @param Pending Indicates if the alarm signal is pending a= nd requires acknowledgement. - @param Time The current alarm setting. - - @retval EFI_SUCCESS The alarm settings were returned. - @retval EFI_INVALID_PARAMETER Any parameter is NULL. - @retval EFI_DEVICE_ERROR The wakeup time could not be retrieved due= to a hardware error. - -**/ -EFI_STATUS -EFIAPI -LibGetWakeupTime ( - OUT BOOLEAN *Enabled, - OUT BOOLEAN *Pending, - OUT EFI_TIME *Time - ) -{ - // Not a required feature - return EFI_UNSUPPORTED; -} - - -/** - Sets the system wakeup alarm clock time. - - @param Enabled Enable or disable the wakeup alarm. - @param Time If Enable is TRUE, the time to set the wak= eup alarm for. - - @retval EFI_SUCCESS If Enable is TRUE, then the wakeup alarm w= as enabled. If - Enable is FALSE, then the wakeup alarm was= disabled. - @retval EFI_INVALID_PARAMETER A time field is out of range. - @retval EFI_DEVICE_ERROR The wakeup time could not be set due to a = hardware error. - @retval EFI_UNSUPPORTED A wakeup timer is not supported on this pl= atform. - -**/ -EFI_STATUS -EFIAPI -LibSetWakeupTime ( - IN BOOLEAN Enabled, - OUT EFI_TIME *Time - ) -{ - // Not a required feature - return EFI_UNSUPPORTED; -} - - - -/** - This is the declaration of an EFI image entry point. This can be the ent= ry point to an application - written to this specification, an EFI boot service driver, or an EFI run= time driver. - - @param ImageHandle Handle that identifies the loaded image. - @param SystemTable System Table for this image. - - @retval EFI_SUCCESS The operation completed successfully. - -**/ -EFI_STATUS -EFIAPI -LibRtcInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_HANDLE Handle; - - - EFI_TIME EfiTime; - - // Setup the setters and getters - gRT->GetTime =3D LibGetTime; - gRT->SetTime =3D LibSetTime; - gRT->GetWakeupTime =3D LibGetWakeupTime; - gRT->SetWakeupTime =3D LibSetWakeupTime; - - Status =3D gRT->GetTime (&EfiTime, NULL); - if(EFI_ERROR (Status) || (EfiTime.Year < 2000) || (EfiTime.Year > 2099)){ - EfiTime.Year =3D 2000; - EfiTime.Month =3D 1; - EfiTime.Day =3D 1; - EfiTime.Hour =3D 0; - EfiTime.Minute =3D 0; - EfiTime.Second =3D 0; - EfiTime.Nanosecond =3D 0; - EfiTime.Daylight =3D 0; - EfiTime.TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; - - Status =3D gRT->SetTime(&EfiTime); - if (EFI_ERROR(Status)) - { - DEBUG((EFI_D_ERROR, "[%a]:[%dL] Status : %r\n", __FUNCTION__, __LI= NE__, Status)); - } - } - - // Install the protocol - Handle =3D NULL; - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &Handle, - &gEfiRealTimeClockArchProtocolGuid, NULL, - NULL - ); - - return Status; -} - - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - // - // Only needed if you are going to support the OS calling RTC functions = in virtual mode. - // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses - // to virtual address. After the OS transitions to calling in virtual mo= de, all future - // runtime calls will be made in virtual mode. - // - return; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109559): https://edk2.groups.io/g/devel/message/109559 Mute This Topic: https://groups.io/mt/101914671/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109547+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109547+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101811; cv=none; d=zohomail.com; s=zohoarc; b=cHot/8W7g5PVB8VaLBzUlpjnpyki410zLW1YeuhJ/+w4kyvYYGFNZW7FsI0WueDleqLEhtu7vkE5VsPHxWa2HYremU252CDbWDt5G3LiljimY1yVgGxhSobtS3NEXDn+ki8c4UYcGtOBvUJ7e00icz3OKWPcvd+0xCcsx2N/tbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101811; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=tOregMBqO23W72BpkfKJTH4xS/JDBtwiSHOjYzmVEYY=; b=iI7qGOVhykbJ6oKEj1dXr8LHARQYybPRfEjutqcOkCRJSJej8glrA0FQobAEdMavM9vjWBOkNvPuFNBz6MiXp+xt77qOUBcFRzs1RE4z5TeeyjKIUEyBewlkgyRlqKR/9NEDe/Mmrvr4Ds92rgOKLtYwGsHcFKpswi0wpR1AbBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109547+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101811801146.0065957096183; Thu, 12 Oct 2023 02:10:11 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=tOregMBqO23W72BpkfKJTH4xS/JDBtwiSHOjYzmVEYY=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101811; v=1; b=KPkV4lInqNoWQ73Xg46fefdEnaNrcF0WDAetmgDyLScXwoshVCXYMcG5a2lv62ZWO1maTJl+ dZxksTXR/9/oyM1UY1WN1CQoPyrvpnnzE2oLiFAYFFN3k93/zaW3nIdSxcl9ecnsxarN/kuiSgk ww3qWYdC7DhtqdYiySUTzgtY= X-Received: by 127.0.0.2 with SMTP id tGbyYY1788612xd12qZ494hU; Thu, 12 Oct 2023 02:10:11 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7079.1697101810794388665 for ; Thu, 12 Oct 2023 02:10:11 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-HQmQ7Tz2MVygbDfUHnbuzg-1; Thu, 12 Oct 2023 05:10:05 -0400 X-MC-Unique: HQmQ7Tz2MVygbDfUHnbuzg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D4A2811E7B; Thu, 12 Oct 2023 09:10:05 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E7B540C6F79; Thu, 12 Oct 2023 09:10:04 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 09/19] Hisilicon: drop unused VirtualRealTimeClockLib instance Date: Thu, 12 Oct 2023 11:09:40 +0200 Message-Id: <20231012090950.108577-10-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 9hfx3GMntf1By53q7yYPdo12x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101813549100004 Content-Type: text/plain; charset="utf-8"; x-default="true" VirtualRealTimeClockLib is not used in either edk2-platforms or edk2-non-osi, and there never has been a reference to it -- even the initial code drop that added it to edk2-platforms [*] contained zero references to it. Remove it. [*] commit 600081b52deb ("Platform,Silicon: Import Hisilicon D02,D03,D05 and HiKey", 2017-08-03) Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf | = 41 -- Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c | 4= 23 -------------------- 2 files changed, 464 deletions(-) diff --git a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeCloc= kLib.inf b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockL= ib.inf deleted file mode 100644 index 8029dda436db..000000000000 --- a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf +++ /dev/null @@ -1,41 +0,0 @@ -#/** @file -# -# Copyright (c) 2015, Hisilicon Limited. All rights reserved. -# Copyright (c) 2015, Linaro Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -#**/ - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D RealTimeClockLibVirtual - FILE_GUID =3D 432B35C1-A0CC-4720-A4B9-1EFD70050107 - MODULE_TYPE =3D BASE - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D RealTimeClockLib - -[Sources.common] - RealTimeClockLib.c - -[Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - ArmPkg/ArmPkg.dec - OpenPlatformPkg/OpenPlatformPkg.dec - -[LibraryClasses] - IoLib - UefiLib - DebugLib - PcdLib - DxeServicesTableLib - TimeBaseLib - UefiRuntimeLib - ArmLib - -[Guids] - gEfiEventVirtualAddressChangeGuid - -[Pcd] - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz diff --git a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeCloc= kLib.c b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib= .c deleted file mode 100644 index 60edbce0f158..000000000000 --- a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c +++ /dev/null @@ -1,423 +0,0 @@ -/** @file - Implement EFI RealTimeClock runtime services via RTC Lib. - - Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
- Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.
- Copyright (c) 2015, Hisilicon Limited. All rights reserved.
- Copyright (c) 2015, Linaro Limited. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - - Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL= 031RealTimeClockLib.inf - -**/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#include - -STATIC CONST CHAR16 mTimeZoneVariableName[] =3D L"PV660VirtualRt= cTimeZone"; -STATIC CONST CHAR16 mDaylightVariableName[] =3D L"PV660VirtualRt= cDaylight"; -STATIC EFI_EVENT mRtcVirtualAddrChangeEvent; -STATIC EFI_RUNTIME_SERVICES *mRT; - - -STATIC INTN mEpochDiff =3D 0; - -/** - Returns the current time and date information, and the time-keeping capa= bilities - of the hardware platform. - - @param Time A pointer to storage to receive a snapsho= t of the current time. - @param Capabilities An optional pointer to a buffer to receiv= e the real time clock - device's capabilities. - - @retval EFI_SUCCESS The operation completed successfully. - @retval EFI_INVALID_PARAMETER Time is NULL. - @retval EFI_DEVICE_ERROR The time could not be retrieved due to ha= rdware error. - @retval EFI_SECURITY_VIOLATION The time could not be retrieved due to an= authentication failure. -**/ -EFI_STATUS -EFIAPI -LibGetTime ( - OUT EFI_TIME *Time, - OUT EFI_TIME_CAPABILITIES *Capabilities - ) -{ - EFI_STATUS Status =3D EFI_SUCCESS; - UINT64 Temp; - UINT32 EpochSeconds; - INT16 TimeZone =3D 0; - UINT8 Daylight =3D 0; - UINTN Size; - - // Ensure Time is a valid pointer - if (Time =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - ArmArchTimerReadReg(CntPct,&Temp); - - // UINT32 force convertion for PC-LINT - EpochSeconds =3D mEpochDiff + Temp / (UINT32) PcdGet32(PcdArmArchTimerFr= eqInHz); - - // Get the current time zone information from non-volatile storage - Size =3D sizeof (TimeZone); - Status =3D mRT->GetVariable ( - (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 mRT->SetVariable ( - (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; - } - } - - // Get the current daylight information from non-volatile storage - Size =3D sizeof (Daylight); - Status =3D mRT->GetVariable ( - (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 mRT->SetVariable ( - (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; - } - } - - // Convert from internal 32-bit time to UEFI time - EpochToEfiTime (EpochSeconds, Time); - - // Update the Capabilities info - if (Capabilities !=3D NULL) { - Capabilities->Resolution =3D 1; - // Accuracy in ppm multiplied by 1,000,000, e.g. for 50ppm set 50,000,= 000 - - Capabilities->Accuracy =3D PcdGet32 (PcdArmArchTimerFreqInHz); - // FALSE: Setting the time does not clear the values below the resolut= ion level - Capabilities->SetsToZero =3D FALSE; - } - - EXIT: - return Status; -} - - -/** - Sets the current local time and date information. - - @param Time A pointer to the current time. - - @retval EFI_SUCCESS The operation completed successfully. - @retval EFI_INVALID_PARAMETER A time field is out of range. - @retval EFI_DEVICE_ERROR The time could not be set due due to hardw= are error. - -**/ -EFI_STATUS -EFIAPI -LibSetTime ( - IN EFI_TIME *Time - ) -{ - EFI_STATUS Status; - UINTN EpochSeconds; - UINTN Temp; - - // Check the input parameters are within the range specified by UEFI - if (!IsTimeValid (Time)) { - 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; - } - - EpochSeconds =3D EfiTimeToEpoch (Time); - - // Adjust for the correct time zone, i.e. convert to UTC time zone - if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { - EpochSeconds -=3D Time->TimeZone * SEC_PER_MIN; - } - - // 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 - EpochSeconds -=3D SEC_PER_HOUR; - } - - ArmArchTimerReadReg(CntPct,&Temp); - - // UINT32 force convertion for PC-LINT - mEpochDiff =3D EpochSeconds - Temp / (UINT32) PcdGet32(PcdArmArchTimerFr= eqInHz); - - // 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 mRT->SetVariable ( - (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 mRT->SetVariable ( - (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; -} - - -/** - Returns the current wakeup alarm clock setting. - - @param Enabled Indicates if the alarm is currently enable= d or disabled. - @param Pending Indicates if the alarm signal is pending a= nd requires acknowledgement. - @param Time The current alarm setting. - - @retval EFI_SUCCESS The alarm settings were returned. - @retval EFI_INVALID_PARAMETER Any parameter is NULL. - @retval EFI_DEVICE_ERROR The wakeup time could not be retrieved due= to a hardware error. - -**/ -EFI_STATUS -EFIAPI -LibGetWakeupTime ( - OUT BOOLEAN *Enabled, - OUT BOOLEAN *Pending, - OUT EFI_TIME *Time - ) -{ - // Not a required feature - return EFI_UNSUPPORTED; -} - - -/** - Sets the system wakeup alarm clock time. - - @param Enabled Enable or disable the wakeup alarm. - @param Time If Enable is TRUE, the time to set the wak= eup alarm for. - - @retval EFI_SUCCESS If Enable is TRUE, then the wakeup alarm w= as enabled. If - Enable is FALSE, then the wakeup alarm was= disabled. - @retval EFI_INVALID_PARAMETER A time field is out of range. - @retval EFI_DEVICE_ERROR The wakeup time could not be set due to a = hardware error. - @retval EFI_UNSUPPORTED A wakeup timer is not supported on this pl= atform. - -**/ -EFI_STATUS -EFIAPI -LibSetWakeupTime ( - IN BOOLEAN Enabled, - OUT EFI_TIME *Time - ) -{ - // Not a required feature - return EFI_UNSUPPORTED; -} - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - // - // Only needed if you are going to support the OS calling RTC functions = in virtual mode. - // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses - // to virtual address. After the OS transitions to calling in virtual mo= de, all future - // runtime calls will be made in virtual mode. - // - EfiConvertPointer (0x0, (VOID**)&mRT); - return; -} - -/** - This is the declaration of an EFI image entry point. This can be the ent= ry point to an application - written to this specification, an EFI boot service driver, or an EFI run= time driver. - - @param ImageHandle Handle that identifies the loaded image. - @param SystemTable System Table for this image. - - @retval EFI_SUCCESS The operation completed successfully. - -**/ -EFI_STATUS -EFIAPI -LibRtcInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_HANDLE Handle; - - // Setup the setters and getters - gRT->GetTime =3D LibGetTime; - gRT->SetTime =3D LibSetTime; - gRT->GetWakeupTime =3D LibGetWakeupTime; - gRT->SetWakeupTime =3D LibSetWakeupTime; - - mRT =3D gRT; - - // Install the protocol - Handle =3D NULL; - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &Handle, - &gEfiRealTimeClockArchProtocolGuid, NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - // - // Register for the virtual address change event - // - Status =3D gBS->CreateEventEx ( - EVT_NOTIFY_SIGNAL, - TPL_NOTIFY, - LibRtcVirtualNotifyEvent, - NULL, - &gEfiEventVirtualAddressChangeGuid, - &mRtcVirtualAddrChangeEvent - ); - ASSERT_EFI_ERROR (Status); - - return Status; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109547): https://edk2.groups.io/g/devel/message/109547 Mute This Topic: https://groups.io/mt/101914656/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109550+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109550+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101813; cv=none; d=zohomail.com; s=zohoarc; b=dwtYmxq7x8j8nFICRlEW66mfhV8hipef06udHvHU7Se0lNOevfUHrGC+RQHHw4jsfY2S0A69OxJwMWYUx1cI1REVsAUSXq9TmqIREk7pbRfyKaHNKHdE3hszk3YFC2wx84/15UyhJLVcwYxJ3iV+idO+xjDEuqWJtHUURXpYwWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101813; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=XXcIOWgUxsYHCNrFTLAglnUo8dh0bjHaZ9OsvV6zDa0=; b=Uz1i+pP2/vY7g/n8MDEMPXmUJEKFKH0xhmHRKMrxaxfIFWYWODjWeNAMuZwIPwS3ioMwrQZj9fBYechrSjOv90jHivmGQS/NQUPuzQy5a1YXcwy6QS58Y8KnXu4Nrh8PxQIKSviuJc4Af/NsXdgF/6Lw4RzAmQbONGVmsMSXMrU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109550+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101813852565.5206286036585; Thu, 12 Oct 2023 02:10:13 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=XXcIOWgUxsYHCNrFTLAglnUo8dh0bjHaZ9OsvV6zDa0=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101813; v=1; b=vgQWVlBMo1gldOjS2e//kyMhZJj0PPWFgicwKhmthRbZNV1yWILBoHRgoju3EwSJu4MpbVtk gmk+Akz1WMGpvfD9n/VDWPSCjavlF771wHOghywkAZZLsbNRHAOO0tDCwZ/OYIVpzy3YaO64dGe KUdstIXg81apl+wVMZJ1KDCw= X-Received: by 127.0.0.2 with SMTP id R3jSYY1788612xYNonKyCgUw; Thu, 12 Oct 2023 02:10:13 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7195.1697101812589534009 for ; Thu, 12 Oct 2023 02:10:12 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-632-cOMAXOIJNNiLY4i1tD_YrA-1; Thu, 12 Oct 2023 05:10:07 -0400 X-MC-Unique: cOMAXOIJNNiLY4i1tD_YrA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E7BD811E8E; Thu, 12 Oct 2023 09:10:06 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF7BF40C6F79; Thu, 12 Oct 2023 09:10:05 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 10/19] Hisilicon/DS3231RealTimeClockLib: drop LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:41 +0200 Message-Id: <20231012090950.108577-11-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: G2A5ozmyrhpDFgEKtGLhr4mvx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101815722100014 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. In particular, DS3231RealTimeClockLib *itself* doesn't even use LibRtcVirtualNotifyEvent() -- the function is defined with an empty body, clearly in an understandable, but misguided, attempt, to conform to the (bogus) library interface. Remove the function. Build-tested only (with the Hisilicon platforms). Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockL= ib.c | 25 -------------------- 1 file changed, 25 deletions(-) diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231Re= alTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS= 3231RealTimeClockLib.c index 898335a7b73f..3a84b6e9297b 100644 --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeC= lockLib.c +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeC= lockLib.c @@ -471,28 +471,3 @@ LibRtcInitialize ( =20 return Status; } - - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - // - // Only needed if you are going to support the OS calling RTC functions = in virtual mode. - // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses - // to virtual address. After the OS transitions to calling in virtual mo= de, all future - // runtime calls will be made in virtual mode. - // - return; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109550): https://edk2.groups.io/g/devel/message/109550 Mute This Topic: https://groups.io/mt/101914659/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109549+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109549+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101813; cv=none; d=zohomail.com; s=zohoarc; b=XX8JADAj4HA9goN9sHcXk2SbUOmqudHNm34U48gKdWraLlDzadqWU0kKVF3x0a9dbm4Nvn7jNmKhS9bdgWuT2ofRp2DlE5WzJ1RBRTwMMP9x8kGeMjWRBd+l3o/JsBh+ZjhIBuaeAn6oWnw8t9P6lJ3tOsmYFBrhzyvOuJ7ul1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101813; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=QfYvSqkZYeCzjCeKTw4MCPbZE0aocjPrROfiAaQqIbU=; b=n4Es7QwCV+betMxE8x+PjV6hcgNvDX1CD6sBWAvQN/7kN7r0sNlnewj6l+U5pj4uJNqdfKg/jAWTQPSAguRYSA5CjKlWiZJv0CwuR/ucUK3pSCvJ1oy3aEYl1utK0IXKJURVmyG67HLaVLQwkMoyw2Ui/tAlHMcQ9hLjYP2AG5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109549+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101813315440.4124960818476; Thu, 12 Oct 2023 02:10:13 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=QfYvSqkZYeCzjCeKTw4MCPbZE0aocjPrROfiAaQqIbU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101812; v=1; b=HndI36s4OXznTQZ9EkoJG8BZD5eBnTkZc5y/b/gZUzbF51qB7l6RXgw+Kakxbti8s2BzJjen o+bZImiHjrkRs1dXRSr/hzWxjZ6IILNhOfo8SYccESNlIgk4RGuS4kLzjgfUmjn2IDJu0OyJSdJ VmL1F9OLuG6Zz5H4O587/2cI= X-Received: by 127.0.0.2 with SMTP id szCYYY1788612xIUFV1VMQJc; Thu, 12 Oct 2023 02:10:12 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7194.1697101812351316750 for ; Thu, 12 Oct 2023 02:10:12 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-9WzfTeV7OQmkwsCPUiLhrA-1; Thu, 12 Oct 2023 05:10:08 -0400 X-MC-Unique: 9WzfTeV7OQmkwsCPUiLhrA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BFD5B811E7E; Thu, 12 Oct 2023 09:10:07 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id E14BC40C6F79; Thu, 12 Oct 2023 09:10:06 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-platforms PATCH 11/19] Hisilicon/RX8900RealTimeClockLib: drop LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:42 +0200 Message-Id: <20231012090950.108577-12-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: u6AnVS2NgpbcxXoWF0RMDFxNx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101815725100015 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. In particular, RX8900RealTimeClockLib *itself* doesn't even use LibRtcVirtualNotifyEvent() -- the function is defined with an empty body, clearly in an understandable, but misguided, attempt, to conform to the (bogus) library interface. Remove the function. Note that this patch is *untestable* in edk2-platforms (and in edk2-non-osi too), because no platform consumes RX8900RealTimeClockLib -- worse, there hasn't been a single consumer since the introduction of the lib instance in commit de704335c47f ("Silicon/Hisilicon: Add RX8900RealTimeClockLib", 2020-05-20). Normally this would nominate RX8900RealTimeClockLib to the axe, but commit de704335c47f said, "There are some boards base on D06, but use RX8900 RTC, so upstream the RX8900RealTimeClockLib", so I guess there might be out-of-tree / proprietary consumers. Quite unfortunate. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockLib.c = | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTim= eClockLib.c b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTi= meClockLib.c index b6c9e6769fce..ea41202fc72a 100644 --- a/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockL= ib.c +++ b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockL= ib.c @@ -455,14 +455,3 @@ LibRtcInitialize ( =20 return Status; } - - -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - return; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109549): https://edk2.groups.io/g/devel/message/109549 Mute This Topic: https://groups.io/mt/101914658/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109551+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109551+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101814; cv=none; d=zohomail.com; s=zohoarc; b=is+I91KNXIL2LE918lk1DeQ/XfXU0/mIns1r4/atzTp6GzkkRHJeZByyqqTrHJOH0nzOvtGGoViAt3kyutNhfgkGYXOjbISBNcmlutBLT/wvyJ8aBbHI66T3ioPVDZp5UP0j59nqs4OWlyCMs8sTtnrcuVMM4D8bZcKNx5VSK8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101814; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=BmGvnL+WoZaRJwDc2be5/WuE3eaCEsw1pJn9xR9DGXQ=; b=P+s22kxmrZBOJ30qiZV+q7UKF6kYDuANKeIpqxf03f9qbE+QX4noNpBdT7Q6DVeTqbDzZigqNusc1G6qK/H+HdO7rfFueysVhbolI0xEKOmYLH50S4/E+HmY2rn4fx/+fvaOSXTCqcKfMvyBSQcNKAKupN2gKH65pFBgATox+Fk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109551+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101814616614.7746057523831; Thu, 12 Oct 2023 02:10:14 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=BmGvnL+WoZaRJwDc2be5/WuE3eaCEsw1pJn9xR9DGXQ=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101814; v=1; b=ZHdUKlxLWxNVPEDYNoHh+iYx8SPxBknHqgV/lxohKZZ4vhW3o9fVG+aY0g6XXzf5Pvutp/sZ tu5Ra08CvrHcIm41MFR+YvgNX4aUv40WF8/xE80l6emkgRHZViizE027Ef7OKNfXcPOe0Xcd4is BRo9Ky+d7tim77t9MoEm+Taw= X-Received: by 127.0.0.2 with SMTP id RlQRYY1788612xB6fLE9635k; Thu, 12 Oct 2023 02:10:14 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.7082.1697101813713915445 for ; Thu, 12 Oct 2023 02:10:13 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-664-BuzzhtD-OmiXIm47GoZK7A-1; Thu, 12 Oct 2023 05:10:09 -0400 X-MC-Unique: BuzzhtD-OmiXIm47GoZK7A-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 10BE13C1476B; Thu, 12 Oct 2023 09:10:09 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E7C440C6F79; Thu, 12 Oct 2023 09:10:07 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Chuong Tran , Leif Lindholm , Nhi Pham , Rebecca Cran Subject: [edk2-devel] [edk2-platforms PATCH 12/19] AmpereAltraPkg/Ac01PcieLib: fix compilation error Date: Thu, 12 Oct 2023 11:09:43 +0200 Message-Id: <20231012090950.108577-13-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: TRG3KPcETShmie3O014dMKc7x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101815710100013 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 380b4b40c60d ("AmpereAltraPkg: Update Ampere specific platform PCIe core", 2023-03-29) removed the DEBUG macro call from Ac01PcieCoreUpdateLink() that was the only reader of "Val". Since then, Val has only been set, but never read. This triggers "-Werror=3Dunused-but-set-variable". Found when trying to build "Jade.dsc". Keep the MmioRead32() call, so that the PCIe config space sees the same behavior as before, but explicitly throw away the result. Cc: Chuong Tran Cc: Leif Lindholm Cc: Nhi Pham Cc: Rebecca Cran Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Nhi Pham --- Silicon/Ampere/AmpereAltraPkg/Library/Ac01PcieLib/PcieCore.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/Ac01PcieLib/PcieCore.c b= /Silicon/Ampere/AmpereAltraPkg/Library/Ac01PcieLib/PcieCore.c index 3c1fe5e35ca2..fa00c1e36999 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/Ac01PcieLib/PcieCore.c +++ b/Silicon/Ampere/AmpereAltraPkg/Library/Ac01PcieLib/PcieCore.c @@ -1747,7 +1747,6 @@ Ac01PcieCoreUpdateLink ( PHYSICAL_ADDRESS CfgBase; UINT8 PcieIndex; UINT32 Index; - UINT32 Val; =20 *IsNextRoundNeeded =3D FALSE; *FailedPcieCount =3D 0; @@ -1767,7 +1766,7 @@ Ac01PcieCoreUpdateLink ( if (Pcie->Active && !Pcie->LinkUp) { if (PcieLinkUpCheck (Pcie)) { Pcie->LinkUp =3D TRUE; - Val =3D MmioRead32 (CfgBase + PCIE_CAPABILITY_BASE + LINK_CONTROL_= LINK_STATUS_REG); + (VOID)MmioRead32 (CfgBase + PCIE_CAPABILITY_BASE + LINK_CONTROL_LI= NK_STATUS_REG); =20 // Doing link checking and recovery if needed Ac01PcieCoreQoSLinkCheckRecovery (RootComplex, PcieIndex); -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109551): https://edk2.groups.io/g/devel/message/109551 Mute This Topic: https://groups.io/mt/101914660/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109556+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109556+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101823; cv=none; d=zohomail.com; s=zohoarc; b=UvEEvj85k/TkqGwEF7fKoVZ1t7ZTje2tbEQj22HgCr/Mjhy5hYJZMeXRUpgsJWZWHpBpxi8OHoZ9jWZ0Y9h5/1RAVY42FEOLNrZ8SqMt/FIxp+FQ52qloSPqGqJWe+bCuw/dKmb8+U17/iFnP8zwQtZJEnrKTUMYEPtBBXMO+qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101823; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=aguQRVWrp5iugCcNkmXcosEKn+JU2vDxARCkig5U25I=; b=krYHBY1gauczmQEZvx3o4J+Zv5WAMREgL6uSnOz8uZ+LvMuOh7fsa2+P1jZW3RKHh5kgR3mv1MCSprgu+AIMMQlzUH0AEh3g36w7RBiZQd0AeGJ4OX5wbP9U+6FiEu0ingY3f0LIJZQZ3eyt+cFNvOz0JPYXBQA3eKEC89txmMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109556+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101823563483.60173389801105; Thu, 12 Oct 2023 02:10:23 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=aguQRVWrp5iugCcNkmXcosEKn+JU2vDxARCkig5U25I=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101823; v=1; b=aJlaptD8VVrpKkL0lsbgJvMet/air0gcU6AXKhnnPZSYZowQTr6xlB6gksn8Qs9yoRUlu1Mo NqB5JGaXCU92l+SE7QyedtBucgPIwfQ65WXaumyVXFUoAaRrhfGc6LgupTPzxPa2BSuPPKHySog 6pAMtGs1Hi+ZVdzH19gnQVDo= X-Received: by 127.0.0.2 with SMTP id s6JRYY1788612xSnFWTvJ7AR; Thu, 12 Oct 2023 02:10:23 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7201.1697101822666487032 for ; Thu, 12 Oct 2023 02:10:22 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-5gg8Ox_AMT-vzKKFUIJEVQ-1; Thu, 12 Oct 2023 05:10:10 -0400 X-MC-Unique: 5gg8Ox_AMT-vzKKFUIJEVQ-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5459C38145A1; Thu, 12 Oct 2023 09:10:10 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52BB040C6F7F; Thu, 12 Oct 2023 09:10:09 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Chuong Tran , Leif Lindholm , Nhi Pham , Rebecca Cran Subject: [edk2-devel] [edk2-platforms PATCH 13/19] JadePkg/PCF85063RealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:44 +0200 Message-Id: <20231012090950.108577-14-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: LnhaUYG9kda4ZVKU3F9R9gJqx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101825527100011 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Build-tested only (with "Jade.dsc"). Cc: Chuong Tran Cc: Leif Lindholm Cc: Nhi Pham Cc: Rebecca Cran Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Nhi Pham --- Platform/Ampere/JadePkg/Library/PCF85063RealTimeClockLib/PCF85063RealTimeC= lockLib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Platform/Ampere/JadePkg/Library/PCF85063RealTimeClockLib/PCF85= 063RealTimeClockLib.c b/Platform/Ampere/JadePkg/Library/PCF85063RealTimeClo= ckLib/PCF85063RealTimeClockLib.c index ef8c71e92c18..1df781364bbc 100644 --- a/Platform/Ampere/JadePkg/Library/PCF85063RealTimeClockLib/PCF85063Real= TimeClockLib.c +++ b/Platform/Ampere/JadePkg/Library/PCF85063RealTimeClockLib/PCF85063Real= TimeClockLib.c @@ -201,9 +201,10 @@ LibSetWakeupTime ( @param[in] Event The Event that is being processed @param[in] Context Event Context **/ +STATIC VOID EFIAPI -LibRtcVirtualNotifyEvent ( +VirtualNotifyEvent ( IN EFI_EVENT Event, IN VOID *Context ) @@ -246,7 +247,7 @@ LibRtcInitialize ( Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mVirtualAddressChangeEvent -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109556): https://edk2.groups.io/g/devel/message/109556 Mute This Topic: https://groups.io/mt/101914668/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109553+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109553+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101816; cv=none; d=zohomail.com; s=zohoarc; b=g3dPo3Dl5J//VbJkcUmdX7soofyBKXTVa10P9WljTv9wmODP4fZ4/Woqui32shkuEZtICs0nQaP7+ZtApDrYN1QkmF5bGXp9NdyPhK6XvEss+FA/3aR3tdsFwSQmHty1kXua9ru0JbYdEUwKU2coGRv+tSU3tlpebvHBUPISs9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101816; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=mMMTCxUpcKBFnhhOkbU12T8T7vPOULrZ9Xd9spwKs/Q=; b=Ilwhil6C73lZslgn5EmkrkemL/6p2Csjoug3Qac/tpEuKYWYr6Bl1S4sltY9M2zXO+7dlvBSiYT5I0MgO6JkVFC0310NMnQN3w2910gWdUzqr8Gwva+v5TlP3a2RJXtt7ByrbNoFNnB1rcLpxsrksZBZblxaTFcN3TrRuZepkQY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109553+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101816815323.6066008698451; Thu, 12 Oct 2023 02:10:16 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=mMMTCxUpcKBFnhhOkbU12T8T7vPOULrZ9Xd9spwKs/Q=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101816; v=1; b=Cfeu2TAEo+GpxHVSBfXolqWm/1qgR9Yb3e9nBJ+Kwfq2pkRyaiwXzyJVmGWwmOy73/5h1why 4oARxBb7ca7A4+LUpNKjA0cFlRh43efUfa9yATngZ5Ce/YdZYEa//FiPPq72YNwc+k492z/p3sQ ZozgWtHXkB5aDJRXB67iQ6zM= X-Received: by 127.0.0.2 with SMTP id dWShYY1788612xcATrEZA000; Thu, 12 Oct 2023 02:10:16 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7198.1697101815910409707 for ; Thu, 12 Oct 2023 02:10:16 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-q4w8rWlPOgCCCSNFoK4GcA-1; Thu, 12 Oct 2023 05:10:11 -0400 X-MC-Unique: q4w8rWlPOgCCCSNFoK4GcA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7536F1C0653B; Thu, 12 Oct 2023 09:10:11 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9717A40C6F79; Thu, 12 Oct 2023 09:10:10 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Bibo Mao , Chao Li , Xianglai li Subject: [edk2-devel] [edk2-platforms PATCH 14/19] LoongArchQemuPkg/LsRealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:45 +0200 Message-Id: <20231012090950.108577-15-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: dljpiPEJSfa5ijh0aIeHHtZlx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101817483100024 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Build-tested only (with "Loongson.dsc"). Cc: Bibo Mao Cc: Chao Li Cc: Xianglai li Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Acked-by: Chao Li Reviewed-by: Ard Biesheuvel --- Platform/Loongson/LoongArchQemuPkg/Library/LsRealTimeClockLib/LsRealTimeCl= ockLib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Platform/Loongson/LoongArchQemuPkg/Library/LsRealTimeClockLib/= LsRealTimeClockLib.c b/Platform/Loongson/LoongArchQemuPkg/Library/LsRealTim= eClockLib/LsRealTimeClockLib.c index 4315c2074d2f..eeac011a9400 100644 --- a/Platform/Loongson/LoongArchQemuPkg/Library/LsRealTimeClockLib/LsRealT= imeClockLib.c +++ b/Platform/Loongson/LoongArchQemuPkg/Library/LsRealTimeClockLib/LsRealT= imeClockLib.c @@ -180,9 +180,10 @@ LibSetWakeupTime ( @param[in] Event The Event that is being processed @param[in] Context Event Context **/ +STATIC VOID EFIAPI -LibRtcVirtualNotifyEvent ( +VirtualNotifyEvent ( IN EFI_EVENT Event, IN VOID *Context ) @@ -325,7 +326,7 @@ LibRtcInitialize ( Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mRtcVirtualAddrChangeEvent -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109553): https://edk2.groups.io/g/devel/message/109553 Mute This Topic: https://groups.io/mt/101914663/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109552+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109552+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101816; cv=none; d=zohomail.com; s=zohoarc; b=GU2Dc54MaJ8VGEYm4kPFHS9qLzTL/nXr8IUIBedpN9D/8GvkUOmr6IrLFXe8UT0wJSweYxVJrQdcSTVl31J4tchtKR43g7zdOpEVucCarZyL8xHGv4UZ2VB9NXlga6SkgxbpnSdh5iubnZE3c1YOX56NsRje51Ah3SuVDVnzG5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101816; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=hMFebTE1/xR1J4HaGk3vPlRFui1bGwDZup8azHulrFo=; b=nejLM1vCtL4emipglh2uXHHvtTIixK1Hst6IfgqAThVNUb4as0uFY3nONolkMxWJZgja3/3gIX/BohCSVU/rUFAwYmcOyeKgH3sgQabboxNDNPumUAsd1zGXWOfe7IOE8B4L7EJzz9H7PQuFZuPih5aa74yxwYwmBcGMPKaOfOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109552+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 169710181599416.938347646477723; Thu, 12 Oct 2023 02:10:15 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=hMFebTE1/xR1J4HaGk3vPlRFui1bGwDZup8azHulrFo=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101815; v=1; b=U6PCNp+t9qCj83dLe1MzvRbRhv1ZJLWRYoNMgohVDhsydIR2zWWiaxmvTFCQehpUIPkqU9t7 968OuxD2AlBYj8zJkLCy/2X7aBQI7OXsnnspzR/PxGYnFnEz1lRO2aPQGJg6O0kgNqRQQRjXY3+ tZCu+y2hbf7ICai6A3Rf2owU= X-Received: by 127.0.0.2 with SMTP id oBA5YY1788612xC61KD9Z2jS; Thu, 12 Oct 2023 02:10:15 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7084.1697101815083784911 for ; Thu, 12 Oct 2023 02:10:15 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-nc4VWckIO-qXdWNzlIK7BA-1; Thu, 12 Oct 2023 05:10:12 -0400 X-MC-Unique: nc4VWckIO-qXdWNzlIK7BA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7484C803D6A; Thu, 12 Oct 2023 09:10:12 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id B80BE40C6F79; Thu, 12 Oct 2023 09:10:11 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [edk2-platforms PATCH 15/19] Styx/RealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:46 +0200 Message-Id: <20231012090950.108577-16-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: H660qDFFxvup27XmSJwRf9n5x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101817472100023 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Also hoist the function definition above the reference. Build-tested only (with "OverdriveBoard.dsc", "CelloBoard.dsc", "Overdrive1000Board.dsc"). Cc: Ard Biesheuvel Cc: Leif Lindholm Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c | 55 ++++++++= +----------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c b= /Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c index d15fcf031afa..052359f60b44 100644 --- a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c +++ b/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c @@ -179,6 +179,31 @@ LibSetWakeupTime ( } =20 =20 +/** + Fixup internal data so that EFI can be call in virtual mode. + Call the passed in Child Notify event and convert any pointers in + lib to virtual mode. + + @param[in] Event The Event that is being processed + @param[in] Context Event Context +**/ +STATIC +VOID +EFIAPI +VirtualNotifyEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + // + // Only needed if you are going to support the OS calling RTC functions = in virtual mode. + // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses + // to virtual address. After the OS transistions to calling in virtual m= ode, all future + // runtime calls will be made in virtual mode. + // + EfiConvertPointer (0x0, (VOID**)&mRtcIscpDxeProtocol); +} + =20 /** This is the declaration of an EFI image entry point. This can be the ent= ry point to an application @@ -218,7 +243,7 @@ LibRtcInitialize ( Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mRtcVirtualAddrChangeEvent @@ -227,31 +252,3 @@ LibRtcInitialize ( =20 return Status; } - - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - // - // Only needed if you are going to support the OS calling RTC functions = in virtual mode. - // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses - // to virtual address. After the OS transistions to calling in virtual m= ode, all future - // runtime calls will be made in virtual mode. - // - EfiConvertPointer (0x0, (VOID**)&mRtcIscpDxeProtocol); -} - - - -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109552): https://edk2.groups.io/g/devel/message/109552 Mute This Topic: https://groups.io/mt/101914661/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109558+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109558+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101827; cv=none; d=zohomail.com; s=zohoarc; b=hBgG1oeJ7cGQ/z9IuFRJDapCjjbGezxqU9ZBVhMwXNePPosVCfLd9RZCqvC7NfYPV4KmocnLoW9jYjVlz+i8VYseziZZZcoLF48IrRnZ2g+0pHE5Mn60oYVJpono1sdp7Kpl7bukIQtS7n8Ieki09UPKHmqpRBgIGqJI9+CWs7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101827; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=cjafZA75drEoe6qDeZzA2lBUfEXlm+hLxpZFKPPozSU=; b=NQ9PU7CmTtVxQTlPq+Emz0oMf0uHs819AgepJXgV3UkZ6ppCmrbeTAytRwZtBHjr+88Cj0/rXffJLLGEhDcAUA6FuRKC/6Ea2dW1JtJY4aZuJhzh0Y9uf6VjR05drHr1k+wG+wCrP48uLP+AejL6gm8G1NtVM14PfruooYKB7rk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109558+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101827180524.4811488110034; Thu, 12 Oct 2023 02:10:27 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=cjafZA75drEoe6qDeZzA2lBUfEXlm+hLxpZFKPPozSU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101826; v=1; b=HqwCQhk3Lu2h15fv+t0V8sgcaSsOA2BcjfITICYxK196SLtMhAJMNTGQKZpQy8yA7fZGXVeh BWwfhjEj7A8MdKVxFDCC5jBc3Sjcam6w8VYhLG1cq/ioXyQZO38HoRUQuyav2Vw1/zTH2WvhIuL yrcRs2qwQMfv77y+k7/VdPFA= X-Received: by 127.0.0.2 with SMTP id bliKYY1788612xCA3LQfqGnX; Thu, 12 Oct 2023 02:10:26 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7095.1697101826311188439 for ; Thu, 12 Oct 2023 02:10:26 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-153-2qoPcJREMLqH5U76uHRt_g-1; Thu, 12 Oct 2023 05:10:13 -0400 X-MC-Unique: 2qoPcJREMLqH5U76uHRt_g-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73844811E7E; Thu, 12 Oct 2023 09:10:13 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id B713740C6F79; Thu, 12 Oct 2023 09:10:12 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Leif Lindholm , Marcin Wojtas Subject: [edk2-devel] [edk2-platforms PATCH 16/19] Armada7k8k/RealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:47 +0200 Message-Id: <20231012090950.108577-17-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: gakDZFo23Iy7kR4soYEiosgix1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101827612100014 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Also hoist the function definition above the reference. Build-tested only, with the following platforms: - Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc - Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc - Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc - Platform/SolidRun/Cn913xCEx7Eval/Cn913xCEx7Eval.dsc ("Platform/Marvell/Cn913xDb/Cn913xDbA.dsc" fails to build regardless: "build" complains that "Silicon/Marvell/OcteonTx/DeviceTree/T91/$(PLATFORM_NAME).inf" is missing, and as far as I can see, not even the "Silicon/Marvell/OcteonTx/DeviceTree" directory exists.) Cc: Leif Lindholm Cc: Marcin Wojtas Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Marcin Wojtas --- Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c | 5= 2 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeCl= ockLib.c b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeCloc= kLib.c index 49c9385d53d6..d538b030b111 100644 --- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c +++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c @@ -205,6 +205,31 @@ LibSetWakeupTime ( return EFI_SUCCESS; } =20 +/** + Fixup internal data so that EFI can be call in virtual mode. + Call the passed in Child Notify event and convert any pointers in + lib to virtual mode. + + @param[in] Event The Event that is being processed + @param[in] Context Event Context +**/ +STATIC +VOID +EFIAPI +VirtualNotifyEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + // + // Only needed if you are going to support the OS calling RTC functions = in virtual mode. + // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses + // to virtual address. After the OS transistions to calling in virtual m= ode, all future + // runtime calls will be made in virtual mode. + // + EfiConvertPointer (0x0, (VOID**)&mArmadaRtcBase); +} + /** This is the declaration of an EFI image entry point. This can be the ent= ry point to an application written to this specification, an EFI boot service driver, or an EFI run= time driver. @@ -285,7 +310,7 @@ LibRtcInitialize ( Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mRtcVirtualAddrChangeEvent @@ -304,28 +329,3 @@ ErrSetMem: =20 return Status; } - - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - // - // Only needed if you are going to support the OS calling RTC functions = in virtual mode. - // You will need to call EfiConvertPointer (). To convert any stored phy= sical addresses - // to virtual address. After the OS transistions to calling in virtual m= ode, all future - // runtime calls will be made in virtual mode. - // - EfiConvertPointer (0x0, (VOID**)&mArmadaRtcBase); -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109558): https://edk2.groups.io/g/devel/message/109558 Mute This Topic: https://groups.io/mt/101914670/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109555+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109555+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101820; cv=none; d=zohomail.com; s=zohoarc; b=QqOWB9kAl4CtTz1N4abspCMD/CcRqOK6aIxJxgm1+hHtcNyQXOj3O7RsrTMfO1GwOzmLTmrHZmTXFqos6rjJW8nmNARNK5McLngI9ZvmZMvABcJ3+c889Bo7XzpwUxPryQgQM4Bb4IL4TIcmCzCHpYqAGLIub5H5w7niC+dZc0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101820; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=vmBJn2ilIbCSPUgUplLO6ir60U1N0/4wXZTT54/695M=; b=nuaQyOU996ivmaNuUoyEL5sxc54ypuUZMr9FcWdSONODtH3PuE9pj1j9+1GCAoVJ8r+/sVD6OFkqTu+2TI1mItsJgVTLNRWsqADVhPIuahDjs5rw5xlYLZ0w0e469EfCwP+IB6eFO5MlpRIxLrdB60e6WIkPNxVvmceivQ+99Ek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109555+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101820942829.9128475964658; Thu, 12 Oct 2023 02:10:20 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=vmBJn2ilIbCSPUgUplLO6ir60U1N0/4wXZTT54/695M=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101820; v=1; b=twJ6Ig9LrH2JS+NX0EnmEedC9CxuzjXmn/0HSBz9sA1vjL+0maOItYKrH1gurvmzfrxFMj0O yFEBqSZ52PtZRPzJAXCC2VAFuMpzssKMQJHiAndaYlaCMN4es5NGjMria9eEPA8zgfxWXnwccsx fnOWrTZ/XCYK0b7StCKe20kk= X-Received: by 127.0.0.2 with SMTP id JK2hYY1788612xFYotVm0u35; Thu, 12 Oct 2023 02:10:20 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.7089.1697101819918631966 for ; Thu, 12 Oct 2023 02:10:20 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-P1w769sRPMuEf05A5hePJQ-1; Thu, 12 Oct 2023 05:10:15 -0400 X-MC-Unique: P1w769sRPMuEf05A5hePJQ-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B81B28030CB; Thu, 12 Oct 2023 09:10:14 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id B634840C6F79; Thu, 12 Oct 2023 09:10:13 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Masami Hiramatsu , Meenakshi Aggarwal Subject: [edk2-devel] [edk2-platforms PATCH 17/19] NXP/Pcf8563RealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:48 +0200 Message-Id: <20231012090950.108577-18-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Ku5kZ6XXL5wqwPb6h0PsE4k2x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101821524100002 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Build-tested only (with "DeveloperBox.dsc"). Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Masami Hiramatsu Cc: Meenakshi Aggarwal Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c | 5 = +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClo= ckLib.c b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockL= ib.c index b79ea89fea0f..ac68c0396776 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c @@ -339,9 +339,10 @@ I2cMasterRegistrationEvent ( @param[in] Event The Event that is being processed @param[in] Context Event Context **/ +STATIC VOID EFIAPI -LibRtcVirtualNotifyEvent ( +VirtualNotifyEvent ( IN EFI_EVENT Event, IN VOID *Context ) @@ -394,7 +395,7 @@ LibRtcInitialize ( // Register for the virtual address change event // Status =3D gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, NULL, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mRtcVirtualAddrChangeEvent); ASSERT_EFI_ERROR (Status); -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109555): https://edk2.groups.io/g/devel/message/109555 Mute This Topic: https://groups.io/mt/101914667/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109557+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109557+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101826; cv=none; d=zohomail.com; s=zohoarc; b=en6XAG/rZN/GKk3q3FKuyQ6AKxDCNhAN2QPmC4n9E4F0LqVGCE8VE7t5fITgXS/o7PQsuU+Ft1AwpB9xmCWRICPTR0JTVVnDWPbPQ4DMWWmOWXqOcYInxX98U7bjwCudTLYUteQd2Aq5D5NVWLq+TLM2BoWgfYI+nc1zDcqmNZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101826; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=asG8vasis1U2cLr6M/edICoPUP6unHTuobJcMOJOW/8=; b=WhsI/UE8fN2TMyXMgPrUg4app30O6EtK6lYczzvRqi8fAvPryRvrjJCMQSw1FPK12KbZpwX9GrsaYmuRgJ+balm/RHCC3WzXCYPKlA4Z95R/CjFfgI9OC665gkrX4lZRpWm8jYYQov7ws34tHalHDFfS9X3ASVgR5HWIPMHqn0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109557+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101826570170.31092989826766; Thu, 12 Oct 2023 02:10:26 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=asG8vasis1U2cLr6M/edICoPUP6unHTuobJcMOJOW/8=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101826; v=1; b=jklKVv16++3RjcdRi6oTBqeLWOhk1b7jNm/LZP0qvx5fsDXoKiKHODiGrOic55s7CPe+byvg OTfeo8e4y424qzHoCM44m0eQ/ynLVvJEg7EEWd34SOOA1FDGHg08ucxHcJ50gKqzQDrDDIdxY6q RXENulXvoO2w50ZcDZZGKIe8= X-Received: by 127.0.0.2 with SMTP id AAQsYY1788612x8gsOfhdGx0; Thu, 12 Oct 2023 02:10:26 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7203.1697101825610919617 for ; Thu, 12 Oct 2023 02:10:25 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-WNZlyLI4PYiE9XWBxLso2Q-1; Thu, 12 Oct 2023 05:10:16 -0400 X-MC-Unique: WNZlyLI4PYiE9XWBxLso2Q-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0897B800045; Thu, 12 Oct 2023 09:10:16 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 067A940C6F79; Thu, 12 Oct 2023 09:10:14 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Leif Lindholm , Ling Jia , Peng Xie , Yiqi Shu Subject: [edk2-devel] [edk2-platforms PATCH 18/19] FT2000-4Pkg/RealTimeClockLib: hide LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:49 +0200 Message-Id: <20231012090950.108577-19-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Ned1MMXqwEIeY19Qnwj6whf7x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101827588100013 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. Rename LibRtcVirtualNotifyEvent() to VirtualNotifyEvent(), and make it static, in preparation for removing the LibRtcVirtualNotifyEvent() declaration from the lib class header later. Build-tested only (with "DurianPkg.dsc"). Cc: Leif Lindholm Cc: Ling Jia Cc: Peng Xie Cc: Yiqi Shu Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.c | = 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeC= lockLib.c b/Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeCl= ockLib.c index 1c88958e3bb7..5c3d0cdccff8 100644 --- a/Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib= .c +++ b/Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib= .c @@ -307,9 +307,10 @@ LibSetWakeupTime ( @param[in] Context Event Context =20 **/ +STATIC VOID EFIAPI -LibRtcVirtualNotifyEvent ( +VirtualNotifyEvent ( IN EFI_EVENT Event, IN VOID *Context ) @@ -452,7 +453,7 @@ LibRtcInitialize ( Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, - LibRtcVirtualNotifyEvent, + VirtualNotifyEvent, NULL, &gEfiEventVirtualAddressChangeGuid, &mRtcVirtualAddrChangeEvent -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109557): https://edk2.groups.io/g/devel/message/109557 Mute This Topic: https://groups.io/mt/101914669/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 13:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109554+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109554+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101820; cv=none; d=zohomail.com; s=zohoarc; b=byU/QjZoRbrkx/QTFIKp4lah91V3jMNp4Sha9Qum/FKsmmrDvaGEPCCxgWag7EEucI7qmZWKn0y7PXTkLoNF7Q9Ai+GymNbHVjDtRmvgdgLtBPnbyoX29mdiZdiISOsoyaDcvTOh19e9Wewoo1zpuw+Wt0Iy09K2hZVxCU3xp44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101820; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=IWVOS45U3+WhigPeWvZzjmHcySODxu63eEbkb7RqlzM=; b=ZsD8/JWBdE8vaABmtqmrcNhLg1n0GrsHrrMhiMIcc2ee52+aj+mgG8FOh+PWYYgih4+ZcnO+X5muU2qIsSDVmVVIEEN8mN+Go+/jZ5rLRuts1RDZoB1AJvFZDTIjAIWELfMwg1ePq/5HzgxWrOB49vCsOVLaEVfuadQfPdskbKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109554+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101820439318.51319508442555; Thu, 12 Oct 2023 02:10:20 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=IWVOS45U3+WhigPeWvZzjmHcySODxu63eEbkb7RqlzM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101820; v=1; b=dlKVlIiZxLYr4dUehA1rddGIH7MofyqD7wYwjfeFJrPfbKdBHX3Ydjv55qrgpausc2+q78o2 PKyYJHRHk8ECLo1zJqHcdrfvGS2XMP0azsVUeMj8ZYNJ2RssrQjOebtx3jgZ2UkSTBC+ac1n+lq n9TZJFR7oxzl6zKwYr3yvwNU= X-Received: by 127.0.0.2 with SMTP id f6IMYY1788612xXqxSVkXRiZ; Thu, 12 Oct 2023 02:10:20 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7088.1697101819585228692 for ; Thu, 12 Oct 2023 02:10:19 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-pV6MEVNbPfS9gxhRWjN8RA-1; Thu, 12 Oct 2023 05:10:17 -0400 X-MC-Unique: pV6MEVNbPfS9gxhRWjN8RA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08D06101A529; Thu, 12 Oct 2023 09:10:17 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B63740C6F79; Thu, 12 Oct 2023 09:10:16 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [edk2-platforms PATCH 19/19] Omap35xxPkg/RealTimeClockLib: drop LibRtcVirtualNotifyEvent Date: Thu, 12 Oct 2023 11:09:50 +0200 Message-Id: <20231012090950.108577-20-lersek@redhat.com> In-Reply-To: <20231012090950.108577-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012090950.108577-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: cf60b4MgpGiGjVsV76iXd1cSx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101821522100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The RealTimeClockLib class header in edk2 mistakenly declares a function called LibRtcVirtualNotifyEvent(). No component ever calls this function crossing module boundaries; all RealTimeClockLib instances in edk2 and edk2-platforms are supposed to register (and do register) their SetVirtualAddressMap() notification functions. In particular, Omap35xxPkg/RealTimeClockLib *itself* doesn't even use LibRtcVirtualNotifyEvent() -- the function is defined with an empty body, clearly in an understandable, but misguided, attempt, to conform to the (bogus) library interface. Remove the function. Build-tested only (with "BeagleBoardPkg.dsc"). Cc: Ard Biesheuvel Cc: Leif Lindholm Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel --- Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTimeCloc= kLib.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/= RealTimeClockLib.c b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeC= lockLib/RealTimeClockLib.c index ddde1868ac01..10920a13786b 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTim= eClockLib.c +++ b/Silicon/TexasInstruments/Omap35xxPkg/Library/RealTimeClockLib/RealTim= eClockLib.c @@ -271,21 +271,3 @@ LibRtcInitialize ( =20 return Status; } - -/** - Fixup internal data so that EFI can be call in virtual mode. - Call the passed in Child Notify event and convert any pointers in - lib to virtual mode. - - @param[in] Event The Event that is being processed - @param[in] Context Event Context -**/ -VOID -EFIAPI -LibRtcVirtualNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - return; -} -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109554): https://edk2.groups.io/g/devel/message/109554 Mute This Topic: https://groups.io/mt/101914666/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-