From patchwork Mon Aug 2 15:00:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1512479 X-Patchwork-Delegate: sr@denx.de 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=F03Syyje; dkim-atps=neutral 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 (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gdh7q500gz9s5R for ; Tue, 3 Aug 2021 01:02:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A147A83440; Mon, 2 Aug 2021 17:01:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk 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; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="F03Syyje"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 78C1C8341A; Mon, 2 Aug 2021 17:00:59 +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=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0730.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::730]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3DD6C82CDC for ; Mon, 2 Aug 2021 17:00:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSRVK7YI7JcOw2Qh9L4ogS38vNWnbTrQgg26eiR51q8Xfh6BYdbV6v/q/jWP3dIiGhN2GO8N4kOY5+Omi2cEv/lbbvIj6bz0NKNrKUc7r5OErD+p/wsLX5XOnGGbHGVcEhdgpY2n5rx2aaC4qJLOjZ7gtVvTZsMkeK+9+RfIX1p0oxgjXvLWLMrUA+3YaoKfhiT1Ez6CugHnktFK5YzcxiZbtgFNHnQxA4elF/qK9mINLyEufcacj2Gw60MvYghkm977487fcEDnbdKcTVYYkvWcy4hkcgPZjMnsTNPDysafpiZ6w8+r6SrFxTvxwDoFiEVMYD+iMkzXep0f9iUeew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cS40Syk8v1FDTgWqe3Yc6T//hdR33J0jnVWHomnX+ec=; b=YkC56QkCRZ0S44o8fzoIWEcxAl3lJfpSRiDvFgUdPrzOxYn1MhY51YIId0dZR3afHK32oJuxS8Us1kIS+N58WMmveAz2ch8OZTPnr1Ls/7OaKaxZFwkVZU+eW9Mgj09IDdlY9PcnLm8fvttQcbZnoPuPO438d4V4nBoag0HxAXR+rL8vdaTaiGacFdcuMyIdaAWIOz8LPOde98JpkDULs21tw55kOwPpJ5BgJ4lmETHiySe9CuEguyLGn0bCKH+a71iG4VeZXgwjC11/+xjTyrTwU1wIxhXmTAOdvdca+iXJjG44tQk1Nz/ffbgHsvnx/orM9CmdSxRPWm/YSli4nQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cS40Syk8v1FDTgWqe3Yc6T//hdR33J0jnVWHomnX+ec=; b=F03SyyjeE4/27U/rG73h97iYwYlsOtIBJZpKhLRvzNGpS0pYjviWHYm1lWBRgeMTRiByDdVxZFgtPIsBJK2ccDc2B5xta1+9ZIaTL2XSx7xLmVpOX7GoV2aCIygGfHaVsYTXRde6/XEFSONle/E9htSRoeJi6gMZGlcy0NvC+S0= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) by AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Mon, 2 Aug 2021 15:00:36 +0000 Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb]) by AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb%7]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:00:36 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH v4 09/10] sandbox: add test of wdt_gpio driver Date: Mon, 2 Aug 2021 17:00:15 +0200 Message-Id: <20210802150016.588750-10-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802150016.588750-1-rasmus.villemoes@prevas.dk> References: <20210802150016.588750-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: HE1PR05CA0257.eurprd05.prod.outlook.com (2603:10a6:3:fb::33) To AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (81.216.59.226) by HE1PR05CA0257.eurprd05.prod.outlook.com (2603:10a6:3:fb::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 15:00:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52ac1850-aff2-44b1-4a4d-08d955c648af X-MS-TrafficTypeDiagnostic: AM0PR10MB3586: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y7Lt0K3CIO645ZL3MSVJzCm2/pT/xHbGk9i+TU5388UtTSTtqh6/2llw+TLgHsNGiC2vv1K9vzKYaacNFONW3j3WtTd1AdGeJrg0BdWzv81cQrKZBELrFe3XOUJ42hO2jivXHMPSA5v0CcZy4Ybk9A6uYgGf2hDDmM14hGCZZiU3uErsXMd9A+TAmGoS2T4d8DC3yhfFqJX3dwmRiGPzIAyeoUMp9xSnOiAN96+YOk71n5SkDiaYm7zYn2wlPEvK6MVSu2+GlBUrNhiUvfwRFngbhBMmaPb42OV6ocMg1kVIa1kCSFHZ3c/eZtrjRgnc9lcwV/vnPNE5bE62CczEwEC6x/R/pEp8VraCQ7OxageyMJYCihC4YLF3EHNcoZainflE5MZvPUHIfor04EXCogaW+E7wEbeux/Ge8xU4NaACJYA60fyZRUxczC880H1v7gG6IJStMTIRYjdh7Ej75fF6rhYoZXbOsfxyCD7lKBWYUPUfGCtw06ivTxZuqTpbay1qtoai58P3md5O1AVfq/lJYNnBFO8ci3daoUtmy26NHh/zKQHG/BFYM6JO255YGmgAqNeOBEjz1ew4/SUYKzU7a/CfIttzQ2IRDdSXU9bnw/sazVpMZBkhDv8sUGLKEzpxVNTHE9Gvf+o6PSJoUyVHR/hV1DgWPC/9Fld+8RhfQsTf0MvC6tRXxmcYVX6VaaHT+b2Xp0qgyTbacEE2vw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(39830400003)(366004)(136003)(346002)(376002)(396003)(36756003)(1076003)(107886003)(478600001)(38350700002)(38100700002)(6486002)(6916009)(5660300002)(4326008)(66476007)(66556008)(44832011)(66946007)(6512007)(86362001)(6666004)(956004)(316002)(2906002)(54906003)(83380400001)(2616005)(8976002)(26005)(186003)(6506007)(8676002)(52116002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GUqF0ZUIrP+gy2ZzKsYcpK+bSCua6+tmFtYRzdQYEMV1FZWeFWaBOcntMJu1NwqmZU0KK9VtFbm3aPgwUe49zLkfy1pKCNL4c597Hqd8ht1mPxTsZFpSHrHagniEqvJhPwhhY3/swvww97Xwd48cpe9KinGszEExmNVFhgTzy3zM3mtXVI1MenlSXVYqtL06cdCPEE+SfrxUYBhEYgZLNZeUM8nV58hw+Oj1MfqAxZrTXoU4fWx4/JjaV0ebI9OukEh/dGA8lvcS8LArA4irrU95DwbHe5mf3EgOOX7KI1RTv0Xg5EiD5xbN8oeowH8syQXkI2DL43U8R36waUmorMeNdCHCHSQFUkuUZsh7dnoFN8TaSNW9DxjWUqyRzfKFVdB1RQKncvC7Kij5cDDbsmODTqZS6CxV7X3PsRlljNlSe/AbN8PfucBaCifqA6rE1/ceczCQXAMM4iZTBC+z3z1yWaN8bDLxCUYdI0Ac5Fz3XHwSLW376kOlQsvrYpTLEjo8wR3AHJyAoAPspLHZ9q2w6U8M2nErKtReIczvVuYhZUfyznzLaArpfPbBjVxkUonclVXOkrNQhaNejALIBJ3AymvXjeEEFX+igpGlV5JlcmgeGY+jCUWd3Xbv9E979GQoeqxgm3j1+xpMlwSBPxsJD0kNnl0xKCArzLb8/gGFD1YDOV0g1C7gwqlegGs0hAIkfSZXeFZVayeLizA9dwUuuW/VNEyo5mwKYfcGIX/Zf4x/o4pyIZrKtS7RVY3fW+6RrVEpQ7SuaDfO/KRrhmnAnQAejUQM//uPLxXTeOo5odPRlH7mbSuXoW5lfOacbEdYr+hgNkqVoixxO8cieBcwfxJGHJFbDpRPdWLoDjWCNQfn8QOydFeiaxT2U0RPcxxnp9T7r/Pd2iAtvytniGwoJuuaMv5Xu5+S3JNpE8PChc4Ukko0c78dLKo2cU23hLWb0KqJhHqIE0Q2sx2jp33RR6faQD/okZXkm/9AC1I0TMnctn49udT2EV8G2BGHB3/sD+ykA3Rqv70UFvtNVzH1UhIYnFcjPt9d6H0ldKDWcTQsQIcZUoK+L+3FcZe4eF0s25WAYKmfnG35kIP+Iu+uHOFfgg8gkRyw4KXLp65PbqrIJhtspQ8ryJ/uSRMar13GlopGGAHWfIBazsfAu8+kTIfmoLiUYoALRTcFtOLqoQym64iWvR1OdLw9+qhnnYG5rH5sq3QwEkcS4H2Kb6P8bccWh1dMXDmYlP70GfYxWheumd8ysMW6Z87HI4WagV+iztHFVO8bhO/eZWwY64+Gkf2HhQCd+xuDX3/KNJ2rUNyxwiijRWU0gDoDRUvr X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 52ac1850-aff2-44b1-4a4d-08d955c648af X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:00:36.2917 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 69r5YExWbHTeUltnGhFtChG0qyPHs4ofW45xHTamYzjPZQodoXbYGApa3GpTEmYyUgvgnaQ6Spg0lEgdOcQODDGAPurfVrbF/7qWg5RU/Z4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3586 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 It seems that no other test has claimed gpio_a:7 yet, so use that. The only small wrinkle is modifying the existing wdt test to use uclass_get_device_by_driver() since we now have two UCLASS_WDT instances in play, so it's a little more robust to fetch the device by driver and not merely uclass+index. Reviewed-by: Simon Glass Reviewed-by: Stefan Roese Signed-off-by: Rasmus Villemoes --- arch/sandbox/dts/test.dts | 6 ++++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + test/dm/wdt.c | 36 +++++++++++++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index d5976318d1..fe5ac6ecd9 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -779,6 +779,12 @@ }; }; + gpio-wdt { + gpios = <&gpio_a 7 0>; + compatible = "linux,wdt-gpio"; + always-running; + }; + mbox: mbox { compatible = "sandbox,mbox"; #mbox-cells = <1>; diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 3627a066b4..6cad90b03e 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -225,6 +225,7 @@ CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_RLE8=y # CONFIG_WATCHDOG_AUTOSTART is not set CONFIG_WDT=y +CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 34b749b47b..4a8b4f220d 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -284,6 +284,7 @@ CONFIG_W1_EEPROM=y CONFIG_W1_EEPROM_SANDBOX=y # CONFIG_WATCHDOG_AUTOSTART is not set CONFIG_WDT=y +CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 24b991dff6..abff853a02 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,8 @@ static int dm_test_wdt_base(struct unit_test_state *uts) struct udevice *dev; const u64 timeout = 42; - ut_assertok(uclass_get_device(UCLASS_WDT, 0, &dev)); + ut_assertok(uclass_get_device_by_driver(UCLASS_WDT, + DM_DRIVER_GET(wdt_sandbox), &dev)); ut_assertnonnull(dev); ut_asserteq(0, state->wdt.counter); ut_asserteq(false, state->wdt.running); @@ -39,3 +41,35 @@ static int dm_test_wdt_base(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_wdt_base, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + +static int dm_test_wdt_gpio(struct unit_test_state *uts) +{ + /* + * The sandbox wdt gpio is "connected" to gpio bank a, offset + * 7. Use the sandbox back door to verify that the gpio-wdt + * driver behaves as expected. + */ + struct udevice *wdt, *gpio; + const u64 timeout = 42; + const int offset = 7; + int val; + + ut_assertok(uclass_get_device_by_driver(UCLASS_WDT, + DM_DRIVER_GET(wdt_gpio), &wdt)); + ut_assertnonnull(wdt); + + ut_assertok(uclass_get_device_by_name(UCLASS_GPIO, "base-gpios", &gpio)); + ut_assertnonnull(gpio); + ut_assertok(wdt_start(wdt, timeout, 0)); + + val = sandbox_gpio_get_value(gpio, offset); + ut_assertok(wdt_reset(wdt)); + ut_asserteq(!val, sandbox_gpio_get_value(gpio, offset)); + ut_assertok(wdt_reset(wdt)); + ut_asserteq(val, sandbox_gpio_get_value(gpio, offset)); + + ut_asserteq(-ENOSYS, wdt_stop(wdt)); + + return 0; +} +DM_TEST(dm_test_wdt_gpio, UT_TESTF_SCAN_FDT);