From patchwork Wed Jun 14 21:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 692638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 010AAEB64DB for ; Wed, 14 Jun 2023 21:48:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231846AbjFNVsR (ORCPT ); Wed, 14 Jun 2023 17:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235703AbjFNVsN (ORCPT ); Wed, 14 Jun 2023 17:48:13 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C152690; Wed, 14 Jun 2023 14:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686779292; x=1718315292; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cw/QhAdjWl7JffXxMm5aaEooruas6iuC7iOV6O8jfFs=; b=gIpPjdIR0jJoAu2yh16aHFDHnyJnXr1OabEzMJJKP8m22/tGjW3rZ+JJ HTKBfCRKXS9PoWjDRXLEwyby1Er3AoH6gKmuztEkNhAtbsB1H7FQgDxYt 5WTXhxenysktQe5F0ZIXc0EVkJd/bvrHPqzh+UrTmb/m4HTDoRS+R7kv9 RaNcN3vuZVNCYvd1fm4AFgihGSCBcddJzoZL31UJRvqLrFHLL4AZroRca 0azgeNDpW8Z0nT/bb0UU7S88dHu3gRYK8J2aKdhdzXiEF7pH7cov4mGdT ImjNCK/QFMb7QAIgLuYcte4r5SE4Jwo5IQZHa8LHRmaiFUp87Ljy5cXcB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="357624234" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="357624234" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 14:48:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="715366004" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="715366004" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [192.168.1.177]) ([10.212.110.39]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 14:48:11 -0700 Subject: [PATCH v4 2/4] lib/firmware_table: tables: Add CDAT table parsing support From: Dave Jiang To: linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Jonathan Cameron , "Rafael J. Wysocki" , rafael@kernel.org, lenb@kernel.org, dan.j.williams@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, alison.schofield@intel.com, lukas@wunner.de, Jonathan.Cameron@huawei.com, guohanjun@huawei.com Date: Wed, 14 Jun 2023 14:48:11 -0700 Message-ID: <168677929102.2787985.16025973208700705746.stgit@djiang5-mobl3> In-Reply-To: <168677921156.2787985.6927511816148622557.stgit@djiang5-mobl3> References: <168677921156.2787985.6927511816148622557.stgit@djiang5-mobl3> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 cdat_table_parse() for CXL driver to parse a CDAT table. In order to minimize ACPICA code changes, __force is being utilized to deal with the case of a big endian (BE) host parsing a CDAT. All CDAT data structure variables are being force casted to __leX as appropriate. Cc: Rafael J. Wysocki Cc: Len Brown Reviewed-by: Jonathan Cameron Signed-off-by: Dave Jiang Acked-by: Rafael J. Wysocki --- v4: - Add {} in acpi_get_entry_length() to fix 0-day failure. v3: Rafael, Attempted to rename acpi_ prefix to something common but that ended up causing a significant amount of ACPI code changes. I'll leave that alone unless you'd like me to go that direction. v2: - Make acpi_table_header and acpi_table_cdat a union. (Jonathan) - Use local var to make acpi_table_get_length() more readable. (Jonathan) - Remove ACPI_SIG_CDAT define, already defined. --- drivers/acpi/tables.c | 5 +++- include/linux/fw_table.h | 11 +++++++++ lib/fw_table.c | 54 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index cfc76efd8788..d4c7a76a0fce 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -241,8 +241,9 @@ int __init_or_acpilib acpi_table_parse_entries_array( return -ENODEV; } - count = acpi_parse_entries_array(id, table_size, table_header, - proc, proc_num, max_entries); + count = acpi_parse_entries_array(id, table_size, + (union fw_table_header *)table_header, + proc, proc_num, max_entries); acpi_put_table(table_header); return count; diff --git a/include/linux/fw_table.h b/include/linux/fw_table.h index ff8fa58d5818..a97d368df520 100644 --- a/include/linux/fw_table.h +++ b/include/linux/fw_table.h @@ -28,16 +28,25 @@ struct acpi_subtable_proc { #include #include +union fw_table_header { + struct acpi_table_header acpi; + struct acpi_table_cdat cdat; +}; + union acpi_subtable_headers { struct acpi_subtable_header common; struct acpi_hmat_structure hmat; struct acpi_prmt_module_header prmt; struct acpi_cedt_header cedt; + struct acpi_cdat_header cdat; }; int acpi_parse_entries_array(char *id, unsigned long table_size, - struct acpi_table_header *table_header, + union fw_table_header *table_header, struct acpi_subtable_proc *proc, int proc_num, unsigned int max_entries); +int cdat_table_parse(enum acpi_cdat_type type, + acpi_tbl_entry_handler_arg handler_arg, void *arg, + struct acpi_table_cdat *table_header); #endif diff --git a/lib/fw_table.c b/lib/fw_table.c index e84bd0866e10..108f1db3f1a6 100644 --- a/lib/fw_table.c +++ b/lib/fw_table.c @@ -18,6 +18,7 @@ enum acpi_subtable_type { ACPI_SUBTABLE_HMAT, ACPI_SUBTABLE_PRMT, ACPI_SUBTABLE_CEDT, + CDAT_SUBTABLE, }; struct acpi_subtable_entry { @@ -37,6 +38,8 @@ acpi_get_entry_type(struct acpi_subtable_entry *entry) return 0; case ACPI_SUBTABLE_CEDT: return entry->hdr->cedt.type; + case CDAT_SUBTABLE: + return entry->hdr->cdat.type; } return 0; } @@ -53,6 +56,11 @@ acpi_get_entry_length(struct acpi_subtable_entry *entry) return entry->hdr->prmt.length; case ACPI_SUBTABLE_CEDT: return entry->hdr->cedt.length; + case CDAT_SUBTABLE: { + __le16 length = (__force __le16)entry->hdr->cdat.length; + + return le16_to_cpu(length); + } } return 0; } @@ -69,6 +77,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 CDAT_SUBTABLE: + return sizeof(entry->hdr->cdat); } return 0; } @@ -82,9 +92,24 @@ 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 CDAT_SUBTABLE; return ACPI_SUBTABLE_COMMON; } +static unsigned long __init_or_acpilib +acpi_table_get_length(enum acpi_subtable_type type, + union fw_table_header *header) +{ + if (type == CDAT_SUBTABLE) { + __le32 length = (__force __le32)header->cdat.length; + + return le32_to_cpu(length); + } + + return header->acpi.length; +} + static __init_or_acpilib bool has_handler(struct acpi_subtable_proc *proc) { return proc->handler || proc->handler_arg; @@ -126,21 +151,24 @@ static __init_or_acpilib int call_handler(struct acpi_subtable_proc *proc, */ int __init_or_acpilib acpi_parse_entries_array(char *id, unsigned long table_size, - struct acpi_table_header *table_header, + union fw_table_header *table_header, struct acpi_subtable_proc *proc, int proc_num, unsigned int max_entries) { unsigned long table_end, subtable_len, entry_len; struct acpi_subtable_entry entry; + enum acpi_subtable_type type; int count = 0; int errs = 0; int i; - table_end = (unsigned long)table_header + table_header->length; + type = acpi_get_subtable_type(id); + table_end = (unsigned long)table_header + + acpi_table_get_length(type, table_header); /* Parse all entries looking for a match. */ - entry.type = acpi_get_subtable_type(id); + entry.type = type; entry.hdr = (union acpi_subtable_headers *) ((unsigned long)table_header + table_size); subtable_len = acpi_get_subtable_header_length(&entry); @@ -187,3 +215,23 @@ acpi_parse_entries_array(char *id, unsigned long table_size, return errs ? -EINVAL : count; } EXPORT_SYMBOL_GPL(acpi_parse_entries_array); + +int cdat_table_parse(enum acpi_cdat_type type, + acpi_tbl_entry_handler_arg handler_arg, void *arg, + struct acpi_table_cdat *table_header) +{ + struct acpi_subtable_proc proc = { + .id = type, + .handler_arg = handler_arg, + .arg = arg, + }; + + if (!table_header) + return -EINVAL; + + return acpi_parse_entries_array(ACPI_SIG_CDAT, + sizeof(struct acpi_table_cdat), + (union fw_table_header *)table_header, + &proc, 1, 0); +} +EXPORT_SYMBOL_NS_GPL(cdat_table_parse, CXL); From patchwork Wed Jun 14 21:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 692637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF696EB64D8 for ; Wed, 14 Jun 2023 21:48:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235822AbjFNVsZ (ORCPT ); Wed, 14 Jun 2023 17:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230178AbjFNVsZ (ORCPT ); Wed, 14 Jun 2023 17:48:25 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B28268F; Wed, 14 Jun 2023 14:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686779304; x=1718315304; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BlBJs6J2Ig0B77uN9ly6Nsq9/OB13grYX/N1Pr3I6jg=; b=Wdd+DZbG9qrIu51VICWKRvd+/5OpXX3FZ/KrFACVOobUMyVahs2DcmFo 0ZuRnDImVOxUi6LYXFWQ+d40vT6R/aN67VEbG/xf/qK6298pTIh8oJn2V iX8DUj0b7aZE/+/2pF2Egs+FSg0swolLqiY9rqekQIH/4saqzRmscrprT Yf6Q9yBp8uCklYoS+LQFOQxdVIxZrVPPFLggk2Ig5s/cfdWcSJVsqxIU4 KBC052Bi8N/fYO58JHDV7/f5zymvBKiN2va71xHa73Zw7Tqv9ohi/3TCt tfx4ZulJ8lpZCCQfi14IM0PJlpvDFzF3qcFctthQk/0S+0rMHCaFzcM3t A==; X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="357624264" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="357624264" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 14:48:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="715366017" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="715366017" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [192.168.1.177]) ([10.212.110.39]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 14:48:23 -0700 Subject: [PATCH v4 4/4] acpi: Add defines for CDAT SSLBIS From: Dave Jiang To: linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org Cc: Jonathan Cameron , "Rafael J. Wysocki" , rafael@kernel.org, lenb@kernel.org, dan.j.williams@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, alison.schofield@intel.com, lukas@wunner.de, Jonathan.Cameron@huawei.com, guohanjun@huawei.com Date: Wed, 14 Jun 2023 14:48:23 -0700 Message-ID: <168677930330.2787985.15866363373310739456.stgit@djiang5-mobl3> In-Reply-To: <168677921156.2787985.6927511816148622557.stgit@djiang5-mobl3> References: <168677921156.2787985.6927511816148622557.stgit@djiang5-mobl3> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Add upstream port and any port definition for SSLBIS. Links: https://github.com/acpica/acpica/pull/874 Reviewed-by: Jonathan Cameron Signed-off-by: Dave Jiang Acked-by: Rafael J. Wysocki --- --- include/acpi/actbl1.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 8d5572ad48cb..a33375e055ad 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -465,6 +465,9 @@ struct acpi_cdat_sslbe { u16 reserved; }; +#define ACPI_CDAT_SSLBIS_US_PORT 0x0100 +#define ACPI_CDAT_SSLBIS_ANY_PORT 0xffff + /******************************************************************************* * * CEDT - CXL Early Discovery Table