[AMD Official Use Only - General] Hi Hao, Thank you for your review. I already created a pull request for this commit, may I know how to proceed to merge it into master? https://github.com/tianocore/edk2/pull/4424 Regards, Neo ________________________________ From: Wu, Hao A Sent: Thursday, June 1, 2023 10:14 PM To: He, Jiangang ; devel@edk2.groups.io ; Hsueh, Hong-Chih (Neo) Cc: Chang, Abner Subject: RE: [edk2-devel] [PATCH] MdeModulePkg: Fix port multiplier port in AhciPei PEIM [AMD Official Use Only - General] Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. Thanks. Reviewed-by: Hao A Wu Best Regards, Hao Wu > -----Original Message----- > From: He, Jiangang > Sent: Wednesday, May 31, 2023 10:49 PM > To: Wu, Hao A ; devel@edk2.groups.io; Hsueh, Hong- > Chih (Neo) > Cc: Chang, Abner > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg: Fix port multiplier port in > AhciPei PEIM > > [AMD Official Use Only - General] > > We did crisis recovery and Opal HD password unlock from S3 resume from > SATA HD test on two different version of AHCI host controllers. > > Thanks, > Jiangang > -----Original Message----- > From: Wu, Hao A > Sent: Tuesday, May 30, 2023 10:30 PM > To: devel@edk2.groups.io; Hsueh, Hong-Chih (Neo) Chih.Hsueh@amd.com> > Cc: He, Jiangang ; Chang, Abner > > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg: Fix port multiplier port in > AhciPei PEIM > > Caution: This message originated from an External Source. Use proper > caution when opening attachments, clicking links, or responding. > > > Thanks, the code changes look good to me. > May I know what tests have been performed for the patch? > > Best Regards, > Hao Wu > > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Neo > > Hsueh via groups.io > > Sent: Wednesday, May 24, 2023 1:07 AM > > To: devel@edk2.groups.io > > Cc: jiangang.he@amd.com; abner.chang@amd.com; Neo Hsueh > Chih.Hsueh@amd.com> > > Subject: [edk2-devel] [PATCH] MdeModulePkg: Fix port multiplier port > > in AhciPei PEIM > > > > If there is no port multiplier, PortMultiplierPort should be converted > > to 0 to follow AHCI spec. > > The same logic already applied in AtaAtapiPassThruDxe driver. > > > > Signed-off-by: Neo Hsueh > > --- > > MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c > > b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c > > index cd55272c96..7bd04661d0 100644 > > --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c > > +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c > > @@ -3,6 +3,7 @@ > > mode at PEI phase. > > > > Copyright (c) 2019, Intel Corporation. All rights reserved.
> > + Copyright (C) 2023 Advanced Micro Devices, Inc. All rights > > + reserved.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > @@ -92,6 +93,15 @@ AhciPassThruExecute ( { > > EFI_STATUS Status; > > > > + if (PortMultiplierPort == 0xFFFF) { > > + // > > + // If there is no port multiplier, PortMultiplierPort will be 0xFFFF > > + // according to UEFI spec. Here, we convert its value to 0 to follow > > + // AHCI spec. > > + // > > + PortMultiplierPort = 0; > > + } > > + > > switch (Packet->Protocol) { > > case EFI_ATA_PASS_THRU_PROTOCOL_ATA_NON_DATA: > > Status = AhciNonDataTransfer ( > > -- > > 2.40.0.windows.1 > > > > > > > > > >