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, Jimmy Assarsson <extja@kvaser.com>,
Anssi Hannula <anssi.hannula@bitwise.fi>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH net-next 25/29] can: kvaser_usb: Add struct kvaser_usb_busparams
Date: Wed, 26 Oct 2022 10:40:03 +0200 [thread overview]
Message-ID: <20221026084007.1583333-26-mkl@pengutronix.de> (raw)
In-Reply-To: <20221026084007.1583333-1-mkl@pengutronix.de>
From: Jimmy Assarsson <extja@kvaser.com>
Add struct kvaser_usb_busparams containing the busparameters used in
CMD_{SET,GET}_BUSPARAMS* commands.
Tested-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Link: https://lore.kernel.org/all/20221010185237.319219-11-extja@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 8 +++++
.../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 32 +++++++------------
.../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 18 ++++-------
3 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
index d9c5dd5da908..778b61c90c2b 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
@@ -76,6 +76,14 @@ struct kvaser_usb_tx_urb_context {
u32 echo_index;
};
+struct kvaser_usb_busparams {
+ __le32 bitrate;
+ u8 tseg1;
+ u8 tseg2;
+ u8 sjw;
+ u8 nsamples;
+} __packed;
+
struct kvaser_usb {
struct usb_device *udev;
struct usb_interface *intf;
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index 7b52fda73d82..1c4ce42b980d 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -196,17 +196,9 @@ struct kvaser_cmd_chip_state_event {
#define KVASER_USB_HYDRA_BUS_MODE_CANFD_ISO 0x01
#define KVASER_USB_HYDRA_BUS_MODE_NONISO 0x02
struct kvaser_cmd_set_busparams {
- __le32 bitrate;
- u8 tseg1;
- u8 tseg2;
- u8 sjw;
- u8 nsamples;
+ struct kvaser_usb_busparams busparams_arb;
u8 reserved0[4];
- __le32 bitrate_d;
- u8 tseg1_d;
- u8 tseg2_d;
- u8 sjw_d;
- u8 nsamples_d;
+ struct kvaser_usb_busparams busparams_data;
u8 canfd_mode;
u8 reserved1[7];
} __packed;
@@ -1538,11 +1530,11 @@ static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev)
return -ENOMEM;
cmd->header.cmd_no = CMD_SET_BUSPARAMS_REQ;
- cmd->set_busparams_req.bitrate = cpu_to_le32(bt->bitrate);
- cmd->set_busparams_req.sjw = (u8)sjw;
- cmd->set_busparams_req.tseg1 = (u8)tseg1;
- cmd->set_busparams_req.tseg2 = (u8)tseg2;
- cmd->set_busparams_req.nsamples = 1;
+ cmd->set_busparams_req.busparams_arb.bitrate = cpu_to_le32(bt->bitrate);
+ cmd->set_busparams_req.busparams_arb.sjw = (u8)sjw;
+ cmd->set_busparams_req.busparams_arb.tseg1 = (u8)tseg1;
+ cmd->set_busparams_req.busparams_arb.tseg2 = (u8)tseg2;
+ cmd->set_busparams_req.busparams_arb.nsamples = 1;
kvaser_usb_hydra_set_cmd_dest_he
(cmd, dev->card_data.hydra.channel_to_he[priv->channel]);
@@ -1572,11 +1564,11 @@ static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev)
return -ENOMEM;
cmd->header.cmd_no = CMD_SET_BUSPARAMS_FD_REQ;
- cmd->set_busparams_req.bitrate_d = cpu_to_le32(dbt->bitrate);
- cmd->set_busparams_req.sjw_d = (u8)sjw;
- cmd->set_busparams_req.tseg1_d = (u8)tseg1;
- cmd->set_busparams_req.tseg2_d = (u8)tseg2;
- cmd->set_busparams_req.nsamples_d = 1;
+ cmd->set_busparams_req.busparams_data.bitrate = cpu_to_le32(dbt->bitrate);
+ cmd->set_busparams_req.busparams_data.sjw = (u8)sjw;
+ cmd->set_busparams_req.busparams_data.tseg1 = (u8)tseg1;
+ cmd->set_busparams_req.busparams_data.tseg2 = (u8)tseg2;
+ cmd->set_busparams_req.busparams_data.nsamples = 1;
if (priv->can.ctrlmode & CAN_CTRLMODE_FD) {
if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 2250c8707ccc..8392c5268379 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -164,11 +164,7 @@ struct usbcan_cmd_softinfo {
struct kvaser_cmd_busparams {
u8 tid;
u8 channel;
- __le32 bitrate;
- u8 tseg1;
- u8 tseg2;
- u8 sjw;
- u8 no_samp;
+ struct kvaser_usb_busparams busparams;
} __packed;
struct kvaser_cmd_tx_can {
@@ -1725,15 +1721,15 @@ static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev)
cmd->len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_busparams);
cmd->u.busparams.channel = priv->channel;
cmd->u.busparams.tid = 0xff;
- cmd->u.busparams.bitrate = cpu_to_le32(bt->bitrate);
- cmd->u.busparams.sjw = bt->sjw;
- cmd->u.busparams.tseg1 = bt->prop_seg + bt->phase_seg1;
- cmd->u.busparams.tseg2 = bt->phase_seg2;
+ cmd->u.busparams.busparams.bitrate = cpu_to_le32(bt->bitrate);
+ cmd->u.busparams.busparams.sjw = bt->sjw;
+ cmd->u.busparams.busparams.tseg1 = bt->prop_seg + bt->phase_seg1;
+ cmd->u.busparams.busparams.tseg2 = bt->phase_seg2;
if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
- cmd->u.busparams.no_samp = 3;
+ cmd->u.busparams.busparams.nsamples = 3;
else
- cmd->u.busparams.no_samp = 1;
+ cmd->u.busparams.busparams.nsamples = 1;
rc = kvaser_usb_send_cmd(dev, cmd, cmd->len);
--
2.35.1
next prev parent reply other threads:[~2022-10-26 8:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 8:39 [PATCH net-next 0/29] pull-request: can-next 2022-10-26 Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 01/29] can: add termination resistor documentation Marc Kleine-Budde
2022-10-26 13:00 ` patchwork-bot+netdevbpf
2022-10-26 8:39 ` [PATCH net-next 02/29] can: j1939: j1939_session_tx_eoma(): fix debug info Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 03/29] can: remove obsolete PCH CAN driver Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 04/29] can: ucan: Replace zero-length array with DECLARE_FLEX_ARRAY() helper Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 05/29] can: kvaser_usb: Remove -Warray-bounds exception Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 06/29] can: m_can: is_lec_err(): clean up LEC error handling Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 07/29] can: m_can: m_can_handle_bus_errors(): add support for handling DLEC error on CAN-FD frames Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 08/29] can: gs_usb: mention candleLight as supported device Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 09/29] can: gs_usb: gs_make_candev(): set netdev->dev_id Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 10/29] can: gs_usb: gs_can_open(): allow loopback and listen only at the same time Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 11/29] can: gs_usb: gs_can_open(): sort checks for ctrlmode Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 12/29] can: gs_usb: gs_can_open(): merge setting of timestamp flags and init Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 13/29] can: gs_usb: document GS_CAN_FEATURE_BERR_REPORTING Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 14/29] can: gs_usb: add ability to enable / disable berr reporting Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 15/29] can: gs_usb: document GS_CAN_FEATURE_GET_STATE Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 16/29] can: gs_usb: add support for reading error counters Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 17/29] can: kvaser_usb: kvaser_usb_leaf: Get capabilities from device Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 18/29] can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 19/29] can: kvaser_usb: kvaser_usb_leaf: Handle CMD_ERROR_EVENT Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 20/29] can: kvaser_usb_leaf: Set Warning state even without bus errors Marc Kleine-Budde
2022-10-26 8:39 ` [PATCH net-next 21/29] can: kvaser_usb_leaf: Fix improved state not being reported Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 22/29] can: kvaser_usb_leaf: Fix wrong CAN state after stopping Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 23/29] can: kvaser_usb_leaf: Ignore stale bus-off after start Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 24/29] can: kvaser_usb_leaf: Fix bogus restart events Marc Kleine-Budde
2022-10-26 8:40 ` Marc Kleine-Budde [this message]
2022-10-26 8:40 ` [PATCH net-next 26/29] can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 27/29] can: m_can: use consistent indention Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 28/29] can: ucan: ucan_disconnect(): change unregister_netdev() to unregister_candev() Marc Kleine-Budde
2022-10-26 8:40 ` [PATCH net-next 29/29] can: rcar_canfd: Use devm_reset_control_get_optional_exclusive 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=20221026084007.1583333-26-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=anssi.hannula@bitwise.fi \
--cc=davem@davemloft.net \
--cc=extja@kvaser.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox