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 0FDFBC433F5 for ; Sat, 12 Feb 2022 00:32:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F46683BD2; Sat, 12 Feb 2022 01:32:49 +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="FuzJMa2n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B20F83BEB; Sat, 12 Feb 2022 01:32:46 +0100 (CET) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 92AF883BD3 for ; Sat, 12 Feb 2022 01:32:40 +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=mr.bossman075@gmail.com Received: by mail-qt1-x833.google.com with SMTP id s1so10507851qtw.9 for ; Fri, 11 Feb 2022 16:32:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kgSpyqrzPCTXepy72qUJ1FCHnpvvBgeb+urKKhEu0/s=; b=FuzJMa2nOIbLNrgR4r15azkH7BiStIplGIbZAN8ioxXGwSFHPFsgUtckdeeVFstQuR RTYeuLMmXt4E/0/skPuEHPRlPum6joLk9r9AxrSMBxdW1+OK5tX1t45G/EwqH/HAoIMO J5JUiM1xFuC5bkKad8n4UnjAIAoXExsVIz5CK1eMNc+qoPoK6VYGej3Kb0bEeOa5FMRd ms3M/SfI9mrCsbFdzK+3X3L06NzZJhGPjZ4CaJqgmXIrN5HAf4uG96XHlqAvUiWmUKb1 PMoy1aPquxjHUHewmfRxUdY+4J9waKTPkSVEbuarraxBsNTgXru1bn5X5VxYfdTL6COn xjdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kgSpyqrzPCTXepy72qUJ1FCHnpvvBgeb+urKKhEu0/s=; b=uKRB8+5yAAL78//+3HhwV0R/b5h3GUXjlMNolPi/AO65Kv7rGSRtM1k613rGm2KlCo IqbC8V1Hl+6gZCc5v8i0aXAdkpA3FL3wlWyxTnv5aEZgrrDVM7KHtstfDrVfE0fIPNKL djY3btup5t7v0n1olkJM/b8UNShypvq+IJu5tFUnbiHv4WLjCP6id0dGA3O62c/Srh2v apkz/LsShz+t8gn38ox1inwqHAfxQHXlnjL4TQ1xz7I28woOiPvVw80LnRiXvI14gq7+ A/fQV0YQOgepXHTiJlMzgE/qdO5VcFCw7cL45J7vf02Wiu65sO9qAAKu4xnNZqlhC40L xjRg== X-Gm-Message-State: AOAM5323QClTzVPWaE1ZmTj6xKcmakgspMAACTJs9SS5ZSOHAOdHF9hS 3Xndt0pfTr4gdZ4sNY8i/stM2p30I4g= X-Google-Smtp-Source: ABdhPJx9m7R2tJjWWMjSjOypQfdhrcURpbK8qGmWH/J5I93RE8D4g1whISW0VFRPE8vu3puVCaBWlw== X-Received: by 2002:a05:622a:5ce:: with SMTP id d14mr2965508qtb.624.1644625959198; Fri, 11 Feb 2022 16:32:39 -0800 (PST) Received: from jesse-desktop.jtp-bos.lab (146-115-144-188.s4282.c3-0.nwt-cbr1.sbo-nwt.ma.cable.rcncustomer.com. [146.115.144.188]) by smtp.gmail.com with ESMTPSA id d22sm12471322qkn.112.2022.02.11.16.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 16:32:38 -0800 (PST) From: Jesse Taube X-Google-Original-From: Jesse Taube To: u-boot@lists.denx.de Cc: jagan@amarulasolutions.com, andre.przywara@arm.com, hdegoede@redhat.com, sjg@chromium.org, icenowy@aosc.io, marek.behun@nic.cz, festevam@denx.de, narmstrong@baylibre.com, tharvey@gateworks.com, christianshewitt@gmail.com, pbrobinson@gmail.com, jernej.skrabec@gmail.com, hs@denx.de, samuel@sholland.org, arnaud.ferraris@gmail.com, giulio.benetti@benettiengineering.com, Mr.Bossman075@gmail.com, thirtythreeforty@gmail.com Subject: [PATCH v2 1/3] mach-sunxi: Add boot device detection for SUNIV/F1C100s Date: Fri, 11 Feb 2022 19:32:33 -0500 Message-Id: <20220212003235.2162334-2-Mr.Bossman075@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220212003235.2162334-1-Mr.Bossman075@gmail.com> References: <20220212003235.2162334-1-Mr.Bossman075@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean In contrast to other Allwinner SoCs the F1C100s BROM does not store a boot source indicator in the eGON header in SRAM. This leaves the SPL guessing where we were exactly booted from, and for instance trying the SD card first, even though we booted from SPI flash. By inspecting the BROM code and by experimentation, Samuel found that the top of the BROM stack contains unique pointers for each of the boot sources, which we can use as a boot source indicator. This patch removes the existing board_boot_order bodge and replace it with a proper boot source indication function. Signed-off-by: Jesse Taube Suggested-by: Samuel Holland --- V1 -> V2: * Bail on NAND * Change commit description * Change sunxi_get_boot_source to u32 * Fix FEL boot by next change * Move suniv_get_boot_device call into sunxi_get_boot_source * Rename suniv_get_boot_device * Remove redundant comments --- arch/arm/include/asm/arch-sunxi/spl.h | 10 +++++ arch/arm/mach-sunxi/board.c | 57 +++++++++++++-------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h index 58cdf806d9..9a6e8da8e1 100644 --- a/arch/arm/include/asm/arch-sunxi/spl.h +++ b/arch/arm/include/asm/arch-sunxi/spl.h @@ -19,6 +19,16 @@ #define SUNXI_BOOTED_FROM_MMC0_HIGH 0x10 #define SUNXI_BOOTED_FROM_MMC2_HIGH 0x12 +/* + * Values taken from the Bootrom's stack used + * to determine where we booted from. + */ + +#define SUNIV_BOOTED_FROM_MMC0 0xffff40f8 +#define SUNIV_BOOTED_FROM_NAND 0xffff4114 +#define SUNIV_BOOTED_FROM_SPI 0xffff4130 +#define SUNIV_BOOTED_FROM_MMC1 0xffff4150 + #define is_boot0_magic(addr) (memcmp((void *)(addr), BOOT0_MAGIC, 8) == 0) uint32_t sunxi_get_boot_device(void); diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 57078f7a7b..27aee1e445 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -191,12 +191,37 @@ SPL_LOAD_IMAGE_METHOD("FEL", 0, BOOT_DEVICE_BOARD, spl_board_load_image); #define SUNXI_INVALID_BOOT_SOURCE -1 -static int sunxi_get_boot_source(void) +static uint32_t suniv_get_boot_source(void) +{ + /* Get the last function call from BootRom's stack. */ + u32 brom_call = *(u32 *)(fel_stash.sp - 4); + + /* translate SUNIV Bootrom stack to standard SUNXI boot sources */ + switch (brom_call) { + case SUNIV_BOOTED_FROM_MMC0: + return SUNXI_BOOTED_FROM_MMC0; + case SUNIV_BOOTED_FROM_SPI: + return SUNXI_BOOTED_FROM_SPI; + case SUNIV_BOOTED_FROM_MMC1: + return SUNXI_BOOTED_FROM_MMC2; + /* SPI nand is invalid try to boot from FEL*/ + case SUNIV_BOOTED_FROM_NAND: + return SUNXI_INVALID_BOOT_SOURCE; + } + /* If we get here something went wrong try to boot from FEL.*/ + printf("Unknown boot source from BROM: 0x%x\n", brom_call); + return SUNXI_INVALID_BOOT_SOURCE; +} + +static uint32_t sunxi_get_boot_source(void) { if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */ return SUNXI_INVALID_BOOT_SOURCE; - return readb(SPL_ADDR + 0x28); + if (IS_ENABLED(CONFIG_MACH_SUNIV)) + return suniv_get_boot_source(); + else + return readb(SPL_ADDR + 0x28); } /* The sunxi internal brom will try to loader external bootloader @@ -204,7 +229,7 @@ static int sunxi_get_boot_source(void) */ uint32_t sunxi_get_boot_device(void) { - int boot_source = sunxi_get_boot_source(); + uint32_t boot_source = sunxi_get_boot_source(); /* * When booting from the SD card or NAND memory, the "eGON.BT0" @@ -276,36 +301,10 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, return sector; } -#ifdef CONFIG_MACH_SUNIV -/* - * The suniv BROM does not pass the boot media type to SPL, so we try with the - * boot sequence in BROM: mmc0->spinor->fail. - * TODO: This has the slight chance of being wrong (invalid SPL signature, - * but valid U-Boot legacy image on the SD card), but this should be rare. - * It looks like we can deduce from some BROM state upon entering the SPL - * (registers, SP, or stack itself) where the BROM was coming from and use - * that here. - */ -void board_boot_order(u32 *spl_boot_list) -{ - /* - * See the comments above in sunxi_get_boot_device() for information - * about FEL boot. - */ - if (!is_boot0_magic(SPL_ADDR + 4)) { - spl_boot_list[0] = BOOT_DEVICE_BOARD; - return; - } - - spl_boot_list[0] = BOOT_DEVICE_MMC1; - spl_boot_list[1] = BOOT_DEVICE_SPI; -} -#else u32 spl_boot_device(void) { return sunxi_get_boot_device(); } -#endif __weak void sunxi_sram_init(void) { -- 2.34.1