From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242])
 by mx.groups.io with SMTP id smtpd.web12.1529.1668480883653846654
 for <devel@edk2.groups.io>;
 Mon, 14 Nov 2022 18:54:45 -0800
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=kPojHEKh;
 spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from walk.intel-email.com (localhost [127.0.0.1])
	by walk.intel-email.com (Postfix) with ESMTP id A336ACD1F7D4
	for <devel@edk2.groups.io>; Tue, 15 Nov 2022 10:54:40 +0800 (CST)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn;
	s=cloud-union; t=1668480880;
	bh=4y2rNq/5HjPIDR/vOCUPzT0H0RdjyWPIxKyDonoY0Qo=;
	h=From:To:Cc:References:In-Reply-To:Subject:Date;
	b=kPojHEKh98z6dFfDrKhmJWIDf7c2++0vQfvBoFtAIYcloeFbLYRJyXHIOMWsyV3V+
	 rGvqOStkx5SWLz2ubvVkByjXxawkuDe8HRnPkRq8fioOPQ4ptfuVMQuKhjpbc1NvuG
	 tNdsyJOOVBp6Gwkn5DtafccMFlizou/yEsKJ4EIA=
Received: from localhost (localhost [127.0.0.1])
	by walk.intel-email.com (Postfix) with ESMTP id 9EF13CD1F6D1
	for <devel@edk2.groups.io>; Tue, 15 Nov 2022 10:54:40 +0800 (CST)
Received: from walk.intel-email.com (localhost [127.0.0.1])
	by walk.intel-email.com (Postfix) with ESMTP id 7736BCD1F6A4
	for <devel@edk2.groups.io>; Tue, 15 Nov 2022 10:54:40 +0800 (CST)
Authentication-Results: walk.intel-email.com; none
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
	by walk.intel-email.com (Postfix) with SMTP id 1184CCD1F7BC
	for <devel@edk2.groups.io>; Tue, 15 Nov 2022 10:54:37 +0800 (CST)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <ardb@kernel.org>; Tue, 15 Nov 2022 10:54:32 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-Originating-IP: 58.246.60.130
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<ardb@kernel.org>,
	<Pierre.Gondois@arm.com>
Cc: "'Ard Biesheuvel'" <ardb+tianocore@kernel.org>,
	"'Leif Lindholm'" <leif@nuviainc.com>,
	"'Sami Mujawar'" <sami.mujawar@arm.com>
References: <20221114144347.1664317-1-Pierre.Gondois@arm.com> <CAMj1kXGh8h8qwONy0_4Cikjg=bUhBEgrB5oJEiAKZOvqrmt=Yg@mail.gmail.com>
In-Reply-To: <CAMj1kXGh8h8qwONy0_4Cikjg=bUhBEgrB5oJEiAKZOvqrmt=Yg@mail.gmail.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIDEvMV1bZWRrMi1zdGFibGUyMDIyMTFdIEFybVBrZy9Bcm1Ucm5nTGliOiBSZW1vdmUgQVNTRVJUIGluIEdldEFybVRybmdWZXJzaW9uKCk=?=
Date: Tue, 15 Nov 2022 10:54:32 +0800
Message-ID: <010601d8f89d$96deb000$c49c1000$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQEvOXqpZMdmV+Z0NEbEaBaAGsUUFgIXrGunr4IKnwA=
Sender: "gaoliming" <gaoliming@byosoft.com.cn>
Content-Type: text/plain;
	charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Ard:
  I am OK to merge it for this stable tag. I will do it.=20

Thanks
Liming
> -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6-----
> =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io <devel@edk2.groups.io> =
=E4=BB=A3=E8=A1=A8 Ard
> Biesheuvel
> =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2022=E5=B9=B411=E6=9C=8814=E6=97=A5=
 23:10
> =E6=94=B6=E4=BB=B6=E4=BA=BA: Pierre.Gondois@arm.com
> =E6=8A=84=E9=80=81: devel@edk2.groups.io; Ard Biesheuvel <ardb+tianocore@=
kernel.org>;
> Leif Lindholm <leif@nuviainc.com>; Sami Mujawar
> <sami.mujawar@arm.com>; Liming Gao <gaoliming@byosoft.com.cn>
> =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH 1/1][edk2-stable202211] ArmPk=
g/ArmTrngLib:
> Remove ASSERT in GetArmTrngVersion()
>=20
> On Mon, 14 Nov 2022 at 15:44, <Pierre.Gondois@arm.com> wrote:
> >
> > From: Pierre Gondois <pierre.gondois@arm.com>
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4150
> >
> > GetArmTrngVersion() is used to check the presence of an Arm
> > Trng. If not found, an ASSERT prevents from booting in DEBUG
> > builds.
> > Remove this ASSERT.
> >
> > Reported-by: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
>=20
> Acked-by: Ard Biesheuvel <ardb@kernel.org>
>=20
> Liming: please merge this if you are ok with it, or I can merge it if
> you prefer.
>=20
> > ---
> >  ArmPkg/Library/ArmTrngLib/ArmTrngLib.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
> b/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
> > index fdabc02cd39c..3278722320c8 100644
> > --- a/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
> > +++ b/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
> > @@ -344,7 +344,6 @@ ArmTrngLibConstructor (
> >
> >    Status =3D GetArmTrngVersion (&MajorRev, &MinorRev);
> >    if (RETURN_ERROR (Status)) {
> > -    ASSERT_RETURN_ERROR (Status);
> >      goto ErrorHandler;
> >    }
> >
> > --
> > 2.25.1
> >
>=20
>=20
>=20
>=20