From: "Marek Behún" <kabel@kernel.org>
To: "Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Andrew Lunn" <andrew@lunn.ch>, "Arnd Bergmann" <arnd@arndb.de>,
soc@kernel.org, arm@kernel.org,
"Andy Shevchenko" <andy@kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: "Marek Behún" <kabel@kernel.org>
Subject: [PATCH v4 03/19] firmware: turris-mox-rwtm: Use macro constant instead of hardcoded 4096
Date: Mon, 15 Jul 2024 12:47:07 +0200 [thread overview]
Message-ID: <20240715104723.17751-4-kabel@kernel.org> (raw)
In-Reply-To: <20240715104723.17751-1-kabel@kernel.org>
The 4096 bytes limit in mox_hwrng_read() is due to the DMA buffer being
allocated to one PAGE_SIZE bytes. Use new local macro constant
RWTM_DMA_BUFFER_SIZE at allocation time and when used in mox_hwrng_read().
Use SZ_4K instead of PAGE_SIZE. Although PAGE_SIZE is never set to a
larger value on Armada 3720, it theoretically could, and this would be a
waste of space.
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
---
drivers/firmware/turris-mox-rwtm.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
index 3f4758e03c81..aafd747543f6 100644
--- a/drivers/firmware/turris-mox-rwtm.c
+++ b/drivers/firmware/turris-mox-rwtm.c
@@ -11,14 +11,18 @@
#include <linux/dma-mapping.h>
#include <linux/hw_random.h>
#include <linux/mailbox_client.h>
+#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/sizes.h>
#include <linux/slab.h>
#define DRIVER_NAME "turris-mox-rwtm"
+#define RWTM_DMA_BUFFER_SIZE SZ_4K
+
/*
* The macros and constants below come from Turris Mox's rWTM firmware code.
* This firmware is open source and it's sources can be found at
@@ -287,8 +291,7 @@ static int mox_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
struct armada_37xx_rwtm_tx_msg msg;
int ret;
- if (max > 4096)
- max = 4096;
+ max = min(max, RWTM_DMA_BUFFER_SIZE);
msg.command = MBOX_CMD_GET_RANDOM;
msg.args[0] = 1;
@@ -479,8 +482,8 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
return -ENOMEM;
rwtm->dev = dev;
- rwtm->buf = dmam_alloc_coherent(dev, PAGE_SIZE, &rwtm->buf_phys,
- GFP_KERNEL);
+ rwtm->buf = dmam_alloc_coherent(dev, RWTM_DMA_BUFFER_SIZE,
+ &rwtm->buf_phys, GFP_KERNEL);
if (!rwtm->buf)
return -ENOMEM;
--
2.44.2
next prev parent reply other threads:[~2024-07-15 10:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 10:47 [PATCH v4 00/19] Updates for turris-mox-rwtm driver Marek Behún
2024-07-15 10:47 ` [PATCH v4 01/19] firmware: turris-mox-rwtm: Do not complete if there are no waiters Marek Behún
2024-07-15 10:47 ` [PATCH v4 02/19] firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout() Marek Behún
2024-07-15 10:47 ` Marek Behún [this message]
2024-07-15 10:47 ` [PATCH v4 04/19] firmware: turris-mox-rwtm: Use ETH_ALEN instead of hardcoded 6 Marek Behún
2024-07-15 10:47 ` [PATCH v4 05/19] firmware: turris-mox-rwtm: Use the boolean type where appropriate Marek Behún
2024-07-15 10:47 ` [PATCH v4 06/19] firmware: turris-mox-rwtm: Hide signature related constants behind macros Marek Behún
2024-07-15 10:47 ` [PATCH v4 07/19] firmware: turris-mox-rwtm: Fix driver includes Marek Behún
2024-07-15 10:47 ` [PATCH v4 08/19] firmware: turris-mox-rwtm: Use sysfs_emit() instead of sprintf() Marek Behún
2024-07-15 10:47 ` [PATCH v4 09/19] firmware: turris-mox-rwtm: Don't create own kobject type Marek Behún
2024-07-15 10:47 ` [PATCH v4 10/19] firmware: turris-mox-rwtm: Simplify debugfs code Marek Behún
2024-07-15 10:47 ` [PATCH v4 11/19] firmware: turris-mox-rwtm: Convert rest to devm_* and get rid of driver .remove() Marek Behún
2024-07-15 10:47 ` [PATCH v4 12/19] firmware: turris-mox-rwtm: Use dev_err_probe() where possible Marek Behún
2024-07-15 10:47 ` [PATCH v4 13/19] firmware: turris-mox-rwtm: Initialize completion before mailbox Marek Behún
2024-07-15 10:47 ` [PATCH v4 14/19] firmware: turris-mox-rwtm: Drop redundant device pointer Marek Behún
2024-07-15 10:47 ` [PATCH v4 15/19] firmware: turris-mox-rwtm: Use devm_mutex_init() instead of mutex_init() Marek Behún
2024-07-15 10:47 ` [PATCH v4 16/19] firmware: turris-mox-rwtm: Use container_of() instead of hwrng .priv member Marek Behún
2024-07-15 10:47 ` [PATCH v4 17/19] firmware: turris-mox-rwtm: Use EOPNOTSUPP instead of ENOSYS Marek Behún
2024-07-15 10:47 ` [PATCH v4 18/19] firmware: turris-mox-rwtm: Use ALIGN() instead of hardcoding Marek Behún
2024-07-15 10:47 ` [PATCH v4 19/19] firmware: turris-mox-rwtm: Deduplicate command execution code Marek Behún
2024-07-15 11:11 ` [PATCH v4 00/19] Updates for turris-mox-rwtm driver Arnd Bergmann
2024-08-06 20:08 ` patchwork-bot+linux-soc
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=20240715104723.17751-4-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=andy@kernel.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=soc@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.