From patchwork Mon Jul 15 10:47:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13733289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4AE06C3DA5D for ; Mon, 15 Jul 2024 10:47:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 316E0C4AF0F; Mon, 15 Jul 2024 10:47:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16270C4AF10; Mon, 15 Jul 2024 10:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721040456; bh=A92y7rfHrXNvKJG+cqVuONweaDExbg3HeSLntRSQGps=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=essjcEZHiUjVW/C3qThucYXeSdfidVz2isNUw9dxaaHyHO8pa3fJfJ/z7nVcu6PWY mzH6sYEl31zaLua55d/XtPY+s4vWaiiDp0O2HUDWQ3Z/YBq/6FxN6GOdriaaZXmq+v 942N0WJV3XrHFar8s1dTMwfqZb7xbXuF+r1GEpf0A0wP2aZCr3DokLGmk1cfCnY5AB 8914X1nkhKbQ6v6pHc2SxHIjxomLo0F25ea89np4DCLX+1CGsmWm8wozjjnmpS4ZrR UcMPxcLgHLblbVbQgkVFsP5hcWrI70yS1m0rekPPgvsCHnH0jVgPuXCW9JQn83tIGr rEqsYL79hMoXg== From: =?utf-8?q?Marek_Beh=C3=BAn?= List-Id: To: Gregory CLEMENT , Andrew Lunn , Arnd Bergmann , soc@kernel.org, arm@kernel.org, Andy Shevchenko , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: =?utf-8?q?Marek_Beh=C3=BAn?= 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 Message-ID: <20240715104723.17751-4-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240715104723.17751-1-kabel@kernel.org> References: <20240715104723.17751-1-kabel@kernel.org> MIME-Version: 1.0 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 Reviewed-by: Andy Shevchenko --- 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 #include #include +#include #include #include #include #include +#include #include #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;