From patchwork Tue Feb 20 22:57:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13564705 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B1F2C48BC3 for ; Tue, 20 Feb 2024 22:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y4NQvbb+dyupmIOa663OatpdbfcOKL2fx2704DLT55o=; b=E2/UmLSCVazml1 T4kIOdv19TObDXs1pjL3jIUacliDVByeth9FVEw04O6rsE3XT1GlCzyejD3e+/9h6gScFlxsK9mgN V7tIOg7s15TCAVim4Aq7Enq84aDBBSefU5Ej056KeYOXEHR9GQqKmR7HCptmp40vDpbYrUgRV+6jr ukedAGQjyl1DjcfWw/zyBoQAHr791ogWV+jylUP95nLu/y5bSXtHBvAyfjeIOeSgto7vJFt56cxvL fViJeifvpBC3khB5pa6gCIdFRa1F2zWsyC2NLajFT/X7szjfVZdbyKUx/qlw9MIL/a1JV17xv5k6x SXcLH7+QoIPeTW2TDxTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcZ3m-0000000GQKN-0veO; Tue, 20 Feb 2024 22:57:58 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcZ3W-0000000GQCb-0DeE for linux-arm-kernel@lists.infradead.org; Tue, 20 Feb 2024 22:57:43 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2d204e102a9so77365071fa.0 for ; Tue, 20 Feb 2024 14:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708469860; x=1709074660; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AycSOZZElt80+nGkUPVSHZn5jQIyWVlzHRqHfSaFet8=; b=CHhgmWPD+eqSuHrOEl1PRFsNg6QqMwBY5Dn/D9dROQQdqFM7msMyDi+W+DpemPZQ0H 2CD34leUi09u9gXqVFb2zHSmYfw4VUwVTZSUK9NtOSe9jrwwVH7WUR4HtUinCFZh+SRP PwV6I6br9APzKITrjIljNsLjTSf9E3S39ZKwNF5EURY+lwwXw8rmwfjnB/K9Wk/IInYi zxdznUqQhjGmP5UeeBYa+yeSzMnOVBIV/VXp5hb0z9186JibCwWbSm1Xmyo0QRquffcX qAW/OILsBQ/R4HOkWvzmw3Ty3lKmQuproEr68gSVDKsTPoc+XQdoAeq93MhsVTgESjIQ k6rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708469860; x=1709074660; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AycSOZZElt80+nGkUPVSHZn5jQIyWVlzHRqHfSaFet8=; b=J9bzTfsqRQ6XmoqkQ17msKlO0XR/hxnDerezt8HwS9arB6zkjA36CvpnYi2wbzRzpI A40zoXcJAzzjjlIIuM4W0mfsuBc/0SImj1Gl/KPFCMsPghjvztgIwHNahi/ebBKegptu UApUy2r5rsZLdvyJBzkwGZ0FmOJGClWBD2fRkAetROY5qv7i+/u88azH4rJIJj5ssYYV LLvR7pOAOlZQTp2r/xEuEbajuyyyxaR7w4VT4OVANan0v7GnGfg7sMnNR7ywxWnAL7UY Zp7NYdIv1vAMfEFTPuVtElNW1DBG7lW8LwVBvCCGcr3vMhkBTCTANdTBYLpONhyVeRGq mLbw== X-Gm-Message-State: AOJu0YzF+ifm5LJciVPuoG2NDHKjhi6K5eGkQR+MkOAcf0dWcCB0Ugmr 6awKUHe8BpdpZBGjoRuTD6cKrE7xD2JJ+9n5FQh4R6kV9WoAvpW4BAqTGmAY+c0= X-Google-Smtp-Source: AGHT+IHBCq0/5GF/mwezuBx5TnS+uOE9hdW//tO0VhHT/8WFv5KmFg6mip6f4whXUgDOaqB6Q/Y5hw== X-Received: by 2002:a2e:8782:0:b0:2d2:4637:63f with SMTP id n2-20020a2e8782000000b002d24637063fmr2090357lji.45.1708469860050; Tue, 20 Feb 2024 14:57:40 -0800 (PST) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id q8-20020a2e9688000000b002d24de76dffsm277990lji.100.2024.02.20.14.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 14:57:39 -0800 (PST) From: Dmitry Baryshkov Date: Wed, 21 Feb 2024 00:57:37 +0200 Subject: [PATCH RESEND 2/2] ARM: implement cacheinfo support MIME-Version: 1.0 Message-Id: <20240221-armv7-cacheinfo-v1-2-69dbd7f20d04@linaro.org> References: <20240221-armv7-cacheinfo-v1-0-69dbd7f20d04@linaro.org> In-Reply-To: <20240221-armv7-cacheinfo-v1-0-69dbd7f20d04@linaro.org> To: Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6946; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=znYqH4KKX5PqF5T6XnwgCw2bHRlbEzXsyiPDt8vHcKg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl1S5hwYCth0hBera7/JSOcwFboMaVGKIed56og /AfC53i4xCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZdUuYQAKCRCLPIo+Aiko 1W96CACrFLlalqgyVcuIrd9YS9M0OUZch03Ifg7KgjMsW/CbExCdMNhz9hKoTBf+heLUA3/5A8Y 5T6ovlcsLrH1KQ7T+LBahjkFV6Wjsg8qdcFAFtkJeEB084XXnDiZ3/6newjl9QfG4IU9jypKFrC /1Ln4wKwqg5RFqKO5l/B7Zu0ggOLKyoHk1MdoLCPVwWkwL6PeAg53rehdv8XQHxfspBZ/tszDic kT8Xk1OeOoARYyMuLRAYT5F4oZ7yKlTWZuRbI3MXb6JWYnTHjBPxccNFm9yeD4p5UYihNHjkn3m LIRA7DHzOfwTvsbRe5TWGrzuiD/SQ8S3++WcMHDGIVEA/30V X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_145742_156201_6E1317B2 X-CRM114-Status: GOOD ( 22.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On ARMv7 / v7m machines read CTR and CLIDR registers to provide information regarding the cache topology. Earlier machines should describe full cache topology in the device tree. Note, this follows the ARM64 cacheinfo support and provides only minimal support required to bootstrap cache info. All useful properties should be decribed in Device Tree. Signed-off-by: Dmitry Baryshkov --- arch/arm/Kconfig | 1 + arch/arm/include/asm/cache.h | 6 ++ arch/arm/kernel/Makefile | 1 + arch/arm/kernel/cacheinfo.c | 164 +++++++++++++++++++++++++++++++++++++++++++ include/linux/cacheinfo.h | 2 +- 5 files changed, 173 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8f47d6762ea4..cb293ddae6bb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -5,6 +5,7 @@ config ARM select ARCH_32BIT_OFF_T select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_CACHE_LINE_SIZE if OF select ARCH_HAS_CPU_FINALIZE_INIT if MMU select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VIRTUAL if MMU diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h index e3ea34558ada..ecbc100d22a5 100644 --- a/arch/arm/include/asm/cache.h +++ b/arch/arm/include/asm/cache.h @@ -26,4 +26,10 @@ #define __read_mostly __section(".data..read_mostly") +#ifndef __ASSEMBLY__ +#ifdef CONFIG_ARCH_HAS_CACHE_LINE_SIZE +int cache_line_size(void); +#endif +#endif + #endif diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 771264d4726a..b39c38ee9fdb 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -40,6 +40,7 @@ obj-y += entry-armv.o endif obj-$(CONFIG_MMU) += bugs.o +obj-$(CONFIG_OF) += cacheinfo.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ISA_DMA_API) += dma.o obj-$(CONFIG_FIQ) += fiq.o fiqasm.o diff --git a/arch/arm/kernel/cacheinfo.c b/arch/arm/kernel/cacheinfo.c new file mode 100644 index 000000000000..878ff4d10139 --- /dev/null +++ b/arch/arm/kernel/cacheinfo.c @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ARM cacheinfo support + * + * Copyright (C) 2023 Linaro Ltd. + * Copyright (C) 2015 ARM Ltd. + * All Rights Reserved + */ + +#include +#include +#include + +#include +#include +#include + +/* Ctypen, bits[3(n - 1) + 2 : 3(n - 1)], for n = 1 to 7 */ +#define CLIDR_CTYPE_SHIFT(level) (3 * (level - 1)) +#define CLIDR_CTYPE_MASK(level) (7 << CLIDR_CTYPE_SHIFT(level)) +#define CLIDR_CTYPE(clidr, level) \ + (((clidr) & CLIDR_CTYPE_MASK(level)) >> CLIDR_CTYPE_SHIFT(level)) + +#define MAX_CACHE_LEVEL 7 /* Max 7 level supported */ + +#define CTR_FORMAT_MASK GENMASK(27, 24) +#define CTR_CWG_MASK GENMASK(27, 24) +#define CTR_DSIZE_LEN_MASK GENMASK(13, 12) +#define CTR_ISIZE_LEN_MASK GENMASK(1, 0) + +/* Also valid for v7m */ +static inline int cache_line_size_cp15(void) +{ + u32 ctr = read_cpuid_cachetype(); + u32 format = FIELD_GET(CTR_FORMAT_MASK, ctr); + + if (format == 4) { + u32 cwg = FIELD_GET(CTR_CWG_MASK, ctr); + + return cwg ? 4 << cwg : ARCH_DMA_MINALIGN; + } else if (WARN_ON_ONCE(format != 0)) { + return ARCH_DMA_MINALIGN; + } + + return 8 << max(FIELD_GET(CTR_ISIZE_LEN_MASK, ctr), + FIELD_GET(CTR_DSIZE_LEN_MASK, ctr)); +} + +int cache_line_size(void) +{ + if (coherency_max_size != 0) + return coherency_max_size; + + /* CP15 is optional / implementation defined before ARMv6 */ + if (cpu_architecture() < CPU_ARCH_ARMv6) + return ARCH_DMA_MINALIGN; + + return cache_line_size_cp15(); +} +EXPORT_SYMBOL_GPL(cache_line_size); + +static inline enum cache_type get_cache_type(int level) +{ + u32 clidr; + + if (level > MAX_CACHE_LEVEL) + return CACHE_TYPE_NOCACHE; + + clidr = read_clidr(); + + return CLIDR_CTYPE(clidr, level); +} + +static void ci_leaf_init(struct cacheinfo *this_leaf, + enum cache_type type, unsigned int level) +{ + this_leaf->level = level; + this_leaf->type = type; +} + +static int detect_cache_level(unsigned int *level_p, unsigned int *leaves_p) +{ + unsigned int ctype, level, leaves; + + /* CLIDR is not present before ARMv7/v7m */ + if (cpu_architecture() < CPU_ARCH_ARMv7) + return -EOPNOTSUPP; + + for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) { + ctype = get_cache_type(level); + if (ctype == CACHE_TYPE_NOCACHE) { + level--; + break; + } + /* Separate instruction and data caches */ + leaves += (ctype == CACHE_TYPE_SEPARATE) ? 2 : 1; + } + + *level_p = level; + *leaves_p = leaves; + + return 0; +} + +int early_cache_level(unsigned int cpu) +{ + struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + + return detect_cache_level(&this_cpu_ci->num_levels, &this_cpu_ci->num_leaves); +} + +int init_cache_level(unsigned int cpu) +{ + unsigned int level, leaves; + struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + int fw_level; + int ret; + + ret = detect_cache_level(&level, &leaves); + if (ret) + return ret; + + fw_level = of_find_last_cache_level(cpu); + + if (level < fw_level) { + /* + * some external caches not specified in CLIDR_EL1 + * the information may be available in the device tree + * only unified external caches are considered here + */ + leaves += (fw_level - level); + level = fw_level; + } + + this_cpu_ci->num_levels = level; + this_cpu_ci->num_leaves = leaves; + return 0; +} + +int populate_cache_leaves(unsigned int cpu) +{ + unsigned int level, idx; + enum cache_type type; + struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + struct cacheinfo *this_leaf = this_cpu_ci->info_list; + unsigned int arch = cpu_architecture(); + + /* CLIDR is not present before ARMv7/v7m */ + if (arch < CPU_ARCH_ARMv7) + return -EOPNOTSUPP; + + for (idx = 0, level = 1; level <= this_cpu_ci->num_levels && + idx < this_cpu_ci->num_leaves; idx++, level++) { + type = get_cache_type(level); + if (type == CACHE_TYPE_SEPARATE) { + ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level); + ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level); + } else { + ci_leaf_init(this_leaf++, type, level); + } + } + + return 0; +} diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index d504eb4b49ab..cb1222b8bbc8 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -132,7 +132,7 @@ static inline int get_cpu_cacheinfo_id(int cpu, int level) return -1; } -#ifdef CONFIG_ARM64 +#if defined(CONFIG_ARM64) || defined(CONFIG_ARM) #define use_arch_cache_info() (true) #else #define use_arch_cache_info() (false)