[{"id":3675135,"web_url":"http://patchwork.ozlabs.org/comment/3675135/","msgid":"<3ecb2179-64e6-4937-9c43-11caaa03a1b0@linaro.org>","list_archive_url":null,"date":"2026-04-09T08:00:45","subject":"Re: [PATCH 1/4] arm: mach-meson: move reset_cpu to spl only","submitter":{"id":84903,"url":"http://patchwork.ozlabs.org/api/people/84903/","name":"Neil Armstrong","email":"neil.armstrong@linaro.org"},"content":"On 4/8/26 22:30, Ferass El Hafidi wrote:\n> This is in preparation of enabling SYSRESET across all Amlogic boards by\n> default. SYSRESET brings its own reset_cpu implementation which will\n> conflict with the one defined in board-common.c. SPL however will not\n> have SYSRESET enabled (due to overhead in the final image, as we have\n> very little space to work with), and thus will still need that reset_cpu\n> to be defined, so move it to spl.c so it is only built for SPL.\n> \n> Signed-off-by: Ferass El Hafidi <funderscore@postmarketos.org>\n> ---\n>   arch/arm/mach-meson/board-common.c | 14 --------------\n>   arch/arm/mach-meson/spl.c          | 10 ++++++++++\n>   2 files changed, 10 insertions(+), 14 deletions(-)\n> \n> diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c\n> index a5afc2d75c0..24dcafd30ac 100644\n> --- a/arch/arm/mach-meson/board-common.c\n> +++ b/arch/arm/mach-meson/board-common.c\n> @@ -154,17 +154,3 @@ int board_late_init(void)\n>   \n>   \treturn meson_board_late_init();\n>   }\n> -\n> -void reset_cpu(void)\n> -{\n> -#if CONFIG_SPL_BUILD\n> -\t/*\n> -\t * We do not have BL31 running yet, so no PSCI.\n> -\t * Instead, let the watchdog reset the board.\n> -\t */\n> -\tfor (;;)\n> -\t\t;\n> -#else\n> -\tpsci_system_reset();\n> -#endif\n> -}\n> diff --git a/arch/arm/mach-meson/spl.c b/arch/arm/mach-meson/spl.c\n> index 28a63f39d36..ec566849667 100644\n> --- a/arch/arm/mach-meson/spl.c\n> +++ b/arch/arm/mach-meson/spl.c\n> @@ -121,3 +121,13 @@ void board_init_f(ulong dummy)\n>   \tclrbits_32(GX_WDT_CTRL_REG, (1 << 18) | (1 << 25));\n>   #endif\n>   }\n> +\n> +void reset_cpu(void)\n> +{\n> +\t/*\n> +\t * We do not have BL31 running yet, so no PSCI.\n> +\t * Instead, let the watchdog reset the board.\n> +\t */\n> +\tfor (;;)\n> +\t\t;\n> +}\n> \n\nReviewed-by: Neil Armstrong <neil.armstrong@linaro.org>\n\nThanks,\nNeil","headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=YkThGUwX;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=linaro.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.b=\"YkThGUwX\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=linaro.org","phobos.denx.de;\n spf=pass smtp.mailfrom=neil.armstrong@linaro.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4frsnN4T50z1xtJ\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 09 Apr 2026 18:00:56 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id BC7B4839D5;\n\tThu,  9 Apr 2026 10:00:52 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 8D92B83CF5; Thu,  9 Apr 2026 10:00:51 +0200 (CEST)","from mail-wm1-x332.google.com (mail-wm1-x332.google.com\n [IPv6:2a00:1450:4864:20::332])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id A72B783693\n for <u-boot@lists.denx.de>; Thu,  9 Apr 2026 10:00:47 +0200 (CEST)","by mail-wm1-x332.google.com with SMTP id\n 5b1f17b1804b1-488b0e1b870so8319045e9.2\n for <u-boot@lists.denx.de>; Thu, 09 Apr 2026 01:00:47 -0700 (PDT)","from ?IPV6:2a01:e0a:106d:1080:70d5:8219:5bd4:e213?\n ([2a01:e0a:106d:1080:70d5:8219:5bd4:e213])\n by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-43d1e2c5253sm58880667f8f.9.2026.04.09.01.00.46\n (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n Thu, 09 Apr 2026 01:00:46 -0700 (PDT)"],"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,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1775721647; x=1776326447; darn=lists.denx.de;\n h=content-transfer-encoding:in-reply-to:organization:autocrypt\n :content-language:references:cc:to:subject:reply-to:from:user-agent\n :mime-version:date:message-id:from:to:cc:subject:date:message-id\n :reply-to; bh=Om2xywcxI3fHwkTpaTy/n/Yzf0/yCJWYXd+MLwqqrf8=;\n b=YkThGUwXpclijFJ/ru8mHieU2ASAMyEg63KqOw6kSTBRsTrNtKd0KaWRTOGpbHpkTZ\n mOgAyHdcwWYffhbEfizBe/jCqFi0Y2QAVZ+Kv/VZhtGyNaQYdAePys0Rkv6xr4WJosBO\n adIdLG1KRHcvLdD7o3l6lugD2AsRJU4ZbVpQL/TkcPdogbRBNFyZFfcpUfU2Cp0W32xx\n PS/viQ1oecbqFxuV3ssqkpo+rBjfiQhg7DDzH9Kp66vSPz0pDMbf7xf14B5wsqg+mjN3\n hpNh//iBW8oRMqfb/XY01LEBnVdO0IGQouZYMyOn1Ak0Fv6VDHWW0Ply0z9EDvg+W5a4\n AXvA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775721647; x=1776326447;\n h=content-transfer-encoding:in-reply-to:organization:autocrypt\n :content-language:references:cc:to:subject:reply-to:from:user-agent\n :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=Om2xywcxI3fHwkTpaTy/n/Yzf0/yCJWYXd+MLwqqrf8=;\n b=R4eT9Axc4pUHiZippAJk6iyhpveExNO5zL5op3vMrh7FXVMsid+YdLZrZ5CvwkAy8I\n dM3HPr4X5xGxJdknagEHWOPx0yHX3ZIaaukMhikCLCh4aZXy0dPVLJgoGhu78BMfsQDM\n a/z+aQWnMf5nNQM1J0E9SETQ2XgRIGVNfzzYVvU7tdJMBJeQbS6SxiA4pnWxkLHzpgog\n bVoyKJN6t9WL3pRVk1uofTuzc7jWTZmpH5H53jr2Jf2P4q7C5hy7ucY/9KRHv+J6cUCS\n zKn+GFHaRLoiWLMZeICmK9dyHAYzu+Si8wGo29YCzFVr/XXals5+dhYOjgKIjVHtGRno\n HwZA==","X-Forwarded-Encrypted":"i=1;\n AJvYcCU6Xh3AcLU6xBz/3vKu0i1zPS01EFOzjs9QuVvzrKO9pFuWb1xEJ0hXwK4zQisAHFWpsA2zJJY=@lists.denx.de","X-Gm-Message-State":"AOJu0YzU0aSrmRg1oF5Yzs2IUWNDFF3jH4mdL2niYnfCYAS0im0M0oaR\n hdlfLqtV4xY90wMl1MwuNMvAjGZ7xZ8RUKHOIv4SjPMAHOhgDfgbZXLPWPBQj+HdgLk=","X-Gm-Gg":"AeBDieth4HELL4KV88hiTDRmmMv8SYSDhlC1jPvb9xFbzosUqa5lBMuGXtpedNr/miX\n 5C5HsqTU+wC86dm7JTwsnBrGOfSNAE3FssDX3gIHcUdESBaLO7KtJaPVVvMY11RxgvfMsaaVspW\n kEw42AaZb98/eK4O1zJSr6MPfu+OGnDdj892aevEWS9aWSuCmearp5iVFvgminAE2/5jaV4m/bU\n NZeyNrKqE1HrBc1RcV9EMlOjhRAXPcreNvlx8KjIW93hSpyXi9Um8WkJCJS3SlWGVokZREb1/16\n u/5xZkceACjP6ENUKn2Wpo3ElNgmysi1KhzejTAuoTsmx+hkjJRTtcMFCProITzilD6iR/k0rvu\n b8NbfPrm2ErGcRiaKyusQgHqCxDvd02Hd0cV6ULvpi31N3AkgcdnDWaQAS49UvPqd9YUFv8Pvgq\n +MxZC+xH2PpM7mYE4fjwMiotxagL5OXbfhKWOOm1dWZf1g8/rPexj1XI/6d5kq3sGNe2X3ZPA97\n AS2Esc=","X-Received":"by 2002:a05:600c:a47:b0:485:4eaf:eb53 with SMTP id\n 5b1f17b1804b1-48899781357mr356705255e9.19.1775721646839;\n Thu, 09 Apr 2026 01:00:46 -0700 (PDT)","Message-ID":"<3ecb2179-64e6-4937-9c43-11caaa03a1b0@linaro.org>","Date":"Thu, 9 Apr 2026 10:00:45 +0200","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","From":"Neil Armstrong <neil.armstrong@linaro.org>","Subject":"Re: [PATCH 1/4] arm: mach-meson: move reset_cpu to spl only","To":"Ferass El Hafidi <funderscore@postmarketos.org>,\n u-boot-amlogic@groups.io, u-boot@lists.denx.de","Cc":"Tom Rini <trini@konsulko.com>,\n Evgeny Bachinin <EABachinin@salutedevices.com>,\n Marek Vasut <marek.vasut+renesas@mailbox.org>","References":"\n <20260408-b4-amlogic-sysreset-capsules-v1-0-6f3386eb5124@postmarketos.org>\n <20260408-b4-amlogic-sysreset-capsules-v1-1-6f3386eb5124@postmarketos.org>","Content-Language":"en-US, fr","Autocrypt":"addr=neil.armstrong@linaro.org; keydata=\n xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP\n GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4\n BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9\n qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik\n 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB\n AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA\n OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk\n Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04\n YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ\n GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw\n UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa\n GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r\n yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp\n QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+\n SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY\n 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM\n Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX\n oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn\n M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3\n 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS\n KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy\n 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT\n QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g","Organization":"Linaro","In-Reply-To":"\n <20260408-b4-amlogic-sysreset-capsules-v1-1-6f3386eb5124@postmarketos.org>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<https://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>","Reply-To":"Neil Armstrong <neil.armstrong@linaro.org>","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"}}]