From patchwork Mon May 27 17:17:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 799239 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a47:0:b0:354:fb4b:99cd with SMTP id t7csp1980196wrw; Mon, 27 May 2024 10:18:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXo/6ZtIs73Ox7k7+B2QtLnXhnG/ErZsoChDgDnz4HN1P5sKmFVfUqmCaS7FMSRQ/9+Q4Vjek48UZWJxinM0eEf X-Google-Smtp-Source: AGHT+IGeWhmim3CPvs8Eg25ubQIzvbSBzeavDvfcWUjgKvF6iDPQpmuLixZRnOO1aO6xepqgqfEV X-Received: by 2002:ac2:4d93:0:b0:526:92d7:52d4 with SMTP id 2adb3069b0e04-52966ab6449mr5996264e87.61.1716830337036; Mon, 27 May 2024 10:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716830337; cv=none; d=google.com; s=arc-20160816; b=CcQC8Y3lhVr9EGEgmiziFJ+ImYFGHH12mvpe5fT2Xgp2LhQYu7Zl64/P6Ju4nAuA78 aoJx2AeBU8SZcHbl9PdciNWYy0bgwoT7RShWqvrh0zjA6Rls0O87z0YRfFi18vhb0So4 S2VhimE7x91zcFB1loHYKYIfIWo4TVtbCMo+BWEOviBtpMRlSiJZChkoYw85QPbX3n7w xTwPQVEClOSo8FkHkeajWsHnM5Vi11qwHVRQHm8tX4dvJrGccxm6AuaiPVvdAPAnJISS oBPKzbYeOxkj34P8VSTdHk4RFAmTuqA+i8+VwQn0Jm/EoKi8j5FT/NO/QjZX4rfo3tAr vF3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=4QFnjJkoDCSX9C4/0NHjltbmE9XPV1RDNc1JdmYfbQk=; fh=0KMHVfEVwpYmrLmvUa+dGxJ03HZfwo7/qKVaIJ/cQMY=; b=Fde7V4tJl3vH9RMW2Em6SqSfzA8z3s65fmDYWMYyWoztKLc4zpt6DAng9pvnQwhk4A 34F/th9tCdWUKpOstLRl+0t/yb0DSeYse/esyL2Mfj/77Az6JtB3tmJeMTZOOT221MrE Bo++By2RfvzeT70UwSbgv6DxsfZ+kPx2sadJlx0yto5ynPws8hgelPkfAubMiYdn5BSs mIxI1GY/BZj2iSSg9BQcBMBQe1ZS9BZvRxHtWvztWMfBxGUEoRfNwog5FUhcFEGLo4sf lwtRMM9q1rHSNBcaRHVLZ6fQYqk3uIf1K6e9UJy2qVc5P5Lr/0Sihvd8gKQn4+Zfp2NE spJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XyqwcU++; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id a640c23a62f3a-a631ed09c1fsi41351866b.914.2024.05.27.10.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 10:18:57 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XyqwcU++; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 443CA883AA; Mon, 27 May 2024 19:18:03 +0200 (CEST) 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="XyqwcU++"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 98033883B6; Mon, 27 May 2024 19:18:00 +0200 (CEST) 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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 AC13D87EAC for ; Mon, 27 May 2024 19:17:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5751bcb3139so13129525a12.1 for ; Mon, 27 May 2024 10:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716830278; x=1717435078; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=4QFnjJkoDCSX9C4/0NHjltbmE9XPV1RDNc1JdmYfbQk=; b=XyqwcU++RNMTAc5IK+iqceNoDvOFkliSykwp7eF9gsEtcjG+ZWdWVuVyA7xxLg0sl9 FI6g6lgECVfcbQNevuwT22fi1twy0nSUrBxcInPAthdWQxJho58Jqzhyher/KNYXOBnv NHg3EewO8t9ix9YTS/PkR1mRUVALljWnliTPfntumwkw4rgT5MKLe+PXUlndDRrHhaQB zRHfmlv6t4Vus31h6i0MlIRJKnGe4rIMX9WWj4YJ+QAyShj+xHeLzhMKPIQvk7RbgpY6 JdgQN+fde21yGfSllZ7KizhjcSLuzqA0WuJs2859u3bAXDfWgrbUPZTpjZblz0y7ja0r giVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716830278; x=1717435078; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4QFnjJkoDCSX9C4/0NHjltbmE9XPV1RDNc1JdmYfbQk=; b=vS15d9COxnD21jfJ7HdfEX+hj4SW+uPvfzH8zfNRwBdxxAPTpNDaOu8e1ssBLU4aWS JoV8T0ektHJlVbjYgaWs7DWqgn5qyE6j7fiEPtEkTkFzSRR38xsLNs5qgHd5u5a8uy8W sFB/Be8q/kbzHQ1LZPMwSNAIHB4mnIQ1/Ivp/R28vd+nBH9KVwxLGk6cedl5XiUfNWTZ zCFB7sZzTamCxdUDJM1eSu2B0q+9xFmMw7xb48h+543rNQpjD54+Aom6NybEMA0Y3Yh9 Z7Hcad3ITh1WKKWHSqq25tASVAvZo6+xK2pZXN4DcFAb537jZB564vGz6dt2DoUH+GEh Mm/Q== X-Forwarded-Encrypted: i=1; AJvYcCXJnR7s7olU+AxuDu4cTLWTz+3Jlhs1lP20DqXCQ6VImvoTUoczn3E0mRQx8OCEIires+WuTC/3Mtg7Tm8F1vCh7Q70Uw== X-Gm-Message-State: AOJu0YxSQLPkc/R3l8jbxjpydLD1WTXi9ZNAliaIPEIv5eWDsBlgSsT3 HOfqZ2Xpyt4pnt3N5u8JDtXM7OveR7odFdGQ+epoUuZKV9gVymrT9M4voq0KdnE= X-Received: by 2002:a17:906:24c9:b0:a5a:1b60:2345 with SMTP id a640c23a62f3a-a626407be07mr645783366b.4.1716830278145; Mon, 27 May 2024 10:17:58 -0700 (PDT) Received: from [192.168.0.113] ([2a02:8109:aa0d:be00::8bb3]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a626cc8b874sm509469266b.163.2024.05.27.10.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 10:17:57 -0700 (PDT) From: Caleb Connolly Date: Mon, 27 May 2024 19:17:54 +0200 Subject: [PATCH v2 6/8] mach-snapdragon: use SYSRESET_PSCI MIME-Version: 1.0 Message-Id: <20240527-b4-qcom-capsule-updates-v2-6-47583d7ad428@linaro.org> References: <20240527-b4-qcom-capsule-updates-v2-0-47583d7ad428@linaro.org> In-Reply-To: <20240527-b4-qcom-capsule-updates-v2-0-47583d7ad428@linaro.org> To: Tom Rini , Simon Glass , Lukasz Majewski , Mattijs Korpershoek , Caleb Connolly , Neil Armstrong , Sumit Garg Cc: Ilias Apalodimas , u-boot@lists.denx.de, u-boot-qcom@groups.io X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1526; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=y7tfmVs5LE0B4TOHlkExbnL0tgQdbo1XT64nqioQVZ4=; b=owEBbQKS/ZANAwAIAQWDMSsZX2S2AcsmYgBmVMA+fKxrxJ7Byt9BIU64qbipAadoiLcYdO6v3 sqq5OPSggeJAjMEAAEIAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCZlTAPgAKCRAFgzErGV9k ts+RD/9rSuKa5HzjmAMVzGUNcqqgip6jwfuPUzaw5cKDfaGEpVKFczAD/9inf1+yLdBxFwrUt8U Qe+e+0WZGhVgwmc3ho8cHeC9YC8HPcXnsIL8HbVTyWBSTZ3n8TFuV/9NkkWH48lo6Bft0dByQtl 44gDBGu7pwHUBcIa/LnGnMh0syxhVlbrX7G9TAqnveseDZzIGSaSfJHif2S+I5pL/4Z6HGSZVcF 9cVsaT+e29FWO/GUqQOexxZVQx5awn5vHwW5wsU/A+3CJslQjyukosBobBL/wC860qPp6hOkgiR Rd+22M+QxsrfpoZr8AnwcWWnbLtVU6f7f/ZQBrBWmDe74neMP7VjKEkRDsuJak/z93/6R/TQrdW t1KPWoZxXQJhPsbCz0+OLTnWS8kp5lCQvoC8POw9LQPN922HZXL6VSsZFQNw0VUJH45KoXr5dvV 9tb27C1Bjx1fl4D+bqsVo6Iyq79lNRpDr8GI2xflMMV0quiRcRnf2kVsC1NELS3PxmEKSGVFuRB cs7PeTZ/zhjRHdfZWtCXBdqWiSTN8Yn/mxucVXCxCTT68XrrUxuk9O3rUYO5snB1jq1YRFl56EA JZ0LdJqX9UHgOk07Yg2ZVMwTEfnnyBloJh2FMGXZ0iJelWWh/AXelyxdipk/fjCmk1Nic2H5qjs g9q0sKIvY0sg1aQ== X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 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 Capsule updates depend on SYSRESET, which we currently don't select but instead use a custom reset_cpu() implementation which just calls psci_reset(). Clean this up, drop our custom function and require PSCI reset. There are some Qualcomm platforms that either can or do run without PSCI support, but we didn't handle these properly before anyway. Signed-off-by: Caleb Connolly Reviewed-by: Neil Armstrong Reviewed-by: Ilias Apalodimas --- arch/arm/Kconfig | 2 ++ arch/arm/mach-snapdragon/board.c | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 39ad03acd2e4..0d5161358e33 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1084,8 +1084,10 @@ config ARCH_SNAPDRAGON select OF_CONTROL select OF_SEPARATE select SMEM select SPMI + select SYSRESET + select SYSRESET_PSCI select BOARD_LATE_INIT select OF_BOARD select SAVE_PREV_BL_FDT_ADDR select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c index c4a3394706e6..b0d9a65bb8f5 100644 --- a/arch/arm/mach-snapdragon/board.c +++ b/arch/arm/mach-snapdragon/board.c @@ -106,13 +106,8 @@ void *board_fdt_blob_setup(int *err) return (void *)fdt; } -void reset_cpu(void) -{ - psci_system_reset(); -} - /* * Some Qualcomm boards require GPIO configuration when switching USB modes. * Support setting this configuration via pinctrl state. */