<html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> Hi All, I have pushed this change to edk2 master at cfa6ffb113f2..e1999b264f1f Regards, Sami Mujawar <div class="moz-cite-prefix">On 27/05/2021 10:19 AM, Sami Mujawar via groups.io wrote: </div> <blockquote type="cite" cite="mid:1682E1EE63CD4105.7325@groups.io"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> <div class="WordSection1"> Hi Laszlo, Liming,<o:p></o:p> <o:p> </o:p> Apologies for not doing it earlier. I was not sure if it was within my right to merge the change.<o:p></o:p> I will merge this in the next 2 hours.<o:p></o:p> <o:p> </o:p> Regards,<o:p></o:p> <o:p> </o:p> Sami Mujawar<o:p></o:p> <o:p> </o:p> <o:p> </o:p> <div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm"> From: Laszlo Ersek <a class="moz-txt-link-rfc2396E" href="mailto:lersek@redhat.com"><lersek@redhat.com></a> Date: Thursday, 27 May 2021 at 09:50 To: gaoliming <a class="moz-txt-link-rfc2396E" href="mailto:gaoliming@byosoft.com.cn"><gaoliming@byosoft.com.cn></a>, <a class="moz-txt-link-abbreviated" href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <a class="moz-txt-link-rfc2396E" href="mailto:devel@edk2.groups.io"><devel@edk2.groups.io></a>, Sami Mujawar <a class="moz-txt-link-rfc2396E" href="mailto:Sami.Mujawar@arm.com"><Sami.Mujawar@arm.com></a> Cc: <a class="moz-txt-link-abbreviated" href="mailto:ardb@kernel.org">ardb@kernel.org</a> <a class="moz-txt-link-rfc2396E" href="mailto:ardb@kernel.org"><ardb@kernel.org></a>, <a class="moz-txt-link-abbreviated" href="mailto:leif@nuviainc.com">leif@nuviainc.com</a> <a class="moz-txt-link-rfc2396E" href="mailto:leif@nuviainc.com"><leif@nuviainc.com></a>, Matteo Carlini <a class="moz-txt-link-rfc2396E" href="mailto:Matteo.Carlini@arm.com"><Matteo.Carlini@arm.com></a>, Andreas Sandberg <a class="moz-txt-link-rfc2396E" href="mailto:Andreas.Sandberg@arm.com"><Andreas.Sandberg@arm.com></a>, Joey Gouly <a class="moz-txt-link-rfc2396E" href="mailto:Joey.Gouly@arm.com"><Joey.Gouly@arm.com></a>, nd <a class="moz-txt-link-rfc2396E" href="mailto:nd@arm.com"><nd@arm.com></a> Subject: Re: 回复: [edk2-devel] [edk2-devel202105 PATCH v2 1/1] ArmPkg/ArmGic: Fix maximum number of interrupts in GICv3<o:p></o:p> </div> <div> Hi Liming, On 05/27/21 04:32, gaoliming wrote: > If no objection, I will merge this patch today. Then, tomorrow, I will create stable tag 202105. yes, please do that -- TBH, I thought Sami would merge it sooner, as Sami does have maintainer access through DynamicTablesPkg and StandaloneMmPkg. Thanks! Laszlo > > Thanks > Liming >> -----邮件原件----- >> 发件人: <a class="moz-txt-link-abbreviated" href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <a class="moz-txt-link-rfc2396E" href="mailto:devel@edk2.groups.io"><devel@edk2.groups.io></a> 代表 gaoliming >> 发送时间: 2021年5月26日 10:22 >> 收件人: <a class="moz-txt-link-abbreviated" href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; <a class="moz-txt-link-abbreviated" href="mailto:lersek@redhat.com">lersek@redhat.com</a>; >> <a class="moz-txt-link-abbreviated" href="mailto:sami.mujawar@arm.com">sami.mujawar@arm.com</a> >> 抄送: <a class="moz-txt-link-abbreviated" href="mailto:ardb@kernel.org">ardb@kernel.org</a>; <a class="moz-txt-link-abbreviated" href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:Matteo.Carlini@arm.com">Matteo.Carlini@arm.com</a>; >> <a class="moz-txt-link-abbreviated" href="mailto:Andreas.Sandberg@arm.com">Andreas.Sandberg@arm.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:joey.gouly@arm.com">joey.gouly@arm.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:nd@arm.com">nd@arm.com</a> >> 主题: 回复: [edk2-devel] [edk2-devel202105 PATCH v2 1/1] ArmPkg/ArmGic: >> Fix maximum number of interrupts in GICv3 >> >> Laszlo, Ard, Sami: >> I am OK to merge this patch for stable tag 202105. >> >> Thanks >> Liming >>> -----邮件原件----- >>> 发件人: <a class="moz-txt-link-abbreviated" href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <a class="moz-txt-link-rfc2396E" href="mailto:devel@edk2.groups.io"><devel@edk2.groups.io></a> 代表 Laszlo >> Ersek >>> 发送时间: 2021年5月25日 19:55 >>> 收件人: <a class="moz-txt-link-abbreviated" href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; <a class="moz-txt-link-abbreviated" href="mailto:sami.mujawar@arm.com">sami.mujawar@arm.com</a> >>> 抄送: <a class="moz-txt-link-abbreviated" href="mailto:ardb@kernel.org">ardb@kernel.org</a>; <a class="moz-txt-link-abbreviated" href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:Matteo.Carlini@arm.com">Matteo.Carlini@arm.com</a>; >>> <a class="moz-txt-link-abbreviated" href="mailto:Andreas.Sandberg@arm.com">Andreas.Sandberg@arm.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:joey.gouly@arm.com">joey.gouly@arm.com</a>; <a class="moz-txt-link-abbreviated" href="mailto:nd@arm.com">nd@arm.com</a> >>> 主题: Re: [edk2-devel] [edk2-devel202105 PATCH v2 1/1] ArmPkg/ArmGic: >>> Fix maximum number of interrupts in GICv3 >>> >>> Hi Sami, >>> >>> On 05/24/21 15:01, Sami Mujawar wrote: >>>> From: Andreas Sandberg <a class="moz-txt-link-rfc2396E" href="mailto:andreas.sandberg@arm.com"><andreas.sandberg@arm.com></a> >>>> >>>> Bugzilla: 3415 (<a href="https://bugzilla.tianocore.org/show_bug.cgi?id=3415" moz-do-not-send="true">https://bugzilla.tianocore.org/show_bug.cgi?id=3415</a>) >>>> >>>> The GICv3 architecture supports up to 1020 ordinary interrupt >>>> lines. The actual number of interrupts supported is described by the >>>> ITLinesNumber field in the GICD_TYPER register. The total number of >>>> implemented registers is normally calculated as >>>> 32*(ITLinesNumber+1). However, maximum value (0x1f) is a special case >>>> since that would indicate that 1024 interrupts are implemented. >>>> >>>> Add handling for this special case in ArmGicGetMaxNumInterrupts. >>>> >>>> Signed-off-by: Andreas Sandberg <a class="moz-txt-link-rfc2396E" href="mailto:andreas.sandberg@arm.com"><andreas.sandberg@arm.com></a> >>>> Signed-off-by: Joey Gouly <a class="moz-txt-link-rfc2396E" href="mailto:joey.gouly@arm.com"><joey.gouly@arm.com></a> >>>> Signed-off-by: Sami Mujawar <a class="moz-txt-link-rfc2396E" href="mailto:sami.mujawar@arm.com"><sami.mujawar@arm.com></a> >>>> Reviewed-by: Ard Biesheuvel <a class="moz-txt-link-rfc2396E" href="mailto:ardb@kernel.org"><ardb@kernel.org></a> >>>> --- >>>> The changes can be seen at: >>>> <a href="https://github.com/samimujawar/edk2/tree/1396_gic_max_num_intr_v2" moz-do-not-send="true"> https://github.com/samimujawar/edk2/tree/1396_gic_max_num_intr_v2</a> >>>> >>>> Notes: >>>> v2: >>>> - Fix comment style. >>> [Laszlo] >>>> - Updated comment style. >>> [Sami] >>>> >>>> ArmPkg/Drivers/ArmGic/ArmGicLib.c | 11 +++++++++-- >>>> 1 file changed, 9 insertions(+), 2 deletions(-) >>> >>> I think this patch should be merged really soon, as long as Ard agrees. >>> >>> Thanks, >>> Laszlo >>> >>>> >>>> diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c >>> b/ArmPkg/Drivers/ArmGic/ArmGicLib.c >>>> index >>> >> 6b01c88206ad8adef3100dd44c0d57660db77783..bd4b5edb903f3846f4f0e43 >>> 1f93e001f01cd9e7d 100644 >>>> --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c >>>> +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c >>>> @@ -1,6 +1,6 @@ >>>> /** @file >>>> * >>>> -* Copyright (c) 2011-2018, ARM Limited. All rights reserved. >>>> +* Copyright (c) 2011-2021, Arm Limited. All rights reserved. >>>> * >>>> * SPDX-License-Identifier: BSD-2-Clause-Patent >>>> * >>>> @@ -120,7 +120,14 @@ ArmGicGetMaxNumInterrupts ( >>>> IN INTN GicDistributorBase >>>> ) >>>> { >>>> - return 32 * ((MmioRead32 (GicDistributorBase + ARM_GIC_ICDICTR) & >>> 0x1F) + 1); >>>> + UINTN ItLines; >>>> + >>>> + ItLines = MmioRead32 (GicDistributorBase + ARM_GIC_ICDICTR) & >>> 0x1F; >>>> + >>>> + // >>>> + // Interrupt ID 1020-1023 are reserved. >>>> + // >>>> + return (ItLines == 0x1f) ? 1020 : 32 * (ItLines + 1); >>>> } >>>> >>>> VOID >>>> >>> >>> >>> >>> >>> >> >> >> >> >> >> >> > > > <o:p></o:p> </div> </div> </blockquote> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/75795">View/Reply Online (#75795)</a> | | <a target="_blank" href="https://groups.io/mt/83116958/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>