From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6679DC47258 for ; Thu, 25 Jan 2024 16:44:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F03928D0005; Thu, 25 Jan 2024 11:44:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E8ABC8D0002; Thu, 25 Jan 2024 11:44:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDDB98D0005; Thu, 25 Jan 2024 11:44:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B57028D0002 for ; Thu, 25 Jan 2024 11:44:10 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 97AB8A210B for ; Thu, 25 Jan 2024 16:44:10 +0000 (UTC) X-FDA: 81718405860.03.A6E9BCE Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id B9327100018 for ; Thu, 25 Jan 2024 16:44:08 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706201048; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iqltK2Y9d/2ow3+g4elSrmbFiSkngQ1GfY2zIASVBTo=; b=akuikfp4ZKbFfmxUhpWY1L89a83jvddTSeHv9k+h1zzl1bIV3zJHKQUHd2VfrtM4f4xQhK lQPaS85Ogg8IM9jHOETNud5gMCOkuhKUAkKqvRx7gxqUrh8mfDLYMbvGLFlvTykwQMkFma 8OpYpvi05g1nUbR0ukBkg3FouUSAazk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706201048; a=rsa-sha256; cv=none; b=XzUHYeEutfFc7cyXnOpJdrYHXsTazfCkXJfQQyY7fHWUX5asLu7UhuSKuEwtzk9fRIUZIW S/ntZjKkZ5BSt1h5auUFgXPyqWVZnBPkxbfTtkgy2dKh+e8ExzmJgYnuBvFvUkRiDmEwO/ qPnqZNMN7pa/HASY3GrZXUv/8zdi+uk= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=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 7FAFC15A1; Thu, 25 Jan 2024 08:44:52 -0800 (PST) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E70C3F5A1; Thu, 25 Jan 2024 08:44:02 -0800 (PST) From: Alexandru Elisei To: catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, arnd@arndb.de, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, mhiramat@kernel.org, rppt@kernel.org, hughd@google.com Cc: pcc@google.com, steven.price@arm.com, anshuman.khandual@arm.com, vincenzo.frascino@arm.com, david@redhat.com, eugenis@google.com, kcc@google.com, hyesoo.yu@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC v3 14/35] of: fdt: Return the region size in of_flat_dt_translate_address() Date: Thu, 25 Jan 2024 16:42:35 +0000 Message-Id: <20240125164256.4147-15-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125164256.4147-1-alexandru.elisei@arm.com> References: <20240125164256.4147-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B9327100018 X-Rspam-User: X-Stat-Signature: mzco7rb8xaah1bochnt94uokcpewo8s5 X-Rspamd-Server: rspam03 X-HE-Tag: 1706201048-271379 X-HE-Meta: U2FsdGVkX18jU4ZJJPkm49kgkK1HPVjYy/Z7ynpKtQe2DMKMN/yKtAYFdNzI4I04UxJ3k/ooUbbKlPlUorcx3d/wVrQlnZZOXweAvqgj6swKuEnicy94Fx+NI2OWIWg3ErSrZLNmdai/8Gsv94t9mjsa7dEL6v0IY3HU32O5+ZMAdQt/rya0U7Te4Ac4XP8ABbiIvf7LTtSoDjt4bPHdJOXQjXvzlymDYdugq4XdKiFRlSzqt+9Dir3E1bLIHREcxF6K9fpXUKL/jEkE/plLAh9l83VBK+sjU0O6+QkGkNZAWdS2l24yRpPZYJSuto6d91lzdAMnntILxSnE4F//Vp/isFEiv3Hs+Ed2CngJDrMiKU6/UUEEZ+lK/eMkayrJlZtlBKgvV/Bws4qAPLkwFMHOK0n3gQrljYSp6n+jtHOdOLLtgT5K3wRVmxHUiFaqNiYNAMfZPz+Ar0MMa0UgxfqHvhND8e5nxDoo1sjEwrxNI9or1LgTxQQwXtwIL9ClgRw9DrDxLj6QJD9X3J9vNuCyaJCaXUM4YrMwYwchTFyGzcc4bJ92jA6FlIq93hvGD26qPlPXMtgEvIZw9u/iYwIGY0DN60Mlh4wOi7e0873P0f10Az4WSaYu6t36XGiqOjmtXi087n1TdOqScVJibI4A2zcHgzqqzexlFiwsuXCHPvJGCPE0O4yQw/qpng8Y4QlNjgnTWG8pGLYP6B0jrAlYmQLg5Jmb9XO8mQmlbf/iMyPL+YIUT76ob7OalH7X1JvONbH17wgDoPe+ZoQsbbAzuYJqAxY9W8sfnHHT0W3hgaCeP0eBcbdURXOOFYkNQwJJ1anbqE332dAqAIfQP0NxWDZBgGzCZ+GOldWetK9WcWcY95C73UEVsMHO9MpS9gQUipoTH9FsLgf/CK4d0qmwgoiTqVwBlZn62I57GqTyuSZsZueVp3T4LimAxn/AStTd1m6hxkBkyFHhZvv 3bq+Gug1 fPH6SUhOZMMg+s9t2m/IXjKn+kYA8jprFQlODVQw7EqxfQLPw/RHOW/+1UDm31yrm0BMa78Kcy9G9RorPq87OjGJ6/34ZLzX7lTFRaUQ/YCPviZiry6y0Tc0jo7eLFKiWjKPOiJ6zErhfFvr+WVdBHoT2tVQFl6PALr4Z4PEZslg7tPBXnK32Mz/aL0UI/8pCsCm3BDy8tQWGIls= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Alongside the base address, arm64 will also need to know the size of a tag storage region. Teach of_flat_dt_translate_address() to parse and return the size. Signed-off-by: Alexandru Elisei --- Changes since rfc v2: * New patch, suggested by Rob Herring. arch/sh/kernel/cpu/sh2/probe.c | 2 +- drivers/of/fdt_address.c | 12 +++++++++--- drivers/tty/serial/earlycon.c | 2 +- include/linux/of_fdt.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c index 70a07f4f2142..fa8904e8f390 100644 --- a/arch/sh/kernel/cpu/sh2/probe.c +++ b/arch/sh/kernel/cpu/sh2/probe.c @@ -21,7 +21,7 @@ static int __init scan_cache(unsigned long node, const char *uname, if (!of_flat_dt_is_compatible(node, "jcore,cache")) return 0; - j2_ccr_base = ioremap(of_flat_dt_translate_address(node), 4); + j2_ccr_base = ioremap(of_flat_dt_translate_address(node, NULL), 4); return 1; } diff --git a/drivers/of/fdt_address.c b/drivers/of/fdt_address.c index 1dc15ab78b10..4c077778d710 100644 --- a/drivers/of/fdt_address.c +++ b/drivers/of/fdt_address.c @@ -160,7 +160,8 @@ static int __init fdt_translate_one(const void *blob, int parent, * that can be mapped to a cpu physical address). This is not really specified * that way, but this is traditionally the way IBM at least do things */ -static u64 __init fdt_translate_address(const void *blob, int node_offset) +static u64 __init fdt_translate_address(const void *blob, int node_offset, + u64 *out_size) { int parent, len; const struct of_bus *bus, *pbus; @@ -193,6 +194,9 @@ static u64 __init fdt_translate_address(const void *blob, int node_offset) goto bail; } memcpy(addr, reg, na * 4); + /* The size of the region doesn't need translating. */ + if (out_size) + *out_size = of_read_number(reg + na, ns); pr_debug("bus (na=%d, ns=%d) on %s\n", na, ns, fdt_get_name(blob, parent, NULL)); @@ -242,8 +246,10 @@ static u64 __init fdt_translate_address(const void *blob, int node_offset) /** * of_flat_dt_translate_address - translate DT addr into CPU phys addr * @node: node in the flat blob + * @out_size: size of the region, can be NULL if not needed + * @return: the address, OF_BAD_ADDR in case of error */ -u64 __init of_flat_dt_translate_address(unsigned long node) +u64 __init of_flat_dt_translate_address(unsigned long node, u64 *out_size) { - return fdt_translate_address(initial_boot_params, node); + return fdt_translate_address(initial_boot_params, node, out_size); } diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index a5fbb6ed38ae..e941cf786232 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -265,7 +265,7 @@ int __init of_setup_earlycon(const struct earlycon_id *match, spin_lock_init(&port->lock); port->iotype = UPIO_MEM; - addr = of_flat_dt_translate_address(node); + addr = of_flat_dt_translate_address(node, NULL); if (addr == OF_BAD_ADDR) { pr_warn("[%s] bad address\n", match->name); return -ENXIO; diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index d69ad5bb1eb1..0e26f8c3b10e 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -36,7 +36,7 @@ extern char __dtb_start[]; extern char __dtb_end[]; /* Other Prototypes */ -extern u64 of_flat_dt_translate_address(unsigned long node); +extern u64 of_flat_dt_translate_address(unsigned long node, u64 *out_size); extern void of_fdt_limit_memory(int limit); #endif /* CONFIG_OF_FLATTREE */ -- 2.43.0