September 2022 - Linux-stable-mirror

by Greg Kroah-Hartman

I'm announcing the release of the 5.15.69 kernel. All users of the 5.15 kernel series must upgrade. The updated 5.15.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml | 2 Documentation/input/joydev/joystick.rst | 1 Makefile | 2 arch/arm/boot/dts/at91-sama7g5ek.dts | 20 +- arch/arm/boot/dts/imx28-evk.dts | 2 arch/arm/boot/dts/imx28-m28evk.dts | 2 arch/arm/boot/dts/imx28-sps1.dts | 2 arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 arch/arm/boot/dts/imx6q-ba16.dtsi | 2 arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 arch/arm/boot/dts/imx6q-marsboard.dts | 2 arch/arm/boot/dts/imx6q-rex-pro.dts | 2 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 4 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 arch/arm/boot/dts/imx6sl-evk.dts | 2 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 arch/arm/boot/dts/imx6sx-sdb.dts | 4 arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 arch/arm64/kernel/entry-common.c | 8 arch/x86/include/asm/cpu_entry_area.h | 2 arch/x86/include/asm/page_64.h | 2 arch/x86/kvm/x86.h | 2 drivers/acpi/resource.c | 10 + drivers/gpio/gpio-mockup.c | 9 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 drivers/gpu/drm/msm/msm_rd.c | 3 drivers/hid/intel-ish-hid/ishtp-hid.h | 2 drivers/hid/intel-ish-hid/ishtp/client.c | 68 +++--- drivers/infiniband/hw/irdma/uk.c | 3 drivers/input/joystick/iforce/iforce-main.c | 1 drivers/input/touchscreen/goodix.c | 2 drivers/iommu/intel/iommu.c | 100 ++++------ drivers/net/ethernet/broadcom/tg3.c | 8 drivers/net/ieee802154/cc2520.c | 1 drivers/nvme/target/tcp.c | 3 drivers/perf/arm_pmu_platform.c | 2 drivers/platform/surface/surface_aggregator_registry.c | 3 drivers/platform/x86/acer-wmi.c | 9 drivers/soc/fsl/Kconfig | 1 drivers/usb/gadget/function/f_uac2.c | 30 ++- drivers/usb/storage/unusual_uas.h | 7 fs/tracefs/inode.c | 31 ++- include/linux/intel-iommu.h | 9 include/linux/irqflags.h | 4 include/linux/kvm_host.h | 2 include/linux/nfs_fs.h | 4 include/linux/sched/task_stack.h | 2 kernel/entry/common.c | 6 kernel/locking/lockdep.c | 22 -- kernel/sched/idle.c | 2 kernel/trace/trace_preemptirq.c | 8 mm/mmap.c | 9 net/dsa/tag_hellcreek.c | 2 71 files changed, 278 insertions(+), 196 deletions(-) Borislav Petkov (2): x86/mm: Force-inline __phys_addr_nodebug() task_stack, x86/cea: Force-inline stack helpers Brian Norris (1): tracefs: Only clobber mode/uid/gid on remount if asked Chengming Gui (1): drm/amd/amdgpu: skip ucode loading if ucode_size == 0 Chuanhong Guo (1): ACPI: resource: skip IRQ override on AMD Zen platforms Claudiu Beznea (2): ARM: dts: at91: fix low limit for CPU regulator ARM: dts: at91: sama7g5ek: specify proper regulator output ranges Colin Ian King (1): usb: gadget: f_uac2: clean up some inconsistent indenting Dave Wysochanski (1): NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests Even Xu (1): hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message Greg Kroah-Hartman (1): Linux 5.15.69 Greg Tulli (1): Input: iforce - add support for Boeder Force Feedback Wheel Hans de Goede (1): platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Hu Xiaoying (1): usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Jann Horn (1): mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Jarrah Gosbell (1): Input: goodix - add compatible string for GT1158 Jason Wang (1): HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Jing Leng (1): usb: gadget: f_uac2: fix superspeed transfer Kai-Heng Feng (1): tg3: Disable tg3 device on system reboot to avoid triggering AER Krzysztof Kozlowski (2): ARM: dts: imx: align SPI NOR node name with dtschema dt-bindings: iio: gyroscope: bosch,bmg160: correct number of pins Kurt Kanzenbach (1): net: dsa: hellcreek: Print warning only once Li Qiong (1): ieee802154: cc2520: add rc code in cc2520_tx() Lu Baolu (1): iommu/vt-d: Fix kdump kernels boot failure with scalable mode Marco Felsch (1): ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible Mathew McBride (1): soc: fsl: select FSL_GUTS driver for DPIO Maurizio Lombardi (1): nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change() Maximilian Luz (1): platform/surface: aggregator_registry: Add support for Surface Laptop Go 2 Nick Desaulniers (1): lockdep: Fix -Wunused-parameter for _THIS_IP_ Ondrej Jirman (1): Input: goodix - add support for GT1158 Rob Clark (1): drm/msm/rd: Fix FIFO-full deadlock Sindhu-Devale (1): RDMA/irdma: Use s/g array in post send only when its valid Wei Yongjun (1): gpio: mockup: remove gpio debugfs when remove device Yipeng Zou (1): tracing: hold caller_addr to hardirq_{enable,disable}_ip Yu Zhe (1): perf/arm_pmu_platform: fix tests for platform_get_irq() failure

2 years, 1 month

1
1
0 0

Linux 5.10.144

by Greg Kroah-Hartman

I'm announcing the release of the 5.10.144 kernel. All users of the 5.10 kernel series must upgrade. The updated 5.10.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/input/joydev/joystick.rst | 1 Makefile | 2 arch/arm/boot/dts/imx28-evk.dts | 2 arch/arm/boot/dts/imx28-m28evk.dts | 2 arch/arm/boot/dts/imx28-sps1.dts | 2 arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 arch/arm/boot/dts/imx6q-ba16.dtsi | 2 arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 arch/arm/boot/dts/imx6q-marsboard.dts | 2 arch/arm/boot/dts/imx6q-rex-pro.dts | 2 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 4 - arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 arch/arm/boot/dts/imx6sl-evk.dts | 2 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 - arch/arm/boot/dts/imx6sx-sdb.dts | 4 - arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 arch/x86/kernel/ftrace.c | 7 - arch/x86/kernel/ftrace_64.S | 19 +++- drivers/gpio/gpio-mockup.c | 9 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 drivers/gpu/drm/msm/msm_rd.c | 3 drivers/hid/intel-ish-hid/ishtp-hid.h | 2 drivers/hid/intel-ish-hid/ishtp/client.c | 68 +++++++++-------- drivers/input/joystick/iforce/iforce-main.c | 1 drivers/input/touchscreen/goodix.c | 2 drivers/iommu/intel/iommu.c | 28 ++++++- drivers/net/ethernet/broadcom/tg3.c | 8 +- drivers/net/ieee802154/cc2520.c | 1 drivers/nvme/target/tcp.c | 3 drivers/perf/arm_pmu_platform.c | 2 drivers/platform/x86/acer-wmi.c | 9 ++ drivers/soc/fsl/Kconfig | 1 drivers/usb/storage/unusual_uas.h | 7 + fs/tracefs/inode.c | 31 +++++-- mm/mmap.c | 9 +- 53 files changed, 191 insertions(+), 94 deletions(-) Brian Norris (1): tracefs: Only clobber mode/uid/gid on remount if asked Chengming Gui (1): drm/amd/amdgpu: skip ucode loading if ucode_size == 0 Even Xu (1): hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message Greg Kroah-Hartman (1): Linux 5.10.144 Greg Tulli (1): Input: iforce - add support for Boeder Force Feedback Wheel Hans de Goede (1): platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Hu Xiaoying (1): usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Jann Horn (1): mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Jarrah Gosbell (1): Input: goodix - add compatible string for GT1158 Jason Wang (1): HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Kai-Heng Feng (1): tg3: Disable tg3 device on system reboot to avoid triggering AER Krzysztof Kozlowski (1): ARM: dts: imx: align SPI NOR node name with dtschema Li Qiong (1): ieee802154: cc2520: add rc code in cc2520_tx() Lu Baolu (1): iommu/vt-d: Correctly calculate sagaw value of IOMMU Marco Felsch (1): ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible Mathew McBride (1): soc: fsl: select FSL_GUTS driver for DPIO Maurizio Lombardi (1): nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change() Ondrej Jirman (1): Input: goodix - add support for GT1158 Peter Zijlstra (2): x86/ibt,ftrace: Make function-graph play nice x86/ftrace: Use alternative RET encoding Rob Clark (1): drm/msm/rd: Fix FIFO-full deadlock Thadeu Lima de Souza Cascardo (1): Revert "x86/ftrace: Use alternative RET encoding" Wei Yongjun (1): gpio: mockup: remove gpio debugfs when remove device Yu Zhe (1): perf/arm_pmu_platform: fix tests for platform_get_irq() failure

2 years, 1 month

1
1
0 0

Linux 5.4.214

by Greg Kroah-Hartman

I'm announcing the release of the 5.4.214 kernel. All users of the 5.4 kernel series must upgrade. The updated 5.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/input/joydev/joystick.rst | 1 Makefile | 2 drivers/gpu/drm/msm/msm_rd.c | 3 + drivers/hid/intel-ish-hid/ishtp-hid.h | 2 drivers/hid/intel-ish-hid/ishtp/client.c | 68 ++++++++++++++++------------ drivers/input/joystick/iforce/iforce-main.c | 1 drivers/net/ethernet/broadcom/tg3.c | 8 ++- drivers/net/ieee802154/cc2520.c | 1 drivers/net/phy/dp83822.c | 3 - drivers/nvme/target/tcp.c | 3 + drivers/perf/arm_pmu_platform.c | 2 drivers/platform/x86/acer-wmi.c | 9 +++ drivers/soc/fsl/Kconfig | 1 drivers/usb/storage/unusual_uas.h | 7 ++ fs/tracefs/inode.c | 31 +++++++++--- mm/mmap.c | 9 ++- 16 files changed, 104 insertions(+), 47 deletions(-) Brian Norris (1): tracefs: Only clobber mode/uid/gid on remount if asked Enguerrand de Ribaucourt (1): net: dp83822: disable rx error interrupt Even Xu (1): hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message Greg Kroah-Hartman (1): Linux 5.4.214 Greg Tulli (1): Input: iforce - add support for Boeder Force Feedback Wheel Hans de Goede (1): platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Hu Xiaoying (1): usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Jann Horn (1): mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Jason Wang (1): HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Kai-Heng Feng (1): tg3: Disable tg3 device on system reboot to avoid triggering AER Li Qiong (1): ieee802154: cc2520: add rc code in cc2520_tx() Mathew McBride (1): soc: fsl: select FSL_GUTS driver for DPIO Maurizio Lombardi (1): nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change() Rob Clark (1): drm/msm/rd: Fix FIFO-full deadlock Yu Zhe (1): perf/arm_pmu_platform: fix tests for platform_get_irq() failure

2 years, 1 month

1
1
0 0

Linux 4.19.259

by Greg Kroah-Hartman

I'm announcing the release of the 4.19.259 kernel. All users of the 4.19 kernel series must upgrade. The updated 4.19.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/input/joydev/joystick.rst | 1 Makefile | 2 - drivers/gpu/drm/msm/msm_rd.c | 3 ++ drivers/hid/intel-ish-hid/ishtp-hid.h | 2 - drivers/input/joystick/iforce/iforce-main.c | 1 drivers/net/ethernet/broadcom/tg3.c | 8 +++++-- drivers/net/ieee802154/cc2520.c | 1 drivers/net/phy/dp83822.c | 3 -- drivers/perf/arm_pmu_platform.c | 2 - drivers/platform/x86/acer-wmi.c | 9 +++++++- drivers/usb/storage/unusual_uas.h | 7 ++++++ fs/tracefs/inode.c | 31 ++++++++++++++++++++-------- mm/mmap.c | 9 ++++++-- 13 files changed, 61 insertions(+), 18 deletions(-) Brian Norris (1): tracefs: Only clobber mode/uid/gid on remount if asked Enguerrand de Ribaucourt (1): net: dp83822: disable rx error interrupt Greg Kroah-Hartman (1): Linux 4.19.259 Greg Tulli (1): Input: iforce - add support for Boeder Force Feedback Wheel Hans de Goede (1): platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Hu Xiaoying (1): usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Jann Horn (1): mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Jason Wang (1): HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Kai-Heng Feng (1): tg3: Disable tg3 device on system reboot to avoid triggering AER Li Qiong (1): ieee802154: cc2520: add rc code in cc2520_tx() Rob Clark (1): drm/msm/rd: Fix FIFO-full deadlock Yu Zhe (1): perf/arm_pmu_platform: fix tests for platform_get_irq() failure

2 years, 1 month

1
1
0 0

Linux 4.9.329

by Greg Kroah-Hartman

I'm announcing the release of the 4.9.329 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- drivers/gpu/drm/msm/msm_rd.c | 3 +++ drivers/hid/intel-ish-hid/ishtp-hid.h | 2 +- drivers/net/ethernet/broadcom/tg3.c | 8 ++++++-- drivers/net/ieee802154/cc2520.c | 1 + drivers/platform/x86/acer-wmi.c | 9 ++++++++- fs/tracefs/inode.c | 31 +++++++++++++++++++++++-------- mm/mmap.c | 9 +++++++-- 8 files changed, 50 insertions(+), 15 deletions(-) Brian Norris (1): tracefs: Only clobber mode/uid/gid on remount if asked Greg Kroah-Hartman (1): Linux 4.9.329 Hans de Goede (1): platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Jann Horn (1): mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Jason Wang (1): HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Kai-Heng Feng (1): tg3: Disable tg3 device on system reboot to avoid triggering AER Li Qiong (1): ieee802154: cc2520: add rc code in cc2520_tx() Rob Clark (1): drm/msm/rd: Fix FIFO-full deadlock

2 years, 1 month

1
1
0 0

[PATCH net 17/17] can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> The device will respond with a CMD_ERROR_EVENT command, with error_code KVASER_USB_{LEAF,HYDRA}_ERROR_EVENT_PARAM, if the CMD_SET_BUSPARAMS_REQ contains invalid bittiming parameters. However, this command does not contain any channel reference. To check if the CMD_SET_BUSPARAMS_REQ was successful, redback and compare the requested bittiming parameters with the device reported parameters. Cc: stable(a)vger.kernel.org Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Fixes: aec5fb2268b7 ("can: kvaser_usb: Add support for Kvaser USB hydra family") Tested-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Co-developed-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20220903182559.189-15-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 15 +- .../net/can/usb/kvaser_usb/kvaser_usb_core.c | 96 ++++++++++- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 150 +++++++++++++++--- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 64 ++++++-- 4 files changed, 284 insertions(+), 41 deletions(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h index 778b61c90c2b..ff10b3790d84 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h @@ -119,9 +119,12 @@ struct kvaser_usb_net_priv { struct net_device *netdev; int channel; - struct completion start_comp, stop_comp, flush_comp; + struct completion start_comp, stop_comp, flush_comp, + get_busparams_comp; struct usb_anchor tx_submitted; + struct kvaser_usb_busparams busparams_nominal, busparams_data; + spinlock_t tx_contexts_lock; /* lock for active_tx_contexts */ int active_tx_contexts; struct kvaser_usb_tx_urb_context tx_contexts[]; @@ -131,7 +134,9 @@ struct kvaser_usb_net_priv { * struct kvaser_usb_dev_ops - Device specific functions * @dev_set_mode: used for can.do_set_mode * @dev_set_bittiming: used for can.do_set_bittiming + * @dev_get_busparams: readback arbitration busparams * @dev_set_data_bittiming: used for can.do_set_data_bittiming + * @dev_get_data_busparams: readback data busparams * @dev_get_berr_counter: used for can.do_get_berr_counter * * @dev_setup_endpoints: setup USB in and out endpoints @@ -153,8 +158,12 @@ struct kvaser_usb_net_priv { */ struct kvaser_usb_dev_ops { int (*dev_set_mode)(struct net_device *netdev, enum can_mode mode); - int (*dev_set_bittiming)(struct net_device *netdev); - int (*dev_set_data_bittiming)(struct net_device *netdev); + int (*dev_set_bittiming)(const struct net_device *netdev, + const struct kvaser_usb_busparams *busparams); + int (*dev_get_busparams)(struct kvaser_usb_net_priv *priv); + int (*dev_set_data_bittiming)(const struct net_device *netdev, + const struct kvaser_usb_busparams *busparams); + int (*dev_get_data_busparams)(struct kvaser_usb_net_priv *priv); int (*dev_get_berr_counter)(const struct net_device *netdev, struct can_berr_counter *bec); int (*dev_setup_endpoints)(struct kvaser_usb *dev); diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c index 19df05887166..989e75351062 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c @@ -440,10 +440,6 @@ static int kvaser_usb_open(struct net_device *netdev) if (err) return err; - err = kvaser_usb_setup_rx_urbs(dev); - if (err) - goto error; - err = ops->dev_set_opt_mode(priv); if (err) goto error; @@ -534,6 +530,93 @@ static int kvaser_usb_close(struct net_device *netdev) return 0; } +static int kvaser_usb_set_bittiming(struct net_device *netdev) +{ + struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct kvaser_usb *dev = priv->dev; + const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops; + struct can_bittiming *bt = &priv->can.bittiming; + + struct kvaser_usb_busparams busparams; + int tseg1 = bt->prop_seg + bt->phase_seg1; + int tseg2 = bt->phase_seg2; + int sjw = bt->sjw; + int err = -EOPNOTSUPP; + + busparams.bitrate = cpu_to_le32(bt->bitrate); + busparams.sjw = (u8)sjw; + busparams.tseg1 = (u8)tseg1; + busparams.tseg2 = (u8)tseg2; + if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) + busparams.nsamples = 3; + else + busparams.nsamples = 1; + + err = ops->dev_set_bittiming(netdev, &busparams); + if (err) + return err; + + err = kvaser_usb_setup_rx_urbs(priv->dev); + if (err) + return err; + + err = ops->dev_get_busparams(priv); + if (err) { + /* Treat EOPNOTSUPP as success */ + if (err == -EOPNOTSUPP) + err = 0; + return err; + } + + if (memcmp(&busparams, &priv->busparams_nominal, + sizeof(priv->busparams_nominal)) != 0) + err = -EINVAL; + + return err; +} + +static int kvaser_usb_set_data_bittiming(struct net_device *netdev) +{ + struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct kvaser_usb *dev = priv->dev; + const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops; + struct can_bittiming *dbt = &priv->can.data_bittiming; + + struct kvaser_usb_busparams busparams; + int tseg1 = dbt->prop_seg + dbt->phase_seg1; + int tseg2 = dbt->phase_seg2; + int sjw = dbt->sjw; + int err; + + if (!ops->dev_set_data_bittiming || + !ops->dev_get_data_busparams) + return -EOPNOTSUPP; + + busparams.bitrate = cpu_to_le32(dbt->bitrate); + busparams.sjw = (u8)sjw; + busparams.tseg1 = (u8)tseg1; + busparams.tseg2 = (u8)tseg2; + busparams.nsamples = 1; + + err = ops->dev_set_data_bittiming(netdev, &busparams); + if (err) + return err; + + err = kvaser_usb_setup_rx_urbs(priv->dev); + if (err) + return err; + + err = ops->dev_get_data_busparams(priv); + if (err) + return err; + + if (memcmp(&busparams, &priv->busparams_data, + sizeof(priv->busparams_data)) != 0) + err = -EINVAL; + + return err; +} + static void kvaser_usb_write_bulk_callback(struct urb *urb) { struct kvaser_usb_tx_urb_context *context = urb->context; @@ -734,6 +817,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) init_completion(&priv->start_comp); init_completion(&priv->stop_comp); init_completion(&priv->flush_comp); + init_completion(&priv->get_busparams_comp); priv->can.ctrlmode_supported = 0; priv->dev = dev; @@ -746,7 +830,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) priv->can.state = CAN_STATE_STOPPED; priv->can.clock.freq = dev->cfg->clock.freq; priv->can.bittiming_const = dev->cfg->bittiming_const; - priv->can.do_set_bittiming = ops->dev_set_bittiming; + priv->can.do_set_bittiming = kvaser_usb_set_bittiming; priv->can.do_set_mode = ops->dev_set_mode; if ((driver_info->quirks & KVASER_USB_QUIRK_HAS_TXRX_ERRORS) || (priv->dev->card_data.capabilities & KVASER_USB_CAP_BERR_CAP)) @@ -758,7 +842,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) { priv->can.data_bittiming_const = dev->cfg->data_bittiming_const; - priv->can.do_set_data_bittiming = ops->dev_set_data_bittiming; + priv->can.do_set_data_bittiming = kvaser_usb_set_data_bittiming; } netdev->flags |= IFF_ECHO; 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 b8ae29872217..52ef76bd9bdb 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c @@ -45,6 +45,8 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt; /* Minihydra command IDs */ #define CMD_SET_BUSPARAMS_REQ 16 +#define CMD_GET_BUSPARAMS_REQ 17 +#define CMD_GET_BUSPARAMS_RESP 18 #define CMD_GET_CHIP_STATE_REQ 19 #define CMD_CHIP_STATE_EVENT 20 #define CMD_SET_DRIVERMODE_REQ 21 @@ -196,13 +198,26 @@ 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 { - struct kvaser_usb_busparams busparams_arb; + struct kvaser_usb_busparams busparams_nominal; u8 reserved0[4]; struct kvaser_usb_busparams busparams_data; u8 canfd_mode; u8 reserved1[7]; } __packed; +/* Busparam type */ +#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN 0x00 +#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD 0x01 +struct kvaser_cmd_get_busparams_req { + u8 type; + u8 reserved[27]; +} __packed; + +struct kvaser_cmd_get_busparams_res { + struct kvaser_usb_busparams busparams; + u8 reserved[20]; +} __packed; + /* Ctrl modes */ #define KVASER_USB_HYDRA_CTRLMODE_NORMAL 0x01 #define KVASER_USB_HYDRA_CTRLMODE_LISTEN 0x02 @@ -273,6 +288,8 @@ struct kvaser_cmd { struct kvaser_cmd_error_event error_event; struct kvaser_cmd_set_busparams set_busparams_req; + struct kvaser_cmd_get_busparams_req get_busparams_req; + struct kvaser_cmd_get_busparams_res get_busparams_res; struct kvaser_cmd_chip_state_event chip_state_event; @@ -355,6 +372,10 @@ struct kvaser_cmd_ext { } __packed; } __packed; +struct kvaser_usb_net_hydra_priv { + int pending_get_busparams_type; +}; + static const struct can_bittiming_const kvaser_usb_hydra_kcan_bittiming_c = { .name = "kvaser_usb_kcan", .tseg1_min = 1, @@ -832,6 +853,39 @@ static void kvaser_usb_hydra_flush_queue_reply(const struct kvaser_usb *dev, complete(&priv->flush_comp); } +static void kvaser_usb_hydra_get_busparams_reply(const struct kvaser_usb *dev, + const struct kvaser_cmd *cmd) +{ + struct kvaser_usb_net_priv *priv; + struct kvaser_usb_net_hydra_priv *hydra; + + priv = kvaser_usb_hydra_net_priv_from_cmd(dev, cmd); + if (!priv) + return; + + hydra = priv->sub_priv; + if (!hydra) + return; + + switch (hydra->pending_get_busparams_type) { + case KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN: + memcpy(&priv->busparams_nominal, &cmd->get_busparams_res.busparams, + sizeof(priv->busparams_nominal)); + break; + case KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD: + memcpy(&priv->busparams_data, &cmd->get_busparams_res.busparams, + sizeof(priv->busparams_nominal)); + break; + default: + dev_warn(&dev->intf->dev, "Unknown get_busparams_type %d\n", + hydra->pending_get_busparams_type); + break; + } + hydra->pending_get_busparams_type = -1; + + complete(&priv->get_busparams_comp); +} + static void kvaser_usb_hydra_bus_status_to_can_state(const struct kvaser_usb_net_priv *priv, u8 bus_status, @@ -1318,6 +1372,10 @@ static void kvaser_usb_hydra_handle_cmd_std(const struct kvaser_usb *dev, kvaser_usb_hydra_state_event(dev, cmd); break; + case CMD_GET_BUSPARAMS_RESP: + kvaser_usb_hydra_get_busparams_reply(dev, cmd); + break; + case CMD_ERROR_EVENT: kvaser_usb_hydra_error_event(dev, cmd); break; @@ -1514,15 +1572,58 @@ static int kvaser_usb_hydra_set_mode(struct net_device *netdev, return err; } -static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev) +static int kvaser_usb_hydra_get_busparams(struct kvaser_usb_net_priv *priv, + int busparams_type) +{ + struct kvaser_usb *dev = priv->dev; + struct kvaser_usb_net_hydra_priv *hydra = priv->sub_priv; + struct kvaser_cmd *cmd; + int err; + + if (!hydra) + return -EINVAL; + + cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + + cmd->header.cmd_no = CMD_GET_BUSPARAMS_REQ; + kvaser_usb_hydra_set_cmd_dest_he + (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); + kvaser_usb_hydra_set_cmd_transid + (cmd, kvaser_usb_hydra_get_next_transid(dev)); + cmd->get_busparams_req.type = busparams_type; + hydra->pending_get_busparams_type = busparams_type; + + reinit_completion(&priv->get_busparams_comp); + + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); + if (err) + return err; + + if (!wait_for_completion_timeout(&priv->get_busparams_comp, + msecs_to_jiffies(KVASER_USB_TIMEOUT))) + return -ETIMEDOUT; + + return err; +} + +static int kvaser_usb_hydra_get_nominal_busparams(struct kvaser_usb_net_priv *priv) +{ + return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN); +} + +static int kvaser_usb_hydra_get_data_busparams(struct kvaser_usb_net_priv *priv) +{ + return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD); +} + +static int kvaser_usb_hydra_set_bittiming(const struct net_device *netdev, + const struct kvaser_usb_busparams *busparams) { struct kvaser_cmd *cmd; struct kvaser_usb_net_priv *priv = netdev_priv(netdev); - struct can_bittiming *bt = &priv->can.bittiming; struct kvaser_usb *dev = priv->dev; - int tseg1 = bt->prop_seg + bt->phase_seg1; - int tseg2 = bt->phase_seg2; - int sjw = bt->sjw; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); @@ -1530,11 +1631,8 @@ 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.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; + memcpy(&cmd->set_busparams_req.busparams_nominal, busparams, + sizeof(cmd->set_busparams_req.busparams_nominal)); kvaser_usb_hydra_set_cmd_dest_he (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); @@ -1548,15 +1646,12 @@ static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev) return err; } -static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev) +static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev, + const struct kvaser_usb_busparams *busparams) { struct kvaser_cmd *cmd; struct kvaser_usb_net_priv *priv = netdev_priv(netdev); - struct can_bittiming *dbt = &priv->can.data_bittiming; struct kvaser_usb *dev = priv->dev; - int tseg1 = dbt->prop_seg + dbt->phase_seg1; - int tseg2 = dbt->phase_seg2; - int sjw = dbt->sjw; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); @@ -1564,11 +1659,8 @@ 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.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; + memcpy(&cmd->set_busparams_req.busparams_data, busparams, + sizeof(cmd->set_busparams_req.busparams_data)); if (priv->can.ctrlmode & CAN_CTRLMODE_FD) { if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO) @@ -1675,6 +1767,19 @@ static int kvaser_usb_hydra_init_card(struct kvaser_usb *dev) return 0; } +static int kvaser_usb_hydra_init_channel(struct kvaser_usb_net_priv *priv) +{ + struct kvaser_usb_net_hydra_priv *hydra; + + hydra = devm_kzalloc(&priv->dev->intf->dev, sizeof(*hydra), GFP_KERNEL); + if (!hydra) + return -ENOMEM; + + priv->sub_priv = hydra; + + return 0; +} + static int kvaser_usb_hydra_get_software_info(struct kvaser_usb *dev) { struct kvaser_cmd cmd; @@ -2019,10 +2124,13 @@ kvaser_usb_hydra_frame_to_cmd(const struct kvaser_usb_net_priv *priv, const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = { .dev_set_mode = kvaser_usb_hydra_set_mode, .dev_set_bittiming = kvaser_usb_hydra_set_bittiming, + .dev_get_busparams = kvaser_usb_hydra_get_nominal_busparams, .dev_set_data_bittiming = kvaser_usb_hydra_set_data_bittiming, + .dev_get_data_busparams = kvaser_usb_hydra_get_data_busparams, .dev_get_berr_counter = kvaser_usb_hydra_get_berr_counter, .dev_setup_endpoints = kvaser_usb_hydra_setup_endpoints, .dev_init_card = kvaser_usb_hydra_init_card, + .dev_init_channel = kvaser_usb_hydra_init_channel, .dev_get_software_info = kvaser_usb_hydra_get_software_info, .dev_get_software_details = kvaser_usb_hydra_get_software_details, .dev_get_card_info = kvaser_usb_hydra_get_card_info, 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 bb59ee01a093..1c2f99ce4c6c 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -57,6 +57,8 @@ #define CMD_RX_EXT_MESSAGE 14 #define CMD_TX_EXT_MESSAGE 15 #define CMD_SET_BUS_PARAMS 16 +#define CMD_GET_BUS_PARAMS 17 +#define CMD_GET_BUS_PARAMS_REPLY 18 #define CMD_GET_CHIP_STATE 19 #define CMD_CHIP_STATE_EVENT 20 #define CMD_SET_CTRL_MODE 21 @@ -376,6 +378,7 @@ static const u8 kvaser_usb_leaf_cmd_sizes_leaf[] = { [CMD_CHIP_STATE_EVENT] = kvaser_fsize(u.leaf.chip_state_event), [CMD_CAN_ERROR_EVENT] = kvaser_fsize(u.leaf.can_error_event), [CMD_GET_CAPABILITIES_RESP] = kvaser_fsize(u.leaf.cap_res), + [CMD_GET_BUS_PARAMS_REPLY] = kvaser_fsize(u.busparams), [CMD_ERROR_EVENT] = kvaser_fsize(u.leaf.error_event), /* ignored events: */ [CMD_FLUSH_QUEUE_REPLY] = CMD_SIZE_ANY, @@ -1486,6 +1489,25 @@ static void kvaser_usb_leaf_stop_chip_reply(const struct kvaser_usb *dev, complete(&priv->stop_comp); } +static void kvaser_usb_leaf_get_busparams_reply(const struct kvaser_usb *dev, + const struct kvaser_cmd *cmd) +{ + struct kvaser_usb_net_priv *priv; + u8 channel = cmd->u.busparams.channel; + + if (channel >= dev->nchannels) { + dev_err(&dev->intf->dev, + "Invalid channel number (%d)\n", channel); + return; + } + + priv = dev->nets[channel]; + memcpy(&priv->busparams_nominal, &cmd->u.busparams.busparams, + sizeof(priv->busparams_nominal)); + + complete(&priv->get_busparams_comp); +} + static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev, const struct kvaser_cmd *cmd) { @@ -1528,6 +1550,10 @@ static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev, kvaser_usb_leaf_error_event(dev, cmd); break; + case CMD_GET_BUS_PARAMS_REPLY: + kvaser_usb_leaf_get_busparams_reply(dev, cmd); + break; + /* Ignored commands */ case CMD_USBCAN_CLOCK_OVERFLOW_EVENT: if (dev->driver_info->family != KVASER_USBCAN) @@ -1705,10 +1731,10 @@ static void kvaser_usb_leaf_remove_channel(struct kvaser_usb_net_priv *priv) cancel_delayed_work_sync(&leaf->chip_state_req_work); } -static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev) +static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev, + const struct kvaser_usb_busparams *busparams) { struct kvaser_usb_net_priv *priv = netdev_priv(netdev); - struct can_bittiming *bt = &priv->can.bittiming; struct kvaser_usb *dev = priv->dev; struct kvaser_cmd *cmd; int rc; @@ -1721,15 +1747,8 @@ 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.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.busparams.nsamples = 3; - else - cmd->u.busparams.busparams.nsamples = 1; + memcpy(&cmd->u.busparams.busparams, busparams, + sizeof(cmd->u.busparams.busparams)); rc = kvaser_usb_send_cmd(dev, cmd, cmd->len); @@ -1737,6 +1756,27 @@ static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev) return rc; } +static int kvaser_usb_leaf_get_busparams(struct kvaser_usb_net_priv *priv) +{ + int err; + + if (priv->dev->driver_info->family == KVASER_USBCAN) + return -EOPNOTSUPP; + + reinit_completion(&priv->get_busparams_comp); + + err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_GET_BUS_PARAMS, + priv->channel); + if (err) + return err; + + if (!wait_for_completion_timeout(&priv->get_busparams_comp, + msecs_to_jiffies(KVASER_USB_TIMEOUT))) + return -ETIMEDOUT; + + return 0; +} + static int kvaser_usb_leaf_set_mode(struct net_device *netdev, enum can_mode mode) { @@ -1801,7 +1841,9 @@ static int kvaser_usb_leaf_setup_endpoints(struct kvaser_usb *dev) const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = { .dev_set_mode = kvaser_usb_leaf_set_mode, .dev_set_bittiming = kvaser_usb_leaf_set_bittiming, + .dev_get_busparams = kvaser_usb_leaf_get_busparams, .dev_set_data_bittiming = NULL, + .dev_get_data_busparams = NULL, .dev_get_berr_counter = kvaser_usb_leaf_get_berr_counter, .dev_setup_endpoints = kvaser_usb_leaf_setup_endpoints, .dev_init_card = kvaser_usb_leaf_init_card, -- 2.35.1

2 years, 1 month

1
0
0 0

[PATCH net 16/17] can: kvaser_usb: Add struct kvaser_usb_busparams

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Add struct kvaser_usb_busparams containing the busparameters used in CMD_{SET,GET}_BUSPARAMS* commands. Cc: stable(a)vger.kernel.org Tested-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20220903182559.189-14-extja@kvaser.com [mkl: mark struct kvaser_usb_busparams as packed] Signed-off-by: Marc Kleine-Budde <mkl(a)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 3abfaa77e893..b8ae29872217 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 3e31a9ebea88..bb59ee01a093 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

2 years, 1 month

1
0
0 0

[PATCH net 15/17] can: kvaser_usb_leaf: Fix bogus restart events

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> When auto-restart is enabled, the kvaser_usb_leaf driver considers transition from any state >= CAN_STATE_BUS_OFF as a bus-off recovery event (restart). However, these events may occur at interface startup time before kvaser_usb_open() has set the state to CAN_STATE_ERROR_ACTIVE, causing restarts counter to increase and CAN_ERR_RESTARTED to be sent despite no actual restart having occurred. Fix that by making the auto-restart condition checks more strict so that they only trigger when the interface was actually in the BUS_OFF state. Cc: stable(a)vger.kernel.org Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20220903182559.189-13-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f8a12a285050..3e31a9ebea88 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -901,7 +901,7 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev, context = &priv->tx_contexts[tid % dev->max_tx_urbs]; /* Sometimes the state change doesn't come after a bus-off event */ - if (priv->can.restart_ms && priv->can.state >= CAN_STATE_BUS_OFF) { + if (priv->can.restart_ms && priv->can.state == CAN_STATE_BUS_OFF) { struct sk_buff *skb; struct can_frame *cf; @@ -1018,7 +1018,7 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, } if (priv->can.restart_ms && - cur_state >= CAN_STATE_BUS_OFF && + cur_state == CAN_STATE_BUS_OFF && new_state < CAN_STATE_BUS_OFF) priv->can.can_stats.restarts++; @@ -1111,7 +1111,7 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, } if (priv->can.restart_ms && - old_state >= CAN_STATE_BUS_OFF && + old_state == CAN_STATE_BUS_OFF && new_state < CAN_STATE_BUS_OFF) { cf->can_id |= CAN_ERR_RESTARTED; netif_carrier_on(priv->netdev); -- 2.35.1

2 years, 1 month

1
0
0 0

[PATCH net 14/17] can: kvaser_usb_leaf: Ignore stale bus-off after start

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> With 0bfd:0124 Kvaser Mini PCI Express 2xHS FW 4.18.778 it was observed that if the device was bus-off when stopped, at next start (either via interface down/up or manual bus-off restart) the initial CMD_CHIP_STATE_EVENT received just after CMD_START_CHIP_REPLY will have the M16C_STATE_BUS_OFF bit still set, causing the interface to immediately go bus-off again. The bit seems to internally clear quickly afterwards but we do not get another CMD_CHIP_STATE_EVENT. Fix the issue by ignoring any initial bus-off state until we see at least one bus-on state. Also, poll the state periodically until that occurs. It is possible we lose one actual immediately occurring bus-off event here in which case the HW will auto-recover and we see the recovery event. We will then catch the next bus-off event, if any. This issue did not reproduce with 0bfd:0017 Kvaser Memorator Professional HS/HS FW 2.0.50. Cc: stable(a)vger.kernel.org Fixes: 71873a9b38d1 ("can: kvaser_usb: Add support for more Kvaser Leaf v2 devices") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20220903182559.189-12-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) 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 4f9c76f4d0da..f8a12a285050 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -427,6 +427,9 @@ struct kvaser_usb_net_leaf_priv { struct kvaser_usb_net_priv *net; struct delayed_work chip_state_req_work; + + /* started but not reported as bus-on yet */ + bool joining_bus; }; static const struct can_bittiming_const kvaser_usb_leaf_m16c_bittiming_const = { @@ -966,6 +969,7 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, const struct kvaser_usb_err_summary *es, struct can_frame *cf) { + struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv; struct kvaser_usb *dev = priv->dev; struct net_device_stats *stats = &priv->netdev->stats; enum can_state cur_state, new_state, tx_state, rx_state; @@ -990,6 +994,22 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, new_state = CAN_STATE_ERROR_ACTIVE; } + /* 0bfd:0124 FW 4.18.778 was observed to send the initial + * CMD_CHIP_STATE_EVENT after CMD_START_CHIP with M16C_STATE_BUS_OFF + * bit set if the channel was bus-off when it was last stopped (even + * across chip resets). This bit will clear shortly afterwards, without + * triggering a second unsolicited chip state event. + * Ignore this initial bus-off. + */ + if (leaf->joining_bus) { + if (new_state == CAN_STATE_BUS_OFF) { + netdev_dbg(priv->netdev, "ignoring bus-off during startup"); + new_state = cur_state; + } else { + leaf->joining_bus = false; + } + } + if (new_state != cur_state) { tx_state = (es->txerr >= es->rxerr) ? new_state : 0; rx_state = (es->txerr <= es->rxerr) ? new_state : 0; @@ -1065,9 +1085,12 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, /* If there are errors, request status updates periodically as we do * not get automatic notifications of improved state. + * Also request updates if we saw a stale BUS_OFF during startup + * (joining_bus). */ if (new_state < CAN_STATE_BUS_OFF && - (es->rxerr || es->txerr || new_state == CAN_STATE_ERROR_PASSIVE)) + (es->rxerr || es->txerr || new_state == CAN_STATE_ERROR_PASSIVE || + leaf->joining_bus)) schedule_delayed_work(&leaf->chip_state_req_work, msecs_to_jiffies(500)); @@ -1587,8 +1610,11 @@ static int kvaser_usb_leaf_set_opt_mode(const struct kvaser_usb_net_priv *priv) static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv) { + struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv; int err; + leaf->joining_bus = true; + reinit_completion(&priv->start_comp); err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_START_CHIP, @@ -1719,12 +1745,15 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, enum can_mode mode) { struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv; int err; switch (mode) { case CAN_MODE_START: kvaser_usb_unlink_tx_urbs(priv); + leaf->joining_bus = true; + err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP); if (err) return err; -- 2.35.1

2 years, 1 month

1
0
0 0

[PATCH net 13/17] can: kvaser_usb_leaf: Fix wrong CAN state after stopping

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> 0bfd:0124 Kvaser Mini PCI Express 2xHS FW 4.18.778 sends a CMD_CHIP_STATE_EVENT indicating bus-off after stopping the device, causing a stopped device to appear as CAN_STATE_BUS_OFF instead of CAN_STATE_STOPPED. Fix that by not handling error events on stopped devices. Cc: stable(a)vger.kernel.org Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20220903182559.189-11-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 ++++ 1 file changed, 4 insertions(+) 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 993fcc19637d..4f9c76f4d0da 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1045,6 +1045,10 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, leaf = priv->sub_priv; stats = &priv->netdev->stats; + /* Ignore e.g. state change to bus-off reported just after stopping */ + if (!netif_running(priv->netdev)) + return; + /* Update all of the CAN interface's state and error counters before * trying any memory allocation that can actually fail with -ENOMEM. * -- 2.35.1

2 years, 1 month

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2022