From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: manivannan.sadhasivam@linaro.org,
dev.kurt@vandijck-laurijssen.be,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v53 4/6] can: mcp25xxfd: add listen-only mode
Date: Fri, 18 Sep 2020 19:25:34 +0200 [thread overview]
Message-ID: <20200918172536.2074504-5-mkl@pengutronix.de> (raw)
In-Reply-To: <20200918172536.2074504-1-mkl@pengutronix.de>
From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
This commit enables listen-only mode, which works internally like CANFD mode.
Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Link: https://lore.kernel.org/r/20200622122047.9494-1-dev.kurt@vandijck-laurijssen.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
index 10e4b6d07f95..bd2ba981ae36 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
@@ -392,7 +392,8 @@ static int mcp25xxfd_ring_alloc(struct mcp25xxfd_priv *priv)
int ram_free, i;
tef_obj_size = sizeof(struct mcp25xxfd_hw_tef_obj);
- if (priv->can.ctrlmode & CAN_CTRLMODE_FD) {
+ /* listen-only mode works like FD mode */
+ if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_FD)) {
tx_obj_num = MCP25XXFD_TX_OBJ_NUM_CANFD;
tx_obj_size = sizeof(struct mcp25xxfd_hw_tx_obj_canfd);
rx_obj_size = sizeof(struct mcp25xxfd_hw_rx_obj_canfd);
@@ -807,7 +808,7 @@ mcp25xxfd_chip_rx_fifo_init_one(const struct mcp25xxfd_priv *priv,
MCP25XXFD_REG_FIFOCON_RXOVIE |
MCP25XXFD_REG_FIFOCON_TFNRFNIE;
- if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
+ if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_FD))
fifo_con |= FIELD_PREP(MCP25XXFD_REG_FIFOCON_PLSIZE_MASK,
MCP25XXFD_REG_FIFOCON_PLSIZE_64);
else
@@ -857,7 +858,7 @@ static int mcp25xxfd_chip_fifo_init(const struct mcp25xxfd_priv *priv)
MCP25XXFD_REG_FIFOCON_TXEN |
MCP25XXFD_REG_FIFOCON_TXATIE;
- if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
+ if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_FD))
val |= FIELD_PREP(MCP25XXFD_REG_FIFOCON_PLSIZE_MASK,
MCP25XXFD_REG_FIFOCON_PLSIZE_64);
else
@@ -930,7 +931,9 @@ static u8 mcp25xxfd_get_normal_mode(const struct mcp25xxfd_priv *priv)
{
u8 mode;
- if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
+ if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
+ mode = MCP25XXFD_REG_CON_MODE_LISTENONLY;
+ else if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
mode = MCP25XXFD_REG_CON_MODE_MIXED;
else
mode = MCP25XXFD_REG_CON_MODE_CAN2_0;
@@ -2792,8 +2795,9 @@ static int mcp25xxfd_probe(struct spi_device *spi)
priv->can.do_get_berr_counter = mcp25xxfd_get_berr_counter;
priv->can.bittiming_const = &mcp25xxfd_bittiming_const;
priv->can.data_bittiming_const = &mcp25xxfd_data_bittiming_const;
- priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING |
- CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO;
+ priv->can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY |
+ CAN_CTRLMODE_BERR_REPORTING | CAN_CTRLMODE_FD |
+ CAN_CTRLMODE_FD_NON_ISO;
priv->ndev = ndev;
priv->spi = spi;
priv->rx_int = rx_int;
--
2.28.0
next prev parent reply other threads:[~2020-09-18 17:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 17:25 [PATCH v53 1/6] mcp25xxfd: initial driver support Marc Kleine-Budde
2020-09-18 17:25 ` [PATCH v53 1/6] dt-binding: can: mcp25xxfd: document device tree bindings Marc Kleine-Budde
2020-09-18 17:25 ` [PATCH v53 2/6] can: mcp25xxfd: add regmap infrastructure Marc Kleine-Budde
2020-09-21 19:33 ` Mark Brown
2020-09-22 5:57 ` Marc Kleine-Budde
2020-09-22 12:13 ` Mark Brown
2020-09-22 13:56 ` Marc Kleine-Budde
2020-09-22 14:23 ` Mark Brown
2020-09-18 17:25 ` [PATCH v53 3/6] can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN Marc Kleine-Budde
2020-09-18 17:25 ` Marc Kleine-Budde [this message]
2020-09-18 17:25 ` [PATCH v53 5/6] MAINTAINERS: Add entry for Microchip MCP25XXFD SPI-CAN network driver Marc Kleine-Budde
2020-09-18 17:25 ` [PATCH v53 6/6] MAINTAINERS: Add reviewer entry for microchip mcp25xxfd " Marc Kleine-Budde
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=20200918172536.2074504-5-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=dev.kurt@vandijck-laurijssen.be \
--cc=linux-can@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.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).