From: Nathan Chancellor <nathan@kernel.org>
To: srinivas.neeli@amd.com, wim@linux-watchdog.org
Cc: shubhrajyoti.datta@amd.com, michal.simek@amd.com,
linux@roeck-us.net, ndesaulniers@google.com, trix@redhat.com,
linux-watchdog@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, patches@lists.linux.dev,
llvm@lists.linux.dev, Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH] watchdog: xilinx_wwdt: Use div_u64() in xilinx_wwdt_start()
Date: Tue, 15 Aug 2023 12:06:50 -0700 [thread overview]
Message-ID: <20230815-watchdog-xilinx-div_u64-v1-1-20b0b5a65c2e@kernel.org> (raw)
After commit f1a43aadb5a6 ("watchdog: Enable COMPILE_TEST for more
drivers"), it is possible to enable this driver on 32-bit architectures.
When building for those architectures with clang, there is an error due
to a 64-bit division in xilinx_wwdt_start():
ERROR: modpost: "__aeabi_uldivmod" [drivers/watchdog/xilinx_wwdt.ko] undefined!
Use div_u64() to fix this, which takes a 64-bit dividend and 32-bit
divisor. GCC likely avoids the same error due to optimizations it
employs to transform division by a constant into other equivalent
operations, which may be different than what is implemented in clang.
Link: https://github.com/ClangBuiltLinux/linux/issues/1915
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
drivers/watchdog/xilinx_wwdt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index 1d998db41533..d271e2e8d6e2 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -9,6 +9,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/ioport.h>
+#include <linux/math64.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/platform_device.h>
@@ -71,7 +72,7 @@ static int xilinx_wwdt_start(struct watchdog_device *wdd)
/* Calculate timeout count */
time_out = xdev->freq * wdd->timeout;
- closed_timeout = (time_out * xdev->close_percent) / 100;
+ closed_timeout = div_u64(time_out * xdev->close_percent, 100);
open_timeout = time_out - closed_timeout;
wdd->min_hw_heartbeat_ms = xdev->close_percent * 10 * wdd->timeout;
---
base-commit: 8a504bd61ec7b3ddd72680e15775f2c7c0f9e894
change-id: 20230815-watchdog-xilinx-div_u64-85c27c650493
Best regards,
--
Nathan Chancellor <nathan@kernel.org>
next reply other threads:[~2023-08-15 19:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 19:06 Nathan Chancellor [this message]
2023-08-15 20:07 ` [PATCH] watchdog: xilinx_wwdt: Use div_u64() in xilinx_wwdt_start() Guenter Roeck
2023-08-23 15:18 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230815-watchdog-xilinx-div_u64-v1-1-20b0b5a65c2e@kernel.org \
--to=nathan@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=llvm@lists.linux.dev \
--cc=michal.simek@amd.com \
--cc=ndesaulniers@google.com \
--cc=patches@lists.linux.dev \
--cc=shubhrajyoti.datta@amd.com \
--cc=srinivas.neeli@amd.com \
--cc=trix@redhat.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).