From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de, Marc Kleine-Budde <mkl@pengutronix.de>,
Thomas Kopp <thomas.kopp@microchip.com>
Subject: [net-next 02/14] can: mcp251xfd: mcp25xxfd_ring_alloc(): add define instead open coding the maximum number of RX objects
Date: Mon, 30 Nov 2020 15:14:20 +0100 [thread overview]
Message-ID: <20201130141432.278219-3-mkl@pengutronix.de> (raw)
In-Reply-To: <20201130141432.278219-1-mkl@pengutronix.de>
This patch add a define for the maximum number of RX objects instead of open
coding it.
Link: https://lore.kernel.org/r/20201126132144.351154-2-mkl@pengutronix.de
Tested-by: Thomas Kopp <thomas.kopp@microchip.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 3 ++-
drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index d0f2f5c73907..476a2e4a1de8 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -416,7 +416,8 @@ static int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv)
int rx_obj_num;
rx_obj_num = ram_free / rx_obj_size;
- rx_obj_num = min(1 << (fls(rx_obj_num) - 1), 32);
+ rx_obj_num = min(1 << (fls(rx_obj_num) - 1),
+ MCP251XFD_RX_OBJ_NUM_MAX);
rx_ring = kzalloc(sizeof(*rx_ring) + rx_obj_size * rx_obj_num,
GFP_KERNEL);
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
index fa1246e39980..c20c97d01072 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
@@ -368,6 +368,7 @@
* FIFO setup: tef: 8*12 bytes = 96 bytes, tx: 8*16 bytes = 128 bytes
* FIFO setup: tef: 4*12 bytes = 48 bytes, tx: 4*72 bytes = 288 bytes
*/
+#define MCP251XFD_RX_OBJ_NUM_MAX 32
#define MCP251XFD_TX_OBJ_NUM_CAN 8
#define MCP251XFD_TX_OBJ_NUM_CANFD 4
--
2.29.2
next prev parent reply other threads:[~2020-11-30 14:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 14:14 pull-request: can-next 2020-11-30 Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 01/14] can: pcan_usb_core: fix fall-through warnings for Clang Marc Kleine-Budde
2020-11-30 14:14 ` Marc Kleine-Budde [this message]
2020-11-30 14:14 ` [net-next 03/14] can: mcp25xxfd: rx-path: reduce number of SPI core requests to set UINC bit Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 04/14] can: mcp251xfd: struct mcp251xfd_priv::tef to array of length 1 Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 05/14] can: mcp251xfd: move struct mcp251xfd_tef_ring definition Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 06/14] can: mcp251xfd: tef-path: reduce number of SPI core requests to set UINC bit Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 07/14] can: tcan4x5x: tcan4x5x_clear_interrupts(): remove redundant return statement Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 08/14] can: tcan4x5x: rename parse_config() function Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 09/14] can: tcan4x5x: remove mram_start and reg_offset from struct tcan4x5x_priv Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 10/14] can: tcan4x5x: tcan4x5x_can_probe(): remove probe failed error message Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 11/14] can: m_can: Kconfig: convert the into menu Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 12/14] can: m_can: remove not used variable struct m_can_classdev::freq Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 13/14] can: m_can: m_can_plat_remove(): remove unneeded platform_set_drvdata() Marc Kleine-Budde
2020-11-30 14:14 ` [net-next 14/14] can: m_can: m_can_class_unregister(): move right after m_can_class_register() Marc Kleine-Budde
2020-12-01 3:08 ` pull-request: can-next 2020-11-30 Jakub Kicinski
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=20201130141432.278219-3-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=thomas.kopp@microchip.com \
/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).