From: Stefano Garzarella <sgarzare@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Subject: [PATCH] optionrom/pvh: use memcmp() to find the RSDP signature
Date: Mon, 22 Mar 2021 12:48:34 +0100 [thread overview]
Message-ID: <20210322114834.166798-1-sgarzare@redhat.com> (raw)
New versions of gcc report a potential error and there may be alignment
issues using uint64_t pointer to check the RSDP signature:
gcc 10.2.1 "cc (Alpine 10.2.1_pre2) 10.2.1 20210313" reports:
pc-bios/optionrom/pvh_main.c: In function 'search_rsdp':
pc-bios/optionrom/pvh_main.c:61:21: warning: comparison is always false
due to limited range of data type [-Wtype-limits]
61 | if (*rsdp_p == RSDP_SIGNATURE) {
| ^~
Let's use memcmp() to get more readable code and avoid these issues.
Since pvh optionrom is baremetal, we use the compiler's __builtin_memcmp.
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
pc-bios/optionrom/pvh_main.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/pc-bios/optionrom/pvh_main.c b/pc-bios/optionrom/pvh_main.c
index 28e79d7fc4..12202e38c2 100644
--- a/pc-bios/optionrom/pvh_main.c
+++ b/pc-bios/optionrom/pvh_main.c
@@ -27,7 +27,8 @@ asm (".code32"); /* this code will be executed in protected mode */
#include "optrom_fw_cfg.h"
#include "../../include/hw/xen/start_info.h"
-#define RSDP_SIGNATURE 0x2052545020445352LL /* "RSD PTR " */
+#define RSDP_SIGNATURE "RSD PTR "
+#define RSDP_SIGNATURE_SIZE 8
#define RSDP_AREA_ADDR 0x000E0000
#define RSDP_AREA_SIZE 0x00020000
#define EBDA_BASE_ADDR 0x0000040E
@@ -53,12 +54,14 @@ static uint8_t cmdline_buffer[CMDLINE_BUFSIZE];
/* Search RSDP signature. */
static uintptr_t search_rsdp(uint32_t start_addr, uint32_t end_addr)
{
- uint64_t *rsdp_p;
+ char rsdp_signature[RSDP_SIGNATURE_SIZE] = RSDP_SIGNATURE;
+ char *rsdp_p;
/* RSDP signature is always on a 16 byte boundary */
- for (rsdp_p = (uint64_t *)start_addr; rsdp_p < (uint64_t *)end_addr;
- rsdp_p += 2) {
- if (*rsdp_p == RSDP_SIGNATURE) {
+ for (rsdp_p = (char *)start_addr; rsdp_p < (char *)end_addr;
+ rsdp_p += 16) {
+ if (__builtin_memcmp(rsdp_p, rsdp_signature,
+ RSDP_SIGNATURE_SIZE) == 0) {
return (uintptr_t)rsdp_p;
}
}
--
2.30.2
next reply other threads:[~2021-03-22 11:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 11:48 Stefano Garzarella [this message]
2021-03-22 13:15 ` [PATCH] optionrom/pvh: use memcmp() to find the RSDP signature Philippe Mathieu-Daudé
2021-03-22 13:52 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322114834.166798-1-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).