diff mbox series

[06/40] sandbox: Allow building with GENERATE_ACPI_TABLE

Message ID 20211201160315.2203099-7-sjg@chromium.org
State Accepted
Commit 0679cca5072d6959b51f45c00cb5bf59d75a9329
Delegated to: Tom Rini
Headers show
Series RFC: rpi: Enable ACPI booting on ARM with Raspberry Pi 4 | expand

Commit Message

Simon Glass Dec. 1, 2021, 4:02 p.m. UTC
At present this option is missing a header file, a function prototype and
the qfw driver needs a header included.

Fix these problems so we can enable this option on sandbox. This will
increase the build coverage.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/sandbox/include/asm/acpi_table.h | 2 ++
 arch/sandbox/include/asm/tables.h     | 0
 drivers/misc/qfw.c                    | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 arch/sandbox/include/asm/tables.h

Comments

Heinrich Schuchardt Dec. 1, 2021, 6:14 p.m. UTC | #1
On 12/1/21 17:02, Simon Glass wrote:
> At present this option is missing a header file, a function prototype and
> the qfw driver needs a header included.
>
> Fix these problems so we can enable this option on sandbox. This will
> increase the build coverage.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   arch/sandbox/include/asm/acpi_table.h | 2 ++
>   arch/sandbox/include/asm/tables.h     | 0
>   drivers/misc/qfw.c                    | 1 +
>   3 files changed, 3 insertions(+)
>   create mode 100644 arch/sandbox/include/asm/tables.h
>
> diff --git a/arch/sandbox/include/asm/acpi_table.h b/arch/sandbox/include/asm/acpi_table.h
> index 921c7f4201d..ae17f6c5197 100644
> --- a/arch/sandbox/include/asm/acpi_table.h
> +++ b/arch/sandbox/include/asm/acpi_table.h
> @@ -6,4 +6,6 @@
>   #ifndef __ASM_ACPI_TABLE_H__
>   #define __ASM_ACPI_TABLE_H__
>
> +ulong write_acpi_tables(ulong start);

This definition should be in a global include. The parameter must a
pointer to restrict sandbox specific code to the sandbox.

Best regards

Heinrich

> +
>   #endif /* __ASM_ACPI_TABLE_H__ */
> diff --git a/arch/sandbox/include/asm/tables.h b/arch/sandbox/include/asm/tables.h
> new file mode 100644
> index 00000000000..e69de29bb2d
> diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
> index ea00be88a8d..a298e5cf727 100644
> --- a/drivers/misc/qfw.c
> +++ b/drivers/misc/qfw.c
> @@ -14,6 +14,7 @@
>   #include <qfw.h>
>   #include <dm.h>
>   #include <misc.h>
> +#include <tables_csum.h>
>   #ifdef CONFIG_GENERATE_ACPI_TABLE
>   #include <asm/tables.h>
>   #endif
>
Simon Glass Dec. 1, 2021, 7:32 p.m. UTC | #2
Hi Heinrich,

On Wed, 1 Dec 2021 at 11:14, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> On 12/1/21 17:02, Simon Glass wrote:
> > At present this option is missing a header file, a function prototype and
> > the qfw driver needs a header included.
> >
> > Fix these problems so we can enable this option on sandbox. This will
> > increase the build coverage.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >   arch/sandbox/include/asm/acpi_table.h | 2 ++
> >   arch/sandbox/include/asm/tables.h     | 0
> >   drivers/misc/qfw.c                    | 1 +
> >   3 files changed, 3 insertions(+)
> >   create mode 100644 arch/sandbox/include/asm/tables.h
> >
> > diff --git a/arch/sandbox/include/asm/acpi_table.h b/arch/sandbox/include/asm/acpi_table.h
> > index 921c7f4201d..ae17f6c5197 100644
> > --- a/arch/sandbox/include/asm/acpi_table.h
> > +++ b/arch/sandbox/include/asm/acpi_table.h
> > @@ -6,4 +6,6 @@
> >   #ifndef __ASM_ACPI_TABLE_H__
> >   #define __ASM_ACPI_TABLE_H__
> >
> > +ulong write_acpi_tables(ulong start);
>
> This definition should be in a global include. The parameter must a
> pointer to restrict sandbox specific code to the sandbox.

Yes indeed, I meant to fix the header before sending but missed it. Will fix.

It doesn't really help making it a pointer, even if I wanted to, which
I don't, sorry. We still need to print out the address, and pass it on
to other functions, so if we pass a pointer we just need to convert
back to an address for that purpose.

Regards,
Simon
Simon Glass Jan. 23, 2022, 9:54 p.m. UTC | #3
Hi Heinrich,

On Wed, 1 Dec 2021 at 11:14, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> On 12/1/21 17:02, Simon Glass wrote:
> > At present this option is missing a header file, a function prototype and
> > the qfw driver needs a header included.
> >
> > Fix these problems so we can enable this option on sandbox. This will
> > increase the build coverage.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >   arch/sandbox/include/asm/acpi_table.h | 2 ++
> >   arch/sandbox/include/asm/tables.h     | 0
> >   drivers/misc/qfw.c                    | 1 +
> >   3 files changed, 3 insertions(+)
> >   create mode 100644 arch/sandbox/include/asm/tables.h
> >
Applied to u-boot-dm, thanks!
diff mbox series

Patch

diff --git a/arch/sandbox/include/asm/acpi_table.h b/arch/sandbox/include/asm/acpi_table.h
index 921c7f4201d..ae17f6c5197 100644
--- a/arch/sandbox/include/asm/acpi_table.h
+++ b/arch/sandbox/include/asm/acpi_table.h
@@ -6,4 +6,6 @@ 
 #ifndef __ASM_ACPI_TABLE_H__
 #define __ASM_ACPI_TABLE_H__
 
+ulong write_acpi_tables(ulong start);
+
 #endif /* __ASM_ACPI_TABLE_H__ */
diff --git a/arch/sandbox/include/asm/tables.h b/arch/sandbox/include/asm/tables.h
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index ea00be88a8d..a298e5cf727 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -14,6 +14,7 @@ 
 #include <qfw.h>
 #include <dm.h>
 #include <misc.h>
+#include <tables_csum.h>
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 #include <asm/tables.h>
 #endif