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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A9B9C64EC4 for ; Fri, 10 Mar 2023 16:44:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 277D485F29; Fri, 10 Mar 2023 17:44:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="R97wKuME"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BF56685F22; Fri, 10 Mar 2023 17:44:29 +0100 (CET) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (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 04E3D85F22 for ; Fri, 10 Mar 2023 17:44:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ed1-x535.google.com with SMTP id g3so22968252eda.1 for ; Fri, 10 Mar 2023 08:44:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678466666; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=EebjMD44VeXByIFkKjM7U/P2ycPExZqCYbQGRMggSHo=; b=R97wKuMEFAa5xnRZbFeFUt2K+H2hCnlP35SoHRAKWuXdrT2/FKPJbjdWna5ZqBI0Dq YR9Tm70ANz8Wzom+vcyrYMbRGErIN//++f58Y4qDqjDZ2wLHPqD1dKHufghlPG5/gK+y zDA5cV/5fdYwEAedzllIKzKTbqD7nE+eN6xsDRzci3y4gGXwQnUVekOoiKetHIVWe8FH HPXF1wujSSbMM1g9NX9V6QkJPEKnammq6f36UqPUWAg9yege84CuelFs5Q+dKbqJi9q2 tO4bkB84Kdhll5+r0FXIdm+o48kVMOqLl+MXvN2Gs9gUvIjq5J8f8ho4ClXVIh/qcwgV L6aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678466666; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EebjMD44VeXByIFkKjM7U/P2ycPExZqCYbQGRMggSHo=; b=cPEV7M5jzOKS3C53Z67mnA+Q747nH9cFgHgIG1uFgVVrYhwKycQ3M8ri7l+kyXQ2Iv KueBNlowG/hjn3YB8jVDatR/0v+lD4utHllYrtogbIAgrPCAS7y/x2AB6oBBMa1vHi3P WTUhw1LsmN6nEfJUTIgQkLwQ2CVnFe8zAe53IGSMdAp1TNxdPBlHkWYieNkNC4dc5kdv zJnM/IDs5UsSFEP7l356fCeZPLe0r78mSvXT9unik7S82NTx31x20X+AN+VwIsCliHc3 H4fT5kLv00ykHSE82buWjyIjmobElLRZCY4U9oAmitq/xzuixHEOgtTSQxtWvfqMFO69 RRgQ== X-Gm-Message-State: AO0yUKUvUSW3F2o4zNsQcCqVGqACgtO1uYW5hRGeJ83/O+IvZdKbl0Pd NTZuiVyprBpD8hF9WUlCpbU= X-Google-Smtp-Source: AK7set8DWY7orIIMCq8kFMNhLbFdZ6nRDckMPJv2KTeHeqRQuuIcTkXtqHrsVH5z/CnQDu4P0JDwKg== X-Received: by 2002:aa7:c799:0:b0:4f9:e6f1:5c7c with SMTP id n25-20020aa7c799000000b004f9e6f15c7cmr185178eds.32.1678466666613; Fri, 10 Mar 2023 08:44:26 -0800 (PST) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id kz19-20020a17090777d300b008b17662e1f7sm83635ejc.53.2023.03.10.08.44.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Mar 2023 08:44:26 -0800 (PST) Message-ID: <8bf0b2ee-6263-dedb-41f0-0cb9999d923f@gmail.com> Date: Fri, 10 Mar 2023 17:44:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 From: Johan Jonker Subject: [PATCH v7 13/23] core: fdtaddr: add devfdt_get_addr_size_index_ptr function To: dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com, sjg@chromium.org, philipp.tomsich@vrull.eu, kever.yang@rock-chips.com Cc: u-boot@lists.denx.de, yifeng.zhao@rock-chips.com References: <4caa17bc-6d32-5b07-68f3-f5ced40bfcbb@gmail.com> Content-Language: en-US In-Reply-To: <4caa17bc-6d32-5b07-68f3-f5ced40bfcbb@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 Add devfdt_get_addr_size_index_ptr function with the same functionality as devfdt_get_addr_size_index, but instead a return pointer is given. Use map_sysmem() function as cast for the return. Make same fix for devfdt_get_addr_index_ptr() function. Suggested-by: Michael Nazzareno Trimarchi Signed-off-by: Johan Jonker Reviewed-by: Michael Trimarchi --- Changed V7: use map_sysmem() Changed V5: fix spelling use tabs --- drivers/core/fdtaddr.c | 17 ++++++++++++++++- include/dm/fdtaddr.h | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index 91bcd1a2..546db675 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -97,7 +98,10 @@ void *devfdt_get_addr_index_ptr(const struct udevice *dev, int index) { fdt_addr_t addr = devfdt_get_addr_index(dev, index); - return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)(uintptr_t)addr; + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_sysmem(addr, 0); } fdt_addr_t devfdt_get_addr_size_index(const struct udevice *dev, int index, @@ -122,6 +126,17 @@ fdt_addr_t devfdt_get_addr_size_index(const struct udevice *dev, int index, #endif } +void *devfdt_get_addr_size_index_ptr(const struct udevice *dev, int index, + fdt_size_t *size) +{ + fdt_addr_t addr = devfdt_get_addr_size_index(dev, index, size); + + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_sysmem(addr, 0); +} + fdt_addr_t devfdt_get_addr_name(const struct udevice *dev, const char *name) { #if CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h index c9d2b27b..dcdc1913 100644 --- a/include/dm/fdtaddr.h +++ b/include/dm/fdtaddr.h @@ -111,7 +111,7 @@ void *devfdt_get_addr_index_ptr(const struct udevice *dev, int index); * @dev: Pointer to a device * @index: the 'reg' property can hold a list of pairs * and @index is used to select which one is required - * @size: Pointer to size varible - this function returns the size + * @size: Pointer to size variable - this function returns the size * specified in the 'reg' property here * * Return: addr @@ -119,6 +119,21 @@ void *devfdt_get_addr_index_ptr(const struct udevice *dev, int index); fdt_addr_t devfdt_get_addr_size_index(const struct udevice *dev, int index, fdt_size_t *size); +/** + * devfdt_get_addr_size_index_ptr() - Return indexed pointer to the address of the + * reg property of a device + * + * @dev: Pointer to a device + * @index: the 'reg' property can hold a list of pairs + * and @index is used to select which one is required + * @size: Pointer to size variable - this function returns the size + * specified in the 'reg' property here + * + * Return: Pointer to addr, or NULL if there is no such property + */ +void *devfdt_get_addr_size_index_ptr(const struct udevice *dev, int index, + fdt_size_t *size); + /** * devfdt_get_addr_name() - Get the reg property of a device, indexed by name * -- 2.20.1