!432 [sync] PR-428: fix log printing in tpcm_kunpeng module again

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-06-25 01:17:59 +00:00 committed by Gitee
commit 2529742a62
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 13 additions and 7 deletions

View File

@ -399,9 +399,9 @@ index 0000000..57a4cea
+ grub_dprintf ("tpcm", "tpcm control switch turned off, ignore excute_ipmi_cmd failure.\n"); + grub_dprintf ("tpcm", "tpcm control switch turned off, ignore excute_ipmi_cmd failure.\n");
+ else + else
+ { + {
+ err = GRUB_ERR_BUG; + err = grub_error (GRUB_ERR_BUG,
+ grub_dprintf ("tpcm", "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n", + "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n",
+ request_data->SubCmd, status); + request_data->SubCmd, status);
+ } + }
+ goto fail; + goto fail;
+ } + }
@ -458,8 +458,8 @@ index 0000000..57a4cea
+ &response_length, NULL); + &response_length, NULL);
+ if (status != GRUB_EFI_SUCCESS) + if (status != GRUB_EFI_SUCCESS)
+ { + {
+ grub_printf ("excute_ipmi_cmd failed, request sub_cmd:%d, ret:%lu\n", + grub_dprintf ("tpcm", "excute_ipmi_cmd failed, request sub_cmd:%d, ret:%lu\n",
+ request_data.SubCmd, status); + request_data.SubCmd, status);
+ /* if we excute_ipmi_cmd, it could be the fllowing results: + /* if we excute_ipmi_cmd, it could be the fllowing results:
+ * 1. uefi have this interface, but did not implement it. + * 1. uefi have this interface, but did not implement it.
+ * 2. uefi have implemented, but bmc did not support TPCM + * 2. uefi have implemented, but bmc did not support TPCM

View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.12 Version: 2.12
Release: 18 Release: 19
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -447,7 +447,13 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Wed Jun 5 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-18 * Mon Jun 24 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-19
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:fix log printing in tpcm_kunpeng module again
* Wed Jun 19 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-18
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA
- SUG:NA - SUG:NA