From patchwork Tue Sep 29 14:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1373472 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=afNo/pWC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C11kH6thPz9ryj for ; Wed, 30 Sep 2020 00:20:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C8278235A; Tue, 29 Sep 2020 16:19:13 +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="afNo/pWC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6844082259; Tue, 29 Sep 2020 16:18:56 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (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 555E781C2C for ; Tue, 29 Sep 2020 16:18:53 +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=seanga2@gmail.com Received: by mail-qk1-x741.google.com with SMTP id 16so4433486qkf.4 for ; Tue, 29 Sep 2020 07:18:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IUK0PtU/lCwEkpWMHIyzsRi6MrCjbOQ4o0rr1Mycc00=; b=afNo/pWCqERM0uxU58r5XIRFzkt/XciKOlOcR8mZQAaWD6TYvb25R9cicfp1Amrf2b ZegqNxdbmO/oyuj2myIGyodrwJf/iJjT8ZWoLj/23Wdrnqas19gAJCBeP9RFdJTXJ2cl SnSs4ObsygkI2Vw6WA3polHsUEf5Xj1jlYw20TLGdtOIUOGtrCNVOG+yHjWMof9hVT35 7aSmKztHYm7blmZXYP604yYI1+JTClWnPTMLrWn4wCS9s0Pb+duPWz7OTCIWzLpx/4ZX K9HW494eR0IuXl6jtniOi6YVJgcp374us9xMcc4c9FZ7YOcsJIjOB9ZIwPQvhxxo9/nl 7nTw== 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=IUK0PtU/lCwEkpWMHIyzsRi6MrCjbOQ4o0rr1Mycc00=; b=jzT8ecWiEMd8sefKLnW+yINjRPwyuW4BG2UXUpYa2WaYt0Ks5Wxo9v0jMURzpJW1T2 IKwsXu91vydG/Dj3Xy0HCzPAxe2ztGX1Hkj6E18Bp5eyjj0wKh9U26cWMSSEtiKE6YTy RdBAfik95ZBByqjLLsGMR8eVrGsNLBN/BDzld9Gp2Os3fJyVIPM7IK5M2cJIpT0mQi+x 2pbzADGd9bndhtDZje1wcw/ax+TdyOoZqIMuCMxPRFkrArVleqcqdTfjSIN7/fwW6kc0 FdQcdtTxBIYBy7h6oufPmnyArpQXDjWtK6V1D3XcO9a8aeCWKcRjlDbef8uQaLXheWXP r9bQ== X-Gm-Message-State: AOAM531BC/je5OKT2o2D+zdOUbV3+wvjeQXY7aTcxoaabi3GTIB0mEZw eicHeVAFBptkOoSTMUtBkwLhbfDfbFgV3Q== X-Google-Smtp-Source: ABdhPJzU0FGztZoFSECHjWCW7My3Mz+kS1sRvuRqm+uksIuNYDYwVoZKcMtWl3yF59g60cN0PN2qRw== X-Received: by 2002:a37:a443:: with SMTP id n64mr4573136qke.288.1601389131908; Tue, 29 Sep 2020 07:18:51 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id l6sm117535qkb.56.2020.09.29.07.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 07:18:51 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Rick Chen , Heinrich Schuchardt , Sean Anderson , Simon Glass Subject: [PATCH 05/10] test: Add a test for fdtdec_setup_mem_size_base et al. Date: Tue, 29 Sep 2020 10:18:30 -0400 Message-Id: <20200929141835.38435-6-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929141835.38435-1-seanga2@gmail.com> References: <20200929141835.38435-1-seanga2@gmail.com> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean This adds a test for the various methods of extracting ram_base and ram_size from a device tree. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- arch/sandbox/dts/test.dts | 12 ++++++++++ configs/sandbox64_defconfig | 2 +- configs/sandbox_defconfig | 2 +- configs/sandbox_flattree_defconfig | 2 +- test/dm/fdtdec.c | 38 ++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 9f45c48e4e..e98f0cbe25 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -1122,6 +1122,18 @@ resets = <&resetc2 15>, <&resetc2 30>, <&resetc2 60>; reset-names = "valid", "no_mask", "out_of_range"; }; + + memory@0000 { + device_type = "memory"; + reg = <0x1000 0x2000>, + <0x0000 0x1000>; + }; + + memory@8000 { + device_type = "memory"; + reg = <0x8000 0x0000>, + <0x4000 0x3000>; + }; }; #include "sandbox_pmic.dtsi" diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index c3ca796d51..6324961cf1 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -1,5 +1,5 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=4 CONFIG_ENV_SIZE=0x2000 CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 6e9f029cc9..20718d26c8 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,5 +1,5 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=4 CONFIG_ENV_SIZE=0x2000 CONFIG_PRE_CON_BUF_ADDR=0xf0000 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index dd93167e1b..a4941b54d3 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -1,5 +1,5 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=4 CONFIG_ENV_SIZE=0x2000 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c index 716993f706..5fcda1cd13 100644 --- a/test/dm/fdtdec.c +++ b/test/dm/fdtdec.c @@ -128,3 +128,41 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) } DM_TEST(dm_test_fdtdec_add_reserved_memory, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_FLAT_TREE); + +static int _dm_test_fdtdec_setup_mem(struct unit_test_state *uts) +{ + ut_assertok(fdtdec_setup_mem_size_base()); + ut_asserteq(0x1000, gd->ram_base); + ut_asserteq(0x2000, gd->ram_size); + + ut_assertok(fdtdec_setup_mem_size_base_lowest()); + ut_asserteq(0x0000, gd->ram_base); + ut_asserteq(0x1000, gd->ram_size); + + ut_assertok(fdtdec_setup_mem_size_base_highest()); + ut_asserteq(0x4000, gd->ram_base); + ut_asserteq(0x3000, gd->ram_size); + + return 0; +} + +/* + * We need to wrap the actual test so that we don't overwrite the ram parameters + * for the rest of U-Boot + */ +static int dm_test_fdtdec_setup_mem(struct unit_test_state *uts) +{ + int ret; + unsigned long base, size; + + base = gd->ram_base; + size = gd->ram_size; + + ret = _dm_test_fdtdec_setup_mem(uts); + + gd->ram_base = base; + gd->ram_size = size; + + return ret; +} +DM_TEST(dm_test_fdtdec_setup_mem, UT_TESTF_SCAN_FDT | UT_TESTF_FLAT_TREE);