From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 391183F54C3 for ; Wed, 3 Jun 2026 04:02:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780459375; cv=none; b=tHuq9FSniGAc/PA15CFoE4Ogx3J0aCX9mlwdrUzVS80Y0jUfnsCJ12I7wPsEO0gxC31oq3mW9RTzZi+7XZ4dGTckptun8nLUhdZjzUuwrZ8G4Wm3QyvFWNeNTBh4+43eHffh24zbWDxu6NciwR0/jaaefFXm/J9/oYHLk9+Jdug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780459375; c=relaxed/simple; bh=vHuCzqR8LSil06PO+XxUGSIa0ut9qcXEYLKuOP+NJ+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZDARdhjmpk91zGniB43T/QqjgwzHS2iYn0vKpt6Ty/Hd4d9ZY0zqjzazcTxjCWHASzp81kBZ0dVgCWIRkaSRV6870nx96qsf/aFVsJcf+nTEAUCsGTk/mSPGiLEmwz0cN/Wd/IbxEnS9gJOWNEcAPRvn8YCrUf3d380Wn9accWk= 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=rYU3lcBq; arc=none smtp.client-ip=209.85.222.180 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="rYU3lcBq" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-9155183b42cso35234885a.0 for ; Tue, 02 Jun 2026 21:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780459373; x=1781064173; 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=HPCyDDH9UNTEwkuwuBfe1Sw4ZubltM6kmNISCDS0HII=; b=rYU3lcBqi35q6Jl3zj0D2AxN6xA+6k+fieYh1nEinzKu9ZzkoFFUIYZzRHnVDtNRWN /cpIxz4vR4SwADHBMKUwR2uHgV+xqTrtYwAcWnyRCFMFX3mb6+bxjfeOjvuQPUFxKxFM f5aSyniXfCon4kGL8d/2MscMN9ViaFBwCZ7mWvFvG/BldL6UpGhU1yGfRUXpD/IDRW1O 3vMctrG5eBgnsBFWSBV089Sq6INBTulnXJ4lvsMJOn1+C87Bl5JZXsur0i9V0n0dS3Ew gfxEaSCx3NQonWQtn8qiSxSQUGqtFPTzPHsHukTgwpw3rytmDRsTAFceiZh3ENvxLNe4 hngQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780459373; x=1781064173; 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=HPCyDDH9UNTEwkuwuBfe1Sw4ZubltM6kmNISCDS0HII=; b=mDznAGKFJHkcF+bXc6eRVpS0jOEEgyKSA2gfN5v0anNuHSWwPSIrCOUrniNsrtHvuf JWCgp4MJpoKmsI1N2y8X+2He6/UhGTGAFgjAAJ9/x/E7GTHITx0fUOR9K1lVQm9S2C8/ +mQ6iJzm9Xq7S8NcC+dIdVpX/6aDBBQK6k6MtLkrfonNt2K3Qizxy0iFfImZw+XVtIDe pDK1esWnVwAR0Ze6YGIzpS8abCjPZyKeZ75NQeX+LTdO7EW2FgcP4SDhW+Dv9qgE3hCX 1ldTgfB5JPXDlvljlP+19vDNRhqHk/Zn6vfozdufd3Nw97s9od0Vghtv7Wy/uHvk2+0D DPVQ== X-Forwarded-Encrypted: i=1; AFNElJ9wARj3maJ7drMknCcaZRfmhiqigKSFBMz3CgjP+KW1AXax1iVjV5R9nuuDxWvXWNrdPCSRRYUJbKfzZkY=@vger.kernel.org X-Gm-Message-State: AOJu0YxPEPJrx7CND85fzbK8A0PBTg3E+YDTPQjIr9e7nxLTlze8eVN8 QMmYQbKXNyuNNP8uJBRlmsRSAV6htME7YJZrpDOdC9baWN1PB1S4wBPsKwN6c5Ix X-Gm-Gg: Acq92OERMlV0/9/Hr2IxiLZ0I+5ZgqRyrxVm8BajCVDAeW07NxFGCPvhBl3nRq0bo/S GKfgkhQwUMxvt3Yk5tUH9ybgbzkiY5Pwsc9D8WpiiGsrpdSj1GpEOfygIe7WsYY/CoeZomux2QW XxFJg1jVjhSaAokDjEB4fygKmnsm9z65vj9m+N7153S+St1lvsPMsUSmmFR9Egxqi/LQbpY8L77 B7O56K9LP6JMIHP6VJzxn414i/t9yBVLWbHUu5PilBli9CSMljIyzJl+cQrJKwjWoG8WV+cAUuC qYb66tpQgX/ONg+x18ZebTTN+MMz56+g5/Wm87KqWybG1002GlkixxI//mK0m0PNyAj0ek4QzOq mSdcAs4BNmTRnL2+s1FLDEk3jZ9/52s5UbQ+3+AIPGUeutrVpO3VmRCpFtHfQlfQibNA63+7wT4 iBoLq+q5NYrUTFs6NIv4B60ULSv4YrlabdK1YEoDDJooTeC2B16DTJXGj1nyycxzvpZBetygKXl 1Fsj5R+HjOTXEnZ0HcU4Sf4c3COT+/BvcTQqdteiurrOBD9EhkIPbS6 X-Received: by 2002:a05:620a:1a18:b0:90f:47f6:832f with SMTP id af79cd13be357-9158b72aef8mr200905585a.33.1780459373236; Tue, 02 Jun 2026 21:02:53 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9158a3eea49sm127604285a.44.2026.06.02.21.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 21:02:51 -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: [PATCH v2 2/2] watchdog: pika_wdt: replace in_be32/out_be32 with ioread32be/iowrite32be Date: Tue, 2 Jun 2026 21:02:30 -0700 Message-ID: <20260603040230.318998-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260603040230.318998-1-rosenp@gmail.com> References: <20260603040230.318998-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: 8bit Convert the ppc4xx-specific in_be32/out_be32 to the portable ioread32be/iowrite32be. Also relax the Kconfig dependency from (PPC64 && COMPILE_TEST) to just COMPILE_TEST to get build coverage. Add HAS_IOMEM dependency for these functions. 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 60a846cb3601..beb3ba1ab84f 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 = in_be32(pikawdt_private.fpga + 0x14); + unsigned reset = ioread32be(pikawdt_private.fpga + 0x14); /* enable with max timeout - 15 seconds */ reset |= (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 = in_be32(pikawdt_private.fpga + 0x1c) & 0xffff; + ident.firmware_version = ioread32be(pikawdt_private.fpga + 0x1c) & 0xffff; /* POST information is in the sd area. */ np = 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 = in_be32(fpga + 0x40); + post1 = ioread32be(fpga + 0x40); if (post1 & 0x80000000) pikawdt_private.bootstatus = WDIOF_CARDRESET; -- 2.54.0