On Fri, 12 May 2023 09:14:15 -0700
Dan Williams <dan.j.williams@xxxxxxxxx> wrote:
> Jonathan Cameron wrote:
> > On Fri, 05 May 2023 10:32:56 -0700
> > Dave Jiang <dave.jiang@xxxxxxxxx> wrote:
> >
> > > The CDAT table is very similar to ACPI tables when it comes to sub-table
> > > and entry structures. The helper functions can be also used to parse the
> > > CDAT table. Add support to the helper functions to deal with an external
> > > CDAT table, and also handle the endieness since CDAT can be processed by a
> > > BE host. Export a function acpi_table_parse_cdat() for CXL driver to parse
> > > a CDAT table.
> > >
> > > In order to minimize ACPI code changes, __force is being utilized to deal
> > > with the case of a big endien (BE) host parsing a CDAT. All CDAT data
> > > structure variables are being force casted to __leX as appropriate.
> >
> > Hi Dave,
> >
> > This falls into the annoyance that CDAT doesn't have a standard table header.
> > Whilst I understand that was done deliberately it means some odd things happen
> > in this code.
> >
> > Just how bad is the duplication if we don't do this at all, but instead roll
> > a version for CDAT that doesn't force things through pointers of the wrong types?
>
> Yes, this was the question before sending this out. The savings is on
> the order of ~100 lines which is not amazing, but was enough for me to
> say lets keep going with this idea.
>
> The other observation is that the ACPICA project is doing something
> similar for offering disassembly of CDAT buffers within the existing
> ACPICA tooling vs building independent infrastructure. So that was
> another weight on the scale with proceeding with the code reuse for me.
Great. I'd missed that. I took a look at that ages ago and decided it
was too hard to solve and ran away / wrote CDAT tables in a hex editor instead
for a bit.
>
> The only thing I don't like about the result is still seeing acpi_/ACPI_
> prefixes. I think these entry points and symbol names should be
> cdat_/CDAT_ where possible, more below.
>
> ...and as I read to the end of the feedback on this one it seems you
> have the same reaction.
>
> >
> > Otherwise, maybe we need some unions so that the type mashups don't happen.
A union or two would get rid of the type confusion - or at least make it
deliberate at the cost of annoyingly noisy patch or maybe some wrappers.
> >
> > >
> > > Cc: Rafael J. Wysocki <rafael@xxxxxxxxxx>
> > > Cc: Len Brown <lenb@xxxxxxxxxx>
> > > Signed-off-by: Dave Jiang <dave.jiang@xxxxxxxxx>
> > > ---
> > > drivers/acpi/tables.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
> > > include/acpi/actbl1.h | 3 +++
> > > include/linux/acpi.h | 4 ++++
> > > 3 files changed, 52 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> > > index 7b4680da57d7..08486f6df442 100644
> > > --- a/drivers/acpi/tables.c
> > > +++ b/drivers/acpi/tables.c
> > > @@ -42,6 +42,7 @@ enum acpi_subtable_type {
> > > ACPI_SUBTABLE_HMAT,
> > > ACPI_SUBTABLE_PRMT,
> > > ACPI_SUBTABLE_CEDT,
> > > + ACPI_SUBTABLE_CDAT,
>
> To your point about ACPI_SIG_CDAT I also think this should be named
> differently, like CDAT_SUBTABLE, just to make it clear that this is a
> special case and not another ACPI table.
That works for me.
>
> > > };
> > >
> > > struct acpi_subtable_entry {
> > > @@ -239,6 +240,8 @@ acpi_get_entry_type(struct acpi_subtable_entry *entry)
> > > return 0;
> > > case ACPI_SUBTABLE_CEDT:
> > > return entry->hdr->cedt.type;
> > > + case ACPI_SUBTABLE_CDAT:
> > > + return entry->hdr->cdat.type;
> > > }
> > > return 0;
> > > }
> > > @@ -255,6 +258,8 @@ acpi_get_entry_length(struct acpi_subtable_entry *entry)
> > > return entry->hdr->prmt.length;
> > > case ACPI_SUBTABLE_CEDT:
> > > return entry->hdr->cedt.length;
> > > + case ACPI_SUBTABLE_CDAT:
> > > + return le16_to_cpu((__force __le16)entry->hdr->cdat.length);
> > > }
> > > return 0;
> > > }
> > > @@ -271,6 +276,8 @@ acpi_get_subtable_header_length(struct acpi_subtable_entry *entry)
> > > return sizeof(entry->hdr->prmt);
> > > case ACPI_SUBTABLE_CEDT:
> > > return sizeof(entry->hdr->cedt);
> > > + case ACPI_SUBTABLE_CDAT:
> > > + return sizeof(entry->hdr->cdat);
> > > }
> > > return 0;
> > > }
> > > @@ -284,9 +291,22 @@ acpi_get_subtable_type(char *id)
> > > return ACPI_SUBTABLE_PRMT;
> > > if (strncmp(id, ACPI_SIG_CEDT, 4) == 0)
> > > return ACPI_SUBTABLE_CEDT;
> > > + if (strncmp(id, ACPI_SIG_CDAT, 4) == 0)
> > > + return ACPI_SUBTABLE_CDAT;
> >
> > I'm not super keen on inventing a SIG when the CDAT 'table'
> > doesn't actually have one.
>
> Agree, I think CDAT_SIG makes it clearer that CDAT is not in the
> traditional ACPI namespace.
Agreed. IF it shouts different I'm fine with this.
>
> >
> > > return ACPI_SUBTABLE_COMMON;
> > > }
> > >
> > > +static unsigned long __init_or_acpilib
> > > +acpi_table_get_length(enum acpi_subtable_type type,
> > > + struct acpi_table_header *hdr)
> >
> > I don't like parsing in an acpi_table_header type here when it may not be one.
> > I think this length decision needs to be pushed up a level to where we can see
> > if we have a CDAT table or not.
This comment was (as Dave pointed out) not very helpful.
Switch struct acpi_table_header for a union of that and
struct acpi_table_cdat (renamed) and it would make me less
uncomfortable with this
>
