From nobody Mon Feb 9 18:18:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60879+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60879+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1591631872; cv=none; d=zohomail.com; s=zohoarc; b=Yq+PZrggMHNkyuwg+x6YWekvLf70h3ItKNwm5Z5xDYaaznGt12pWLj+Vt1rG22eV9I7saiRqVcggJW/Xyp4euQhaYRt4YB6DkTqtv7jY60hjl7gx+eA96iNamfRedIyCK/KZJfqnG4T4zSe85bzj6kuECNA7Yv0sZTO7nU1g9go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591631872; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OyWPPxRdwjyKNORqC1tV1ml1E8pfAiiB0TKwYtaQB7I=; b=Vwd1C5uWa24C3ccvggpNT+YDZWw0FykO7gaX8tduJJpq+fW1Z/ZsrdqzEpZwo/DHvB5j9WHiJLgvY0MpmN85Yy+In16UINg+uNlkpy8eZBr5DOhXSFB2anK8oSZjAfxVneiz8hlGa8O+UfOLJUhyOhCBxQ1DgMz5iK1dyfGFV0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60879+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1591631872048838.3600986441595; Mon, 8 Jun 2020 08:57:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id DK3fYY1788612xknne5PD5xB; Mon, 08 Jun 2020 08:57:51 -0700 X-Received: from huawei.com (huawei.com [45.249.212.191]) by mx.groups.io with SMTP id smtpd.web12.30715.1591625555082976771 for ; Mon, 08 Jun 2020 07:12:35 -0700 X-Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 38CF84FC0021F1C97C4F; Mon, 8 Jun 2020 22:12:33 +0800 (CST) X-Received: from HGH1000039998.huawei.com (10.184.68.188) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Mon, 8 Jun 2020 22:12:23 +0800 From: "Ming Huang" To: , , CC: , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 2/2] Silicon/Hisilicon/Smbios: Optimize type 9 Date: Mon, 8 Jun 2020 22:09:57 +0800 Message-ID: <1591625397-82711-3-git-send-email-huangming23@huawei.com> In-Reply-To: <1591625397-82711-1-git-send-email-huangming23@huawei.com> References: <1591625397-82711-1-git-send-email-huangming23@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: 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,huangming23@huawei.com X-Gm-Message-State: XyRVe8UlG1fUPlnnAABXLyfsx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591631871; bh=K5U94VWh/5zTwKJ76s123Ed69newF/TWFAEBHohRsxI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=VlpwvZdMANBxie1O+L+7zoJaZeuDaxG7cViij79tfb4cpZ91flbCCTzxh2+F3Mrbao/ 0jzomy04Rq799U1hpPuuFkDOac1QlHWc43NhZGFXytzoxIOiEUvEppm8jJoX5uKAbtiB2 r+A14nNEnvO9vYfDZ38WiULKet7JUm0GLmE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Break down AddSmbiosType9Entry to three funtions for optimizing Smbios type 9. Signed-off-by: Ming Huang Reviewed-by: Leif Lindholm --- Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c | 173 +++= ++++++++--------- 1 file changed, 95 insertions(+), 78 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9= .c b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c index 2398c6b..57e049a 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c +++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c @@ -75,38 +75,16 @@ UpdateSmbiosType9Info ( return; } =20 -EFI_STATUS -EFIAPI -AddSmbiosType9Entry ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable +STATIC +VOID +EmptySmbiosType9 ( + EFI_SMBIOS_PROTOCOL *Smbios ) { EFI_STATUS Status; EFI_SMBIOS_TYPE SmbiosType; EFI_SMBIOS_HANDLE SmbiosHandle; - EFI_SMBIOS_PROTOCOL *Smbios; EFI_SMBIOS_TABLE_HEADER *Record; - SMBIOS_TABLE_TYPE9 *Type9Record; - SMBIOS_TABLE_TYPE9 *SmbiosRecord =3D NULL; - CHAR8 *OptionalStrStart; - - UINT8 SmbiosAddType9Number; - UINT8 Index; - - CHAR16 *SlotDesignation =3D NULL; - UINTN SlotDesignationStrLen; - - Status =3D gBS->LocateProtocol ( - &gEfiSmbiosProtocolGuid, - NULL, - (VOID **) &Smbios - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] LocateProtocol Failed. Status : %r\= n", - __FUNCTION__, __LINE__, Status)); - return Status; - } =20 do { SmbiosHandle =3D SMBIOS_HANDLE_PI_RESERVED; @@ -122,76 +100,115 @@ AddSmbiosType9Entry ( } } while (SmbiosHandle !=3D SMBIOS_HANDLE_PI_RESERVED); =20 - SmbiosAddType9Number =3D OemGetPcieSlotNumber (); + return; +} =20 - for (Index =3D 0; Index < SmbiosAddType9Number; Index++) { - if (gPcieSlotInfo[Index].Hdr.Type !=3D EFI_SMBIOS_TYPE_SYSTEM_SLOTS) { - continue; - } +STATIC +EFI_STATUS +AddSmbiosType9Record ( + EFI_SMBIOS_PROTOCOL *Smbios, + SMBIOS_TABLE_TYPE9 *Type9Record + ) +{ + EFI_STATUS Status; + EFI_SMBIOS_HANDLE SmbiosHandle; + SMBIOS_TABLE_TYPE9 *SmbiosRecord; + CHAR8 *OptionalStrStart; + CHAR16 SlotDesignation[SMBIOS_STRING_MAX_LE= NGTH]; + UINTN SlotStrLen; + + SlotStrLen =3D UnicodeSPrint ( + SlotDesignation, + SMBIOS_STRING_MAX_LENGTH * 2, + L"PCIE Slot%d", + Type9Record->SlotID); + + // + // Two zeros following the last string. + // + SmbiosRecord =3D AllocateZeroPool (sizeof (SMBIOS_TABLE_TYPE9) + SlotStr= Len + 1 + 1); + if (SmbiosRecord =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "AllocateZeroPool Failed for SmbiosRecord.\n")); + return EFI_OUT_OF_RESOURCES; + } =20 - Type9Record =3D &gPcieSlotInfo[Index]; + (VOID)CopyMem (SmbiosRecord, Type9Record, sizeof (SMBIOS_TABLE_TYPE9)); + SmbiosRecord->Hdr.Length =3D sizeof (SMBIOS_TABLE_TYPE9); + OptionalStrStart =3D (CHAR8 *)(SmbiosRecord + 1); + (VOID)UnicodeStrToAsciiStr (SlotDesignation, OptionalStrStart); =20 - UpdateSmbiosType9Info (Type9Record); - SlotDesignation =3D AllocateZeroPool ((sizeof (CHAR16)) * SMBIOS_STRIN= G_MAX_LENGTH); - if (SlotDesignation =3D=3D NULL) { - Status =3D EFI_OUT_OF_RESOURCES; - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] AllocateZeroPool Failed. Status : %= r\n", - __FUNCTION__, __LINE__, Status)); + // + // Now we have got the full smbios record, call smbios protocol to add t= his record. + // + SmbiosHandle =3D SMBIOS_HANDLE_PI_RESERVED; + Status =3D Smbios->Add (Smbios, NULL, &SmbiosHandle, (EFI_SMBIOS_TABLE_H= EADER *)SmbiosRecord); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Add Smbios Type09 Failed! %r\n", Status)); + } =20 - goto Exit; - } + FreePool (SmbiosRecord); + return Status; +} =20 - SlotDesignationStrLen =3D UnicodeSPrint ( - SlotDesignation, - SMBIOS_STRING_MAX_LENGTH - 1, - L"PCIE Slot%d", - Type9Record->SlotID); - - // - // Two zeros following the last string. - // - SmbiosRecord =3D AllocateZeroPool (sizeof (SMBIOS_TABLE_TYPE9) + SlotD= esignationStrLen + 1 + 1); - if (SmbiosRecord =3D=3D NULL) { - Status =3D EFI_OUT_OF_RESOURCES; - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] AllocateZeroPool Failed. Status : %= r\n", - __FUNCTION__, __LINE__, Status)); +STATIC +VOID +HandleSmbiosType9 ( + EFI_SMBIOS_PROTOCOL *Smbios + ) +{ + EFI_STATUS Status; + SMBIOS_TABLE_TYPE9 *Type9Record; + UINT8 RecordCount; + UINT8 Index; =20 - goto Exit; - } + RecordCount =3D OemGetPcieSlotNumber (); + if (RecordCount =3D=3D 0) { + return; + } =20 - (VOID)CopyMem (SmbiosRecord, Type9Record, sizeof (SMBIOS_TABLE_TYPE9)); + EmptySmbiosType9 (Smbios); + Status =3D EFI_SUCCESS; + for (Index =3D 0; Index < RecordCount; Index++) { + if (gPcieSlotInfo[Index].Hdr.Type !=3D EFI_SMBIOS_TYPE_SYSTEM_SLOTS) { + continue; + } =20 - SmbiosRecord->Hdr.Length =3D sizeof (SMBIOS_TABLE_TYPE9); + Type9Record =3D &gPcieSlotInfo[Index]; =20 - OptionalStrStart =3D (CHAR8 *)(SmbiosRecord + 1); - UnicodeStrToAsciiStr (SlotDesignation, OptionalStrStart); + UpdateSmbiosType9Info (Type9Record); =20 - // - // Now we have got the full smbios record, call smbios protocol to add= this record. - // - SmbiosHandle =3D SMBIOS_HANDLE_PI_RESERVED; - Status =3D Smbios->Add (Smbios, NULL, &SmbiosHandle, (EFI_SMBIOS_TABLE= _HEADER *)SmbiosRecord); + Status =3D AddSmbiosType9Record (Smbios, Type9Record); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type09 Table Log Failed! %r = \n", - __FUNCTION__, __LINE__, Status)); - goto Exit; + break; } - - FreePool (SmbiosRecord); - FreePool (SlotDesignation); } =20 - return EFI_SUCCESS; + return; +} =20 -Exit: - if(SmbiosRecord !=3D NULL) { - FreePool (SmbiosRecord); - } +EFI_STATUS +EFIAPI +AddSmbiosType9Entry ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_SMBIOS_PROTOCOL *Smbios; =20 - if(SlotDesignation !=3D NULL) { - FreePool (SlotDesignation); + Status =3D gBS->LocateProtocol ( + &gEfiSmbiosProtocolGuid, + NULL, + (VOID **) &Smbios + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] LocateProtocol Failed. Status : %r\= n", + __FUNCTION__, __LINE__, Status)); + return Status; } =20 + HandleSmbiosType9 (Smbios); + return Status; } =20 --=20 2.8.1 -=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 (#60879): https://edk2.groups.io/g/devel/message/60879 Mute This Topic: https://groups.io/mt/74755015/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-