From patchwork Thu Feb 27 12:14:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 868960 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp247034wrz; Thu, 27 Feb 2025 04:57:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUAB8tanbGE7bJvoVFTdcGOiqc3ARmwTErsCYiv3qDlB8X7ZxfFIgka2mUpnhMtUpBBIrfVBw==@linaro.org X-Google-Smtp-Source: AGHT+IGhVhijt2gaazI7Gg0FqxhzwONJf5yyGzJgX3yLBNoLhnYWk7yB4+ljpYN45yB0mEQWmP7/ X-Received: by 2002:a17:906:2191:b0:aa6:8cbc:8d15 with SMTP id a640c23a62f3a-abeeedc8786mr593122366b.14.1740661042256; Thu, 27 Feb 2025 04:57:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740661042; cv=none; d=google.com; s=arc-20240605; b=HCZG78OQBuNGicBuWdluhRxIcUy1KCk4UUqLQgO+EGD4hzWRf6c3u0qMHasT2sx+pZ FI2w2HjLd+I3GAzZ9VlkY3VrioxVIecwhdaUX8qv6EZrUPqq7djpLKPEBLBvl1giyvis uIBbXgxYQKjeGeeMfedVcumPkfonrDXheAq2EAOF7wnDGQTrnw6WIfqenm7gWm3cpBzH 1/gO2hdPkrP3Rw7CxaeVm85/jpthpFj+xzystq980w64Dn4UlsQsEGQPZe71fl4CNT+a jx1K/1VgdXOEDHZv3DHbRVMo8BV4yOtcUyvR9s+ZKioB7koPtRQjs0YwjF7zYwMld3E2 f2TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sqOy20sja8WQ+/N6U2BFZ8pmWuEOlVnY5Bc/eM0M/kM=; fh=eHExA8wiP9H2dxOaeZUpcFRywZHVEwmpX2hHwvdeB/w=; b=aZxLItFDPyDHGj1qYBgjNoMDW4PAWS0Gubl4I/KrpAOwde0fmTZOCyZ4cIJdX0VUXh tIUktRfPPRphckfIZkH71h+hp/9LtexoMzc7m0Czh5VWHqz5ACarliYt0oTctEUJYzZJ 90jSPLM7rC7uJrdH2Vj2gbv7YZsoeu/rWCOMWkhEOVPrrF/XpjVBNhUiCFoP/j2I37BH 2foTIzaKyIEKKxNpISPAJX7m8cVYyVwQmQVXGa208562bNku6Yxb9lp4LyOGZ5oBlffJ PoAWwRYJ9DrIHUiCpti4v+cSPV/7dkfMniT3Q6/qPGsSrV/vwQEoCJzjFfUN+GEZfO7A ortA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wT39py/t"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id a640c23a62f3a-abf0c71378esi154914566b.271.2025.02.27.04.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 04:57:22 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wT39py/t"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DE4181101; Thu, 27 Feb 2025 13:56:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wT39py/t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 63317801FB; Thu, 27 Feb 2025 13:15:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 463A280FF4 for ; Thu, 27 Feb 2025 13:15:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-abee54ae370so126055266b.3 for ; Thu, 27 Feb 2025 04:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740658534; x=1741263334; darn=lists.denx.de; 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=sqOy20sja8WQ+/N6U2BFZ8pmWuEOlVnY5Bc/eM0M/kM=; b=wT39py/t+/uNs8VFo59cpc2OHimfNTxSnYR+M8KD3bP89VyBp+qolZLzPPumWlAkxI c0ZFg/gURq0APO3j8O1aXE+qoWtCOxdq5EsAdAvxsKIkJr4mzQ5GpUiqE/ckAILDlbVc 4OIL8WXm3yiZ36/4d2IYo/IoIdbFWwwfznyuvaZxrKWfOlKTkTir8UflYxU9or8G2V7+ ZO3Epyt3oa90fzeSLo/tyz+8pPmxHBqIA6CyeGIiF8xb04IvNtDYaxugcmG4d3BnMYsg SfSmBEP5F3M3X6dLb4kIueq5vwL+MEutuaAHToSVN9QudR09t1svyErXeKiRpYj4Xyrc xSyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740658534; x=1741263334; 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=sqOy20sja8WQ+/N6U2BFZ8pmWuEOlVnY5Bc/eM0M/kM=; b=Cg4USRkIxfWNM5axM8H7wdY1CLBy8kjn3vWjrwDbkhmQmzMBSWKDKRm9a8Asp0nggV FJ8RocK+tiqQy0AqXbboOfQLNNyC5JQnfhUq40Ykik/SxIq0N4lm25+Vvad2X6PLbAcm w7G4Vzo8XzMtQJOfMoUPhLbU4/6yKeL+Yj7CM2r0xsav7r5ncjKBO9pSti02LJXtM24C 1txPcf41XBGBGsQT6ajS2DsWdw81gLPcsEMdB3LOGqnYm+aAXHIOjzKogS73nNt7i+Zl Q1dqlER5XQEj29ffWJBmiNQ7iIoQsgAX+FgHnovqwM8aOLetm3UfvSL3JYXg6rU7v7Tt WKpA== X-Forwarded-Encrypted: i=1; AJvYcCUtpvkZF659wNXv/Rda6GGtwEkg825KvjLotuDrnRDJ9AuixeFb1e+2GnAtMDhWgK/JTaeWtec=@lists.denx.de X-Gm-Message-State: AOJu0Yw8Ac6XJFdsvAVs6tg8p60/2GK6m1QI466Fewk7R51O6dbHQ0Zu UMVjEAobXd1Hn51nff5YjwDzPVFTPzoHFrL33A3lXexFLgCQiT4j1qY6ZK8iGf4= X-Gm-Gg: ASbGncvdl/ymhvLtKjMX6OZIznqigBmC842KXWaYypqUooPLsbdQoYOnD2UPILFtR99 0yaDCicBkDLM3BM0r5J/Bp/i3MRUbioetp+gL+RcN5MT+3hCsMGLjjpecDxdpF+YbjabNy2LNbj 1Iu759N9sRnWlp/koIQnUnSFNyBr+OOJK2N8x0Xo0P2oY91U0xNzveiWQIfxhLQBOumSktpHiRK tN8gYUbaYlUu6VxmM2lX3bJdo9LSwjnabLEHwha3hWyRbSLqMhO69vmvLg/a4Q/8hZ7Kfr4DWIF RpBs+FwChUK4slGlmYyyGO8MwDPEzQYWLISfOzYxfigxnymEZCSEVSjrnAQV0oOoEeI19f4RAuN CTr0+ X-Received: by 2002:a17:906:1daa:b0:abe:ebe2:6748 with SMTP id a640c23a62f3a-abeeef649f8mr830652766b.38.1740658533599; Thu, 27 Feb 2025 04:15:33 -0800 (PST) Received: from localhost.localdomain (ppp176092191135.access.hol.gr. [176.92.191.135]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c0dc168sm114736566b.70.2025.02.27.04.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 04:15:33 -0800 (PST) From: Ilias Apalodimas To: xypron.glpk@gmx.de, mark.kettenis@xs4all.nl Cc: Ilias Apalodimas , Jerome Forissier , Caleb Connolly , Alexey Brodkin , Eugeniy Paltsev , Tom Rini , Huan Wang , Angelo Dureghello , Thomas Chou , Rick Chen , Leo , Marek Vasut , Nobuhiro Iwamatsu , Max Filippov , Sughosh Ganu , Simon Glass , =?utf-8?q?Pierre-Cl=C3=A9ment_Tosi?= , Neil Armstrong , Sam Protsenko , Richard Henderson , Sam Edwards , Andre Przywara , Peter Hoyes , Patrick Rudolph , Mayuresh Chitale , Mattijs Korpershoek , Stefan Roese , Harrison Mutai , Alex Shumsky , Jagan Teki , Raymond Mao , Jiaxun Yang , Evgeny Bachinin , Rasmus Villemoes , Christian Marangi , Michal Simek , Jonas Jelonek , uboot-snps-arc@synopsys.com, u-boot@lists.denx.de Subject: [PATCH v3 1/6] meminfo: add memory details for armv8 Date: Thu, 27 Feb 2025 14:14:51 +0200 Message-ID: <20250227121515.232996-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250227121515.232996-1-ilias.apalodimas@linaro.org> References: <20250227121515.232996-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 27 Feb 2025 13:56:54 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Upcoming patches are mapping memory with RO, RW^X etc permsissions. Fix the meminfo command to display them properly Acked-by: Jerome Forissier Reviewed-by: Caleb Connolly Signed-off-by: Ilias Apalodimas --- arch/arm/cpu/armv8/cache_v8.c | 26 +++++++++++++++++++++++--- arch/arm/include/asm/armv8/mmu.h | 2 ++ cmd/meminfo.c | 6 ++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index 5d6953ffedd1..c4b3da4a8da7 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -421,7 +421,7 @@ static int count_ranges(void) return count; } -#define ALL_ATTRS (3 << 8 | PMD_ATTRINDX_MASK) +#define ALL_ATTRS (3 << 8 | PMD_ATTRMASK) #define PTE_IS_TABLE(pte, level) (pte_type(&(pte)) == PTE_TYPE_TABLE && (level) < 3) enum walker_state { @@ -568,6 +568,20 @@ static void pretty_print_table_attrs(u64 pte) static void pretty_print_block_attrs(u64 pte) { u64 attrs = pte & PMD_ATTRINDX_MASK; + u64 perm_attrs = pte & PMD_ATTRMASK; + char mem_attrs[16] = { 0 }; + int cnt = 0; + + if (perm_attrs & PTE_BLOCK_PXN) + cnt += snprintf(mem_attrs + cnt, sizeof(mem_attrs) - cnt, "PXN "); + if (perm_attrs & PTE_BLOCK_UXN) + cnt += snprintf(mem_attrs + cnt, sizeof(mem_attrs) - cnt, "UXN "); + if (perm_attrs & PTE_BLOCK_RO) + cnt += snprintf(mem_attrs + cnt, sizeof(mem_attrs) - cnt, "RO"); + if (!mem_attrs[0]) + snprintf(mem_attrs, sizeof(mem_attrs), "RWX "); + + printf(" | %-10s", mem_attrs); switch (attrs) { case PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE): @@ -613,6 +627,7 @@ static void print_pte(u64 pte, int level) { if (PTE_IS_TABLE(pte, level)) { printf(" %-5s", "Table"); + printf(" %-12s", "|"); pretty_print_table_attrs(pte); } else { pretty_print_pte_type(pte); @@ -642,9 +657,9 @@ static bool pagetable_print_entry(u64 start_attrs, u64 end, int va_bits, int lev printf("%*s", indent * 2, ""); if (PTE_IS_TABLE(start_attrs, level)) - printf("[%#011llx]%14s", _addr, ""); + printf("[%#016llx]%19s", _addr, ""); else - printf("[%#011llx - %#011llx]", _addr, end); + printf("[%#016llx - %#016llx]", _addr, end); printf("%*s | ", (3 - level) * 2, ""); print_pte(start_attrs, level); @@ -1112,3 +1127,8 @@ void __weak enable_caches(void) icache_enable(); dcache_enable(); } + +void arch_dump_mem_attrs(void) +{ + dump_pagetable(gd->arch.tlb_addr, get_tcr(NULL, NULL)); +} diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 0ab681c893d3..6af8cd111a44 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -66,6 +66,7 @@ #define PTE_BLOCK_NG (1 << 11) #define PTE_BLOCK_PXN (UL(1) << 53) #define PTE_BLOCK_UXN (UL(1) << 54) +#define PTE_BLOCK_RO (UL(1) << 7) /* * AttrIndx[2:0] @@ -75,6 +76,7 @@ #define PMD_ATTRMASK (PTE_BLOCK_PXN | \ PTE_BLOCK_UXN | \ PMD_ATTRINDX_MASK | \ + PTE_BLOCK_RO | \ PTE_TYPE_VALID) /* diff --git a/cmd/meminfo.c b/cmd/meminfo.c index 5e83d61c2dd3..acdb38dcba02 100644 --- a/cmd/meminfo.c +++ b/cmd/meminfo.c @@ -15,6 +15,10 @@ DECLARE_GLOBAL_DATA_PTR; +void __weak arch_dump_mem_attrs(void) +{ +} + static void print_region(const char *name, ulong base, ulong size, ulong *uptop) { ulong end = base + size; @@ -58,6 +62,8 @@ static int do_meminfo(struct cmd_tbl *cmdtp, int flag, int argc, if (!IS_ENABLED(CONFIG_CMD_MEMINFO_MAP)) return 0; + arch_dump_mem_attrs(); + printf("\n%-12s %8s %8s %8s %8s\n", "Region", "Base", "Size", "End", "Gap"); printf("------------------------------------------------\n");