| Message ID | 20240502182804.145926-10-christoph.fritz@hexdev.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | LIN Bus support for Linux | expand |
On Thu, 2 May 2024, Christoph Fritz wrote: > The CAN Broadcast Manager now has the capability to dispatch CANFD > frames marked with the id LINBUS_RXOFFLOAD_ID. This patch introduces > functionality to interpret these specific frames, enabling the > configuration of RX offloading within the LIN driver. > > Signed-off-by: Christoph Fritz <christoph.fritz@hexdev.de> > --- > drivers/net/can/lin.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/net/can/lin.c b/drivers/net/can/lin.c > index 95906003666fb..ee2ebea2c865f 100644 > --- a/drivers/net/can/lin.c > +++ b/drivers/net/can/lin.c > @@ -194,6 +194,27 @@ static void lin_remove_sysfs_id_files(struct net_device *ndev) > } > } > > +static int lin_setup_rxoffload(struct lin_device *ldev, > + struct canfd_frame *cfd) > +{ > + struct lin_responder_answer answ; > + > + if (!(cfd->flags & CANFD_FDF)) > + return -EMSGSIZE; This seems a bit odd error code. > + BUILD_BUG_ON(sizeof(struct lin_responder_answer) > sizeof(cfd->data)); > + memcpy(&answ, cfd->data, sizeof(struct lin_responder_answer)); 2x sizeof(answ) > + > + answ.lf.checksum_mode = (cfd->can_id & LIN_ENHANCED_CKSUM_FLAG) ? > + LINBUS_ENHANCED : LINBUS_CLASSIC; > + > + if (answ.lf.lin_id > LIN_ID_MASK || > + answ.event_associated_id > LIN_ID_MASK) > + return -EINVAL; > + > + return ldev->ldev_ops->update_responder_answer(ldev, &answ); > +} > + > static void lin_tx_work_handler(struct work_struct *ws) > { > struct lin_device *ldev = container_of(ws, struct lin_device, > @@ -206,6 +227,14 @@ static void lin_tx_work_handler(struct work_struct *ws) > ldev->tx_busy = true; > > cfd = (struct canfd_frame *)ldev->tx_skb->data; > + > + if (cfd->can_id & LIN_RXOFFLOAD_DATA_FLAG) { > + ret = lin_setup_rxoffload(ldev, cfd); > + if (ret < 0) > + netdev_err(ndev, "setting up rx failed %d\n", ret); > + goto lin_tx_out; > + } > + > lf.checksum_mode = (cfd->can_id & LIN_ENHANCED_CKSUM_FLAG) ? > LINBUS_ENHANCED : LINBUS_CLASSIC; > lf.lin_id = cfd->can_id & LIN_ID_MASK; >
On Mon, 2024-05-06 at 20:11 +0300, Ilpo Järvinen wrote: > On Thu, 2 May 2024, Christoph Fritz wrote: > > > The CAN Broadcast Manager now has the capability to dispatch CANFD > > frames marked with the id LINBUS_RXOFFLOAD_ID. This patch introduces > > functionality to interpret these specific frames, enabling the > > configuration of RX offloading within the LIN driver. > > > > Signed-off-by: Christoph Fritz <christoph.fritz@hexdev.de> > > --- > > drivers/net/can/lin.c | 29 +++++++++++++++++++++++++++++ > > 1 file changed, 29 insertions(+) > > > > diff --git a/drivers/net/can/lin.c b/drivers/net/can/lin.c > > index 95906003666fb..ee2ebea2c865f 100644 > > --- a/drivers/net/can/lin.c > > +++ b/drivers/net/can/lin.c > > @@ -194,6 +194,27 @@ static void lin_remove_sysfs_id_files(struct net_device *ndev) > > } > > } > > > > +static int lin_setup_rxoffload(struct lin_device *ldev, > > + struct canfd_frame *cfd) > > +{ > > + struct lin_responder_answer answ; > > + > > + if (!(cfd->flags & CANFD_FDF)) > > + return -EMSGSIZE; > > This seems a bit odd error code. OK, will be changed in v4 to more common -EINVAL. > > > + BUILD_BUG_ON(sizeof(struct lin_responder_answer) > sizeof(cfd->data)); > > + memcpy(&answ, cfd->data, sizeof(struct lin_responder_answer)); > > 2x sizeof(answ) OK ... thanks -- Christoph
diff --git a/drivers/net/can/lin.c b/drivers/net/can/lin.c index 95906003666fb..ee2ebea2c865f 100644 --- a/drivers/net/can/lin.c +++ b/drivers/net/can/lin.c @@ -194,6 +194,27 @@ static void lin_remove_sysfs_id_files(struct net_device *ndev) } } +static int lin_setup_rxoffload(struct lin_device *ldev, + struct canfd_frame *cfd) +{ + struct lin_responder_answer answ; + + if (!(cfd->flags & CANFD_FDF)) + return -EMSGSIZE; + + BUILD_BUG_ON(sizeof(struct lin_responder_answer) > sizeof(cfd->data)); + memcpy(&answ, cfd->data, sizeof(struct lin_responder_answer)); + + answ.lf.checksum_mode = (cfd->can_id & LIN_ENHANCED_CKSUM_FLAG) ? + LINBUS_ENHANCED : LINBUS_CLASSIC; + + if (answ.lf.lin_id > LIN_ID_MASK || + answ.event_associated_id > LIN_ID_MASK) + return -EINVAL; + + return ldev->ldev_ops->update_responder_answer(ldev, &answ); +} + static void lin_tx_work_handler(struct work_struct *ws) { struct lin_device *ldev = container_of(ws, struct lin_device, @@ -206,6 +227,14 @@ static void lin_tx_work_handler(struct work_struct *ws) ldev->tx_busy = true; cfd = (struct canfd_frame *)ldev->tx_skb->data; + + if (cfd->can_id & LIN_RXOFFLOAD_DATA_FLAG) { + ret = lin_setup_rxoffload(ldev, cfd); + if (ret < 0) + netdev_err(ndev, "setting up rx failed %d\n", ret); + goto lin_tx_out; + } + lf.checksum_mode = (cfd->can_id & LIN_ENHANCED_CKSUM_FLAG) ? LINBUS_ENHANCED : LINBUS_CLASSIC; lf.lin_id = cfd->can_id & LIN_ID_MASK;
The CAN Broadcast Manager now has the capability to dispatch CANFD frames marked with the id LINBUS_RXOFFLOAD_ID. This patch introduces functionality to interpret these specific frames, enabling the configuration of RX offloading within the LIN driver. Signed-off-by: Christoph Fritz <christoph.fritz@hexdev.de> --- drivers/net/can/lin.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)