From patchwork Fri Jun 7 09:26:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Funke X-Patchwork-Id: 1944987 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=JGZVVI4M; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwbRt5kY6z20KL for ; Fri, 7 Jun 2024 19:26:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1598B88412; Fri, 7 Jun 2024 11:26:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="JGZVVI4M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96BC387842; Fri, 7 Jun 2024 11:26:21 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:260e::701]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B94FA87FCD for ; Fri, 7 Jun 2024 11:26:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Lukas.Funke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fINtC4kYg+pa9uxDdcDm/5SM69rfhF2dMpuz+YJ3qwqXpjohp58h/LRDvlvYOnwZT0CSzmjno31D5EqjFUzOt+pf+MhRoeegeRvNm6tEn8UY+TmeAc46V5Nk6L4ZNYsZ6yjKQRLqi+VaoyZseaHirFpp6fsrDT0Cq7H+B6JVFiNHkTgHR+V0ZvBH+ADBkGI4bhJik63jenUKxKwcHZoXmOkjgPZI7JpDeDXAgFQyNBpN/2fcmCVIPkaZMZIuWJT0n3FQCaamjotx788u+GkRajCxgVFkjGU1X+3WCgB96mh0s/zEUqjk86WU45S7vWo0jdhRfyfTdX65kqz6fGrcEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QFUbVolU8tL24jAx0wXZ88DIOKsOgryU4NBr+LpaMqo=; b=liiMVJGP+G0Cqy7pAaBWy/ndpHF6+gaIt0vwh/aEj1qj7YaUpQ08tULG0e6hlRPHHjuk2kUvrgCikM3Poa+OE6dP0pTrrABuj6SChsyzsbe0W9fxVycFdMbnR+l1DP0PymccnPDsxH1yI4X2RH67lTtQB/eaGzoR/AnHyZApnLfUrTxTxy6Jk5L+Dv8/QzNlRIF6qA4AEKYxKRMF32zux+xMYiZmzTebfp68zNEpoyaS9HW6UcT3YjB0aCoMjuGZSEGGLj2LYVdqNfdfrp0XkyiuG9+bhoDhdtYmUaZPvSCzPMGN41MQHNrTe8ej2dFGZEIK2msqCEN6JnAPBr8KUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QFUbVolU8tL24jAx0wXZ88DIOKsOgryU4NBr+LpaMqo=; b=JGZVVI4M1Ne7zO+PnqXj1kIvavHloNXRsi/wZauQzmKIogIUrMTCcXtLUMd0yK07cSethkebDg9LjfEVMPBHh581htI3hwf6t8aq4Vl1Ienme+QgT4g44GIrsgaxAd6CMoPkk67CX5p/UeGteip04VDt6AueUvcyWRwx+/tGyec= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AS2PR08MB8431.eurprd08.prod.outlook.com (2603:10a6:20b:55a::18) by AS8PR08MB9193.eurprd08.prod.outlook.com (2603:10a6:20b:57d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.28; Fri, 7 Jun 2024 09:26:18 +0000 Received: from AS2PR08MB8431.eurprd08.prod.outlook.com ([fe80::aeb:1738:d59a:cee6]) by AS2PR08MB8431.eurprd08.prod.outlook.com ([fe80::aeb:1738:d59a:cee6%7]) with mapi id 15.20.7633.021; Fri, 7 Jun 2024 09:26:18 +0000 From: lukas.funke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Michal Simek , Lukas Funke , Tom Rini , Venkatesh Yadav Abbarapu Subject: [PATCH v3 1/1] xilinx: zynqmp: Enable reset_cpu() in SPL Date: Fri, 7 Jun 2024 11:26:08 +0200 Message-Id: <20240607092608.712996-2-lukas.funke-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240607092608.712996-1-lukas.funke-oss@weidmueller.com> References: <20240607092608.712996-1-lukas.funke-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0326.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:eb::19) To AS2PR08MB8431.eurprd08.prod.outlook.com (2603:10a6:20b:55a::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS2PR08MB8431:EE_|AS8PR08MB9193:EE_ X-MS-Office365-Filtering-Correlation-Id: a4104702-9981-42a4-245a-08dc86d3e2a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|52116005|366007|376005|38350700005; X-Microsoft-Antispam-Message-Info: J74CYZKVZc6mNbAkNo2AYYhg2+s7bOmBv9a5mmHvfDC0U+Ffyb1TVFuxyheiZm8JDczm9JdxcsgY4BMOIeweponaRwWTHVVTaCI6+rgc1BvIC8NWQSADwlMjxZn2uWT2T8goSSzCFpAo14JrMqXMTBc0Qg4ZwYpYDqJrTIQwKeHmt+9fLPZP30IVuDmFeSngX1yiUHGGLpnfz174RHzKdxW+ecF4aIyXouSPp7YRytbqfQdaNZffT5GmIPKbncNdKPacqlQf6Se6x0Bmjpl0ewzhEb4HuGsHmEDMK1rdih+MOVfxCt0xEsH4yAGzOQWZ9ydMSmWCNuE7xXIgha2dQvTFFUqpUO5Z6WtgzICS9318naB4L1GOfyoh9uThqK+MI3iQpz7KfMuvfAFeBM23v3Q0C4HpMutjqqxsIBS5lG+XMbO+rQcXBI5CsvB8Pl+wnqaboRAthGD8d88eB83vv/zzwWJKin77CqQutCH37oKL16W53BG0k4UdxoEvLgaLJV+SCDx67Ms49/FDxH1mwvugQIbMm0JmO56adbgU5/eyQ8HE38aie8eLKisCgj5YQ7gonF+b9QqehxgoXcn1j8JsV2CLzehXsumYQ24JyVRBefHR1A+2dXBetpZunE2NpIxi65EUTc06uvqz3egx0jQn2fisJ6GRIYt9dpvn2hE995OFyc1nqN0sj7dTWFVmsVkdTehOshe87TjvSNpFYRC3KWwHfJuP6z7ljtrKDWLrXo4mB/rE7x628o/hEHHLPH0LPXzZZGDPSmjCuhfjIXZFUYJL296nSMeoTVSaZHMc0hk3M/GIno8E+GCsAmsWspPbPSw7XESlE6zOOtYQMci3fT9STlGkxwmYGA/taE/Fw2N+kibRbR88Af795RqNnMsP42Jt87gogORRoPwfdK1EnBTBk8W+qyBZL9vq7OVIwm5tR3AZoknXbFX2tFr0Zd9omnc+ltRrJ81bpf8GSPrNK+jOApmDK9Cr9WyTnKC6Bet00/TX40w6X6UPX7Fhbw5k39gsKw/Apq8r8Db4not6uif9BKZkLNgEuoKWXjzF0kwdwcUgVROn9zUE/Y48XN72z9FlrOMNhE3kCyx8v0deyOcDy+1vJUCQhA5g2rcEN7fU75WLQMwHSP7BKK8wgIaMEVEpdvYucrEmxSCzSD9tEIYXvOWIN3wyv+ZRePmj6ff7iEOhc9O8ID1WVSVlpHvQbPoGh1li7g/BmWjyOOeabaldqp1ipVP3VegXfEu0Yx8pNItCj2tVMrE32gEAY4nW5hF89r9Grr4lIPz0R+a/b7XBguIniHsCnjhB/rHJnYZ2RmpZLUlUQrGvWLakccNNoCvn0sN+sdAbzLVL9gVR5huDE6MljKYGkfHOYqU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS2PR08MB8431.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(52116005)(366007)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QFueEruao7U49VM8YXcn9/24Ep0wStMYrz7QYECLIH/Ad4sjJVwygU/ksQg64uKAwg3Ke6ZL8p7aC37Wg45v0uYi/0lCGPT9xXEtLmk0F9zwYGpkx56iI8ihmXELkyGOz8BkpiVtjtJC5xrv4ra0qkPKwmvsKJ0jroLK5Xvk3XC1YPz7E1dSJ5PMG8dITrPmpn6FFgMrWeVgqpaG7ImJ/NBibJKdMG9v3lh/GOQawlC89f8GgN9HhCKS1DPQR23pc04pjKHMxdfyjd1+vpuPsD871TCnC0JDKdP2ZHH+RNlPIquvjfDEqTS1FIj/RM1wwlNezx0th6+UGup5cfWPLCmxdugWbD1Ar6+DnemDE/nzMYc/tLdWr0SvTqA9foTT+8uu+Ww2Avltf6VpoQtMs+O2V0NFTNPQivBlD+EXCVeIGXUqJA8bCfJ5tpQ8vBH0m8MnhpRzOHxoCcNp0RbisJu435pB+6/J6shcU1XjC9zekD4gp9V4u77xi/U04G/y5etVKHdvRqYLnJEHVpRD/bSk5na0l3W5Cqsk9XIEhYdl+nI78m/OnMsWyYWBLldO4AYafFUWyNTfkzQrMbKMRkaZm+uGDjwSvnQSUV5Hx4tUBF3EmdbSGJwaWgMc81i3JAuYTAaNcl0bZE9Wg5SYbeLeTJEX8d9JHrjWWoEBQ92yylU/AdFKpPvfGnmhS9LXwO0NR+HzZhs4xzJqB28imsjvqeVtIqkxPE8ybPcgzVDJmDmA8eh4r4FVG3ViPvC7az+azh/ncbTUZUKmacw+MXRInNPYs1jQn7DCx2yy53WtDMBbFxwmVqjM9TQm6U04XVyRJs4/VhQUDnw/jwL9dhISPeFSQSu9JKX/xrRGqReDLncvajLc6iFmhP9JOUAxF/rXDeHFF23X93+GEQZHmZN33bjpOn2hKNTh6Oml1e6vNq4Te8puSaWB+W45BM7rau2zxIMknMxmudyl0khYC7rIH3IALRYKKTw6SujI2sf0EZpkqUUpCfRbHzsODBGV1aNWgMZdXmgricO64+aAS86B9enB2VBTgWhD1k2t10dHTjup/hP4EC0js8CS3j2sst6UDGM2bmbv4ee3HkSyEM7jwz5Hn2ZwQCaDZp4456Z8Ym6E/6U4v1Qx4d48i96D1G80sGXk38yRy5ZHWYsv7YzNT9YxzgzJPVQIXKnxKNEJhpyBBeaOAEL/5iVlwrPWOzPsdKa/T6H3qpEVk/rYpZs3kFHfcM3JfYqHRr9MD2ctLiUC/XsACbvZB7Mxty1rVSvF4YQ7gvC7TogvN4rk6CaOmbqPFtrUVPMRWllAFIxstDFcLnHkQjyPuqtobEG+GxB7E/5S0UGoeN3D6+QkgVxJSRMs2eaHGNUvedfOw1dc9XR3o4qyLKtNRSsnZ0Lv6v/M5nkjtiVSbmLFpGcyNbU3XbyhtBhGK98Er8F3gjYUt5h2/SxNljMMkeejYaC/PqqdgwLgt+wK7g5andSNjuO3V1mXo06s4lj6m6KZt7JKG1wBrRRBFcgGpr8gXVx/JDClBbTpzVw8dLCV66p5xU2irryMuCUeAKQzQ34Lw9iRdWwz81Hw2pPLvSYKls8HCP80aee6+iPfHnr0rO/gpw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4104702-9981-42a4-245a-08dc86d3e2a4 X-MS-Exchange-CrossTenant-AuthSource: AS2PR08MB8431.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2024 09:26:17.9254 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UGy+c1yR4Sg01baKG/UO3Lete+zhHVYFjxGxyakmuKZn1pndsywlUT9UK/LWwMgakN2bx+eR3o+luXIYxn+RFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9193 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 From: Lukas Funke This commit enables SPL to reset the CPU via PMU-firmware. The usual reset mechanism requires bl31 to be loaded which may not be the case in SPL. Signed-off-by: Lukas Funke --- Changes in v3: - Use 'ZYNQMP_PM_RESET_SOFT' directly - Add comment on what happens if CONFIG_ZYNQMP_FIRMWARE is not enabled Changes in v2: - Drop 2/2 since reworking ZYNQMP_FIRMWARE dependency is out-of-scope board/xilinx/zynqmp/zynqmp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f370fb7347a..c37c198ec55 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -285,6 +285,18 @@ int dram_init(void) #if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { + if (!IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { + log_warning("reset failed: ZYNQMP_FIRMWARE disabled"); + return; + } + + /* In case of !CONFIG_ZYNQMP_FIRMWARE the call to 'xilinx_pm_request()' + * will be removed by the compiler due to the early return. + * If CONFIG_ZYNQMP_FIRMWARE is defined in SPL 'xilinx_pm_request()' + * will send command over IPI and requires pmufw to be present. + */ + xilinx_pm_request(PM_RESET_ASSERT, ZYNQMP_PM_RESET_SOFT, + PM_RESET_ACTION_ASSERT, 0, 0, NULL); } #endif