| Message ID | 168443479457.2966470.18010229834586488037.stgit@djiang5-mobl3 |
|---|---|
| State | Superseded |
| Headers | show |
| Series | acpi: Add CDAT parsing support to ACPI tables code | expand |
Dave Jiang wrote: > ACPI_CEDT_DSMAS_NON_VOLATILE should be defined as > ACPI_CDAT_DSMAS_NON_VOLATILE. Fix misspelled define. > > Cc: Rafael J. Wysocki <rafael@kernel.org> > Cc: Len Brown <lenb@kernel.org> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > > --- > See https://github.com/acpica/acpica/pull/874 > Merged > --- > include/acpi/actbl1.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h > index 81b9e794424d..15df363b9144 100644 > --- a/include/acpi/actbl1.h > +++ b/include/acpi/actbl1.h > @@ -356,7 +356,7 @@ struct acpi_cdat_dsmas { > > /* Flags for subtable above */ > > -#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2) > +#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2) This needs to come in through an ACPICA update. If that is going to happen this cycle, great, if not then I would handle it as a merge fixup after the fact. I.e. just live with the misspelling to keep this patch set ACPICA unencumbered, unless Rafael has different thoughts.
On Tue, May 23, 2023 at 1:24 AM Dan Williams <dan.j.williams@intel.com> wrote: > > Dave Jiang wrote: > > ACPI_CEDT_DSMAS_NON_VOLATILE should be defined as > > ACPI_CDAT_DSMAS_NON_VOLATILE. Fix misspelled define. > > > > Cc: Rafael J. Wysocki <rafael@kernel.org> > > Cc: Len Brown <lenb@kernel.org> > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > > > > --- > > See https://github.com/acpica/acpica/pull/874 > > Merged > > --- > > include/acpi/actbl1.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h > > index 81b9e794424d..15df363b9144 100644 > > --- a/include/acpi/actbl1.h > > +++ b/include/acpi/actbl1.h > > @@ -356,7 +356,7 @@ struct acpi_cdat_dsmas { > > > > /* Flags for subtable above */ > > > > -#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2) > > +#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2) > > This needs to come in through an ACPICA update. If that is going to happen > this cycle, great, if not then I would handle it as a merge fixup after > the fact. I.e. just live with the misspelling to keep this patch set > ACPICA unencumbered, unless Rafael has different thoughts. You can also submit an upstream ACPICA pull request with this change and resend the patch with a Link tag pointing to that PR. Then we'll decide how to handle it.
On 5/23/23 03:46, Rafael J. Wysocki wrote: > On Tue, May 23, 2023 at 1:24 AM Dan Williams <dan.j.williams@intel.com> wrote: >> Dave Jiang wrote: >>> ACPI_CEDT_DSMAS_NON_VOLATILE should be defined as >>> ACPI_CDAT_DSMAS_NON_VOLATILE. Fix misspelled define. >>> >>> Cc: Rafael J. Wysocki <rafael@kernel.org> >>> Cc: Len Brown <lenb@kernel.org> >>> Signed-off-by: Dave Jiang <dave.jiang@intel.com> >>> >>> --- >>> See https://github.com/acpica/acpica/pull/874 >>> Merged >>> --- >>> include/acpi/actbl1.h | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h >>> index 81b9e794424d..15df363b9144 100644 >>> --- a/include/acpi/actbl1.h >>> +++ b/include/acpi/actbl1.h >>> @@ -356,7 +356,7 @@ struct acpi_cdat_dsmas { >>> >>> /* Flags for subtable above */ >>> >>> -#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2) >>> +#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2) >> This needs to come in through an ACPICA update. If that is going to happen >> this cycle, great, if not then I would handle it as a merge fixup after >> the fact. I.e. just live with the misspelling to keep this patch set >> ACPICA unencumbered, unless Rafael has different thoughts. > You can also submit an upstream ACPICA pull request with this change > and resend the patch with a Link tag pointing to that PR. Then we'll > decide how to handle it. That's been done and merged. I'll include the Link tag in the next rev.
On Tue, May 23, 2023 at 4:55 PM Dave Jiang <dave.jiang@intel.com> wrote: > > > On 5/23/23 03:46, Rafael J. Wysocki wrote: > > On Tue, May 23, 2023 at 1:24 AM Dan Williams <dan.j.williams@intel.com> wrote: > >> Dave Jiang wrote: > >>> ACPI_CEDT_DSMAS_NON_VOLATILE should be defined as > >>> ACPI_CDAT_DSMAS_NON_VOLATILE. Fix misspelled define. > >>> > >>> Cc: Rafael J. Wysocki <rafael@kernel.org> > >>> Cc: Len Brown <lenb@kernel.org> > >>> Signed-off-by: Dave Jiang <dave.jiang@intel.com> > >>> > >>> --- > >>> See https://github.com/acpica/acpica/pull/874 > >>> Merged > >>> --- > >>> include/acpi/actbl1.h | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h > >>> index 81b9e794424d..15df363b9144 100644 > >>> --- a/include/acpi/actbl1.h > >>> +++ b/include/acpi/actbl1.h > >>> @@ -356,7 +356,7 @@ struct acpi_cdat_dsmas { > >>> > >>> /* Flags for subtable above */ > >>> > >>> -#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2) > >>> +#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2) > >> This needs to come in through an ACPICA update. If that is going to happen > >> this cycle, great, if not then I would handle it as a merge fixup after > >> the fact. I.e. just live with the misspelling to keep this patch set > >> ACPICA unencumbered, unless Rafael has different thoughts. > > You can also submit an upstream ACPICA pull request with this change > > and resend the patch with a Link tag pointing to that PR. Then we'll > > decide how to handle it. > > That's been done and merged. I'll include the Link tag in the next rev. If it's merged, then the Linux patch can be applied without waiting for an ACPICA release (which should take place in the near future anyway).
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 81b9e794424d..15df363b9144 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -356,7 +356,7 @@ struct acpi_cdat_dsmas { /* Flags for subtable above */ -#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2) +#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2) /* Subtable 1: Device scoped Latency and Bandwidth Information Structure (DSLBIS) */
ACPI_CEDT_DSMAS_NON_VOLATILE should be defined as ACPI_CDAT_DSMAS_NON_VOLATILE. Fix misspelled define. Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- See https://github.com/acpica/acpica/pull/874 Merged --- include/acpi/actbl1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)