Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp2631393rdg; Mon, 16 Oct 2023 09:55:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeiTdlw1yoO1AoM7jyhGJpix8JmMcrNO5wmz6VXXGCPjOTgva3oX8f4VVfG4LsuJCT4Dlm X-Received: by 2002:a05:6a20:2447:b0:160:57a6:7eea with SMTP id t7-20020a056a20244700b0016057a67eeamr39892179pzc.37.1697475349093; Mon, 16 Oct 2023 09:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697475349; cv=none; d=google.com; s=arc-20160816; b=rx9LpCk2aD++rw6gUE9YVwmhE/L7pfbB+Bvi4VE/S+vnx1iYqH84bBCHFSITDABXLH gz8f/j7CR+QEkcAXXZamyM8yKMtGaOKHoZ8CF834+9s8OqoGmYNmy8QYCdFFGDVsVwNp hSZeNa+x6U3ywuwq5B8Sb4D4PK7IsU30o0vxgfeqixn1Gdiksv8LDnWKMPp9QTTe46LZ R3ntaXG4g9eA+HlHZbEknu3aRSZ5n8u5YWPuUlimDmEVr5usUx96ptjEMGB9B/ui/T5I 64LF2wTb9elUIv2NLNrZytx7BZJiJ8fSZItaOdxLzOWjr0GtgxgaN0IgROsnn2U/4j+T 0soQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; fh=GSUzFmVoxnIYRJr2qxP5oVP2HvI7gxdu+Sv/xWUv4xo=; b=ylFd/L20Kq93vU8OD08ImROtnT4j2Mma7GWJWdsfM9oLUSJy9mknSr82cVk/7bEKPl JZBV94bblNG6oqybtBcW+PfW3xCqxlsVkAqpoILI+68XZBpVle6cHagbDhtT2zAe7oph z1xdYG3ym5qu2wNB5UE3TSzKbY1GxkQCB37QhnCq/hRWMzzn/TPmKHNCJ+RtP+4wb7ps F4sjMn6Jwas4hjDxmGCHDqgM+V1HVW9ZUvD92JsyyPcFw1YKIfIuWNUDJXTwH2v4bBUX oSlDaSii2UCNwmifm2UcB+LUFwt9xclZHiQ49kEaz2P2JQOMhQ/J9Fx3Q3gIFKHYLMTB KqPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ejddTP9L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id x6-20020a63fe46000000b0059f0cebd054si11151711pgj.731.2023.10.16.09.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ejddTP9L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id B58A3809D45B; Mon, 16 Oct 2023 09:55:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234266AbjJPQzU (ORCPT + 99 others); Mon, 16 Oct 2023 12:55:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233931AbjJPQzG (ORCPT ); Mon, 16 Oct 2023 12:55:06 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05170E1CF for ; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-57bca5b9b0aso2503025eaf.3 for ; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1697475015; x=1698079815; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; b=ejddTP9LVNNwFngQrJ2MDm+S6rqEhAZBTy5rwQ2m0W9rGjH2ZCCFikWZ5j57O7cvkQ C6HibdcLOD2rMH6vyIEWjT6kEfexxPxBwFhVFTqt8QRmJK5N+d2XBgI4QDeCc+W2D179 HPuPXbg6rspGID9EXgbjFYuWH1C/mlCHMbGGTEW/n7sej0YASa91E7TjkbFQEKFhJzVb 6OH9GnHg/zmNLWglO/0HheXV+lmWfVmOsYfFjQZAvZkJK9p5WariVEYDQXAIuakIuGdl 1/pYUrfMH531wx85NJEq+sARZpNhMaBa3uUpq7qY4pq5TIXnIdXnRxHE5iizYQgy02H7 Sy6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697475015; x=1698079815; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; b=EV0vmaPMKIHPY4xWvKqf7HSqERFuBUWjC1LqJp/nwxN60dc6eHtv80itdX8Sv/7KSy T4dL9hBPKIo6G6J1xzwT+DuAbouw9JpRc+MB04RGYicmb+km+ngHnHzhAO4gNwvxPE4r vQ99usVOt7uOezZu99tL8MuxCQIx5BVsrbpgOz0XZMn82bHNAyEfppBLfYhOBQ0CgntM 2tOsFwrDwrcKZB7RMwcr8emYDir2jRs/DhVIQbB6h8wdibbAiadmiEWw0Ffw17ibjfoN o/G7FOF6gtpw0uQEbMqmPdIDgTQMmOdzSv9vdxz2SVKM92Yy9NdLoj9stqnIRQXVVd3p 1IPw== X-Gm-Message-State: AOJu0YzbeaFR1dp1/P7WLeI2n5M1sOK1u9LqRuSOnFwNXG0lV6GihD5P F4Yw4dYgnlC+ehkZmatE5mH/lA== X-Received: by 2002:a05:6358:18:b0:164:a5c0:46ac with SMTP id 24-20020a056358001800b00164a5c046acmr18820773rww.21.1697475015175; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id t21-20020a056a0021d500b006b1e8f17b85sm111252pfj.201.2023.10.16.09.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:50:14 -0700 (PDT) From: Sunil V L To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Atish Kumar Patra , Sunil V L Subject: [PATCH v3 -next 2/3] RISC-V: ACPI: RHCT: Add function to get CBO block sizes Date: Mon, 16 Oct 2023 22:19:57 +0530 Message-Id: <20231016164958.1191529-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016164958.1191529-1-sunilvl@ventanamicro.com> References: <20231016164958.1191529-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 16 Oct 2023 09:55:37 -0700 (PDT) Cache Block Operation (CBO) related block size in ACPI is provided by RHCT. Add support to read the CMO node in RHCT to get this information. Signed-off-by: Sunil V L --- arch/riscv/include/asm/acpi.h | 6 +++ drivers/acpi/riscv/rhct.c | 93 +++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index d5604d2073bc..7dad0cf9d701 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -66,6 +66,8 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa); static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } +void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size); #else static inline void acpi_init_rintc_map(void) { } static inline struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu) @@ -79,6 +81,10 @@ static inline int acpi_get_riscv_isa(struct acpi_table_header *table, return -EINVAL; } +static inline void acpi_get_cbo_block_size(struct acpi_table_header *table, + u32 *cbom_size, u32 *cboz_size, + u32 *cbop_size) { } + #endif /* CONFIG_ACPI */ #endif /*_ASM_ACPI_H*/ diff --git a/drivers/acpi/riscv/rhct.c b/drivers/acpi/riscv/rhct.c index b280b3e9c7d9..105f1aaa3fac 100644 --- a/drivers/acpi/riscv/rhct.c +++ b/drivers/acpi/riscv/rhct.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "ACPI: RHCT: " fmt #include +#include static struct acpi_table_header *acpi_get_rhct(void) { @@ -81,3 +82,95 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const return -1; } + +static void acpi_parse_hart_info_cmo_node(struct acpi_table_rhct *rhct, + struct acpi_rhct_hart_info *hart_info, + u32 *cbom_size, u32 *cboz_size, u32 *cbop_size) +{ + u32 size_hartinfo = sizeof(struct acpi_rhct_hart_info); + u32 size_hdr = sizeof(struct acpi_rhct_node_header); + struct acpi_rhct_node_header *ref_node; + struct acpi_rhct_cmo_node *cmo_node; + u32 *hart_info_node_offset; + + hart_info_node_offset = ACPI_ADD_PTR(u32, hart_info, size_hartinfo); + for (int i = 0; i < hart_info->num_offsets; i++) { + ref_node = ACPI_ADD_PTR(struct acpi_rhct_node_header, + rhct, hart_info_node_offset[i]); + if (ref_node->type == ACPI_RHCT_NODE_TYPE_CMO) { + cmo_node = ACPI_ADD_PTR(struct acpi_rhct_cmo_node, + ref_node, size_hdr); + if (cbom_size && cmo_node->cbom_size <= 30) { + if (!*cbom_size) { + *cbom_size = BIT(cmo_node->cbom_size); + } else if (*cbom_size != + BIT(cmo_node->cbom_size)) { + pr_warn("CBOM size is not the same across harts\n"); + } + } + + if (cboz_size && cmo_node->cboz_size <= 30) { + if (!*cboz_size) { + *cboz_size = BIT(cmo_node->cboz_size); + } else if (*cboz_size != + BIT(cmo_node->cboz_size)) { + pr_warn("CBOZ size is not the same across harts\n"); + } + } + + if (cbop_size && cmo_node->cbop_size <= 30) { + if (!*cbop_size) { + *cbop_size = BIT(cmo_node->cbop_size); + } else if (*cbop_size != + BIT(cmo_node->cbop_size)) { + pr_warn("CBOP size is not the same across harts\n"); + } + } + } + } +} + +/* + * During early boot, the caller should call acpi_get_table() and pass its pointer to + * these functions(and free up later). At run time, since this table can be used + * multiple times, pass NULL so that the table remains in memory + */ +void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size) +{ + u32 size_hdr = sizeof(struct acpi_rhct_node_header); + struct acpi_rhct_node_header *node, *end; + struct acpi_rhct_hart_info *hart_info; + struct acpi_table_rhct *rhct; + + if (acpi_disabled) + return; + + if (table) { + rhct = (struct acpi_table_rhct *)table; + } else { + rhct = (struct acpi_table_rhct *)acpi_get_rhct(); + if (!rhct) + return; + } + + if (cbom_size) + *cbom_size = 0; + + if (cboz_size) + *cboz_size = 0; + + if (cbop_size) + *cbop_size = 0; + + end = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->header.length); + for (node = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->node_offset); + node < end; + node = ACPI_ADD_PTR(struct acpi_rhct_node_header, node, node->length)) { + if (node->type == ACPI_RHCT_NODE_TYPE_HART_INFO) { + hart_info = ACPI_ADD_PTR(struct acpi_rhct_hart_info, node, size_hdr); + acpi_parse_hart_info_cmo_node(rhct, hart_info, cbom_size, + cboz_size, cbop_size); + } + } +} -- 2.39.2