From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DBD94301034; Wed, 19 Nov 2025 17:09:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763572142; cv=none; b=HStAEZSZ0sONdMQOSey/UEDnnV1QKkLEFsD9fn2hj7KTmnaZEXWvBOYqx4MAWA9FsLxgo3qP53tz2V64YgjlQekAlH/0GyV6rmYUPwLfHGp6e7iuptGjfrqrUm7jHyPNiSX9s0+WPj8TSkZd8gHifjZyv3IuAdhImoRorxRQZ38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763572142; c=relaxed/simple; bh=MkoCQPB5fUt3xNZDCqgOioOLTPiXYFUd6RM7VGPoEEI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=JVLbkL75Y4udPQJ5Qku0bianb16sCRuXqEK/JERFpffLe3Psf9/yN0d1lbEPcihd5xuW9ox9dixzC85WzEUe+ioBwOQNi4JVT9LDliLOwEmaOwluj9UPY1EMVjNNht8B9UK937xDMDj5LDL2uPfaVdZ+HlZJFYn16VA7OhhTMio= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A0651FEC; Wed, 19 Nov 2025 09:08:52 -0800 (PST) Received: from [172.27.42.169] (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4E0FA3F66E; Wed, 19 Nov 2025 09:08:59 -0800 (PST) Message-ID: <1b072510-6ade-4204-b8a5-3590ea698d8f@arm.com> Date: Wed, 19 Nov 2025 11:08:57 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 03/34] ACPI / PPTT: Add acpi_pptt_cache_v1_full to use pptt cache as one structure To: Ben Horgan , james.morse@arm.com Cc: amitsinght@marvell.com, baisheng.gao@unisoc.com, baolin.wang@linux.alibaba.com, bobo.shaobowang@huawei.com, carl@os.amperecomputing.com, catalin.marinas@arm.com, dakr@kernel.org, dave.martin@arm.com, david@redhat.com, dfustini@baylibre.com, fenghuay@nvidia.com, gregkh@linuxfoundation.org, gshan@redhat.com, guohanjun@huawei.com, jonathan.cameron@huawei.com, kobak@nvidia.com, lcherian@marvell.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, lpieralisi@kernel.org, peternewman@google.com, quic_jiles@quicinc.com, rafael@kernel.org, robh@kernel.org, rohit.mathew@arm.com, scott@os.amperecomputing.com, sdonthineni@nvidia.com, sudeep.holla@arm.com, tan.shaopeng@fujitsu.com, will@kernel.org, xhao@linux.alibaba.com, reinette.chatre@intel.com, Shaopeng Tan References: <20251119122305.302149-1-ben.horgan@arm.com> <20251119122305.302149-4-ben.horgan@arm.com> Content-Language: en-US From: Jeremy Linton In-Reply-To: <20251119122305.302149-4-ben.horgan@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/19/25 6:22 AM, Ben Horgan wrote: > In actbl2.h, acpi_pptt_cache describes the fields in the original > Cache Type Structure. In PPTT table version 3 a new field was added at the > end, cache_id. This is described in acpi_pptt_cache_v1 but rather than > including all v1 fields it just includes this one. > > In lieu of this being fixed in acpica, introduce acpi_pptt_cache_v1_full to > contain all the fields of the Cache Type Structure . Update the existing > code to use this new struct. This simplifies the code and removes a > non-standard use of ACPI_ADD_PTR. Per V5: Reviewed-by: Jeremy Linton > > Reviewed-by: Shaopeng Tan > Reviewed-by: Fenghua Yu > Reviewed-by: Jonathan Cameron > Reviewed-by: Gavin Shan > Reviewed-by: Hanjun Guo > Tested-by: Shaopeng Tan > Tested-by: Hanjun Guo > Signed-off-by: Ben Horgan > --- > I have opened a pull request to acpica to update acpi_pptt_cache_v1 to > include all fields. https://github.com/acpica/acpica/pull/1059 > > Changes since v5: > Add __packed > Formatting > > Change since v4: > Use fields directly in acpi_pptt_cache_v1_full > Delay the casting > > Changes since v3: > New patch > --- > drivers/acpi/pptt.c | 45 ++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 36 insertions(+), 9 deletions(-) > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > index 2856254e29d7..ef39b176dc00 100644 > --- a/drivers/acpi/pptt.c > +++ b/drivers/acpi/pptt.c > @@ -21,6 +21,25 @@ > #include > #include > > +/* > + * The acpi_pptt_cache_v1 in actbl2.h, which is imported from acpica, > + * only contains the cache_id field rather than all the fields of the > + * Cache Type Structure. Use this alternative structure until it is > + * resolved in acpica. > + */ > +struct acpi_pptt_cache_v1_full { > + struct acpi_subtable_header header; > + u16 reserved; > + u32 flags; > + u32 next_level_of_cache; > + u32 size; > + u32 number_of_sets; > + u8 associativity; > + u8 attributes; > + u16 line_size; > + u32 cache_id; > +} __packed; > + > static struct acpi_subtable_header *fetch_pptt_subtable(struct acpi_table_header *table_hdr, > u32 pptt_ref) > { > @@ -56,6 +75,18 @@ static struct acpi_pptt_cache *fetch_pptt_cache(struct acpi_table_header *table_ > return (struct acpi_pptt_cache *)fetch_pptt_subtable(table_hdr, pptt_ref); > } > > +static struct acpi_pptt_cache_v1_full *upgrade_pptt_cache(struct acpi_pptt_cache *cache) > +{ > + if (cache->header.length < sizeof(struct acpi_pptt_cache_v1_full)) > + return NULL; > + > + /* No use for v1 if the only additional field is invalid */ > + if (!(cache->flags & ACPI_PPTT_CACHE_ID_VALID)) > + return NULL; > + > + return (struct acpi_pptt_cache_v1_full *)cache; > +} > + > static struct acpi_subtable_header *acpi_get_pptt_resource(struct acpi_table_header *table_hdr, > struct acpi_pptt_processor *node, > int resource) > @@ -355,7 +386,6 @@ static struct acpi_pptt_cache *acpi_find_cache_node(struct acpi_table_header *ta > * @this_leaf: Kernel cache info structure being updated > * @found_cache: The PPTT node describing this cache instance > * @cpu_node: A unique reference to describe this cache instance > - * @revision: The revision of the PPTT table > * > * The ACPI spec implies that the fields in the cache structures are used to > * extend and correct the information probed from the hardware. Lets only > @@ -365,10 +395,9 @@ static struct acpi_pptt_cache *acpi_find_cache_node(struct acpi_table_header *ta > */ > static void update_cache_properties(struct cacheinfo *this_leaf, > struct acpi_pptt_cache *found_cache, > - struct acpi_pptt_processor *cpu_node, > - u8 revision) > + struct acpi_pptt_processor *cpu_node) > { > - struct acpi_pptt_cache_v1* found_cache_v1; > + struct acpi_pptt_cache_v1_full *found_cache_v1; > > this_leaf->fw_token = cpu_node; > if (found_cache->flags & ACPI_PPTT_SIZE_PROPERTY_VALID) > @@ -418,9 +447,8 @@ static void update_cache_properties(struct cacheinfo *this_leaf, > found_cache->flags & ACPI_PPTT_CACHE_TYPE_VALID) > this_leaf->type = CACHE_TYPE_UNIFIED; > > - if (revision >= 3 && (found_cache->flags & ACPI_PPTT_CACHE_ID_VALID)) { > - found_cache_v1 = ACPI_ADD_PTR(struct acpi_pptt_cache_v1, > - found_cache, sizeof(struct acpi_pptt_cache)); > + found_cache_v1 = upgrade_pptt_cache(found_cache); > + if (found_cache_v1) { > this_leaf->id = found_cache_v1->cache_id; > this_leaf->attributes |= CACHE_ID; > } > @@ -445,8 +473,7 @@ static void cache_setup_acpi_cpu(struct acpi_table_header *table, > pr_debug("found = %p %p\n", found_cache, cpu_node); > if (found_cache) > update_cache_properties(this_leaf, found_cache, > - ACPI_TO_POINTER(ACPI_PTR_DIFF(cpu_node, table)), > - table->revision); > + ACPI_TO_POINTER(ACPI_PTR_DIFF(cpu_node, table))); > > index++; > }