From patchwork Sat May 28 23:13:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1636634 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QjfMMEwG; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L9ctR4CyZz9s75 for ; Sun, 29 May 2022 09:13:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E44AE83F40; Sun, 29 May 2022 01:13:43 +0200 (CEST) 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="QjfMMEwG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA0A183F40; Sun, 29 May 2022 01:13:37 +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,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 96E558436A for ; Sun, 29 May 2022 01:13:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pl1-x632.google.com with SMTP id i1so7231641plg.7 for ; Sat, 28 May 2022 16:13:32 -0700 (PDT) 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=p+R/zyXrEJpKy3ANUDXlJfLfiJ1yKUvz2q1Umbp2Pf0=; b=QjfMMEwGgFly4YUIG3HG646DX0BiO9XevMvVjMxCA8tix1hhchWcik+IpcmOvnrUtT +ltpQb+1OBLI86WDX0mXlDlF5HJ+0/bWWzPg7pntzV1/OqLNsCQP034biGar4xAjpFik xlArSdULNhknoKGe/Z5rdjgLwpKP/28Z51mzSCm2NZUkesztOHmFKyPfAK1ATzlnmvi7 j/2STmRUtvnpwpGB/T6dehBQgqGyWEqhpi1pLbxfXm0f8wySFOC3ceW4m8IJMCNv0mgE BWXpSpfhKIub2q8rbwRUg2Fu3uY2OMuBgsTv1pkXmUc9vz70NBS7mOgzaBqEwHOGofuF FLSg== 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=p+R/zyXrEJpKy3ANUDXlJfLfiJ1yKUvz2q1Umbp2Pf0=; b=1Zrya25kzn1Hr/As1X4HiQFuuUbV6vqEuNfFw9yBpl3vCboB8qUX7KSKOYWhhcjIF+ F7w/fJE5gAjB7raMi9mDIladbuGXyAXJAnNDDcAF5TI8aJrngkrKMv4vMJlPd/6GkVu0 x8ON2Dz4jfqh8hHgI1bXcoIFvoYx0ChE2goxXgAw1KdKK3xaitz33Vp7KZMpaVVNMHN6 jMkHYuMZE6/wRbaRCFSvDfLwci4ZThMBc4qGtbhAAH7YsEMAp860eRZDC5mbwFNXvsmk DVCXy7xC9rhCIckGGfPyaw5RslNreU4GQ7phthiLf96/vRZQh6xTk29B0Rz7QzUUDP81 yRrg== X-Gm-Message-State: AOAM530lZRsuADMYvqZmuTWQ5okvJZUZwmE78JPfh7dv1aP9RlbmjiqT WGh7yHAf/dPk0Q+hjMWNI+IK7OB0pxY= X-Google-Smtp-Source: ABdhPJxDgX+FLnK9qtRGrUFL+/UGgtl7EzUUYTQcov1OS5pRUdPcIzfwyvH/BOwH87Dcn2Mn25da/Q== X-Received: by 2002:a17:90a:1b61:b0:1e2:c247:bf5e with SMTP id q88-20020a17090a1b6100b001e2c247bf5emr2846202pjq.68.1653779610469; Sat, 28 May 2022 16:13:30 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:a9ab:7a5c:69ce:1e38]) by smtp.gmail.com with ESMTPSA id b9-20020a17090a488900b001df68146a20sm595308pjh.56.2022.05.28.16.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 16:13:30 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Dennis Gilmore , Jaehoon Chung , Marek Behun , Mario Six , Patrick Delaunay , Peng Fan , Simon Glass , Stefan Roese Subject: [PATCH 2/3] Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig Date: Sun, 29 May 2022 11:13:17 +1200 Message-Id: <20220528231318.359510-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220528231318.359510-1-judge.packham@gmail.com> References: <20220528231318.359510-1-judge.packham@gmail.com> MIME-Version: 1.0 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 CONFIG_FIXED_SDHCI_ALIGNED_BUFFER is needed on some Marvell SoCs when booting from MMC. All existing usages of this have the same value so make this the default and have the Kconfig option depend on SPL && MVEBU_SPL_BOOT_DEVICE_MMC. Signed-off-by: Chris Packham Reviewed-by: Marek Behún Reviewed-by: Stefan Roese --- drivers/mmc/Kconfig | 13 +++++++++++++ include/configs/clearfog.h | 7 ------- include/configs/controlcenterdc.h | 7 ------- include/configs/db-88f6820-gp.h | 7 ------- include/configs/helios4.h | 7 ------- include/configs/turris_omnia.h | 7 ------- scripts/config_whitelist.txt | 1 - 7 files changed, 13 insertions(+), 36 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 5e2921ce41a7..c8f9709d2d49 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -484,6 +484,19 @@ config SPL_MMC_SDHCI_ADMA This enables support for the ADMA (Advanced DMA) defined in the SD Host Controller Standard Specification Version 3.00 in SPL. +config FIXED_SDHCI_ALIGNED_BUFFER + hex "SDRAM address for fixed buffer" + depends on SPL && MVEBU_SPL_BOOT_DEVICE_MMC + default 0x00180000 + help + On the Marvell Armada 38x when the SPL runs it located in internal + SRAM which is the L2 cache locked to memory. When the MMC buffers + are located on the stack (or bss), the SDIO controller (SDHCI) can't + write into this L2 cache memory. + + This specifies the address of a fixed buffer located in SDRAM that + will be used for all SDHCI transfers in the SPL. + config MMC_SDHCI_ASPEED bool "Aspeed SDHCI controller" depends on ARCH_ASPEED diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 871e87c26d01..ec0f0e3ed115 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -56,13 +56,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -#endif -#endif - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index b499d7085fd4..a8534e59d9b1 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -53,13 +53,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -#endif -#endif - /* * Environment Configuration */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 8dc73e8b1cc9..b4b58e0bcb8a 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -53,13 +53,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -#endif -#endif - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 151ab66f4c3f..62a52e68b56a 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -56,13 +56,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -#endif -#endif - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 8119340b112f..112ddd3f4961 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -36,13 +36,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC -/* SPL related MMC defines */ -# ifdef CONFIG_SPL_BUILD -# define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -# endif -#endif - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cecdda678191..25962b735f27 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -87,7 +87,6 @@ CONFIG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR -CONFIG_FIXED_SDHCI_ALIGNED_BUFFER CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_CFI_LEGACY CONFIG_FLASH_OR_PRELIM