From patchwork Sat Aug 28 09:42:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1521855 X-Patchwork-Delegate: sjg@chromium.org 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; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=SANeJwQe; 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 4GxWpX6LXtz9sRf for ; Sat, 28 Aug 2021 19:42:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96455831F6; Sat, 28 Aug 2021 11:42:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="SANeJwQe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAC9B82F32; Sat, 28 Aug 2021 11:42:22 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 51E5A8317A for ; Sat, 28 Aug 2021 11:42:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630143736; bh=TQCrdJX7WJKj1UmMu6M1sDicT5fluoKKySqL7JHHiNE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SANeJwQeGxff9tgEkZ341P7hPcKlRhXxd2znVLkA7Ni4PpM33UVA5hSScTHJqPEeY V9e7pLnZJ2+UnWsagPX/mO9rb7aK9DJ7JfOzkzexAdAO+loJl8+Gv/gUhKHrqXMmIj k3TDivvDFRC6J9gcvUMrET30NOOmumBwjgsxNA4c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.144.157]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N79yQ-1n5TS00140-017Wj3; Sat, 28 Aug 2021 11:42:16 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: Bin Meng , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/2] sandbox: correct cpu nodes Date: Sat, 28 Aug 2021 11:42:08 +0200 Message-Id: <20210828094209.121781-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210828094209.121781-1-xypron.glpk@gmx.de> References: <20210828094209.121781-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:IZ62oDErLh/9VMeGjz13WnDEH60H/cbASTz6aL5UUZ3gb+c3E0F HAUDBcDkJUWuCaSiY1NlbZ11SVY+lADBAsEyPFRcZQmVOoMKu59ILp16vu0BKc8GHUvuPN2 aGH7LZzaJRZOnmGp4WKmFLtY0w2v3Rq5DSJB6cbucCYZq+FBxubdxy6KKMA64nlyeq0n6td NmXNWsa+9TB6ZGUp7PlcA== X-UI-Out-Filterresults: notjunk:1;V03:K0:XZHuM+fapKM=:MZN2JwhlMh6icEDjgDIBcB PE85HLyALKoH4//TxG8s/DbHur357+FrFy4yVP1Ny5cyC1Il/bcXnk+LsFY4vo00bVlvpipH+ eXkkZ6MlkmtUoxXYZWKV1P2kG6eOgvHCnp8UmoYbY+7JoPX0HQenB+R5+f5LdplIVKlmQ+JME xQ4UvOHmLcyAyYNtNZb/hk30K4ki4oIOqfS7rtJ6dNGyTRn6E1uaZ7/WHIblhIdnYhwUYWEfp G0mjBNoE0JHH4/nDZjJaLNTBDk0XGMqUcMB1cOtPSMMNBHbZVDnl7uZlLKssdm2PY62+3F+jW JQK715wE1FTfUMwaXpqMSmq2IGi5Yms1SmULlAHhOozS2e/wasN2rm5a0Rbb2ycfcLH2Mci6q R3AIPTEVrTdXL9Y9GLaGJWQHzygr+kmhCddf3X/ooIcOy8jV9T9fpSY7Y568r66Lj4k/+q2Xn FF2ZQHj17cByN77DpL+SR+UMCAQWwzTMxoOHlGI0RPg/lGBisb0Mkc93Ww59rN9T06QxNZFN1 TTUx+5wKc4NcV0zyRAjM5l7dy0jYPbPlAr0fXBi/s26mQQxNC4ncjHQWvY1wXxeRPOn9M+4WZ tpYnEOfq9Pok595Ap3P7Mop64JakaZGM7B1sNQVWQ4U9EOsFcuyJ1vg+azZFg84ba+UXUE+ui IBpoQ2oFiF1y5K9pKLtEf+bCXCoo+S1IEtoPGZjLByA3Z5BhtHcjerlBdXIg/9XzGC4X3uJuG lbyrScuZ5m56m+XCorNICyehjkTNSSM/e5LnSXEpTco5+BBvEQMsn4bzL7jFqhKaOlbPq5g2F KKTEpGhayq2rdxf+9Poc6YlyPIBSK5PkLD/9Lmo+lGNXGzeSNwTup3+XtiVgZGw8eWb2Zsjc1 PM9F1HcP6Qm/AUZeAeOnIG6EwDp6WmvliSjMRrRV2oTPkeB6sNTD/E8tM1zB0XBdA6ageMWfv rCy6MROxTkdoA1c0CeyZMTUX2LDLSTJu1pTy/Z+vB3B3TzKFesQ9QezzxQulFknHZCMYWG2ZB oI+6jlKL6ES0enwkhFQzL3q3ZpTXDDNAh5oixsdg2ws6ZOgLZdRy6C0dme7kBeSMYy7nvMyuM uIAaXdGEc1U0CAA0SzU/S0LXUUc3pjVabFIWdylSmDC8PsMwHtM7gWvXQ== 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 The cpu nodes in arch/sandbox/dts/test.dts should conform to the devicetree specification: * property device_type must be set to "cpu" * the reg property must be provided * the cpu nodes must have an address Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- arch/sandbox/dts/test.dts | 14 +++++++++++--- drivers/cpu/cpu_sandbox.c | 2 +- test/dm/cpu.c | 2 +- test/dm/timer.c | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) -- 2.30.2 diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 962bdbe556..9046fcf558 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -805,19 +805,27 @@ }; cpus { + #address-cells = <1>; + #size-cells = <0>; timebase-frequency = <2000000>; - cpu-test1 { + cpu1: cpu@1 { + device_type = "cpu"; + reg = <0x1>; timebase-frequency = <3000000>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; - cpu-test2 { + cpu2: cpu@2 { + device_type = "cpu"; + reg = <0x2>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; - cpu-test3 { + cpu3: cpu@3 { + device_type = "cpu"; + reg = <0x3>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index fe6772ba5a..2e871fe313 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -38,7 +38,7 @@ static int cpu_sandbox_get_vendor(const struct udevice *dev, char *buf, return 0; } -static const char *cpu_current = "cpu-test1"; +static const char *cpu_current = "cpu@1"; void cpu_sandbox_set_current(const char *name) { diff --git a/test/dm/cpu.c b/test/dm/cpu.c index ed12cafee2..d7e596ee39 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -27,7 +27,7 @@ static int dm_test_cpu(struct unit_test_state *uts) uclass_find_next_device(&dev)) ut_assert(dev_get_flags(dev) & DM_FLAG_ACTIVATED); - ut_assertok(uclass_get_device_by_name(UCLASS_CPU, "cpu-test1", &dev)); + ut_assertok(uclass_get_device_by_name(UCLASS_CPU, "cpu@1", &dev)); ut_asserteq_ptr(cpu_get_current_dev(), dev); ut_asserteq(cpu_is_current(dev), 1); diff --git a/test/dm/timer.c b/test/dm/timer.c index 70043b9eee..9f94d47692 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -33,16 +33,16 @@ static int dm_test_timer_timebase_fallback(struct unit_test_state *uts) { struct udevice *dev; - cpu_sandbox_set_current("cpu-test1"); + cpu_sandbox_set_current("cpu@1"); ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev)); ut_asserteq(3000000, timer_get_rate(dev)); ut_assertok(device_remove(dev, DM_REMOVE_NORMAL)); - cpu_sandbox_set_current("cpu-test2"); + cpu_sandbox_set_current("cpu@2"); ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev)); ut_asserteq(2000000, timer_get_rate(dev)); - cpu_sandbox_set_current("cpu-test1"); + cpu_sandbox_set_current("cpu@1"); return 0; }