* [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO
@ 2015-01-27 17:58 Oliver Hartkopp
2015-01-27 18:10 ` Oliver Hartkopp
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Hartkopp @ 2015-01-27 17:58 UTC (permalink / raw)
To: linux-can; +Cc: Oliver Hartkopp
The current PCAN USB FD (pro) adapters support the non-ISO CAN FD protocol.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index e4d9354..962c3f0 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -860,6 +860,9 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)
pdev->usb_if->fw_info.fw_version[2],
dev->adapter->ctrl_count);
+ /* the currently supported hw is non-ISO */
+ dev->can.ctrlmode = CAN_CTRLMODE_FD_NON_ISO;
+
/* tell the hardware the can driver is running */
err = pcan_usb_fd_drv_loaded(dev, 1);
if (err) {
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO
2015-01-27 17:58 [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO Oliver Hartkopp
@ 2015-01-27 18:10 ` Oliver Hartkopp
2015-01-27 18:25 ` Marc Kleine-Budde
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Hartkopp @ 2015-01-27 18:10 UTC (permalink / raw)
To: Marc Kleine-Budde, Stephane Grosjean; +Cc: linux-can
Hello Marc,
your v10 series looks very good. The ARRAY_SIZE stuff is a good improvement!
I compiled the peak-next branch and inserting my single PCAN USB FD adapter
worked fine. I'll send my tested-by when I can access my second adapter at
work tomorrow.
The patch below finally sets the CAN_CTRLMODE_FD_NON_ISO flag.
It's tested with the updated ip tool.
But beware: The current linux-can-next is missing the CAN_CTRLMODE_FD_NON_ISO
patch for M_CAN. Therefore CAN_CTRLMODE_FD_NON_ISO is not defined until Dave
pulled net into net-next. So this patch creates a compile error in the latest
linux-can-next.
Regards,
Oliver
On 27.01.2015 18:58, Oliver Hartkopp wrote:
> The current PCAN USB FD (pro) adapters support the non-ISO CAN FD protocol.
>
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> ---
> drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
> index e4d9354..962c3f0 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
> @@ -860,6 +860,9 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)
> pdev->usb_if->fw_info.fw_version[2],
> dev->adapter->ctrl_count);
>
> + /* the currently supported hw is non-ISO */
> + dev->can.ctrlmode = CAN_CTRLMODE_FD_NON_ISO;
> +
> /* tell the hardware the can driver is running */
> err = pcan_usb_fd_drv_loaded(dev, 1);
> if (err) {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO
2015-01-27 18:10 ` Oliver Hartkopp
@ 2015-01-27 18:25 ` Marc Kleine-Budde
2015-01-27 19:19 ` Oliver Hartkopp
0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-01-27 18:25 UTC (permalink / raw)
To: Oliver Hartkopp, Stephane Grosjean; +Cc: linux-can
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
On 01/27/2015 07:10 PM, Oliver Hartkopp wrote:
> your v10 series looks very good. The ARRAY_SIZE stuff is a good improvement!
>
> I compiled the peak-next branch and inserting my single PCAN USB FD adapter
> worked fine. I'll send my tested-by when I can access my second adapter at
> work tomorrow.
Thanks.
> The patch below finally sets the CAN_CTRLMODE_FD_NON_ISO flag.
> It's tested with the updated ip tool.
Thanks, squashed into patch 9/9
> But beware: The current linux-can-next is missing the CAN_CTRLMODE_FD_NON_ISO
> patch for M_CAN. Therefore CAN_CTRLMODE_FD_NON_ISO is not defined until Dave
> pulled net into net-next. So this patch creates a compile error in the latest
> linux-can-next.
I've cherry-picked the missing patch from net/master and put it into the
peak-next branch on kernel.org. So the series compiles and when rebasing
it to net-next after net has been merged, the patch will disappear.
regards,
Marc
--
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 |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO
2015-01-27 18:25 ` Marc Kleine-Budde
@ 2015-01-27 19:19 ` Oliver Hartkopp
0 siblings, 0 replies; 4+ messages in thread
From: Oliver Hartkopp @ 2015-01-27 19:19 UTC (permalink / raw)
To: Marc Kleine-Budde, Stephane Grosjean; +Cc: linux-can
Compile-tested & plugged in based on the latest peak-next.
Looking forward to test it tomorrow morning.
Tnx!
Oliver
On 27.01.2015 19:25, Marc Kleine-Budde wrote:
> On 01/27/2015 07:10 PM, Oliver Hartkopp wrote:
>> your v10 series looks very good. The ARRAY_SIZE stuff is a good improvement!
>>
>> I compiled the peak-next branch and inserting my single PCAN USB FD adapter
>> worked fine. I'll send my tested-by when I can access my second adapter at
>> work tomorrow.
>
> Thanks.
>
>> The patch below finally sets the CAN_CTRLMODE_FD_NON_ISO flag.
>> It's tested with the updated ip tool.
>
> Thanks, squashed into patch 9/9
>
>> But beware: The current linux-can-next is missing the CAN_CTRLMODE_FD_NON_ISO
>> patch for M_CAN. Therefore CAN_CTRLMODE_FD_NON_ISO is not defined until Dave
>> pulled net into net-next. So this patch creates a compile error in the latest
>> linux-can-next.
>
> I've cherry-picked the missing patch from net/master and put it into the
> peak-next branch on kernel.org. So the series compiles and when rebasing
> it to net-next after net has been merged, the patch will disappear.
>
> regards,
> Marc
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-27 19:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27 17:58 [PATCH] can/peak_usb: mark current PEAK USB FD as non-ISO Oliver Hartkopp
2015-01-27 18:10 ` Oliver Hartkopp
2015-01-27 18:25 ` Marc Kleine-Budde
2015-01-27 19:19 ` Oliver Hartkopp
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.