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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA851C4338F for ; Fri, 30 Jul 2021 08:56:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EC1B360F6B for ; Fri, 30 Jul 2021 08:56:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EC1B360F6B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 734A383248; Fri, 30 Jul 2021 10:55:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="yk2cjWBm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BBD9A8323F; Fri, 30 Jul 2021 10:55:49 +0200 (CEST) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 B6D4C83217 for ; Fri, 30 Jul 2021 10:55:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wm1-x330.google.com with SMTP id k4so5482585wms.3 for ; Fri, 30 Jul 2021 01:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IhZU1MEvhq9Au8U6h5DkcWcsx3nWd0Vn2MtScqSSeqk=; b=yk2cjWBmq8mNlO9r73q3Zmw9C0TUDx1U6FpvjSlkdcmUGX0SZxcpXch/8uYyPPaigP LpbDBOf/xFRjEgIxeTm41+TzOcYoOKa3ZW0BZZSCpNCIWyCbivFjZW7Jr9vbcT4j+1ka x/b1zfT452p2hQi58RLNEJ7HUbF4eIRPx9S2d1CeZsxG+GfEsd7sWtHJFytSlP3DnzN0 OZc6Q5WQcmbrlcYbEAj5qivxKbgaohCKUKaIwKxJNwaCDEK7g3eqjVS4QI9Sm35lw4oz K8pFlWA+5G1CqOiX3dFCUjwqapMOqLGeU5wa/p9t+w00sgJwZvPTAxdBhBCWc3s4bmXY 57vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IhZU1MEvhq9Au8U6h5DkcWcsx3nWd0Vn2MtScqSSeqk=; b=o9WgoaJ4r0zv16qGcXazszFsIsqdtioIH77MzmudXoDo8lurwAnAo1o8y/JPNaT34u npDZ0uYxfmqvxupUwOL739mhkFbRRt+ygQAgj+rwKzfSkZi/YCJvBXi4QNSvVN7YfDRL iL4qRIjlbFyBy5Uv4FkIuA6D3xEa3Askfm04ol0CxTCvA9nGnl15SprGGstjVhiPsMA6 jLhxWRqG/lL1YgWawSNiz2sH2c7yHIaduYCkn20msQ0oDJ5Mw0vgAOcUcqjHzvlCzJvD jMDyatdM+2KPKS1PM9og/cUfs1zMnP6pQwLLOQs/aoyu1wmxla2MX36mluQZvH2nufBf DvkA== X-Gm-Message-State: AOAM5339nS7J21FqsQVf2zt6LJL5ETWfOZR/3f6OwVvsJ2HJI529gsOn AIL2caxzn7/PEEHbN2VwXU1tiQ== X-Google-Smtp-Source: ABdhPJyorOvV+95gpDKm6JtRuSEg4V5uKkVN6DkJF3DJeUU/jhwxMzbfeB+TaxiHF9VMAXvjZL1ueA== X-Received: by 2002:a1c:cc1a:: with SMTP id h26mr1672499wmb.47.1627635346235; Fri, 30 Jul 2021 01:55:46 -0700 (PDT) Received: from groot.home ([2a01:cb19:826e:8e00:e7f6:2143:ebd0:943a]) by smtp.gmail.com with ESMTPSA id a12sm957439wrr.84.2021.07.30.01.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 01:55:45 -0700 (PDT) From: Mattijs Korpershoek To: Neil Armstrong Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Mattijs Korpershoek Subject: [PATCH 1/5] Revert "ARM: meson: Add support for fastboot_set_reboot_flag()" Date: Fri, 30 Jul 2021 10:55:27 +0200 Message-Id: <20210730085531.2849834-2-mkorpershoek@baylibre.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210730085531.2849834-1-mkorpershoek@baylibre.com> References: <20210730085531.2849834-1-mkorpershoek@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean With the introduction of a generic reboot flag implemented in commit a362ce214f ("fastboot: Implement generic fastboot_set_reboot_flag"), we no longer need the custom PSCI implementation to handle the reboot reason. This reverts commit 9a34dedfae0ebb031a45324c2fed8c39b2c6fcf2. Signed-off-by: Mattijs Korpershoek --- arch/arm/mach-meson/board-common.c | 34 ------------------------------ 1 file changed, 34 deletions(-) diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 1690b6b1e6..7ceba7cede 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -22,10 +22,7 @@ #include #include -#if CONFIG_IS_ENABLED(FASTBOOT) #include -#include -#endif DECLARE_GLOBAL_DATA_PTR; @@ -152,38 +149,7 @@ int board_late_init(void) return meson_board_late_init(); } -#if CONFIG_IS_ENABLED(FASTBOOT) -static unsigned int reboot_reason = REBOOT_REASON_NORMAL; - -int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) -{ - if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) - return -ENOTSUPP; - - reboot_reason = REBOOT_REASON_BOOTLOADER; - - printf("Using reboot reason: 0x%x\n", reboot_reason); - - return 0; -} - -void reset_cpu(void) -{ - struct pt_regs regs; - - regs.regs[0] = ARM_PSCI_0_2_FN_SYSTEM_RESET; - regs.regs[1] = reboot_reason; - - printf("Rebooting with reason: 0x%lx\n", regs.regs[1]); - - smc_call(®s); - - while (1) - ; -} -#else void reset_cpu(void) { psci_system_reset(); } -#endif -- 2.30.2