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 696C4C6FD1F for ; Mon, 13 Mar 2023 00:31:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1D978611C; Mon, 13 Mar 2023 01:31:21 +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="LlICba7S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 309DB86106; Mon, 13 Mar 2023 01:31:20 +0100 (CET) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 2328F86121 for ; Mon, 13 Mar 2023 01:31:11 +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-x52b.google.com with SMTP id er25so14129999edb.5 for ; Sun, 12 Mar 2023 17:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678667470; 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=s0Enn6yJP2/Q80NEVosAw0tvGgxahMn7OZXukylS+AU=; b=LlICba7S43+z91SM3zsdWcLp2qTlq9W0vgFHddDYQjDoAv98p/xy3vOinsgkFXQAJq fWUicTDyGx8gRODhhxcU6LnsVrYQutHXByhSi5/PhBlz8mA01OLpF3DnFhKCs7Kdu8qQ Sxznfc3tZ/sJwPKnotPz4oBwtH84E8vfusyECkF2Q/oln0chkwOUXvVXhEpgl73NYEuu DQTY5Pd/+kgnQNj2/ojm1xY+WWbgX006kDGSqN6Z4rziCjmDAS5gBriMYe/4XUkdP4+x 23P/0laxa784eMjXYYz2HxjDlAiif4lGOQr1LL35k/FB6zE1xSxzS/Q6MFQmTiw8xTTQ aYkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678667470; 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=s0Enn6yJP2/Q80NEVosAw0tvGgxahMn7OZXukylS+AU=; b=KlYI5phar/F3/TauONdH9eXklYkvtOCT+zuNUNNrX/XZvOPvPzRZYfoDRx4BoBV7Xu nkoFw3WqRW/hsZI4MLCtuzAz+OZbfjXI6weVNiMK2UaGTuCZBlHuN+XZMN5IYHlLELdk F1Hd61hN8+oQYhwXnBo6ATrdhU4zCajtBa05WebpirZEIgwPGyFE9DCQs0lDPZKOxQ6B TSefl556DZTny0ykUauObr/HMHw6R3qBXDnhBioS4pANzI0wlc5pujnwjhs4f/NstTC8 IBAXuqG7UiF/4UTR8tSULCnUHrSJXcmZKi2w0mhW+m3NXWYWCQeXJRMoNCBpDEG6XQyU O4wg== X-Gm-Message-State: AO0yUKWSBdFlUxi2Id76mlu0QIrVGctWq13KZq2uECrg5+WrmsA53Z9e LKqpHK1Iz1p+ArYsOXZrKPs= X-Google-Smtp-Source: AK7set+b23vSkwS8P8myqO4figUbQKpf+KhDsTYUp0bY7lFdqF0X8djoegoZpspQOb8ZxNUKAm3TfA== X-Received: by 2002:a17:907:3186:b0:923:1b14:42fc with SMTP id xe6-20020a170907318600b009231b1442fcmr5755129ejb.20.1678667470782; Sun, 12 Mar 2023 17:31:10 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id lf17-20020a170907175100b008db605598b9sm2761185ejc.67.2023.03.12.17.31.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Mar 2023 17:31:10 -0700 (PDT) Message-ID: Date: Mon, 13 Mar 2023 01:31:09 +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 v8 14/24] 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: Content-Language: en-US In-Reply-To: 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 Reviewed-by: Simon Glass --- 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