On 7/10/22 16:21, Greg KH wrote:
On Fri, Jul 08, 2022 at 08:46:50PM +0200, Jimmy Assarsson wrote:
Add struct kvaser_usb_dev_cfg to ease backporting of upstream commits:
49f274c72357 (can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info)
e6c80e601053 (can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression)
b3b6df2c56d8 (can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits)
What upstream commit is this from?
Hi Greg,
The original upstream commit introducing struct kvaser_usb_dev_cfg is
7259124eac7d1b76b41c7a9cb2511a30556deebe
can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c
And was first merged to 4.19.
This was part of a major restructure of the driver to add support for new type of devices.
And upstream commit
commit fb12797ab1fef480ad8a32a30984844444eeb00d
can: kvaser_usb: get CAN clock frequency from device
introduced kvaser_usb_leaf_dev_cfg_{8,16,24,32}mhz
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Jimmy Assarsson <extja@xxxxxxxxxx>
---
drivers/net/can/usb/kvaser_usb.c | 76 ++++++++++++++++++++++----------
1 file changed, 52 insertions(+), 24 deletions(-)
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 9742e32d5cd5..6759868924b2 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -31,10 +31,6 @@
#define USB_SEND_TIMEOUT 1000 /* msecs */
#define USB_RECV_TIMEOUT 1000 /* msecs */
#define RX_BUFFER_SIZE 3072
-#define KVASER_USB_CAN_CLOCK_8MHZ 8000000
-#define KVASER_USB_CAN_CLOCK_16MHZ 16000000
-#define KVASER_USB_CAN_CLOCK_24MHZ 24000000
-#define KVASER_USB_CAN_CLOCK_32MHZ 32000000
You also deleted these, you didn't really describe any of this in the
changelog text at all :(
They where replaced by const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_{8,16,24,32}mhz.
Sorry for not mentioning this.
Why not just backport the needed commit instead of this unknown one?
Sure, if you prefer it :)
In that case I would also like to backport the rest of the patches related to the
adding of kvaser_usb/kvaser_usb_hydra.c, if you don't mind?
Best regards,
jimmy
thanks,
greg k-h
