* [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB
@ 2023-11-12 23:53 Heinrich Schuchardt
2023-11-13 14:00 ` Simon Glass
2023-12-13 20:39 ` Simon Glass
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2023-11-12 23:53 UTC (permalink / raw)
To: Simon Glass; +Cc: u-boot, Heinrich Schuchardt
The field RsdtAddress has only 32 bit. The RSDT table cannot be located
beyond 4 GiB.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
v2:
Avoid superfluous 0 assignment. RSDP is already zeroed out.
Use constants form linux/sizes.h
---
lib/acpi/base.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/lib/acpi/base.c b/lib/acpi/base.c
index 2057bd2bef..26bf0cb8d3 100644
--- a/lib/acpi/base.c
+++ b/lib/acpi/base.c
@@ -12,6 +12,7 @@
#include <dm/acpi.h>
#include <mapmem.h>
#include <tables_csum.h>
+#include <linux/sizes.h>
void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
struct acpi_xsdt *xsdt)
@@ -21,10 +22,13 @@ void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
memcpy(rsdp->signature, RSDP_SIG, 8);
memcpy(rsdp->oem_id, OEM_ID, 6);
- rsdp->length = sizeof(struct acpi_rsdp);
- rsdp->rsdt_address = map_to_sysmem(rsdt);
+ if (rsdt)
+ rsdp->rsdt_address = map_to_sysmem(rsdt);
+
+ if (xsdt)
+ rsdp->xsdt_address = map_to_sysmem(xsdt);
- rsdp->xsdt_address = map_to_sysmem(xsdt);
+ rsdp->length = sizeof(struct acpi_rsdp);
rsdp->revision = ACPI_RSDP_REV_ACPI_2_0;
/* Calculate checksums */
@@ -68,11 +72,15 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
static int acpi_write_base(struct acpi_ctx *ctx,
const struct acpi_writer *entry)
{
- /* We need at least an RSDP and an RSDT Table */
+ /* We need at least an RSDP and an XSDT Table */
ctx->rsdp = ctx->current;
acpi_inc_align(ctx, sizeof(struct acpi_rsdp));
- ctx->rsdt = ctx->current;
- acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
+ if (map_to_sysmem(ctx->current) < SZ_4G - SZ_64K) {
+ ctx->rsdt = ctx->current;
+ acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
+ } else {
+ ctx->rsdt = 0;
+ }
ctx->xsdt = ctx->current;
acpi_inc_align(ctx, sizeof(struct acpi_xsdt));
@@ -80,7 +88,8 @@ static int acpi_write_base(struct acpi_ctx *ctx,
memset(ctx->base, '\0', ctx->current - ctx->base);
acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt);
- acpi_write_rsdt(ctx->rsdt);
+ if (ctx->rsdt)
+ acpi_write_rsdt(ctx->rsdt);
acpi_write_xsdt(ctx->xsdt);
return 0;
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB
2023-11-12 23:53 [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB Heinrich Schuchardt
@ 2023-11-13 14:00 ` Simon Glass
2023-12-13 20:39 ` Simon Glass
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2023-11-13 14:00 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: u-boot
On Sun, 12 Nov 2023 at 16:54, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> The field RsdtAddress has only 32 bit. The RSDT table cannot be located
> beyond 4 GiB.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> v2:
> Avoid superfluous 0 assignment. RSDP is already zeroed out.
> Use constants form linux/sizes.h
> ---
> lib/acpi/base.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB
2023-11-12 23:53 [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB Heinrich Schuchardt
2023-11-13 14:00 ` Simon Glass
@ 2023-12-13 20:39 ` Simon Glass
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2023-12-13 20:39 UTC (permalink / raw)
To: Simon Glass; +Cc: u-boot, Heinrich Schuchardt
On Sun, 12 Nov 2023 at 16:54, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> The field RsdtAddress has only 32 bit. The RSDT table cannot be located
> beyond 4 GiB.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> v2:
> Avoid superfluous 0 assignment. RSDP is already zeroed out.
> Use constants form linux/sizes.h
> ---
> lib/acpi/base.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot-dm/next, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-13 20:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-12 23:53 [PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB Heinrich Schuchardt
2023-11-13 14:00 ` Simon Glass
2023-12-13 20:39 ` Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.