Message ID | 20190301185221.608501-1-jeremy.linton@arm.com |
---|---|
State | Accepted |
Commit | 4909e6df213a7c3e5e282538356f31ab68828793 |
Headers | show |
Series | ACPI/PPTT: Simplify leaf node detection. | expand |
On Fri, Mar 01, 2019 at 12:52:21PM -0600, Jeremy Linton wrote: > ACPI 6.3 bumps the PPTT table revision and adds a LEAF_NODE flag. > This allows us to avoid a second pass through the table to assure > that the node in question is a leaf. > Reviewed-by:Sudeep Holla <sudeep.holla@arm.com> -- Regards, Sudeep > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> > --- > drivers/acpi/pptt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > index ad31c50de3be..065c4fc245d1 100644 > --- a/drivers/acpi/pptt.c > +++ b/drivers/acpi/pptt.c > @@ -209,6 +209,9 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr, > struct acpi_pptt_processor *cpu_node; > u32 proc_sz; > > + if (table_hdr->revision > 1) > + return (node->flags & ACPI_PPTT_ACPI_LEAF_NODE); > + > table_end = (unsigned long)table_hdr + table_hdr->length; > node_entry = ACPI_PTR_DIFF(node, table_hdr); > entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr, > -- > 2.20.1 >
On Monday, March 4, 2019 11:02:08 AM CET Sudeep Holla wrote: > On Fri, Mar 01, 2019 at 12:52:21PM -0600, Jeremy Linton wrote: > > ACPI 6.3 bumps the PPTT table revision and adds a LEAF_NODE flag. > > This allows us to avoid a second pass through the table to assure > > that the node in question is a leaf. > > > > Reviewed-by:Sudeep Holla <sudeep.holla@arm.com> > > -- > Regards, > Sudeep > > > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> > > --- > > drivers/acpi/pptt.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > > index ad31c50de3be..065c4fc245d1 100644 > > --- a/drivers/acpi/pptt.c > > +++ b/drivers/acpi/pptt.c > > @@ -209,6 +209,9 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr, > > struct acpi_pptt_processor *cpu_node; > > u32 proc_sz; > > > > + if (table_hdr->revision > 1) > > + return (node->flags & ACPI_PPTT_ACPI_LEAF_NODE); > > + > > table_end = (unsigned long)table_hdr + table_hdr->length; > > node_entry = ACPI_PTR_DIFF(node, table_hdr); > > entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr, > > -- Patch applied, thanks!
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index ad31c50de3be..065c4fc245d1 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -209,6 +209,9 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr, struct acpi_pptt_processor *cpu_node; u32 proc_sz; + if (table_hdr->revision > 1) + return (node->flags & ACPI_PPTT_ACPI_LEAF_NODE); + table_end = (unsigned long)table_hdr + table_hdr->length; node_entry = ACPI_PTR_DIFF(node, table_hdr); entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr,
ACPI 6.3 bumps the PPTT table revision and adds a LEAF_NODE flag. This allows us to avoid a second pass through the table to assure that the node in question is a leaf. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- drivers/acpi/pptt.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1