From patchwork Thu Mar 13 12:14:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 873379 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F5A7FC0B; Thu, 13 Mar 2025 12:15:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868123; cv=none; b=bmYA7NFZ2lKuSvGZz4PYrLHjIq/cpNrf0Wbsvn2SuUqJk5Vky7Xd3P3RnBwaM12vKliruJPQyKjBbMTVe3A63JZ5RlmgAfbq4iNiCvz8bv203k9xiYvtu+y76H9Kuh4ZP436/Ecp9SXKOOBw1urblmhzY7XP4bTjLl0+4Pq78sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868123; c=relaxed/simple; bh=hLmDo0j13wZm0z98fG6esxZQVY5Sso4WiGan9W8ZMVQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b5fYCgMs8LTIMJHzpVb/RAWPLwzl1oGQDRyCgT6I7GVKmOTa376y7yT1Tm5U8uOUSFuUHj3XVZtnvAMDwalfNnUwqJzKJLor/nTPYI/ZvgS4NBFvHHLMoLMqKQe6uulfYeZn3sLRZt2GRREpdMyYkv+s1KZi4m0Xic5qN01fS84= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XGWLjSBC; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XGWLjSBC" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-543d8badc30so1034019e87.0; Thu, 13 Mar 2025 05:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741868118; x=1742472918; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vcWyZIGRZ0V0VnjdnEmGXkiK0tOATgxayTp5UfiuylQ=; b=XGWLjSBCeCTbB7z5X3wOmuizPfnx6pnPaDquvsdo4VudcYrtnxKT97fD8raOG/sEJn 0pm9YoRcf+1eDVyISn06KQLVfX2PPcjwcnZZJGNqptcxZWv83PKL7oNsJYrp77uVavHx r+fvKRZUa1y06UzxAU27FC5V9xC1AZxpvSBMRPsS2ReONzgHtGAyUU0ql/+p6qzIriu1 EtN6uELvN3yw1oPGET0K4drabPLJwf3n96IWKmUH/sDPS/SS/LOdBltfLz2rnXtutfd/ 4RDQS//GfRs5iYa+2G3jxgycyIFFyCMy0zep3eU7w/E8iOt8GDSDhPX/czvpN041898W vbnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741868118; x=1742472918; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vcWyZIGRZ0V0VnjdnEmGXkiK0tOATgxayTp5UfiuylQ=; b=laeInhIuZamTMyy4GP+ZI9fnRSayalSHj3QTGeCWvmNytdWhQpkD06uAxQ6mxql/lM bMhx5wYlBMl7hviuAz2+wFKcOzxpT+AG7YjId3VouY8rg01OsKifZx8GgoNeKZVdvTrd XtuPL/KST3gtlMeH4SgLTYqJVJPPhOsrcJJKYJ3o2B2hKlKcA2xHqOZ7Pf6anThdC5wQ GiMH1VoDwEjih7j2jvE5rK6C1kSaIKhUX6/VTxXA8BrLfmBtB3Yl/mK+CXIybkOVlLX4 WWzaN0FTDaQ/mMjTNrnE1EsLw1jaIBeekXyMYfQwJsOXmlS2oGomzkH+sZZ65qENmQJa EZoA== X-Forwarded-Encrypted: i=1; AJvYcCX8LQtoXIcrFY9IHvqLTOSLegh4XO5NAYMS3wkREzzd/gOWBrweBnjlgBkP9zZBq9Mtyome0W1zSiPYvIA=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ3rKOJ5oEF1WfMREzVlbOI/f0xJT0jZUjlfRrYPpvkM/pUfuF Ylv+p2eUakyLcIMJ/iDZX9nhzvKj0ax+5Id576lOdR1mlhVS4ZKW X-Gm-Gg: ASbGncv5zNLm1hdDc4YXBIfct9uvFc/GxSo2ZkXZJaw8GF82/bZ50OjgcQBKRiXprmm bNRB8qxy5jRTeMJ23ZM+ReFRZjncyMFQm8GwrvWwLeHVT6Jf+FdfNQ8tmmVjVEF3q4rqKsRFvG+ 9lAXM/sRHY3zm7jpPEooRhGUjpfLGf4qhIE3UHfT5Vdfp5JjT+cXoW8rIcu6Ggr2LCpdzLHpmWF b8O+2EJzDn3atseuPuO+PGwgGwehqjl73ZpuluOLIzLqNgrj8RbOimQJHR95vx9fXdsDLT8+jME 9C4bda3whr3gcjqp0s6qD2bTA+x3B6VcHoogTGiT08riPZLT92oQSjK1P94KKojWWVQvGnlpi9e Ho1uF/Ge8ane3 X-Google-Smtp-Source: AGHT+IFc45U6LwgHiIwUbMq07bQASP2bE3l0stD6OckyQZEsZB/XVK8KMt0taKyM2lmw15xgeqsBLw== X-Received: by 2002:a05:6512:118a:b0:545:56c:36c7 with SMTP id 2adb3069b0e04-54990ec1877mr8426209e87.41.1741868118269; Thu, 13 Mar 2025 05:15:18 -0700 (PDT) Received: from [192.168.1.11] (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c192bsm192851e87.89.2025.03.13.05.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:15:17 -0700 (PDT) From: Marcus Folkesson Date: Thu, 13 Mar 2025 13:14:41 +0100 Subject: [PATCH 1/4] watchdog: da9052_wdt: add support for nowayout Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-da9052-fixes-v1-1-379dc87af953@gmail.com> References: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> In-Reply-To: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> To: Support Opensource , Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1211; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=hLmDo0j13wZm0z98fG6esxZQVY5Sso4WiGan9W8ZMVQ=; b=owEBbQKS/ZANAwAIAYiATm9ZXVIyAcsmYgBn0sw+yhOHeBqpf3/zWTpR2Q2KknGSeOqbVyGqD iwDNWNtHA+JAjMEAAEIAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCZ9LMPgAKCRCIgE5vWV1S MqzjD/9voJpMZzeGOnShEGFH2OtdgZkVLiGt6RwUSiQ38n9pzH4qshHJMB1ucu7khU4z2vG92WD kG5o9jE3R2JEvJw1D4R1VJMTXudFdt9pP+1xF3mhGYtdGtGvLm85FGON8GlUUE1XKyCYnfUkoo/ zQ5UhSHWBys4mtwYTuN8iULtr+0JuiZeajL/7hY+ngWamZNyRnfofEFpHd7DWc3WhDOTCyalhpu lmYA1vwdhmmcDUml0ZCKs2mKkUU5D61IF8bZ9yzv//kEW/EWVMYlyHPqlexjLD04l5ifFBJ3B/G YuHO0Uu20A3R0Xw67kWDUdu75xCO5VA12e+PqKj1Izv8T77JFjJjTT+RTNWFKYEScIpSffHt/gp YWgOhNhij7ZJeriR2Os5SOErl5gnzafavKftmHKyz7jbxidTr6ck3kGMCKuJXne+Tm/1JNnymcd J/19cu9HUkIWbL7d058T9CFSepKlAscIq10K0xPgeTXPzip/X6GZQPsNENujQT13CMzE11wGfm9 6FxnwC3UouTkLKz72WR4XcWGke13+2VFekroDulhAYPQtp7Ri+KP6M+0Ugnx+ZPW6FnVcxecoeE zHeLIjFakmixYtnuUX+mS6iaoAbi3oI6x8Gs8AA1jHSEOVXY39Lfxs6MihXB9swjJCZpsEogoUn 7KII15U0xvDDTJQ== X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp; fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127 Add nowayout module parameter for not stopping the watchdog when userspae application quits. Signed-off-by: Marcus Folkesson --- drivers/watchdog/da9052_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index 77039f2f0be54273df1666fe40c413b6c89285a1..a8ff1e6a7903f6f139c5bb60d7d92ca39077ee04 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -30,6 +30,12 @@ struct da9052_wdt_data { unsigned long jpast; }; +static bool nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + static const struct { u8 reg_val; int time; /* Seconds */ @@ -172,6 +178,7 @@ static int da9052_wdt_probe(struct platform_device *pdev) da9052_wdt->ops = &da9052_wdt_ops; da9052_wdt->parent = dev; watchdog_set_drvdata(da9052_wdt, driver_data); + watchdog_set_nowayout(da9052_wdt, nowayout); if (da9052->fault_log & DA9052_FAULTLOG_TWDERROR) da9052_wdt->bootstatus |= WDIOF_CARDRESET; From patchwork Thu Mar 13 12:14:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 873794 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75DA1266EFA; Thu, 13 Mar 2025 12:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868125; cv=none; b=XLLfRvW38x9Ybfsh4foZsRkQy62dPK6OEngpE3j9FwPEltDHn4fWeJq/toxRmt/WtVk1D/i6E0q4GDs2NHEsYPtatfv5H3h4mrLuhuDJob9nwv3Pj3suETvvIeOoBBrApgJruue9PH+oPcWhDF00elifUlXmVF4hTrvUHSh5ANU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868125; c=relaxed/simple; bh=6Bw7Z5pqrFp4Dfdtst6FATAGsH9+hZ6V94NiRFJRyrI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C3Bf9S3gc7+ciSpGoXBHSkqNZBbYC/zTBrNKMOv1HXyXcONONoeH9F4AcqH5ni0J8v3ChrE2g/KUdiP36AryZNvSGvboJ8tCFogN+9GhqnYEvpEh0XvXBNTP+sokgzGe+B+Ok/80qrtuAtj+p0maQtRazbhM8Z9/1q3KLv6W7S0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Em2rFZBZ; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Em2rFZBZ" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5499da759e8so2200752e87.0; Thu, 13 Mar 2025 05:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741868121; x=1742472921; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NSl8xyKeQ17PRGrc6DnGNwaWt4mlGOqzwR8Cl5P9HxU=; b=Em2rFZBZJGGVjGlp82W/R39FcOy2uTGmo70W5krgns+uHHG3z+oTOlIYhKvOPEqha5 +LkixmeLncmSsyWf00x4rjH5zoKBA7+rmrGAXzSuP07fIGuXAX4KMVH8Qs3oew/NfbYg 7TWbsnEnWISfBe2rpYpfqy/Jp31DzEn4hOZ70YBMXq7fFWBTQRdh2pp5pUqE2+unnB9g uKx/XqmaYWbFFMVIQZJO1eX6Gx2jpqBK4X+aRz2HuVV33cHRbf6oTbqmyKynxh2fnhUB q/68cZ18GVOYMQ/9cDswagXfaSuuNA3GPmoNgzzVEdKdaKXCaGuD3zj4C0BQcupjGHlK YWnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741868121; x=1742472921; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NSl8xyKeQ17PRGrc6DnGNwaWt4mlGOqzwR8Cl5P9HxU=; b=HWaMVqhipQbrN4Qvelhl+OQrlgDboV4qgknwoRFWKBMI9hQbixNwXMtIquS0+s6G3X z/UAHRmkGWFJ3U8knUIKDPA+Y4p1kfvcR7e90uhL/YHBEED77ejmt+CIx92JvByJZAXL 2ZlSvRYQ00gT96/km18jv9vDaYL9WqMo0veslub2IDqdPb5qL80LNoHbBYrjq7WWfDvr C5WmscgAKZWrr5CAkX/KdRXolcJ86L8iyxgic10XJ6oPEpy94EMiDhvagpBdaNAouY3c Sigo5I8bayMQi2TKoaZ7DpDGFeZQ5eYHdj7l8rO7fiAMznoGBD+kSWqkZObLgxEZnWhD Gsaw== X-Forwarded-Encrypted: i=1; AJvYcCWpKA6S0oAMk7le1po9WUXBAYYOXSBOmB6QRPgkL5gnMoZH8BcFqI5wyqrdUHWgTJvutecq6bquqjOlUZI=@vger.kernel.org X-Gm-Message-State: AOJu0YznbyynM+Ys7BWW6+CekPD4aZOPQvAAUrk0nmKFsfGikbFQy/ZW kE5Uz9W2iM0y35S30xHbHUTKgYuRpLOUmVGKKsLHdQvub5vpuVsOPV/2Bp0z X-Gm-Gg: ASbGnct2enDCW6bpTbc0h/pCsOP59Hi95LQK0iS33XVmYTDW1DgIiIarKUGuS2vgFu2 4jE9dQecsTlGJPc6rpsqycSSGkFyKQmiy+KrBbpWhS9isaOdYnnkybrnMGOY2AsZWf6BfJr+dO7 8iyq+E5Skuuo/SnKlVYy4aWlAIhcQkZEAZAG5eQhiedlam2ABhtTWk8OwdYusFtCgXqC6exUG9n RGtriQJsRXDJ83DuM0QxW7xoQMvVE5B5/ymbFtxfrTVjHzKykNQuPlgWCO/TOmhNVBS4BtBohr1 4q0bn4nflwRtsbnx/1udjgysht4ubcA1dsJU8/VQvVqzbbzsv+qqkCo+F8P4mKeRsJVJbGIVwsQ 0aGAG1+sBDcOB X-Google-Smtp-Source: AGHT+IFJpY+/avg2TRwEJHwn5ZdQgzKDVYL8MtVzMocp4pol7Gi2TEwPrFJnVUWlGgJ/JjbGWgTpzw== X-Received: by 2002:a05:6512:158f:b0:549:7145:5d2d with SMTP id 2adb3069b0e04-549ba41be72mr931681e87.16.1741868121232; Thu, 13 Mar 2025 05:15:21 -0700 (PDT) Received: from [192.168.1.11] (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c192bsm192851e87.89.2025.03.13.05.15.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:15:19 -0700 (PDT) From: Marcus Folkesson Date: Thu, 13 Mar 2025 13:14:42 +0100 Subject: [PATCH 2/4] watchdog: da9052_wdt: use timeout value from external inputs Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-da9052-fixes-v1-2-379dc87af953@gmail.com> References: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> In-Reply-To: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> To: Support Opensource , Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1425; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=6Bw7Z5pqrFp4Dfdtst6FATAGsH9+hZ6V94NiRFJRyrI=; b=owEBbQKS/ZANAwAIAYiATm9ZXVIyAcsmYgBn0sxDvKeocRAvZy6zTCi67LABLkQ60ZOyW/jCx u/zdZOCz+KJAjMEAAEIAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCZ9LMQwAKCRCIgE5vWV1S Mto3D/0fHdx5iAnYyIsyCaxtmCV2WKy2FISWKmyOdELdeFvca+vEMuy1k7CvnYKTACm69Lbb0pc zGovwBg1OQY6fc8vN6hs0UZiEIfxdqWq+2rwlxPFZqH9oTTzfHQ7jTntFr4Kd2rLiZca4M0Im25 cyDnqKknw9+9dms1kEJdK8NOCVRYx91a22EIlCSBRuA/vj3ZFJS3UZm3Li+3tD1ZOgv8JeqOvSw 4cF1iesiKmljOANT/8m2it7iVCAC22XrI3yiG6v0U6U5nrkvrj8JC9aRmKJKyg2EjHkcYarzZ1E /5G6CJYiU43FS4v7y0GxGUaBCc4FBFmZ++H3DJOSRsG+u/oQCSzRtQVwQHHTzXMIfXwctG8WTNN 3aWCo+xfnTFNLqub35XYq+dnqHnjoSf2iFf+hgM88je2suVF7vFKB4mbOynMPuaQg3lAuGR9oF+ z1Uzpd+1vKI8KAbokfiSRnc1TiRhv+AVD3jpbwCSQbCoGqScUWIacYgydQLkHeMVApkGpeNrkQl tFqi4dm+khg/YcZHn8oiQb4nIKZUur2kq2OzoTbfqZKao7LewyysR9jJskXYacs9hX2oahFQGGI wp/okNv6ujbX9nrIkO2Kv2KBHQMs140hFNZQ15GLmwDvDj0zGDqJVroQeCYLmhaBW07KcRugD4+ bkHtYfB0OtSZXjA== X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp; fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127 Introduce the `timeout` module parameter and pass it to watchdog_init_timeout(). If the parameter is not set or contains an invalid value, fallback on the `timeout-secs` devicetree property value. If none of the above is valid, go for the old default value. Signed-off-by: Marcus Folkesson --- drivers/watchdog/da9052_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index a8ff1e6a7903f6f139c5bb60d7d92ca39077ee04..fa9078d4c136a52f1193768fe93dc04189519679 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -36,6 +36,12 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +static int timeout; +module_param(timeout, int, 0); +MODULE_PARM_DESC(timeout, + "Watchdog timeout in seconds. (default = " + __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + static const struct { u8 reg_val; int time; /* Seconds */ @@ -178,6 +184,7 @@ static int da9052_wdt_probe(struct platform_device *pdev) da9052_wdt->ops = &da9052_wdt_ops; da9052_wdt->parent = dev; watchdog_set_drvdata(da9052_wdt, driver_data); + watchdog_init_timeout(da9052_wdt, timeout, dev); watchdog_set_nowayout(da9052_wdt, nowayout); if (da9052->fault_log & DA9052_FAULTLOG_TWDERROR) From patchwork Thu Mar 13 12:14:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 873378 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4461A266F16; Thu, 13 Mar 2025 12:15:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868125; cv=none; b=RBfmAl69AIr3rBeCicrn7LQsGzs+LoZm3xV1zpj/hYpMesDu0BgqJnvXlaI1z1srl+jEN3bWrZpvwgbBgKW4GVwg2ykZRzB/l6Z0hmeHRRJgPaoLcw425oexj7tfu2Cq1tfbqCufM/ERJNlaPyHAAMRb1UfDXFL0MfLQjqmEmTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868125; c=relaxed/simple; bh=xWrATJzy0fqpfJxT3BHyi0zOwfwjKp0GUehuOTG34H4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fxg8w04z//V0lNQbKmkOLHby3n9ZmpDKf6Lx5yamTRXKBpR/AOosk5CmQNZ5wSWYN07uWb2GBGM7cTmMjbTCzZfXpT/bHOEzBE3Hs2XW9gumWYYKfVYC1qXbaV01tKW1AvW631Yhz74R+q45Vy67IqOo3azzcClSY1Rvb+bTgJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fdQBnqHg; arc=none smtp.client-ip=209.85.208.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fdQBnqHg" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-307bc125e2eso10478701fa.3; Thu, 13 Mar 2025 05:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741868122; x=1742472922; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NchkLmxPVzjzeuKKYV3hJaJDWOj3zJcFyf8KvswcV4A=; b=fdQBnqHgZkdXe9GIUvp3tBd/h1mro+iSn7L31IZEM2vAKUcTVckaoHAIvZzXKs7CP+ mo6x2jaOV2nXjeKZkrxUpLEfbTbVzfPmgkAwtZgKNgqdGAJR2PHqO3VhraN2re80iica Ra76jSzxoRP3p734afkDvb5zVEGiyUn7ITJeuo5NymY832yJg2HYl0uJk1K7IrzYc5BS SYRTQCFHraqaXsR6Gmc/ELlrtvGsm/xy5AuOh41rzrGe5k5l1tTTdhRI5UEUC3Eq2QwF T+kEKw3w6/Zu8s0c4M3LY3TZP3s3y83WyyWojE0Md/sl7GcAj3zcYbGOPAS32bO4X/73 OKWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741868122; x=1742472922; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NchkLmxPVzjzeuKKYV3hJaJDWOj3zJcFyf8KvswcV4A=; b=VDdGgT2qOlV2wVO3Sj62EE/uwcrBrWKmBtFUOaguCY72jYXbxl5Byfv3hr1IkKgKQM IntW9jI7cRfPPZD9Gi4KVeFeUOdHTSf5T5NtSQ9KUNtZr9WQHtCmZKbGSfEU0dXE6NTS +Gf8rVY2DSucQpo7wVLVLGuzUZ8/q7QrH8CHNv2gOFQGuZi6DNDdAhoaTq9mW4GZYQV8 3uAorl61M5iDowvSLtmiG3gjRP4DJeaMfj5KohjzmfD7oC2aUHH3uVuBto0o6NM+Y76u NEzvh2uvZzPzgn19jR7Rb+pHSh0heRur/QlCiT0RvXqG43v1BMEAC5NnVubiTvrSH9RG p+cw== X-Forwarded-Encrypted: i=1; AJvYcCUhm/vG9+OscNNuVjZSbSTpvQW2jBRv20SgGRutjrTRKj4nsaNpwvpUSQlbi6q9dmYT66Jzx7cXW+PfCgk=@vger.kernel.org X-Gm-Message-State: AOJu0YwoolGkFOyrtr9a8ktycwBlRtD2cr+cfzQTpJ4ELFAH3O3p8lJz QHtuK+i03R7z2Y9M1i8/R/LONt9nUL24GlOA9xXMCruZLPTmr+3C X-Gm-Gg: ASbGncuNtrU7QcA4RKZk70TdFKrNGoeKYf8VA//IMpCx4YgeSDR8PRQrnpcfY8SUs4R BIbiYx28XlWd8aoQzL6NAR4GFJMkGPzAL5+MB6vjmsn88ploBUvGbORPtGpMrHrlKqu0+ZZ9swg 028iCUAcvWcb4aBSfGfReVogAvSrVYzhEeXzPbELaMn5Ndp8GXzH7JQw/k2WNIyAde0MBGyV+T8 uESariQ9bh6rmBzDy/N8JvpWRisKzTNIc2k4tnc4pPU/0ORwAgW2MXanVsIuWPMI54USw6CYnsY oU9Vftfd+1jy5FQVbTTCMCL/97+t1zY676H2sY0IWJqQGtLrJGWDLuCCz4BE1nO4qZTv/3ydds9 h0GWPCMI0loLF X-Google-Smtp-Source: AGHT+IHfKZ6TqjIrCf/nw2gMMwzdGnq8tc+dDltv67gFS7UhcIfAPuXhuzVmc3pUF+J4hrvtHINocQ== X-Received: by 2002:a05:6512:3c98:b0:549:5b54:2c5b with SMTP id 2adb3069b0e04-54990e67418mr10412156e87.24.1741868122213; Thu, 13 Mar 2025 05:15:22 -0700 (PDT) Received: from [192.168.1.11] (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c192bsm192851e87.89.2025.03.13.05.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:15:21 -0700 (PDT) From: Marcus Folkesson Date: Thu, 13 Mar 2025 13:14:43 +0100 Subject: [PATCH 3/4] watchdog: da9052_wdt: do not disable wdt during probe Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-da9052-fixes-v1-3-379dc87af953@gmail.com> References: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> In-Reply-To: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> To: Support Opensource , Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=956; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=xWrATJzy0fqpfJxT3BHyi0zOwfwjKp0GUehuOTG34H4=; b=owEBbQKS/ZANAwAIAYiATm9ZXVIyAcsmYgBn0sxIs0j37DpVkzxgRUudQjOJgdKFRWb5lGauC Xzz/2/SXFiJAjMEAAEIAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCZ9LMSAAKCRCIgE5vWV1S Mty4D/9kHsxzbNIRY/bioO71WBI7ImqUyPs7wpNZsgawHRLT6xFLSdVsFu7DjmB6bpKs5bv25yo m9m4F7KdcKsW7gPzz4OdgQRk1rS7Se/Dy0EfYjNriz7OPnBeQbGEtDZpn+NpUvWhKuTazFFhY0b 8CqIdJTR0cDJxOsH7X0hpwALwlD5hLpBMGQShE1kvDkpMw9PRTbYsG1xsvqzQm6ivM2Oj4BujjI aGL4NjlU0CYOASTrn2gtTpKFdb0k4nRS80dYpVQVYoMRA/Y62HVvwq/Qg7i9wQNz6mUmZtZ9SwM FZZf/JvBrPV6Kl8p+ihngcoJHRDMr4m4T0ck9usTRdI9VaTXjcLgcTrKAWe76LbyKpPfe4odwoQ SDPk4sUBXfv17TMHYMb2Dl4wD6v8j3HgaywQjyC1EIJosD6HAzgsOXx2ryX8raDen3Pk/la8pry y36iSWIjr0I1DF1sTXBPPzlr/cy0HQjvFRRudAIM8SxqC2ENj1/92URdpIOgNfcJJk6PpTW+tgs 9brW0GHafnS9N1Uu5+5O/ldDFlXq6E/gooo3W46wxgdKBpNnwNE4+ZpFZb5370XZPCet9Am/LLn Fi5tx3lcuiTuh1+3z6IQsvWJsoK89FTF9TOURSsyY65XJDGEtHmHKmqlErmoXwF9Rw2e4DrZ0YF SV/VPrYENb3H+nw== X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp; fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127 If the watchog is started by the bootloader, we do not want the watchdog to be disabled. Signed-off-by: Marcus Folkesson --- drivers/watchdog/da9052_wdt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index fa9078d4c136a52f1193768fe93dc04189519679..90b620b11b5fb634372e18ce4c40568cd946f284 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -194,13 +194,6 @@ static int da9052_wdt_probe(struct platform_device *pdev) if (da9052->fault_log & DA9052_FAULTLOG_VDDFAULT) da9052_wdt->bootstatus |= WDIOF_POWERUNDER; - ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, - DA9052_CONTROLD_TWDSCALE, 0); - if (ret < 0) { - dev_err(dev, "Failed to disable watchdog bits, %d\n", ret); - return ret; - } - return devm_watchdog_register_device(dev, &driver_data->wdt); } From patchwork Thu Mar 13 12:14:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 873793 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 560662673BA; Thu, 13 Mar 2025 12:15:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868128; cv=none; b=O7MuGaByShHcstPOeUeLptEoSH26kaY6+WhvD7RujzWxzXlVJfqT/Gh3kim4Z2tQqc5EH1GAH6pOJqT9uLN0QRHO1Q97UnsmtLAmYMoVr60FYO/nBcOZfL27zAkxS2AZrZqNhRTK5R4JgWVd3ZjfAhyBp8RWt57nvvdDJnE9URw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741868128; c=relaxed/simple; bh=msRQvskLF0OZgyr0Nn2gFUtgHE+JQ1Q+SpkaJxkauws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HW6EIMKVOTFTXT4d+XcRr11H4hfPpvTMiVxa/8LJkvvXEdiZ1j4NVVmIDdnNWrBFuFCX49ofNTcsojB++AERz3Bn2U5ChPtHbBACwmv67C2vVGmwcXropBjdfEVR7WWrIavZHgiLSdxbhkXfHxgYho6aJC8ZbGZCNz/s/if0c8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VJRY1Rxo; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VJRY1Rxo" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-549644ae382so1008884e87.1; Thu, 13 Mar 2025 05:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741868124; x=1742472924; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EX8q9UrYqVDJV0DCL4gk761qzs/ghU5IMPiNSIbYdrU=; b=VJRY1Rxomem9o7mHI16uMgqpPHedNYFmkWItA7uP2rf+J94QnVcUiybc5Td/E2wHyf DYrh/7GLuHBGFNpbncFzwWeoxSVVFSiIbXZMZhw7Mp7cXM5GY7P+XbpHXfQv5IgaS0Ch 8mGndV+bG9rY1JF7otXbMZCeBr9ggw/q08xEKfrNJph8ageLoxVfpYpoc77eApEcW8NU afdw44AGbz8hfZidsrYIz99i1OD37GJTUYtxHRY0qJxclaK4tjw+T6vPHc6mOjhjjYZZ 0UYsJxkKct1oMdhTXzcyPKHtmlFvJTqRVHVeRWyu8OBjALd1ZFXVl7ZX+KcbJ+VVzMP5 PanA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741868124; x=1742472924; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EX8q9UrYqVDJV0DCL4gk761qzs/ghU5IMPiNSIbYdrU=; b=U2sB3HavkJ6Uh3jORwNJpGpgdiPrQHEdizXYWZjn7id3C4S5csT/oDkxLhF4h1Ajtq l9zBBZnzlxjnTDF63pubD0FUs68fZE79zvGuCy3PyhNBNnUzYy3R3Ww+wV2MzVUTScNc jFQvODtTG9rT7DjPDyuPC8XIMqBEdzkt1ZZX0WMyzr0cAQRSuOEQbI5QYqc+Vk7CcJbz yjWX53vJjjk/i52QZX0ifVOo/wKHfLiPkldugBFsOqwIr+kAzrH/EIyPmO6X07JLdumT BMB6wnuvnpgYMvhDqR4gRk7Z/Mh99he51FwwhzHVxc/BucCCj78avIK5vkE0q8V03TaC AfxQ== X-Forwarded-Encrypted: i=1; AJvYcCUBNdmCWnOn2xjmGrEMsr0FtkagqYB9lSsZa1SE/AoLf+Eqv0DRSnbVc4pRO4xNDY5T4IyMnIaQwAmR0tQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyQp6dSA8SPIuXPQtdnpixtmw70MOHDQeGRqqGlY8Cyzvaxjt+9 j914Qr1wZnbUyK8NtRJ7Fz5bjMCAfbpCcMs0iIza7ldMm8mR5Q4/ X-Gm-Gg: ASbGncsrylzDh4UQP9dE5Cod9wjh5UwPU09xN5FbVhq7nWegNNCUcdveXWa0ZNn0byP IKUp+o3TVtnA36wYLYFcCWT5U7eXD6xxPuKqhUF1w4jzKlZinEBteDZX7lEUD0ffIlwiz31wtaG Bbw3ZZmyuw5tnnPBO+x5Ic0RZFjvYd35t7zk/Gpjw6Z/W2YqPSW29ApdwIBmVeIatkONt+JRxWw Hz0coYY4pCU5/zT3AZJ5WDECfXaGflYloNOrCVe3vEIMyKuYs0qGfhe/xG0l62uphRWn7aRsLgy EYQnhDromxC0f/j7TuJY5WQf0Wtgfmfa8jPTV2CuKwmxxUW87SYwVe5/tkXetsE90ZpgOO6bAl3 VAmVFkQA0ZnEM7satsAzD6Gs= X-Google-Smtp-Source: AGHT+IHMRtNCp83Y5VfziuGToqqqNP58sFYcJkuPp1RzeIUqXPMosvv/GKK4Fe03sF47GiIrlqbP7Q== X-Received: by 2002:a05:6512:1242:b0:545:2837:17d0 with SMTP id 2adb3069b0e04-54990e5d3fcmr9433873e87.12.1741868124206; Thu, 13 Mar 2025 05:15:24 -0700 (PDT) Received: from [192.168.1.11] (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c192bsm192851e87.89.2025.03.13.05.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:15:23 -0700 (PDT) From: Marcus Folkesson Date: Thu, 13 Mar 2025 13:14:44 +0100 Subject: [PATCH 4/4] watchdog: da9052_wdt: respect TWDMIN Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-da9052-fixes-v1-4-379dc87af953@gmail.com> References: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> In-Reply-To: <20250313-da9052-fixes-v1-0-379dc87af953@gmail.com> To: Support Opensource , Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=945; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=msRQvskLF0OZgyr0Nn2gFUtgHE+JQ1Q+SpkaJxkauws=; b=owEBbQKS/ZANAwAIAYiATm9ZXVIyAcsmYgBn0sxNyp/FjToxW9L13vbZBkc33m+xJJc7q48ql mVpKIkU0s+JAjMEAAEIAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCZ9LMTQAKCRCIgE5vWV1S MsckD/9h1UydeVp6qsi+uKW5zBfGDCsGW5VxuZlyfzEph8LSo7bvEZ7zza+keb/Zr++SzDK/swb VIKvjFQX7w/0RQ78pJ9tdLPnbF2lj8JarD0SOSgo6pyxNLLUTKEa1WOQaBntXjY3oyQpBTqrob+ 29lgnNKYd7O7Pf0i0ROt2qHnmqJlOOXtQMh8AsfycyvPr7t/aX7V6uNm8O+VXsQUWdlQdLfSgKT AYZdu7bh0UOkjsXCNWwM0aRNpNsbjMhW0+vKWAdBlMOqLqR9Uum4jkPSQ1e52mzVwwrkur5ZBr6 u5whBqWQTzsmvjYYbKVzFkSHQB5/Brm8h08qeajZPyYL+0VGXUBs0fqZGYvixMPIFmnRLCTOC+N g/OZTAF0rnRsQKw9rq3n4tBQzLoVc3Td6nuSQ+1U4m7pdULCVNltq+HLLIDe0REaogi9nM8s5uT SEy0jyEK3vszBAdzpu8ix9FOhqQrhcZFOzh9Rp8BTkBU5kpgy4VZdetORrFZT2AoXzfFneDbJwp D3TYzzvLXdPlDpG0h21w5PMTel/o1V5Atf8dU0ENPTw+AKFGwuJBygw5EP6VYNqiC2yOFvPJyQj FaJfdQeRPmcMqFTJp/T6dEWvXuDZYOpuOJRtAJEmeO+pifmHuZfDDe/xQ5UZNazkwEqLkCU6DSu DnPwqg/N2zb0AUw== X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp; fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127 We have to wait at least the minimium time for the watchdog window (TWDMIN) before writings to the wdt register after the watchdog is activated. Otherwise the chip will assert TWD_ERROR and power down to reset mode. Signed-off-by: Marcus Folkesson --- drivers/watchdog/da9052_wdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index 90b620b11b5fb634372e18ce4c40568cd946f284..b46338061e7d269adec691f8e88e650e1e2fbfc9 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -180,6 +180,7 @@ static int da9052_wdt_probe(struct platform_device *pdev) da9052_wdt = &driver_data->wdt; da9052_wdt->timeout = DA9052_DEF_TIMEOUT; + da9052_wdt->min_hw_heartbeat_ms = DA9052_TWDMIN; da9052_wdt->info = &da9052_wdt_info; da9052_wdt->ops = &da9052_wdt_ops; da9052_wdt->parent = dev;