From patchwork Fri Apr 28 04:08:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1774723 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=D9R2f3ex; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q6yZr2Tvqz23s0 for ; Fri, 28 Apr 2023 13:22:12 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23DA7863A0; Fri, 28 Apr 2023 05:19:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="D9R2f3ex"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA78586068; Fri, 28 Apr 2023 05:18:50 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::626]) (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 6C9EF863BD for ; Fri, 28 Apr 2023 05:18:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JiDnR8CWNzTTRgz1AksTtGtAU+1VIQK13UiMJ02dygCTXySr6T36AkIqWVvUqD0tqPfQ4eMULuDKQ0tOGuX8/aU2XtYJKMMkwBd/614maAe+XInHKgfRAektviMUvGz9f/lSA89ima9tP/5RXxOiFZS3coS3wolvFGV8LyVeeHr+w3zi8lem5Q5MOD1HCRIDNPqThowr9vz80af2Fg7NHQMQKA2WpRVXxvYxFXnC9UYYGUfBpew7XdZ9sb1ZOhjuQGTiM9gYK7qFXaAHgf48iPc0BzSiqWi3vmDdjxX+g8VOwACxcF2TOsSk9a7NaMrVnUDiwsELRzqrMY+Z1tW/VQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tgNWpKq/S+j+/TWEE4IglhB86krk4Hf7d95lSiWMHTY=; b=jemnqj4fUMuQ+mNIEgz77Y/6wh9KY9ZqFcWG87h9wgZf6pg3IexQTphttwTQFT6N3egnP1VOVeMGHBp0xnNICyzlsUavbEsRwSwnOgevxMamqH5wEo5Kb2VTC9eE99S+LwOpqReb9OXeww81H/XssEd8YW4pmRWcDY2lLQU4FS0h1OTmP0fkIi1N9ifIdb56dx75ySFwst913HnmRduPz0hcAvrZULcqTyQSSGNJV6rni0a4ZMgWRO+qxC1ujPmMyGpurDMPSla6ZgdnXpDLD5AvYNJTadz/WU0J+2zwlGiwjR19vUleo/Jz4LMl+In+H7SG+py40GxUbGm/PL0TrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tgNWpKq/S+j+/TWEE4IglhB86krk4Hf7d95lSiWMHTY=; b=D9R2f3ex4o6P5D+yIqe3fxR5EG59NEGVwfXTM4ASDszXaYmawwszwKJm5DNLD8NvmpMMEFR589cK1cyrOCXzfNAmWJlVwgrTjeBI9XedYq8utMXK+QN4YsMffg2Yif++y0IcCQWBcZ5hN9btBQN9Euyi1AURVPRGeRvec04yRS8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB8009.eurprd04.prod.outlook.com (2603:10a6:10:1ef::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.23; Fri, 28 Apr 2023 03:18:45 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4%5]) with mapi id 15.20.6340.022; Fri, 28 Apr 2023 03:18:44 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Stefan Roese Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 21/42] watchdog: ulp_wdog: guard reset_cpu with condition check Date: Fri, 28 Apr 2023 12:08:26 +0800 Message-Id: <20230428040847.10841-22-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230428040847.10841-1-peng.fan@oss.nxp.com> References: <20230428040847.10841-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DBBPR04MB8009:EE_ X-MS-Office365-Filtering-Correlation-Id: f7a5e820-de36-413f-f487-08db47974616 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KS4IbJ82X5HU7ob2VAB27MxKwRVmaGV0dnq6yrc1GjTELl8eroTrTws0nYvGdoXpno/Rd2IX7LK185TPIFdrDM3PbdxcD4HLRDFLAyfX/fJB2wn+Z0bCDgTQX/gz1KgaArzSjdJQJM3vVpIlyXj8VShkr4GgLt7keRWG9uYg3vsfxamkTaxgTSiwwFG9Zf8ONAONoLy+NisaUg8OChRiBXk7xQLxfg/aS+A6PnvNVn36Qjm6p65S8zPeJWMSbhIp4HM0aVFBeQULuPgTn50l8CuBmNHob7VHuoPONycqwISZRynjFXmkH9a0S3xFbY5aoFkcX9r8EfrB9LGq2Nint2plf62DIJnHJ9/b7cLFZ5gpZptI0YC2PD0A7pLFlEZaJWhklKDh8x6qbEl52XGPBFQiWPOrHzQrY1w7Jqsrh2t9Iu6disBixtyii7tNFEoQWDZcE+luA0Y5oo8HpaPFytGx+lWKg9f/LwzysgvXakxZYflllKh5gO+knD3A9+n6tfmXrTRqwKLRzcTGeGYxd0AbfgiSncuZhpB3e5sbhoSq5snctgETfQuvtD48aXTCcIHb95WQO0jCRuhBnt9b3K842lBfgyOtu5A01iDnQyMTtOWm8KDYAZW9BR0wQ3MJ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(451199021)(8936002)(8676002)(5660300002)(66476007)(66556008)(66946007)(316002)(4326008)(38100700002)(41300700001)(38350700002)(2616005)(2906002)(4744005)(6916009)(478600001)(86362001)(52116002)(6512007)(26005)(186003)(1076003)(6506007)(6666004)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nLeo3K2POBhGc2nz2Rl4fX202hKdfMf3kc0/agPtBsuCtkViMh1enk6v0I/s2++PlpMPjjcgHZ+luOSZSlXURWOb4zoFIYMMmzTq36lrv6zeVulxv1M5ICQJhYBQVmuVGMifSHm/1O529CmfBqt6gnQQ6Qhz5ZbyssBm9G5ebORINIunW2J7/BB2Qvm6AISsCpyd/l3+suC3mUdShZGcwHBArpEUcvPg98cPiF4uNtq1pQ3F2hGRqV1oFitovx0KFoQa9FHyLje8d9qmQ344BXTbkhdSmcCoj1dyA/GgvwBiqTF3yleS72uSnk86M1gb3ffmy5f49lyCe4+bQTl+0zZsnAKUv0B3HEOq33ZcGDEPc1kgL3J4dukX/tCoN/gUfEiGybbCpSTN9zSQNngHlHScUESdF8NCYvU2NVBQmdJL3Ytf1lI9iavqnHLx1mvfNERp8Xy2euTyZRnqmtkO8BvKREj1+dSxy0eJ/9oP7j+KIj/DMZoXWnCGgM0OkzcHKZFb8LQhoirop5nzx5pG8IQjkVR7TvwWtOxnaT9QIeAEMxY1//dfHhGCs2/cyx8NFuLZcKdQRuptAiz5pPpSqY/CAJvdEQKPmDxCNPvmrSqK2RWZBYT721uw7mMeMLXdUVPQDmbHI3vUU03/luiBMqJt+QLfLVBodGB7oY963PpHPolJsszwvrmWjL9P2e1Wk8RzS2VcU38KXPJEVewjsWQHp9g+rr8vPSmS/JcxnrqWl7rPmJpS9JDRCclgFdl3/CnHlXpWzCtYThJwIs+zUIf1uu2F6+cNgiOXU3ug2ZqgvuSbWCuf2IL3LJW/zgayIs6ZA2eCD1nMx06wzvwonShnwqHfH6eAFMW0/6NiNbMJLqVMj0ohEBpugW+8j1rEicaYpr2oyGlJlyMhCxi9888qhl9R+n50DyH0skauX+9NiLdws1AMVubwJ0bQTkgKNInzN+M2CDVnHzIa9ForrIRQILSnXrRLwJ8Ufh7srTMIN/eL7ZxxaEeDYVSjbhZtGFTOZ7iImw1xGv7QCQbfnq88XW/oEJgjXJA5GC4rgEkKjCy8EkbjbC3D8gvT0QpPZs7Qyobu0agprglcxBJC37cLjpjEIKVbJUWShvIUcIPqvwVE1MTpw1Vk4pDpU9Qqnkf8AU3B5G2CTcthqcNVHhIatup+PefciyvI5zgo2hkCKrMOJ6n2/J1oSp1XpvcHA5E/WDUO9sQ+rj02e2cVQcnfZApheS6vconoJXNWKTU22Wv7R6D2kWIb/3E2ylOt2dpbOePRuiON3U64WNVNkHr2EHd3T4Pa98RLunZvljY2cskfqHvxK9tVVpHAW3qyZ7+aBBm9RtwoKLEpgFHbub9CNkt8qLD9oRzG0sDLhpzq2J7pGRvq9wRhqpn8sc++FetLOgvM24p11tqMvSQGy+RdSxP0bselMSEiqYNMmM3Hw8u9wGgTESSVGUO8hhT3tdOFm76/Fg4fq/4q7Hd1voXaEvKTCAkBMD2/ngaUvCQi29mrnk6paQTw1O2w5YhJ24MPmj4f9F4x1OOI6yxvZB+IoX7ehhtVP5lnXB8xHT4dCA/JYtv+FlWVBQOFuC8P X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7a5e820-de36-413f-f487-08db47974616 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2023 03:18:44.7906 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tZr0kWF9+Ug1qDCaYcPdVuVUYNrOAmY/P/2QCVuom2T+hhTGbXJ1DaV5nM9k7eu3AzNWSQIKCPw9p18JzzLwyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8009 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan There will be build error if CONFIG_SYSRESET is enabled, so guard the reset_cpu with condition check here Signed-off-by: Peng Fan Reviewed-by: Stefan Roese --- drivers/watchdog/ulp_wdog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c index c21aa3af55f..0eea04ed2c6 100644 --- a/drivers/watchdog/ulp_wdog.c +++ b/drivers/watchdog/ulp_wdog.c @@ -122,6 +122,7 @@ void hw_watchdog_init(void) ulp_watchdog_init(wdog, CONFIG_WATCHDOG_TIMEOUT_MSECS); } +#if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG_BASE_ADDR; @@ -159,6 +160,7 @@ void reset_cpu(void) while (1); } +#endif static int ulp_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) {