- Linux-stable-mirror - lists.linaro.org

by CKI

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c91951f15978 Linux 4.20.12 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge ----- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: c91951f15978 Linux 4.20.12 We then merged the following patches with `git am`: arm-8834-1-fix-kprobes-optimized-kprobes-illegal-instruction.patch kprobe-do-not-use-uaccess-functions-to-access-kernel-memory-that-can-fault.patch tracing-fix-number-of-entries-in-trace-header.patch mips-ebpf-always-return-sign-extended-32b-values.patch mt76x0u-fix-suspend-resume.patch gpio-mt7621-use-a-per-instance-irq_chip-structure.patch gpio-pxa-avoid-attempting-to-set-pin-direction-via-pinctrl-on-mmp2.patch mac80211-restore-vif-beacon-interval-if-start-ap-fails.patch mac80211-use-linked-list-instead-of-rhashtable-walk-for-mesh-tables.patch mac80211-free-mpath-object-when-rhashtable-insertion-fails.patch pinctrl-qcom-qcs404-correct-sdc-tile.patch libceph-handle-an-empty-authorize-reply.patch ceph-avoid-repeatedly-adding-inode-to-mdsc-snap_flush_list.patch numa-change-get_mempolicy-to-use-nr_node_ids-instead-of-max_numnodes.patch proc-oom-do-not-report-alien-mms-when-setting-oom_score_adj.patch alsa-hda-realtek-headset-microphone-and-internal-speaker-support-for-system76-oryp5.patch alsa-hda-realtek-disable-pc-beep-in-passthrough-on-alc285.patch keys-allow-reaching-the-keys-quotas-exactly.patch backlight-pwm_bl-fix-devicetree-parsing-with-auto-ge.patch mfd-ti_am335x_tscadc-use-platform_devid_auto-while-r.patch pvcalls-front-read-all-data-before-closing-the-conne.patch pvcalls-front-don-t-try-to-free-unallocated-rings.patch pvcalls-front-properly-allocate-sk.patch pvcalls-back-set-enotconn-in-pvcalls_conn_back_read.patch mfd-twl-core-fix-section-annotations-on-un-protect_p.patch mfd-db8500-prcmu-fix-some-section-annotations.patch mfd-mt6397-do-not-call-irq_domain_remove-if-pmic-uns.patch mfd-ab8500-core-return-zero-in-get_register_interrup.patch mfd-bd9571mwv-add-volatile-register-to-make-dvfs-wor.patch mfd-at91-usart-add-platform-dependency.patch mfd-qcom_rpm-write-fw_version-to-ctrl_reg.patch mfd-wm5110-add-missing-asrc-rate-register.patch mfd-axp20x-add-ac-power-supply-cell-for-axp813.patch mfd-axp20x-re-align-mfd-cell-entries.patch mfd-axp20x-add-supported-cells-for-axp803.patch mfd-cros_ec_dev-add-missing-mfd_remove_devices-call-.patch mfd-tps65218-use-devm_regmap_add_irq_chip-and-clean-.patch mfd-mc13xxx-fix-a-missing-check-of-a-register-read-f.patch xen-pvcalls-remove-set-but-not-used-variable-intf.patch soc-fsl-qe-fix-err-handling-of-ucc_of_parse_tdm.patch qed-fix-qed_chain_set_prod-for-pbl-chains-with-non-p.patch qed-fix-qed_ll2_post_rx_buffer_notify_fw-by-adding-a.patch net-hns-fix-use-after-free-identified-by-slub-debug.patch selftests-net-fix-improve-ip_defrag-selftest.patch bpf-fix-1-rewrite-in-sys_sendmsg.patch selftests-bpf-test-1-rewrite-in-sys_sendmsg-in-test_.patch hwmon-nct6775-fix-chip-id-for-nct6798d.patch hwmon-nct6775-enable-io-mapping-for-nct6797d-and-nct.patch watchdog-mt7621_wdt-rt2880_wdt-fix-compilation-probl.patch net-mlx4-get-rid-of-page-operation-after-dma_alloc_c.patch mips-ath79-enable-of-serial-ports-in-the-default-con.patch xprtrdma-double-free-in-rpcrdma_sendctxs_create.patch mlxsw-spectrum_acl-add-cleanup-after-c-tcam-update-e.patch mlxsw-spectrum-add-vxlan-dependency-for-spectrum.patch selftests-forwarding-add-a-test-for-vlan-deletion.patch netfilter-nf_tables-fix-leaking-object-reference-cou.patch scsi-qla4xxx-check-return-code-of-qla4xxx_copy_from_.patch scsi-isci-initialize-shost-fully-before-calling-scsi.patch include-linux-compiler-.h-fix-optimizer_hide_var.patch mips-jazz-fix-64bit-build.patch netfilter-nft_flow_offload-fix-reverse-route-lookup.patch bpf-correctly-set-initial-window-on-active-fast-open.patch pvcalls-front-avoid-get_free_pages-gfp_kernel-under-.patch selftests-bpf-install-files-tcp_-server-client-.py.patch bpf-fix-panic-in-stack_map_get_build_id-on-i386-and-.patch afs-set-correct-lock-type-for-the-yfs-createfile.patch netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch rdma-mthca-clear-qp-objects-during-their-allocation.patch powerpc-8xx-fix-setting-of-pagetable-for-abatron-bdi.patch acpi-nfit-fix-race-accessing-memdev-in-nfit_get_smbi.patch net-stmmac-fix-pci-module-removal-leak.patch net-stmmac-dwxgmac2-only-clear-interrupts-that-are-a.patch net-stmmac-check-if-cbs-is-supported-before-configur.patch net-stmmac-fix-the-logic-of-checking-if-rx-watchdog-.patch net-stmmac-prevent-rx-starvation-in-stmmac_napi_poll.patch isdn-i4l-isdn_tty-fix-some-concurrency-double-free-b.patch scsi-tcmu-avoid-cmd-qfull-timers-updated-whenever-a-.patch scsi-ufs-fix-system-suspend-status.patch scsi-qedi-add-ep_state-for-login-completion-on-un-re.patch scsi-ufs-fix-geometry-descriptor-size.patch scsi-qla1280-set-64bit-coherent-mask.patch scsi-cxgb4i-add-wait_for_completion.patch netfilter-nft_flow_offload-fix-checking-method-of-co.patch always-clear-the-x2apic_enable-bit-for-pv-guest.patch drm-meson-add-missing-of_node_put.patch drm-amdkfd-don-t-assign-dgpus-to-apu-topology-device.patch drm-amd-display-fix-pme-notification-not-working-in-.patch vhost-return-einval-if-iovecs-size-does-not-match-th.patch vhost-scsi-use-copy_to_iter-to-send-control-queue-re.patch xsk-check-if-a-queue-exists-during-umem-setup.patch selftests-bpf-install-with_tunnels.sh-for-test_flow_.patch samples-bpf-workaround-clang-asm-goto-compilation-er.patch sunrpc-ensure-rq_bytes_sent-is-reset-before-request-.patch sunrpc-ensure-we-respect-the-rpcsec_gss-sequence-num.patch drm-sun4i-backend-add-missing-of_node_puts.patch pvcalls-front-fix-potential-null-dereference.patch acpi-ec-look-for-ecdt-ec-after-calling-acpi_load_tab.patch net-phy-micrel-set-soft_reset-callback-to-genphy_sof.patch selftests-tc-testing-drop-test-on-missing-tunnel-key.patch selftests-tc-testing-fix-tunnel_key-failure-if-dst_p.patch selftests-tc-testing-fix-parsing-of-ife-type.patch afs-don-t-set-vnode-cb_s_break-in-afs_validate.patch afs-fix-key-refcounting-in-file-locking-code.patch afs-provide-a-function-to-get-a-ref-on-a-call.patch afs-fix-race-in-async-call-refcounting.patch bpf-don-t-assume-build-id-length-is-always-20-bytes.patch bpf-zero-out-build_id-for-bpf_stack_build_id_ip.patch selftests-bpf-retry-tests-that-expect-build-id.patch atm-he-fix-sign-extension-overflow-on-large-shift.patch hwmon-tmp421-correct-the-misspelling-of-the-tmp442-c.patch leds-lp5523-fix-a-missing-check-of-return-value-of-l.patch bpf-bpf_setsockopt-reset-sock-dst-on-so_mark-changes.patch bpf-fix-so_max_pacing_rate-to-support-tcp-internal-p.patch dpaa_eth-netif_f_lltx-requires-to-do-our-own-update-.patch mlxsw-pci-return-error-on-pci-reset-timeout.patch net-bridge-mark-fdb-entries-that-were-added-by-user-.patch mlxsw-spectrum_switchdev-do-not-treat-static-fdb-ent.patch selftests-forwarding-add-a-test-case-for-externally-.patch bpf-pull-in-pkt_sched.h-header-for-tooling-to-fix-bp.patch net-mlx5e-fix-wrong-zero-tx-drop-counter-indication-.patch isdn-avm-fix-string-plus-integer-warning-from-clang.patch batman-adv-fix-uninit-value-in-batadv_interface_tx.patch inet_diag-fix-reporting-cgroup-classid-and-fallback-to-priority.patch ipv6-propagate-genlmsg_reply-return-code.patch net-ena-fix-race-between-link-up-and-device-initalization.patch net-mlx4_en-force-checksum_none-for-short-ethernet-frames.patch net-mlx5e-don-t-overwrite-pedit-action-when-multiple-pedit-used.patch net-packet-fix-4gb-buffer-limit-due-to-overflow-check.patch net-sfp-do-not-probe-sfp-module-before-we-re-attached.patch sctp-call-gso_reset_checksum-when-computing-checksum-in-sctp_gso_segment.patch sctp-set-stream-ext-to-null-after-freeing-it-in-sctp_stream_outq_migrate.patch team-avoid-complex-list-operations-in-team_nl_cmd_options_set.patch net-dsa-fix-npd-checking-for-br_vlan_enabled.patch revert-socket-fix-struct-ifreq-size-in-compat-ioctl.patch revert-kill-dev_ifsioc.patch net-socket-fix-siocgifname-in-compat.patch net-socket-make-bond-ioctls-go-through-compat_ifreq_ioctl.patch geneve-should-not-call-rt6_lookup-when-ipv6-was-disabled.patch sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch net_sched-fix-a-race-condition-in-tcindex_destroy.patch net_sched-fix-a-memory-leak-in-cls_tcindex.patch net_sched-fix-two-more-memory-leaks-in-cls_tcindex.patch net-mlx5e-fpga-fix-innova-ipsec-tx-offload-data-path-performance.patch net-mlx5e-xdp-fix-redirect-resources-availability-check.patch scsi-sd_zbc-fix-sd_zbc_report_zones-buffer-allocation.patch rdma-srp-rework-scsi-device-reset-handling.patch keys-user-align-the-payload-buffer.patch keys-always-initialize-keyring_index_key-desc_len.patch clk-at91-fix-masterck-name.patch clk-at91-fix-at91sam9x5-peripheral-clock-number.patch parisc-fix-ptrace-syscall-number-modification.patch arcv2-enable-unaligned-access-in-early-asm-code.patch arc-u-boot-check-arguments-paranoidly.patch arc-define-arch_slab_minalign-8.patch cpufreq-scmi-fix-use-after-free-in-scmi_cpufreq_exit.patch drm-amdgpu-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch gpu-drm-radeon-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch drm-i915-fbdev-actually-configure-untiled-displays.patch drm-amdgpu-disable-bulk-moves-for-now.patch drm-amd-display-fix-mst-reboot-poweroff-sequence.patch mac80211-change-default-tx_sk_pacing_shift-to-7.patch mac80211-allocate-tailroom-for-forwarded-mesh-packets.patch kvm-mmu-record-maximum-physical-address-width-in-kvm_mmu_extended_role.patch x86-kvm-mmu-fix-switch-between-root-and-guest-mmus.patch kvm-x86-return-la57-feature-based-on-hardware-capability.patch s390-vsie-use-effective-crycbd.31-to-check-crycbd-validity.patch asoc-soc-core-fix-init-platform-memory-handling.patch net-validate-untrusted-gso-packets-without-csum-offload.patch net-avoid-false-positives-in-untrusted-gso-validation.patch staging-erofs-remove-the-redundant-d_rehash-for-the-root-dentry.patch staging-erofs-atomic_cond_read_relaxed-on-ref-locked-workgroup.patch staging-erofs-fix-erofs_workgroup_-try_to_freeze-unfreeze.patch staging-erofs-add-a-full-barrier-in-erofs_workgroup_unfreeze.patch staging-erofs-dir-inode-super-.c-rectify-bug_ons.patch staging-erofs-unzip_-pagevec.h-vle.c-rectify-bug_ons.patch staging-erofs-unzip_vle_lz4.c-utils.c-rectify-bug_ons.patch revert-bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch netfilter-nft_compat-use-after-free-when-deleting-targets.patch netfilter-ipv6-don-t-preserve-original-oif-for-loopback-address.patch netfilter-nfnetlink_osf-add-missing-fmatch-check.patch netfilter-ipt_clusterip-fix-sleep-in-atomic-bug-in-clusterip_config_entry_put.patch Compile ------- We compiled the kernel for 4 architectures: s390x: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/s390x/e22c84be9b2954d89f8115795516… powerpc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/80996d94d6074563eb8de67b2a… aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/754be0184e1925287423e1d958… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/37dfd1f43eaccd265e85c65a4a5… Tests ----- We booted each kernel and ran the following tests: s390: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… powerpc: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

6 years, 8 months

1
0
0 0

WTF: patch "[PATCH] ARC: enable uboot support unconditionally" was seriously submitted to be applied to the 4.20-stable tree?

by gregkh＠linuxfoundation.org

The patch below was submitted to be applied to the 4.20-stable tree. I fail to see how this patch meets the stable kernel rules as found at Documentation/process/stable-kernel-rules.rst. I could be totally wrong, and if so, please respond to <stable(a)vger.kernel.org> and let me know why this patch should be applied. Otherwise, it is now dropped from my patch queues, never to be seen again. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 493a2f812446e92bcb1e69a77381b4d39808d730 Mon Sep 17 00:00:00 2001 From: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Date: Thu, 14 Feb 2019 18:07:45 +0300 Subject: [PATCH] ARC: enable uboot support unconditionally After reworking U-boot args handling code and adding paranoid arguments check we can eliminate CONFIG_ARC_UBOOT_SUPPORT and enable uboot support unconditionally. For JTAG case we can assume that core registers will come up reset value of 0 or in worst case we rely on user passing '-on=clear_regs' to Metaware debugger. Cc: stable(a)vger.kernel.org Tested-by: Corentin LABBE <clabbe(a)baylibre.com> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 7215f52b3413..d750b302d5ab 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -191,7 +191,6 @@ config NR_CPUS config ARC_SMP_HALT_ON_RESET bool "Enable Halt-on-reset boot mode" - default y if ARC_UBOOT_SUPPORT help In SMP configuration cores can be configured as Halt-on-reset or they could all start at same time. For Halt-on-reset, non @@ -523,17 +522,6 @@ config ARC_DBG_TLB_PARANOIA endif -config ARC_UBOOT_SUPPORT - bool "Support uboot arg Handling" - help - ARC Linux by default checks for uboot provided args as pointers to - external cmdline or DTB. This however breaks in absence of uboot, - when booting from Metaware debugger directly, as the registers are - not zeroed out on reset by mdb and/or ARCv2 based cores. The bogus - registers look like uboot args to kernel which then chokes. - So only enable the uboot arg checking/processing if users are sure - of uboot being in play. - config ARC_BUILTIN_DTB_NAME string "Built in DTB" help diff --git a/arch/arc/configs/nps_defconfig b/arch/arc/configs/nps_defconfig index 6e84060e7c90..621f59407d76 100644 --- a/arch/arc/configs/nps_defconfig +++ b/arch/arc/configs/nps_defconfig @@ -31,7 +31,6 @@ CONFIG_ARC_CACHE_LINE_SHIFT=5 # CONFIG_ARC_HAS_LLSC is not set CONFIG_ARC_KVADDR_SIZE=402 CONFIG_ARC_EMUL_UNALIGNED=y -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_PREEMPT=y CONFIG_NET=y CONFIG_UNIX=y diff --git a/arch/arc/configs/vdk_hs38_defconfig b/arch/arc/configs/vdk_hs38_defconfig index 1e59a2e9c602..e447ace6fa1c 100644 --- a/arch/arc/configs/vdk_hs38_defconfig +++ b/arch/arc/configs/vdk_hs38_defconfig @@ -13,7 +13,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARC_PLAT_AXS10X=y CONFIG_AXS103=y CONFIG_ISA_ARCV2=y -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38" CONFIG_PREEMPT=y CONFIG_NET=y diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig index b5c3f6c54b03..c82cdb10aaf4 100644 --- a/arch/arc/configs/vdk_hs38_smp_defconfig +++ b/arch/arc/configs/vdk_hs38_smp_defconfig @@ -15,8 +15,6 @@ CONFIG_AXS103=y CONFIG_ISA_ARCV2=y CONFIG_SMP=y # CONFIG_ARC_TIMERS_64BIT is not set -# CONFIG_ARC_SMP_HALT_ON_RESET is not set -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp" CONFIG_PREEMPT=y CONFIG_NET=y diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S index 1f945d0f40da..30e090625916 100644 --- a/arch/arc/kernel/head.S +++ b/arch/arc/kernel/head.S @@ -100,7 +100,6 @@ ENTRY(stext) st.ab 0, [r5, 4] 1: -#ifdef CONFIG_ARC_UBOOT_SUPPORT ; Uboot - kernel ABI ; r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2 ; r1 = magic number (always zero as of now) @@ -108,7 +107,6 @@ ENTRY(stext) ; These are handled later in handle_uboot_args() st r0, [@uboot_tag] st r2, [@uboot_arg] -#endif ; setup "current" tsk and optionally cache it in dedicated r25 mov r9, @init_task diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index 8bb156164556..93d4d6639873 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -487,7 +487,6 @@ void __init handle_uboot_args(void) bool use_embedded_dtb = true; bool append_cmdline = false; -#ifdef CONFIG_ARC_UBOOT_SUPPORT /* check that we know this tag */ if (uboot_tag != UBOOT_TAG_NONE && uboot_tag != UBOOT_TAG_CMDLINE && @@ -514,7 +513,6 @@ void __init handle_uboot_args(void) append_cmdline = true; ignore_uboot_args: -#endif if (use_embedded_dtb) { machine_desc = setup_machine_fdt(__dtb_start);

6 years, 8 months

4
5
0 0

Stable queue: queue-4.20

by CKI

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c91951f15978 Linux 4.20.12 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge ----- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: c91951f15978 Linux 4.20.12 We then merged the following patches with `git am`: arm-8834-1-fix-kprobes-optimized-kprobes-illegal-instruction.patch kprobe-do-not-use-uaccess-functions-to-access-kernel-memory-that-can-fault.patch tracing-fix-number-of-entries-in-trace-header.patch mips-ebpf-always-return-sign-extended-32b-values.patch mt76x0u-fix-suspend-resume.patch gpio-mt7621-use-a-per-instance-irq_chip-structure.patch gpio-pxa-avoid-attempting-to-set-pin-direction-via-pinctrl-on-mmp2.patch mac80211-restore-vif-beacon-interval-if-start-ap-fails.patch mac80211-use-linked-list-instead-of-rhashtable-walk-for-mesh-tables.patch mac80211-free-mpath-object-when-rhashtable-insertion-fails.patch pinctrl-qcom-qcs404-correct-sdc-tile.patch libceph-handle-an-empty-authorize-reply.patch ceph-avoid-repeatedly-adding-inode-to-mdsc-snap_flush_list.patch numa-change-get_mempolicy-to-use-nr_node_ids-instead-of-max_numnodes.patch proc-oom-do-not-report-alien-mms-when-setting-oom_score_adj.patch alsa-hda-realtek-headset-microphone-and-internal-speaker-support-for-system76-oryp5.patch alsa-hda-realtek-disable-pc-beep-in-passthrough-on-alc285.patch keys-allow-reaching-the-keys-quotas-exactly.patch backlight-pwm_bl-fix-devicetree-parsing-with-auto-ge.patch mfd-ti_am335x_tscadc-use-platform_devid_auto-while-r.patch pvcalls-front-read-all-data-before-closing-the-conne.patch pvcalls-front-don-t-try-to-free-unallocated-rings.patch pvcalls-front-properly-allocate-sk.patch pvcalls-back-set-enotconn-in-pvcalls_conn_back_read.patch mfd-twl-core-fix-section-annotations-on-un-protect_p.patch mfd-db8500-prcmu-fix-some-section-annotations.patch mfd-mt6397-do-not-call-irq_domain_remove-if-pmic-uns.patch mfd-ab8500-core-return-zero-in-get_register_interrup.patch mfd-bd9571mwv-add-volatile-register-to-make-dvfs-wor.patch mfd-at91-usart-add-platform-dependency.patch mfd-qcom_rpm-write-fw_version-to-ctrl_reg.patch mfd-wm5110-add-missing-asrc-rate-register.patch mfd-axp20x-add-ac-power-supply-cell-for-axp813.patch mfd-axp20x-re-align-mfd-cell-entries.patch mfd-axp20x-add-supported-cells-for-axp803.patch mfd-cros_ec_dev-add-missing-mfd_remove_devices-call-.patch mfd-tps65218-use-devm_regmap_add_irq_chip-and-clean-.patch mfd-mc13xxx-fix-a-missing-check-of-a-register-read-f.patch xen-pvcalls-remove-set-but-not-used-variable-intf.patch soc-fsl-qe-fix-err-handling-of-ucc_of_parse_tdm.patch qed-fix-qed_chain_set_prod-for-pbl-chains-with-non-p.patch qed-fix-qed_ll2_post_rx_buffer_notify_fw-by-adding-a.patch net-hns-fix-use-after-free-identified-by-slub-debug.patch selftests-net-fix-improve-ip_defrag-selftest.patch bpf-fix-1-rewrite-in-sys_sendmsg.patch selftests-bpf-test-1-rewrite-in-sys_sendmsg-in-test_.patch hwmon-nct6775-fix-chip-id-for-nct6798d.patch hwmon-nct6775-enable-io-mapping-for-nct6797d-and-nct.patch watchdog-mt7621_wdt-rt2880_wdt-fix-compilation-probl.patch net-mlx4-get-rid-of-page-operation-after-dma_alloc_c.patch mips-ath79-enable-of-serial-ports-in-the-default-con.patch xprtrdma-double-free-in-rpcrdma_sendctxs_create.patch mlxsw-spectrum_acl-add-cleanup-after-c-tcam-update-e.patch mlxsw-spectrum-add-vxlan-dependency-for-spectrum.patch selftests-forwarding-add-a-test-for-vlan-deletion.patch netfilter-nf_tables-fix-leaking-object-reference-cou.patch scsi-qla4xxx-check-return-code-of-qla4xxx_copy_from_.patch scsi-isci-initialize-shost-fully-before-calling-scsi.patch include-linux-compiler-.h-fix-optimizer_hide_var.patch mips-jazz-fix-64bit-build.patch netfilter-nft_flow_offload-fix-reverse-route-lookup.patch bpf-correctly-set-initial-window-on-active-fast-open.patch pvcalls-front-avoid-get_free_pages-gfp_kernel-under-.patch selftests-bpf-install-files-tcp_-server-client-.py.patch bpf-fix-panic-in-stack_map_get_build_id-on-i386-and-.patch afs-set-correct-lock-type-for-the-yfs-createfile.patch netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch rdma-mthca-clear-qp-objects-during-their-allocation.patch powerpc-8xx-fix-setting-of-pagetable-for-abatron-bdi.patch acpi-nfit-fix-race-accessing-memdev-in-nfit_get_smbi.patch net-stmmac-fix-pci-module-removal-leak.patch net-stmmac-dwxgmac2-only-clear-interrupts-that-are-a.patch net-stmmac-check-if-cbs-is-supported-before-configur.patch net-stmmac-fix-the-logic-of-checking-if-rx-watchdog-.patch net-stmmac-prevent-rx-starvation-in-stmmac_napi_poll.patch isdn-i4l-isdn_tty-fix-some-concurrency-double-free-b.patch scsi-tcmu-avoid-cmd-qfull-timers-updated-whenever-a-.patch scsi-ufs-fix-system-suspend-status.patch scsi-qedi-add-ep_state-for-login-completion-on-un-re.patch scsi-ufs-fix-geometry-descriptor-size.patch scsi-qla1280-set-64bit-coherent-mask.patch scsi-cxgb4i-add-wait_for_completion.patch netfilter-nft_flow_offload-fix-checking-method-of-co.patch always-clear-the-x2apic_enable-bit-for-pv-guest.patch drm-meson-add-missing-of_node_put.patch drm-amdkfd-don-t-assign-dgpus-to-apu-topology-device.patch drm-amd-display-fix-pme-notification-not-working-in-.patch vhost-return-einval-if-iovecs-size-does-not-match-th.patch vhost-scsi-use-copy_to_iter-to-send-control-queue-re.patch xsk-check-if-a-queue-exists-during-umem-setup.patch selftests-bpf-install-with_tunnels.sh-for-test_flow_.patch samples-bpf-workaround-clang-asm-goto-compilation-er.patch sunrpc-ensure-rq_bytes_sent-is-reset-before-request-.patch sunrpc-ensure-we-respect-the-rpcsec_gss-sequence-num.patch drm-sun4i-backend-add-missing-of_node_puts.patch pvcalls-front-fix-potential-null-dereference.patch acpi-ec-look-for-ecdt-ec-after-calling-acpi_load_tab.patch net-phy-micrel-set-soft_reset-callback-to-genphy_sof.patch selftests-tc-testing-drop-test-on-missing-tunnel-key.patch selftests-tc-testing-fix-tunnel_key-failure-if-dst_p.patch selftests-tc-testing-fix-parsing-of-ife-type.patch afs-don-t-set-vnode-cb_s_break-in-afs_validate.patch afs-fix-key-refcounting-in-file-locking-code.patch afs-provide-a-function-to-get-a-ref-on-a-call.patch afs-fix-race-in-async-call-refcounting.patch bpf-don-t-assume-build-id-length-is-always-20-bytes.patch bpf-zero-out-build_id-for-bpf_stack_build_id_ip.patch selftests-bpf-retry-tests-that-expect-build-id.patch atm-he-fix-sign-extension-overflow-on-large-shift.patch hwmon-tmp421-correct-the-misspelling-of-the-tmp442-c.patch leds-lp5523-fix-a-missing-check-of-return-value-of-l.patch bpf-bpf_setsockopt-reset-sock-dst-on-so_mark-changes.patch bpf-fix-so_max_pacing_rate-to-support-tcp-internal-p.patch dpaa_eth-netif_f_lltx-requires-to-do-our-own-update-.patch mlxsw-pci-return-error-on-pci-reset-timeout.patch net-bridge-mark-fdb-entries-that-were-added-by-user-.patch mlxsw-spectrum_switchdev-do-not-treat-static-fdb-ent.patch selftests-forwarding-add-a-test-case-for-externally-.patch bpf-pull-in-pkt_sched.h-header-for-tooling-to-fix-bp.patch net-mlx5e-fix-wrong-zero-tx-drop-counter-indication-.patch isdn-avm-fix-string-plus-integer-warning-from-clang.patch batman-adv-fix-uninit-value-in-batadv_interface_tx.patch inet_diag-fix-reporting-cgroup-classid-and-fallback-to-priority.patch ipv6-propagate-genlmsg_reply-return-code.patch net-ena-fix-race-between-link-up-and-device-initalization.patch net-mlx4_en-force-checksum_none-for-short-ethernet-frames.patch net-mlx5e-don-t-overwrite-pedit-action-when-multiple-pedit-used.patch net-packet-fix-4gb-buffer-limit-due-to-overflow-check.patch net-sfp-do-not-probe-sfp-module-before-we-re-attached.patch sctp-call-gso_reset_checksum-when-computing-checksum-in-sctp_gso_segment.patch sctp-set-stream-ext-to-null-after-freeing-it-in-sctp_stream_outq_migrate.patch team-avoid-complex-list-operations-in-team_nl_cmd_options_set.patch net-dsa-fix-npd-checking-for-br_vlan_enabled.patch revert-socket-fix-struct-ifreq-size-in-compat-ioctl.patch revert-kill-dev_ifsioc.patch net-socket-fix-siocgifname-in-compat.patch net-socket-make-bond-ioctls-go-through-compat_ifreq_ioctl.patch geneve-should-not-call-rt6_lookup-when-ipv6-was-disabled.patch sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch net_sched-fix-a-race-condition-in-tcindex_destroy.patch net_sched-fix-a-memory-leak-in-cls_tcindex.patch net_sched-fix-two-more-memory-leaks-in-cls_tcindex.patch net-mlx5e-fpga-fix-innova-ipsec-tx-offload-data-path-performance.patch net-mlx5e-xdp-fix-redirect-resources-availability-check.patch scsi-sd_zbc-fix-sd_zbc_report_zones-buffer-allocation.patch rdma-srp-rework-scsi-device-reset-handling.patch keys-user-align-the-payload-buffer.patch keys-always-initialize-keyring_index_key-desc_len.patch clk-at91-fix-masterck-name.patch clk-at91-fix-at91sam9x5-peripheral-clock-number.patch parisc-fix-ptrace-syscall-number-modification.patch arcv2-enable-unaligned-access-in-early-asm-code.patch arc-u-boot-check-arguments-paranoidly.patch arc-define-arch_slab_minalign-8.patch cpufreq-scmi-fix-use-after-free-in-scmi_cpufreq_exit.patch drm-amdgpu-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch gpu-drm-radeon-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch drm-i915-fbdev-actually-configure-untiled-displays.patch drm-amdgpu-disable-bulk-moves-for-now.patch drm-amd-display-fix-mst-reboot-poweroff-sequence.patch mac80211-change-default-tx_sk_pacing_shift-to-7.patch mac80211-allocate-tailroom-for-forwarded-mesh-packets.patch kvm-mmu-record-maximum-physical-address-width-in-kvm_mmu_extended_role.patch x86-kvm-mmu-fix-switch-between-root-and-guest-mmus.patch kvm-x86-return-la57-feature-based-on-hardware-capability.patch s390-vsie-use-effective-crycbd.31-to-check-crycbd-validity.patch asoc-soc-core-fix-init-platform-memory-handling.patch net-validate-untrusted-gso-packets-without-csum-offload.patch net-avoid-false-positives-in-untrusted-gso-validation.patch staging-erofs-remove-the-redundant-d_rehash-for-the-root-dentry.patch staging-erofs-atomic_cond_read_relaxed-on-ref-locked-workgroup.patch staging-erofs-fix-erofs_workgroup_-try_to_freeze-unfreeze.patch staging-erofs-add-a-full-barrier-in-erofs_workgroup_unfreeze.patch staging-erofs-dir-inode-super-.c-rectify-bug_ons.patch staging-erofs-unzip_-pagevec.h-vle.c-rectify-bug_ons.patch staging-erofs-unzip_vle_lz4.c-utils.c-rectify-bug_ons.patch Compile ------- We compiled the kernel for 4 architectures: s390x: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/s390x/f06404a7e716b503cb4dd1a2d69c… powerpc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/70eaca33a666561b7126592415… aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/3f4a00b5e920661d49ebbdc52f… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/f70ed54e4dfa7a8da96bdd73fb0… Tests ----- We booted each kernel and ran the following tests: s390: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… powerpc: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… WAIVED: PASSED: tuned: tune-processes-through-perf - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

6 years, 8 months

1
0
0 0

[PATCH] ALSA: firewire-motu: fix construction of PCM frame for capture direction

by Takashi Sakamoto

In data blocks of common isochronous packet for MOTU devices, PCM frames are multiplexed in a shape of '24 bit * 4 Audio Pack', described in IEC 61883-6. The frames are not aligned to quadlet. For capture PCM substream, ALSA firewire-motu driver constructs PCM frames by reading data blocks byte-by-byte. However this operation includes bug for lower byte of the PCM sample. This brings invalid content of the PCM samples. This commit fixes the bug. Reported-by: Peter Sjöberg <autopeter(a)gmail.com> Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: 4641c9394010 ("ALSA: firewire-motu: add MOTU specific protocol layer") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/motu/amdtp-motu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/firewire/motu/amdtp-motu.c b/sound/firewire/motu/amdtp-motu.c index f0555a24d90e..6c9b743ea74b 100644 --- a/sound/firewire/motu/amdtp-motu.c +++ b/sound/firewire/motu/amdtp-motu.c @@ -136,7 +136,9 @@ static void read_pcm_s32(struct amdtp_stream *s, byte = (u8 *)buffer + p->pcm_byte_offset; for (c = 0; c < channels; ++c) { - *dst = (byte[0] << 24) | (byte[1] << 16) | byte[2]; + *dst = (byte[0] << 24) | + (byte[1] << 16) | + (byte[2] << 8); byte += 3; dst++; } -- 2.19.1

6 years, 8 months

2
1
0 0

[PATCH] ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56

by Takashi Sakamoto

ALSA bebob driver has an entry for Focusrite Saffire Pro 10 I/O. The entry matches vendor_id in root directory and model_id in unit directory of configuration ROM for IEEE 1394 bus. On the other hand, configuration ROM of Focusrite Liquid Saffire 56 has the same vendor_id and model_id. This device is an application of TCAT Dice (TCD2220 a.k.a Dice Jr.) however ALSA bebob driver can be bound to it randomly instead of ALSA dice driver. At present, drivers in ALSA firewire stack can not handle this situation appropriately. This commit uses more identical mod_alias for Focusrite Saffire Pro 10 I/O in ALSA bebob driver. $ python2 crpp < /sys/bus/firewire/devices/fw1/config_rom ROM header and bus information block ----------------------------------------------------------------- 400 042a829d bus_info_length 4, crc_length 42, crc 33437 404 31333934 bus_name "1394" 408 f0649222 irmc 1, cmc 1, isc 1, bmc 1, pmc 0, cyc_clk_acc 100, max_rec 9 (1024), max_rom 2, gen 2, spd 2 (S400) 40c 00130e01 company_id 00130e | 410 000606e0 device_id 01000606e0 | EUI-64 00130e01000606e0 root directory ----------------------------------------------------------------- 414 0009d31c directory_length 9, crc 54044 418 04000014 hardware version 41c 0c0083c0 node capabilities per IEEE 1394 420 0300130e vendor 424 81000012 --> descriptor leaf at 46c 428 17000006 model 42c 81000016 --> descriptor leaf at 484 430 130120c2 version 434 d1000002 --> unit directory at 43c 438 d4000006 --> dependent info directory at 450 unit directory at 43c ----------------------------------------------------------------- 43c 0004707c directory_length 4, crc 28796 440 1200a02d specifier id: 1394 TA 444 13010001 version: AV/C 448 17000006 model 44c 81000013 --> descriptor leaf at 498 dependent info directory at 450 ----------------------------------------------------------------- 450 000637c7 directory_length 6, crc 14279 454 120007f5 specifier id 458 13000001 version 45c 3affffc7 (immediate value) 460 3b100000 (immediate value) 464 3cffffc7 (immediate value) 468 3d600000 (immediate value) descriptor leaf at 46c ----------------------------------------------------------------- 46c 00056f3b leaf_length 5, crc 28475 470 00000000 textual descriptor 474 00000000 minimal ASCII 478 466f6375 "Focu" 47c 73726974 "srit" 480 65000000 "e" descriptor leaf at 484 ----------------------------------------------------------------- 484 0004a165 leaf_length 4, crc 41317 488 00000000 textual descriptor 48c 00000000 minimal ASCII 490 50726f31 "Pro1" 494 30494f00 "0IO" descriptor leaf at 498 ----------------------------------------------------------------- 498 0004a165 leaf_length 4, crc 41317 49c 00000000 textual descriptor 4a0 00000000 minimal ASCII 4a4 50726f31 "Pro1" 4a8 30494f00 "0IO" $ python2 crpp < /sys/bus/firewire/devices/fw1/config_rom ROM header and bus information block ----------------------------------------------------------------- 400 040442e4 bus_info_length 4, crc_length 4, crc 17124 404 31333934 bus_name "1394" 408 e0ff8112 irmc 1, cmc 1, isc 1, bmc 0, pmc 0, cyc_clk_acc 255, max_rec 8 (512), max_rom 1, gen 1, spd 2 (S400) 40c 00130e04 company_id 00130e | 410 018001e9 device_id 04018001e9 | EUI-64 00130e04018001e9 root directory ----------------------------------------------------------------- 414 00065612 directory_length 6, crc 22034 418 0300130e vendor 41c 8100000a --> descriptor leaf at 444 420 17000006 model 424 8100000e --> descriptor leaf at 45c 428 0c0087c0 node capabilities per IEEE 1394 42c d1000001 --> unit directory at 430 unit directory at 430 ----------------------------------------------------------------- 430 000418a0 directory_length 4, crc 6304 434 1200130e specifier id 438 13000001 version 43c 17000006 model 440 8100000f --> descriptor leaf at 47c descriptor leaf at 444 ----------------------------------------------------------------- 444 00056f3b leaf_length 5, crc 28475 448 00000000 textual descriptor 44c 00000000 minimal ASCII 450 466f6375 "Focu" 454 73726974 "srit" 458 65000000 "e" descriptor leaf at 45c ----------------------------------------------------------------- 45c 000762c6 leaf_length 7, crc 25286 460 00000000 textual descriptor 464 00000000 minimal ASCII 468 4c495155 "LIQU" 46c 49445f53 "ID_S" 470 41464649 "AFFI" 474 52455f35 "RE_5" 478 36000000 "6" descriptor leaf at 47c ----------------------------------------------------------------- 47c 000762c6 leaf_length 7, crc 25286 480 00000000 textual descriptor 484 00000000 minimal ASCII 488 4c495155 "LIQU" 48c 49445f53 "ID_S" 490 41464649 "AFFI" 494 52455f35 "RE_5" 498 36000000 "6" Cc: <stable(a)vger.kernel.org> # v3.16+ Fixes: 25784ec2d034 ("ALSA: bebob: Add support for Focusrite Saffire/SaffirePro series") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/bebob/bebob.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index d91874275d2c..5b46e8dcc2dd 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -448,7 +448,19 @@ static const struct ieee1394_device_id bebob_id_table[] = { /* Focusrite, SaffirePro 26 I/O */ SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, 0x00000003, &saffirepro_26_spec), /* Focusrite, SaffirePro 10 I/O */ - SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, 0x00000006, &saffirepro_10_spec), + { + // The combination of vendor_id and model_id is the same as the + // same as the one of Liquid Saffire 56. + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_MODEL_ID | + IEEE1394_MATCH_SPECIFIER_ID | + IEEE1394_MATCH_VERSION, + .vendor_id = VEN_FOCUSRITE, + .model_id = 0x000006, + .specifier_id = 0x00a02d, + .version = 0x010001, + .driver_data = (kernel_ulong_t)&saffirepro_10_spec, + }, /* Focusrite, Saffire(no label and LE) */ SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, MODEL_FOCUSRITE_SAFFIRE_BOTH, &saffire_spec), -- 2.19.1

6 years, 8 months

2
1
0 0

Stable queue: queue-4.20

by CKI

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c91951f15978 Linux 4.20.12 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge ----- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: c91951f15978 Linux 4.20.12 We then merged the following patches with `git am`: arm-8834-1-fix-kprobes-optimized-kprobes-illegal-instruction.patch kprobe-do-not-use-uaccess-functions-to-access-kernel-memory-that-can-fault.patch tracing-fix-number-of-entries-in-trace-header.patch mips-ebpf-always-return-sign-extended-32b-values.patch mt76x0u-fix-suspend-resume.patch gpio-mt7621-use-a-per-instance-irq_chip-structure.patch gpio-pxa-avoid-attempting-to-set-pin-direction-via-pinctrl-on-mmp2.patch mac80211-restore-vif-beacon-interval-if-start-ap-fails.patch mac80211-use-linked-list-instead-of-rhashtable-walk-for-mesh-tables.patch mac80211-free-mpath-object-when-rhashtable-insertion-fails.patch pinctrl-qcom-qcs404-correct-sdc-tile.patch libceph-handle-an-empty-authorize-reply.patch ceph-avoid-repeatedly-adding-inode-to-mdsc-snap_flush_list.patch numa-change-get_mempolicy-to-use-nr_node_ids-instead-of-max_numnodes.patch proc-oom-do-not-report-alien-mms-when-setting-oom_score_adj.patch alsa-hda-realtek-headset-microphone-and-internal-speaker-support-for-system76-oryp5.patch alsa-hda-realtek-disable-pc-beep-in-passthrough-on-alc285.patch keys-allow-reaching-the-keys-quotas-exactly.patch backlight-pwm_bl-fix-devicetree-parsing-with-auto-ge.patch mfd-ti_am335x_tscadc-use-platform_devid_auto-while-r.patch pvcalls-front-read-all-data-before-closing-the-conne.patch pvcalls-front-don-t-try-to-free-unallocated-rings.patch pvcalls-front-properly-allocate-sk.patch pvcalls-back-set-enotconn-in-pvcalls_conn_back_read.patch mfd-twl-core-fix-section-annotations-on-un-protect_p.patch mfd-db8500-prcmu-fix-some-section-annotations.patch mfd-mt6397-do-not-call-irq_domain_remove-if-pmic-uns.patch mfd-ab8500-core-return-zero-in-get_register_interrup.patch mfd-bd9571mwv-add-volatile-register-to-make-dvfs-wor.patch mfd-at91-usart-add-platform-dependency.patch mfd-qcom_rpm-write-fw_version-to-ctrl_reg.patch mfd-wm5110-add-missing-asrc-rate-register.patch mfd-axp20x-add-ac-power-supply-cell-for-axp813.patch mfd-axp20x-re-align-mfd-cell-entries.patch mfd-axp20x-add-supported-cells-for-axp803.patch mfd-cros_ec_dev-add-missing-mfd_remove_devices-call-.patch mfd-tps65218-use-devm_regmap_add_irq_chip-and-clean-.patch mfd-mc13xxx-fix-a-missing-check-of-a-register-read-f.patch xen-pvcalls-remove-set-but-not-used-variable-intf.patch soc-fsl-qe-fix-err-handling-of-ucc_of_parse_tdm.patch qed-fix-qed_chain_set_prod-for-pbl-chains-with-non-p.patch qed-fix-qed_ll2_post_rx_buffer_notify_fw-by-adding-a.patch net-hns-fix-use-after-free-identified-by-slub-debug.patch selftests-net-fix-improve-ip_defrag-selftest.patch bpf-fix-1-rewrite-in-sys_sendmsg.patch selftests-bpf-test-1-rewrite-in-sys_sendmsg-in-test_.patch hwmon-nct6775-fix-chip-id-for-nct6798d.patch hwmon-nct6775-enable-io-mapping-for-nct6797d-and-nct.patch watchdog-mt7621_wdt-rt2880_wdt-fix-compilation-probl.patch net-mlx4-get-rid-of-page-operation-after-dma_alloc_c.patch mips-ath79-enable-of-serial-ports-in-the-default-con.patch xprtrdma-double-free-in-rpcrdma_sendctxs_create.patch mlxsw-spectrum_acl-add-cleanup-after-c-tcam-update-e.patch mlxsw-spectrum-add-vxlan-dependency-for-spectrum.patch selftests-forwarding-add-a-test-for-vlan-deletion.patch netfilter-nf_tables-fix-leaking-object-reference-cou.patch scsi-qla4xxx-check-return-code-of-qla4xxx_copy_from_.patch scsi-isci-initialize-shost-fully-before-calling-scsi.patch include-linux-compiler-.h-fix-optimizer_hide_var.patch mips-jazz-fix-64bit-build.patch netfilter-nft_flow_offload-fix-reverse-route-lookup.patch bpf-correctly-set-initial-window-on-active-fast-open.patch pvcalls-front-avoid-get_free_pages-gfp_kernel-under-.patch selftests-bpf-install-files-tcp_-server-client-.py.patch bpf-fix-panic-in-stack_map_get_build_id-on-i386-and-.patch afs-set-correct-lock-type-for-the-yfs-createfile.patch netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch rdma-mthca-clear-qp-objects-during-their-allocation.patch powerpc-8xx-fix-setting-of-pagetable-for-abatron-bdi.patch acpi-nfit-fix-race-accessing-memdev-in-nfit_get_smbi.patch net-stmmac-fix-pci-module-removal-leak.patch net-stmmac-dwxgmac2-only-clear-interrupts-that-are-a.patch net-stmmac-check-if-cbs-is-supported-before-configur.patch net-stmmac-fix-the-logic-of-checking-if-rx-watchdog-.patch net-stmmac-prevent-rx-starvation-in-stmmac_napi_poll.patch isdn-i4l-isdn_tty-fix-some-concurrency-double-free-b.patch scsi-tcmu-avoid-cmd-qfull-timers-updated-whenever-a-.patch scsi-ufs-fix-system-suspend-status.patch scsi-qedi-add-ep_state-for-login-completion-on-un-re.patch scsi-ufs-fix-geometry-descriptor-size.patch scsi-qla1280-set-64bit-coherent-mask.patch scsi-cxgb4i-add-wait_for_completion.patch netfilter-nft_flow_offload-fix-checking-method-of-co.patch always-clear-the-x2apic_enable-bit-for-pv-guest.patch drm-meson-add-missing-of_node_put.patch drm-amdkfd-don-t-assign-dgpus-to-apu-topology-device.patch drm-amd-display-fix-pme-notification-not-working-in-.patch vhost-return-einval-if-iovecs-size-does-not-match-th.patch vhost-scsi-use-copy_to_iter-to-send-control-queue-re.patch xsk-check-if-a-queue-exists-during-umem-setup.patch selftests-bpf-install-with_tunnels.sh-for-test_flow_.patch samples-bpf-workaround-clang-asm-goto-compilation-er.patch sunrpc-ensure-rq_bytes_sent-is-reset-before-request-.patch sunrpc-ensure-we-respect-the-rpcsec_gss-sequence-num.patch drm-sun4i-backend-add-missing-of_node_puts.patch pvcalls-front-fix-potential-null-dereference.patch acpi-ec-look-for-ecdt-ec-after-calling-acpi_load_tab.patch net-phy-micrel-set-soft_reset-callback-to-genphy_sof.patch selftests-tc-testing-drop-test-on-missing-tunnel-key.patch selftests-tc-testing-fix-tunnel_key-failure-if-dst_p.patch selftests-tc-testing-fix-parsing-of-ife-type.patch afs-don-t-set-vnode-cb_s_break-in-afs_validate.patch afs-fix-key-refcounting-in-file-locking-code.patch afs-provide-a-function-to-get-a-ref-on-a-call.patch afs-fix-race-in-async-call-refcounting.patch bpf-don-t-assume-build-id-length-is-always-20-bytes.patch bpf-zero-out-build_id-for-bpf_stack_build_id_ip.patch selftests-bpf-retry-tests-that-expect-build-id.patch atm-he-fix-sign-extension-overflow-on-large-shift.patch hwmon-tmp421-correct-the-misspelling-of-the-tmp442-c.patch leds-lp5523-fix-a-missing-check-of-return-value-of-l.patch bpf-bpf_setsockopt-reset-sock-dst-on-so_mark-changes.patch bpf-fix-so_max_pacing_rate-to-support-tcp-internal-p.patch dpaa_eth-netif_f_lltx-requires-to-do-our-own-update-.patch mlxsw-pci-return-error-on-pci-reset-timeout.patch net-bridge-mark-fdb-entries-that-were-added-by-user-.patch mlxsw-spectrum_switchdev-do-not-treat-static-fdb-ent.patch selftests-forwarding-add-a-test-case-for-externally-.patch bpf-pull-in-pkt_sched.h-header-for-tooling-to-fix-bp.patch net-mlx5e-fix-wrong-zero-tx-drop-counter-indication-.patch isdn-avm-fix-string-plus-integer-warning-from-clang.patch batman-adv-fix-uninit-value-in-batadv_interface_tx.patch inet_diag-fix-reporting-cgroup-classid-and-fallback-to-priority.patch ipv6-propagate-genlmsg_reply-return-code.patch net-ena-fix-race-between-link-up-and-device-initalization.patch net-mlx4_en-force-checksum_none-for-short-ethernet-frames.patch net-mlx5e-don-t-overwrite-pedit-action-when-multiple-pedit-used.patch net-packet-fix-4gb-buffer-limit-due-to-overflow-check.patch net-sfp-do-not-probe-sfp-module-before-we-re-attached.patch sctp-call-gso_reset_checksum-when-computing-checksum-in-sctp_gso_segment.patch sctp-set-stream-ext-to-null-after-freeing-it-in-sctp_stream_outq_migrate.patch team-avoid-complex-list-operations-in-team_nl_cmd_options_set.patch net-dsa-fix-npd-checking-for-br_vlan_enabled.patch revert-socket-fix-struct-ifreq-size-in-compat-ioctl.patch revert-kill-dev_ifsioc.patch net-socket-fix-siocgifname-in-compat.patch net-socket-make-bond-ioctls-go-through-compat_ifreq_ioctl.patch geneve-should-not-call-rt6_lookup-when-ipv6-was-disabled.patch sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch net_sched-fix-a-race-condition-in-tcindex_destroy.patch net_sched-fix-a-memory-leak-in-cls_tcindex.patch net_sched-fix-two-more-memory-leaks-in-cls_tcindex.patch net-mlx5e-fpga-fix-innova-ipsec-tx-offload-data-path-performance.patch net-mlx5e-xdp-fix-redirect-resources-availability-check.patch scsi-sd_zbc-fix-sd_zbc_report_zones-buffer-allocation.patch rdma-srp-rework-scsi-device-reset-handling.patch keys-user-align-the-payload-buffer.patch keys-always-initialize-keyring_index_key-desc_len.patch clk-at91-fix-masterck-name.patch clk-at91-fix-at91sam9x5-peripheral-clock-number.patch parisc-fix-ptrace-syscall-number-modification.patch arcv2-enable-unaligned-access-in-early-asm-code.patch arc-u-boot-check-arguments-paranoidly.patch arc-define-arch_slab_minalign-8.patch cpufreq-scmi-fix-use-after-free-in-scmi_cpufreq_exit.patch drm-amdgpu-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch gpu-drm-radeon-set-dpm_flag_never_skip-when-enabling-pm-runtime.patch drm-i915-fbdev-actually-configure-untiled-displays.patch drm-amdgpu-disable-bulk-moves-for-now.patch drm-amd-display-fix-mst-reboot-poweroff-sequence.patch mac80211-change-default-tx_sk_pacing_shift-to-7.patch mac80211-allocate-tailroom-for-forwarded-mesh-packets.patch kvm-mmu-record-maximum-physical-address-width-in-kvm_mmu_extended_role.patch x86-kvm-mmu-fix-switch-between-root-and-guest-mmus.patch kvm-x86-return-la57-feature-based-on-hardware-capability.patch s390-vsie-use-effective-crycbd.31-to-check-crycbd-validity.patch Compile ------- We compiled the kernel for 4 architectures: s390x: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/s390x/4965dc3fda28feff7219461a595c… powerpc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/51dcfc8bdb0cb02761b1fd2655… aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/affaec82cddb1c51665d1f5a3a… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/aa5b9711feeb637f490417cd27b… Tests ----- We booted each kernel and ran the following tests: s390: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… powerpc: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: PASSED: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: /distribution/command PASSED: LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… PASSED: Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… PASSED: xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… PASSED: AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu PASSED: Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… WAIVED: PASSED: httpd: php sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… PASSED: Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

6 years, 8 months

1
0
0 0

[PATCH 8/8] hptiop: fix calls to dma_set_mask()

by Hannes Reinecke

The change to use dma_set_mask() incorrectly made a second call with the 32 bit DMA mask value when the call with the 64 bit DMA mask value succeeded. Fixes: 453cd3700ca3 ("scsi: hptiop: use dma_set_mask") Cc: <stable(a)vger.kernel.org> Suggested-by: Ewan D. Milne <emilne(a)redhat.com> Signed-off-by: Hannes Reinecke <hare(a)suse.com> --- drivers/scsi/hptiop.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index 3eedfd4f8f57..251c084a6ff0 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c @@ -1292,6 +1292,7 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id) dma_addr_t start_phy; void *start_virt; u32 offset, i, req_size; + int rc; dprintk("hptiop_probe(%p)\n", pcidev); @@ -1308,9 +1309,12 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id) /* Enable 64bit DMA if possible */ iop_ops = (struct hptiop_adapter_ops *)id->driver_data; - if (dma_set_mask(&pcidev->dev, - DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) || - dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) { + rc = dma_set_mask(&pcidev->dev, + DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)); + if (rc) + rc = dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32)); + + if (rc) { printk(KERN_ERR "hptiop: fail to set dma_mask\n"); goto disable_pci_device; } -- 2.16.4

6 years, 8 months

3
2
0 0

[PATCH 7/8] hisi_sas: fix calls to dma_set_mask_and_coherent()

by Hannes Reinecke

The change to use dma_set_mask_and_coherent() incorrectly made a second call with the 32 bit DMA mask value when the call with the 64 bit DMA mask value succeeded. This resulted in FC connections failing due to corrupted data buffers, and various other SCSI/FCP I/O errors. Fixes: e4db40e7a1a2 ("scsi: hisi_sas: use dma_set_mask_and_coherent") Cc: <stable(a)vger.kernel.org> Suggested-by: Ewan D. Milne <emilne(a)redhat.com> Signed-off-by: Hannes Reinecke <hare(a)suse.com> --- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 923296653ed7..13ca5a0bdf6b 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2484,6 +2484,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, struct Scsi_Host *shost; struct hisi_hba *hisi_hba; struct device *dev = &pdev->dev; + int error; shost = scsi_host_alloc(hw->sht, sizeof(*hisi_hba)); if (!shost) { @@ -2504,8 +2505,11 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, if (hisi_sas_get_fw_info(hisi_hba) < 0) goto err_out; - if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) && - dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) { + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); + if (error) + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); + + if (error) { dev_err(dev, "No usable DMA addressing method\n"); goto err_out; } diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 00738d0673fe..79390f235c7e 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -2742,10 +2742,12 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (rc) goto err_out_disable_device; - if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) || - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (rc) + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (rc) { dev_err(dev, "No usable DMA addressing method\n"); - rc = -EIO; + rc = -ENODEV; goto err_out_regions; } -- 2.16.4

6 years, 8 months

4
3
0 0

[PATCH 6/8] csiostor: fix calls to dma_set_mask_and_coherent()

by Hannes Reinecke

The change to use dma_set_mask_and_coherent() incorrectly made a second call with the 32 bit DMA mask value when the call with the 64 bit DMA mask value succeeded. Fixes: c22b332d811b ("scsi: csiostor: switch to generic DMA API") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hannes Reinecke <hare(a)suse.com> --- drivers/scsi/csiostor/csio_init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c index 460e4ee1c8fe..a6dd704d7f2d 100644 --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c @@ -206,8 +206,11 @@ csio_pci_init(struct pci_dev *pdev, int *bars) pci_set_master(pdev); pci_try_set_mwi(pdev); - if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) || - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { + rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (rv) + rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (rv) { + rv = -ENODEV; dev_err(&pdev->dev, "No suitable DMA available.\n"); goto err_release_regions; } -- 2.16.4

6 years, 8 months

3
2
0 0

[PATCH 5/8] bfa: fix calls to dma_set_mask_and_coherent()

by Hannes Reinecke

The change to use dma_set_mask_and_coherent() incorrectly made a second call with the 32 bit DMA mask value when the call with the 64 bit DMA mask value succeeded. This resulted in FC connections failing due to corrupted data buffers, and various other SCSI/FCP I/O errors. Fixes: a69b080025ea ("scsi: bfa: use dma_set_mask_and_coherent") Cc: <stable(a)vger.kernel.org> Suggested-by: Ewan D. Milne <emilne(a)redhat.com> Signed-off-by: Hannes Reinecke <hare(a)suse.com> --- drivers/scsi/bfa/bfad.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 42a0caf6740d..88880a66a189 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -727,7 +727,7 @@ bfad_init_timer(struct bfad_s *bfad) int bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) { - int rc = -ENODEV; + int rc = -ENODEV; if (pci_enable_device(pdev)) { printk(KERN_ERR "pci_enable_device fail %p\n", pdev); @@ -739,8 +739,12 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) pci_set_master(pdev); - if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) || - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (rc) + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + + if (rc) { + rc = -ENODEV; printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev); goto out_release_region; } @@ -1534,6 +1538,7 @@ bfad_pci_slot_reset(struct pci_dev *pdev) { struct bfad_s *bfad = pci_get_drvdata(pdev); u8 byte; + int rc; dev_printk(KERN_ERR, &pdev->dev, "bfad_pci_slot_reset flags: 0x%x\n", bfad->bfad_flags); @@ -1561,8 +1566,11 @@ bfad_pci_slot_reset(struct pci_dev *pdev) pci_save_state(pdev); pci_set_master(pdev); - if (dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64)) || - dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(32))) + rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64)); + if (rc) + rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, + DMA_BIT_MASK(32)); + if (rc) goto out_disable_device; if (restart_bfa(bfad) == -1) -- 2.16.4

6 years, 8 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror