From nobody Thu Jun 25 00:31:45 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 17AD737998B for ; Mon, 8 Jun 2026 21:04:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780952664; cv=none; b=l4ZgYPRmtDwWvw3wfBU26XidMBrDMDxFD+/zYGmn3JIGABoGcdAg3QxaFRJttu+JDptjooZJQoSXj1aS5vU60CKO5PdsMzDV1gwuuUE+7rvWt2Ooa2v8Hh+ZhuLFwYCMm7j9/9obUd7pwqJWTB2RO4HHMQLVsyBT12MX2eTL4S0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780952664; c=relaxed/simple; bh=eQVQngmAj6T5Ofq5iPClVJszXRnjeijZdxVbnGzfx+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EaPoB6Ac2fyaSfHnvH7z8DDFvfwrVFVH+ufFggFqLBlbpfXq1+KdMrHwC0BjeX5KZinuBDlENJNva7Dh4FD/VCK/orZziA2NnsvJyc782Pb42Av0gVI5l7YwzdDwvoKqBbLxvGnNs8iZJQOYtO2YTOu+Tg6gKtgrGVpNsSRaQQg= 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=NwRK4CeU; arc=none smtp.client-ip=209.85.128.181 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="NwRK4CeU" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-7dc6fbf3e86so50867057b3.3 for ; Mon, 08 Jun 2026 14:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780952662; x=1781557462; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BNaBAmDTN0BUWsmF0Hwzk9UyiSH6I83sWyPJfmaJMDU=; b=NwRK4CeUgv6x9PNyXDO63t8AqQ51Vv7Pz5Mom7tHg4cIW3c69G75WAI/06gfhPgBav 0wRb9mL14Q14HBcB4wpKvS7q8wFpXMD/hyhPjn+4ys5UDTXQo6lrTGXDfL03e8waxqvS 0HrIfnS1Tzfi5FKRO5xTHFFFrrnGAoE6nihUAADtYIcD32vrc4ZB8/VpAUKApCWKKLZ2 uTHpYJCFXEACyO639D8c9u1jWAchg0uThyFjTOJuTTjmcD+QLpzNpV+Z+8jDSCz9Qpnn /JTU/6AnXGgtpQPg0Hyk2XzmMO8SecuSXPSejSUmWqrjeFFueWH2gL1AhGj1XlfWFAbo 9FJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780952662; x=1781557462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BNaBAmDTN0BUWsmF0Hwzk9UyiSH6I83sWyPJfmaJMDU=; b=QPx1zIYdGj3QyytQQOd07l5F3mCvd1y22Wxrr1hGwnvWhY7I22kjFr3jVQcApuICH1 X4hkmkdLm9lY/+ExzaDW0xZ92sWo5bc2ZUTjyh8UcUUU+r5ksndg79Sv1q82dhiPgMiy hjenLMW8irROJ/hTmqwmE0TPlNTxS8HzE1TSfB7rV5bKz/K2jQwI8B5C8JCcBf5klzqL Ut+8iWHe1RODFw48zAzb8LZQzOfqgMshrrepc13rUwd0wHwYjYVCxJo2QtGSDTpR/UeU 4/etvd1BDDB6ZhZRCGD2SCXnoeQ9Jw4VtOzRE6yLAelmGxXGzlNpFsWHqEM5djfakJ/s k12Q== X-Forwarded-Encrypted: i=1; AFNElJ+8xsVdE56r6B3YDcUaUcvN/7iFs/a5e2BnbbEPYkRENjWX1PPuLX8CrJzTrm3BfzJl8MypYEY3SV1VCXQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8BKYmUncoUrSW42qQfG6ktNZs8PtDgwyl6iJEc1PIGioTgiqu RAR6HpF9fdC9gBA6CfOqNsGv6yZZ/ysdnXxsRDoYTmOrGHKOzybm4EA10YCr6gWq X-Gm-Gg: Acq92OGbfSH20vL3T7hL+gk+tai67Ad1Hl2FZZ8TQL+wW9EJAFrG/J7LJNtugNUda4C e/UzqwsA9/pb7BJdoTuezkqOpvn0xrT0D4DFYcHxkZ9aXyYj8Ol+oNAhgYRJODPjzTgv/vzEMzr 8Otc+1kfew+CdamxTVwfsnikAelG9gsiTLDmD/f/1+7OBpmXXoWTd0Idd4yOzDLjIb/BkSWH7IM m4UuDh7PbJxjEoZiWBnQFv6JaMS5h505UhVNhTK+ll0RsKRFlEm6GQna5sEDw2UMdQjGjmXSuzt N4Y7ZF0MLw4eunaB75feDZ1pvxoKnVo74q2kCBUSK+R7eyb/yFfMz2qTyrR8y0HgMhZtoxxdnKb UARnz3W24Z2FOholaCHV30URbm/XAu20ykxH6e9AyJylp9bZXmCuxY+NgrAsfA+uYxXriCDPkxR Jpzotd3z9Ze/ekq+7Q/fYmEwQtav3FzHu0SwlmWbvtJE40/COFus7BlCfjdZ2+r0oruhh7ME4vx /yx4SIpaVYKwOOqHodK32fN848FIOnzy4H6XlEhaVRk3w== X-Received: by 2002:a05:690c:4512:b0:7e2:b35a:adba with SMTP id 00721157ae682-7ed0f630379mr167776767b3.21.1780952662058; Mon, 08 Jun 2026 14:04:22 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7ea2399ab1fsm89468367b3.33.2026.06.08.14.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 14:04:21 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3 1/2] watchdog: pika_wdt: fix timer lifecycle bugs Date: Mon, 8 Jun 2026 14:04:01 -0700 Message-ID: <20260608210402.31545-2-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608210402.31545-1-rosenp@gmail.com> References: <20260608210402.31545-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Two timer lifecycle bugs in the PIKA watchdog driver: 1. pikawdt_release() clears the open bit before stopping the timer, allowing a concurrent pikawdt_open() to start a new timer that is then immediately deleted. Move clear_bit after the timer stop. Use timer_shutdown_sync() so the handler cannot re-arm after the call returns. Add timer_setup() in pikawdt_open() to re-initialize the timer for the next open. 2. pikawdt_exit() unmaps FPGA IO memory without first stopping the ping timer. If the timer handler fires after iounmap(), it executes pikawdt_ping() on freed memory. Use timer_shutdown_sync() which permanently prevents re-arming. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/watchdog/pika_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c index 87b8988d2520..d567103ec5e4 100644 --- a/drivers/watchdog/pika_wdt.c +++ b/drivers/watchdog/pika_wdt.c @@ -117,6 +117,7 @@ static int pikawdt_open(struct inode *inode, struct fil= e *file) if (test_and_set_bit(0, &pikawdt_private.open)) return -EBUSY; + timer_setup(&pikawdt_private.timer, pikawdt_ping, 0); pikawdt_start(); return stream_open(inode, file); @@ -129,7 +130,7 @@ static int pikawdt_release(struct inode *inode, struct = file *file) { /* stop internal ping */ if (!pikawdt_private.expect_close) - timer_delete(&pikawdt_private.timer); + timer_shutdown_sync(&pikawdt_private.timer); clear_bit(0, &pikawdt_private.open); pikawdt_private.expect_close =3D 0; @@ -291,6 +292,7 @@ static void __exit pikawdt_exit(void) { misc_deregister(&pikawdt_miscdev); + timer_shutdown_sync(&pikawdt_private.timer); iounmap(pikawdt_private.fpga); } -- 2.54.0 From nobody Thu Jun 25 00:31:45 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) (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 EFC4E399351 for ; Mon, 8 Jun 2026 21:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780952666; cv=none; b=pXHpxCUj0cmkzP8pHdQkVFyAwMs71TIthyGu02uQWIRBfX3kKw9EmZ0zHS3whG/BPk6gHObFaLbkj1bv2lVzETDHWk4pwBrkkgAUkg5f6XIzSDk8dd+RsisVmDRjqIS43n7hRksYcD0RM2AvJuXtuEte8NM9jEeqHR8w/JzTxFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780952666; c=relaxed/simple; bh=bFta00Twt/E/RTqGANbDtk89KNmVRe6fyKVi3Knj4aM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dX28Y+qINOBfYZavT7aljPHlulxRaXSPcfq2RQOQgpp4ILlAOkvOtIvkGbECBG4BS/FWCf2n5NuW87Q7Ve+yYMA07p1bjyk+FjV5dZwrx8Ft92NpQcnOz9HjID/4dGknMbjGjvaMKACOWUDVDNQt046M1dIJHbRamQKaykb5ZKU= 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=H0pnuAVB; arc=none smtp.client-ip=209.85.128.173 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="H0pnuAVB" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-7f015f87fddso19180197b3.0 for ; Mon, 08 Jun 2026 14:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780952664; x=1781557464; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BYTDwqz4z09i7KEktqEP/nOWuMoIM8Ls9CTv9jln1cM=; b=H0pnuAVBebyn5ZqZFCft73WZC38VZVbYepx5gYVhJdPuQy23risPPe83ciQLiynUDz k0nnsYe10iMiP26JGgtqg342IgnMevIV7EnlSPR77bo9HftD45upoBMlc00iCC+8196A ESPHbSVn+ET7RVYOJ6i6ZvCcrwo5jfFZOYLYEKzPP5GmWp8EVPqsdlw4CpMDo6M2JfjD dHE4sy1Hv+LrcQavwnIfTQPKU0pajYDW4i3F4swM92Nso+RAOufiMPxGsN1ZCCWbvRw0 dljOoW8SxZ1tyTO1JA538lSjXZHUlnoBuneQ0LXIRAXyYhKBfL/TrA07CY+eKddnvHAW f1UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780952664; x=1781557464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BYTDwqz4z09i7KEktqEP/nOWuMoIM8Ls9CTv9jln1cM=; b=B6yimjA4hOKT8jYaLDv8J/rHhP6XtBaCsgj01Y/Ci96ouke7yrmPJxcz188mbKGKrL qjJGsP5W38505Kxktd31FP9CkmyulX4i9/q1e8BEMfKA033Ttb1F0mqPjtVyowXpVRVD EfZ0dNzO5PB6F1YlngKPZJ8qnqWUTU2dP8olAQ2RIxb/xuXZB22pMzkjkTCcHuUvupcC KMnG5coPtdxZdvRdBcJWee0Rxx0sWxvQxBQqla86Sl8WEK7ThxjkWlTKyY6G8cIYTDXi V38FE+h5hv+u8WMXG2ZCZ4TGOwpRxjehlzCrAUsPJfMrGZV7/Ee/rH/HivGoQw0ijCcP 6xOg== X-Forwarded-Encrypted: i=1; AFNElJ9RckseQaBXlE/AgWc9GxYNkeeSFqXnW0n7/XncUXXgYuxIdzMqvFRTpSs/Pmd7/NBhviRP8LiJiN/+yPo=@vger.kernel.org X-Gm-Message-State: AOJu0YxdTLf8hGKpF8kQVE7CPERpEPOhozpl5P9lH1iS47yMxpBhe43q kBritClSyLznOajpcoeUI2eT55nCrhewvoZvsMct17hUdlTm+Ulm4ERfNbt9UDuh X-Gm-Gg: Acq92OFxWXMpmY8rYpGTtf6e3l+6J0jsfxrgzLyRQj7kLwWWHKXn0TjIBdsWstQHf4N 95K/E/U55e3Hv5SJh0A9yhSQcOgxM/elZky3htRJNywrt4dU1D8aFrYbn16q83Q5TpGsgqlAT27 VWb4ojrvWAzRJqQSOAMWknXd3/wfYRqqm3LN/aDgKSkSUL8JyGFVCWFCR3W7y/MhyhgguvsmsrH f74xBSgSoRRY2uSyoPAfVDcHXO9CnAhUejuD6byGWPHswbYtQxU0nIX5Hq9J84NKl2FqLLo1wuW AMsBDw+/8Ef3AK5QztJzJpGb/KHLjdEaUxy+/yXXdqCnq5KSaGvBDGus5mDmxxROckllEEir6JW nf4rgPwdOz9RGAtLu02e0nzxK4wLDrt3ZYuUKLAswyNn16QKehIB5tJVvUAMpPm3SfZedOvCtHx 2GBRHrpbi+Bsr6K72dcBfv792mRi/T+907zMrCmxCDeZCp1HvwtIc7J0ehCmlyCXOlsUcme4xI5 +MCpiHTw8nD8v0dN1Wg2bJJUCDzihGcXlQj/EiY8VMmAQ== X-Received: by 2002:a05:690c:650c:b0:7b9:f136:56d8 with SMTP id 00721157ae682-7ed53996c90mr133275957b3.30.1780952664090; Mon, 08 Jun 2026 14:04:24 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7ea2399ab1fsm89468367b3.33.2026.06.08.14.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 14:04:22 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3 2/2] watchdog: pika_wdt: enable COMPILE_TEST builds Date: Mon, 8 Jun 2026 14:04:02 -0700 Message-ID: <20260608210402.31545-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608210402.31545-1-rosenp@gmail.com> References: <20260608210402.31545-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace powerpc-specific I/O accessors (in_be32/out_be32) with generic ones (ioread32be/iowrite32be) so the driver can be compile-tested on other architectures. Relax the Kconfig dependency accordingly and add the required HAS_IOMEM. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/watchdog/Kconfig | 3 ++- drivers/watchdog/pika_wdt.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8319c503319a..855736eaca2c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -2040,7 +2040,8 @@ config 8xxx_WDT config PIKA_WDT tristate "PIKA FPGA Watchdog" - depends on WARP || (PPC64 && COMPILE_TEST) + depends on WARP || COMPILE_TEST + depends on HAS_IOMEM default WARP help This enables the watchdog in the PIKA FPGA. Currently used on diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c index d567103ec5e4..e599aff8329b 100644 --- a/drivers/watchdog/pika_wdt.c +++ b/drivers/watchdog/pika_wdt.c @@ -77,10 +77,10 @@ static inline void pikawdt_reset(void) * seconds. Valid ranges are 1 to 15 seconds. The value can * be modified dynamically. */ - unsigned reset =3D in_be32(pikawdt_private.fpga + 0x14); + unsigned reset =3D ioread32be(pikawdt_private.fpga + 0x14); /* enable with max timeout - 15 seconds */ reset |=3D (1 << 7) + (WDT_HW_TIMEOUT << 8); - out_be32(pikawdt_private.fpga + 0x14, reset); + iowrite32be(reset, pikawdt_private.fpga + 0x14); } /* @@ -243,7 +243,7 @@ static int __init pikawdt_init(void) return -ENOMEM; } - ident.firmware_version =3D in_be32(pikawdt_private.fpga + 0x1c) & 0xffff; + ident.firmware_version =3D ioread32be(pikawdt_private.fpga + 0x1c) & 0xff= ff; /* POST information is in the sd area. */ np =3D of_find_compatible_node(NULL, NULL, "pika,fpga-sd"); @@ -265,7 +265,7 @@ static int __init pikawdt_init(void) * Bit 31, WDOG: Set to 1 when the last reset was caused by a watchdog * timeout. */ - post1 =3D in_be32(fpga + 0x40); + post1 =3D ioread32be(fpga + 0x40); if (post1 & 0x80000000) pikawdt_private.bootstatus =3D WDIOF_CARDRESET; -- 2.54.0