can: preserve skbuff protocol in can_put_echo_skb
PATCH 1/4 can: preserve skbuff protocol in can_put_echo_skb
The skbuff protocol value was formerly fixed/sanitized to ETH_P_CAN in can_put_echo_skb(). With CAN FD this value has to be preserved. This patch changes the hard assignment of the protocol value to a check of valid protocol values for CAN and CAN FD.
--- drivers/net/can/dev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/can/dev.c +3 -2
@@ -317,7 +317,9 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,BUG_ON (idx >= priv->echo_skb_max);/* check flag whether this packet has to be looped back */ -if (!(dev->flags &IFF_ECHO ) || skb->pkt_type !=PACKET_LOOPBACK ) { +if (!(dev->flags &IFF_ECHO ) || skb->pkt_type !=PACKET_LOOPBACK || + (skb->protocol !=htons (ETH_P_CAN ) && + skb->protocol !=htons (ETH_P_CANFD ))) {kfree_skb (skb);return ; }
@@ -329,7 +331,6 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,return ;/* make settings for echo to reduce code in irq context */ - skb->protocol =htons (ETH_P_CAN ); skb->pkt_type =PACKET_BROADCAST ; skb->ip_summed =CHECKSUM_UNNECESSARY ; skb->dev = dev;
Signature · 1 line
1.9.0.rc3
PATCH 2/4 can: netlink send bittiming data only when bittiming_const is available
The bittiming information is only valid when the CAN driver has a valid structure of bittiming_const. Therefore provide the information of the bittiming only when bittiming_const exists.
This is also a preparation for the CAN FD specific bittiming_const structure which is not existing in non-FD drivers. Therefore all the CAN FD bittiming stuff has to be disabled when the CAN FD specific bittiming_const structure is missing.
--- drivers/net/can/dev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/can/dev.c +10 -4
@@ -719,9 +719,10 @@ static size_t can_get_size(const struct net_device *dev)struct can_priv *priv =netdev_priv (dev);size_t size =0 ; - size +=nla_total_size (sizeof (struct can_bittiming ));/* IFLA_CAN_BITTIMING */ -if (priv->bittiming_const)/* IFLA_CAN_BITTIMING_CONST */ +if (priv->bittiming_const) {/* IFLA_CAN_BITTIMING[_CONST] */ + size +=nla_total_size (sizeof (struct can_bittiming )); size +=nla_total_size (sizeof (struct can_bittiming_const )); + } size +=nla_total_size (sizeof (struct can_clock ));/* IFLA_CAN_CLOCK */ size +=nla_total_size (sizeof (u32));/* IFLA_CAN_STATE */ size +=nla_total_size (sizeof (struct can_ctrlmode ));/* IFLA_CAN_CTRLMODE */
@@ -741,15 +742,20 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)if (priv->do_get_state) priv->do_get_state (dev, &state); -if (nla_put (skb,IFLA_CAN_BITTIMING , -sizeof (priv->bittiming), &priv->bittiming) || + +if ((priv->bittiming_const && +nla_put (skb,IFLA_CAN_BITTIMING , +sizeof (priv->bittiming), &priv->bittiming)) || + (priv->bittiming_const &&nla_put (skb,IFLA_CAN_BITTIMING_CONST ,sizeof (*priv->bittiming_const), priv->bittiming_const)) || +nla_put (skb,IFLA_CAN_CLOCK ,sizeof (cm), &priv->clock) ||nla_put_u32 (skb,IFLA_CAN_STATE , state) ||nla_put (skb,IFLA_CAN_CTRLMODE ,sizeof (cm), &cm) ||nla_put_u32 (skb,IFLA_CAN_RESTART_MS , priv->restart_ms) || + (priv->do_get_berr_counter && !priv->do_get_berr_counter (dev, &bec) &&nla_put (skb,IFLA_CAN_BERR_COUNTER ,sizeof (bec), &bec)))
Signature · 1 line
1.9.0.rc3
Marc Kleine-Budde
maintainerRe: [PATCH 2/4] can: netlink send bittiming data only when bittiming_const is available
Quoted 3 lines · Oliver Hartkopp
The bittiming information is only valid when the CAN driver has a valid structure of
bittiming_const. Therefore provide the information of the bittiming only whenbittiming_constexists.
What about intelligent CAN controllers which only support fixed bitrates? We once hat such a device and it was a design goal to support such devices.
Quoted 4 lines
This is also a preparation for the CAN FD specific
bittiming_conststructure which is not existing in non-FD drivers. Therefore all the CAN FD bittiming stuff has to be disabled when the CAN FD specificbittiming_conststructure is missing.
Can we use bitrate == 0 as an indicator?
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Re: [PATCH 2/4] can: netlink send bittiming data only when bittiming_const is available
Quoted 9 lines · Marc Kleine-Budde
Quoted 3 lines · Oliver Hartkopp
The bittiming information is only valid when the CAN driver has a valid structure of
bittiming_const. Therefore provide the information of the bittiming only whenbittiming_constexists.What about intelligent CAN controllers which only support fixed bitrates? We once hat such a device and it was a design goal to support such devices.
Quoted 7 lines
Quoted 4 lines
This is also a preparation for the CAN FD specific
bittiming_conststructure which is not existing in non-FD drivers. Therefore all the CAN FD bittiming stuff has to be disabled when the CAN FD specificbittiming_conststructure is missing.Can we use bitrate == 0 as an indicator?
Good idea.
This is done in another place too.
Updated patchset sent.
How do I make it a "v2" ??
Regards,
Oliver
Marc Kleine-Budde
maintainerRe: [PATCH 2/4] can: netlink send bittiming data only when bittiming_const is available
Quoted 3 lines · Oliver Hartkopp
Updated patchset sent.
How do I make it a "v2" ??
Add "--reroll-count=2" to git send-email.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
PATCH 3/4 can: provide a separate bittiming_const parameter to bittiming functions
In reply to Oliver HartkoppAs the bittiming calculation functions are to be used with different bittiming_const structures for CAN and CAN FD the direct reference to priv->bittiming_const inside these functions has to be removed.
--- drivers/net/can/dev.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/net/can/dev.c +14 -13
@@ -99,10 +99,10 @@ static int can_update_spt(const struct can_bittiming_const *btc,return 1000 * (tseg +1 - *tseg2) / (tseg +1 ); } -static int can_calc_bittiming (struct net_device *dev,struct can_bittiming *bt) +static int can_calc_bittiming (struct net_device *dev,struct can_bittiming *bt, +const struct can_bittiming_const *btc) {struct can_priv *priv =netdev_priv (dev); -const struct can_bittiming_const *btc = priv->bittiming_const;long rate, best_rate =0 ;long best_error =1000000000 , error =0 ;int best_tseg =0 , best_brp =0 , brp =0 ;
@@ -110,7 +110,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)int spt_error =1000 , spt =0 , sampl_pt;u64 v64; -if (!priv->bittiming_const) +if (!btc)return -ENOTSUPP ;/* Use CIA recommended sample points */
@@ -204,7 +204,8 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt) return 0; }#else /* !CONFIG_CAN_CALC_BITTIMING */ -static int can_calc_bittiming (struct net_device *dev,struct can_bittiming *bt) +static int can_calc_bittiming (struct net_device *dev,struct can_bittiming *bt, +const struct can_bittiming_const *btc) {netdev_err (dev,"bit-timing calculation not available\n" );return -EINVAL ;
@@ -217,14 +218,14 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)* prescaler value brp. You can find more information in the header * file linux/can/netlink.h. */ -static int can_fixup_bittiming (struct net_device *dev,struct can_bittiming *bt) +static int can_fixup_bittiming (struct net_device *dev,struct can_bittiming *bt, +const struct can_bittiming_const *btc) {struct can_priv *priv =netdev_priv (dev); -const struct can_bittiming_const *btc = priv->bittiming_const;int tseg1, alltseg;u64 brp64; -if (!priv->bittiming_const) +if (!btc)return -ENOTSUPP ; tseg1 = bt->prop_seg + bt->phase_seg1;
@@ -254,21 +255,21 @@ static int can_fixup_bittiming(struct net_device *dev, struct can_bittiming *bt)return 0 ; } -static int can_get_bittiming (struct net_device *dev,struct can_bittiming *bt) +static int can_get_bittiming (struct net_device *dev,struct can_bittiming *bt, +const struct can_bittiming_const *btc) { -struct can_priv *priv =netdev_priv (dev);int err;/* Check if the CAN device has bit-timing parameters */ -if (priv->bittiming_const) { +if (btc) {/* Non-expert mode? Check if the bitrate has been pre-defined */ if (!bt->tq)/* Determine bit-timing parameters */ - err =can_calc_bittiming (dev, bt); + err =can_calc_bittiming (dev, bt, btc);else /* Check bit-timing params and calculate proper brp */ - err =can_fixup_bittiming (dev, bt); + err =can_fixup_bittiming (dev, bt, btc);if (err)return err; }
@@ -669,7 +670,7 @@ static int can_changelink(struct net_device *dev,memcpy (&bt,nla_data (data[IFLA_CAN_BITTIMING ]),sizeof (bt));if ((!bt.bitrate && !bt.tq) || (bt.bitrate && bt.tq))return -EINVAL ; - err =can_get_bittiming (dev, &bt); + err =can_get_bittiming (dev, &bt, priv->bittiming_const);if (err)return err;memcpy (&priv->bittiming, &bt,sizeof (bt));
Signature · 1 line
1.9.0.rc3
PATCH 4/4 can: introduce a second bitrate for CAN FD data bitrate configuration
In reply to Oliver Hartkopp--- drivers/net/can/dev.c | 44 +++++++++++++++++++++++++++++++++++++++- include/linux/can/dev.h | 6 ++++-- include/uapi/linux/can/netlink.h | 2 ++ 3 files changed, 49 insertions(+), 3 deletions(-)
drivers/net/can/dev.c +43 -1
@@ -650,6 +650,10 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = { = { .len = sizeof(struct can_bittiming_const) }, [IFLA_CAN_CLOCK] = { .len = sizeof(struct can_clock) }, [IFLA_CAN_BERR_COUNTER] = { .len = sizeof(struct can_berr_counter) }, + [IFLA_CAN_DATA_BITTIMING ] + = { .len = sizeof(struct can_bittiming) }, + [IFLA_CAN_DATA_BITTIMING_CONST ] + = { .len = sizeof(struct can_bittiming_const) }, }; static int can_changelink(struct net_device *dev,
@@ -683,6 +687,29 @@ static int can_changelink(struct net_device *dev, } } +if (data[IFLA_CAN_DATA_BITTIMING ]) { +struct can_bittiming bt; + +/* Do not allow changing bittiming while running */ +if (dev->flags &IFF_UP ) +return -EBUSY ; +memcpy (&bt,nla_data (data[IFLA_CAN_DATA_BITTIMING ]), +sizeof (bt)); +if ((!bt.bitrate && !bt.tq) || (bt.bitrate && bt.tq)) +return -EINVAL ; + err =can_get_bittiming (dev, &bt, priv->data_bittiming_const); +if (err) +return err; +memcpy (&priv->data_bittiming, &bt,sizeof (bt)); + +if (priv->do_set_data_bittiming) { +/* Finally, set the bit-timing registers */ + err = priv->do_set_data_bittiming (dev); +if (err) +return err; + } + } +if (data[IFLA_CAN_CTRLMODE ]) {struct can_ctrlmode *cm;
@@ -724,13 +751,19 @@ static size_t can_get_size(const struct net_device *dev) size +=nla_total_size (sizeof (struct can_bittiming )); size +=nla_total_size (sizeof (struct can_bittiming_const )); } + size +=nla_total_size (sizeof (struct can_clock ));/* IFLA_CAN_CLOCK */ size +=nla_total_size (sizeof (u32));/* IFLA_CAN_STATE */ size +=nla_total_size (sizeof (struct can_ctrlmode ));/* IFLA_CAN_CTRLMODE */ size +=nla_total_size (sizeof (u32));/* IFLA_CAN_RESTART_MS */ +if (priv->do_get_berr_counter)/* IFLA_CAN_BERR_COUNTER */ size +=nla_total_size (sizeof (struct can_berr_counter )); +if (priv->data_bittiming_const) {/* IFLA_CAN_DATA_BITTIMING[_CONST] */ + size +=nla_total_size (sizeof (struct can_bittiming )); + size +=nla_total_size (sizeof (struct can_bittiming_const )); + }return size; }
@@ -759,8 +792,17 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) (priv->do_get_berr_counter && !priv->do_get_berr_counter (dev, &bec) && - nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec))) +nla_put (skb,IFLA_CAN_BERR_COUNTER ,sizeof (bec), &bec)) || + + (priv->data_bittiming_const && +nla_put (skb,IFLA_CAN_DATA_BITTIMING , +sizeof (priv->data_bittiming), &priv->data_bittiming)) || + + (priv->data_bittiming_const && +nla_put (skb,IFLA_CAN_DATA_BITTIMING_CONST , + sizeof(*priv->data_bittiming_const), priv->data_bittiming_const))) return -EMSGSIZE; +return 0 ; }
include/linux/can/dev.h +4 -2
@@ -33,8 +33,9 @@ enum can_mode {struct can_priv {struct can_device_stats can_stats; -struct can_bittiming bittiming; -const struct can_bittiming_const *bittiming_const; +struct can_bittiming bittiming, data_bittiming; +const struct can_bittiming_const *bittiming_const, + *data_bittiming_const;struct can_clock clock;enum can_state state;
@@ -45,6 +46,7 @@ struct can_priv {struct timer_list restart_timer;int (*do_set_bittiming)(struct net_device *dev); +int (*do_set_data_bittiming)(struct net_device *dev);int (*do_set_mode)(struct net_device *dev,enum can_mode mode);int (*do_get_state)(const struct net_device *dev,enum can_state *state);
include/uapi/linux/can/netlink.h +2 -0
@@ -122,6 +122,8 @@ enum {IFLA_CAN_RESTART_MS ,IFLA_CAN_RESTART ,IFLA_CAN_BERR_COUNTER , +IFLA_CAN_DATA_BITTIMING , +IFLA_CAN_DATA_BITTIMING_CONST , __IFLA_CAN_MAX };
Signature · 1 line
1.9.0.rc3