March 2018 - Linux-stable-mirror

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Greg, Pleae pull commits for Linux 4.9 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit c426a717c3c633c743bfa84af902012aa84063f4: Linux 4.9.85 (2018-02-28 10:18:34 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.9-15032018 for you to fetch changes up to 17e3a8f890e0b5b906f458153c9072306f2e64f6: ima: relax requiring a file signature for new files with zero length (2018-03-13 16:21:05 -0400) - ---------------------------------------------------------------- for-greg-4.9-15032018 - ---------------------------------------------------------------- Aaron Salter (1): i40e: Acquire NVM lock before reads on all devices Adiel Aloni (1): mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED Akinobu Mita (1): spi: omap2-mcspi: poll OMAP2_MCSPI_CHSTAT_RXS for PIO transfer Al Cooper (1): ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals Aleksandar Markovic (1): MIPS: r2-on-r6-emu: Clear BLTZALL and BGEZALL debugfs counters Alexander Duyck (1): i40e/i40evf: Fix use after free in Rx cleanup path Alexander Potapenko (1): selinux: check for address length in selinux_socket_bind() Alexey Kardashevskiy (2): vfio/powerpc/spapr_tce: Enforce IOMMU type compatibility check vfio/spapr_tce: Check kzalloc() return when preregistering memory Andreas Pape (1): batman-adv: handle race condition for claims between gateways Andrew F. Davis (2): ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin ARM: dts: omap3-n900: Fix the audio CODEC's reset pin Andrew Lunn (1): net/faraday: Add missing include of of.h Andrey Rusalin (1): NFC: pn533: change order of free_irq and dev unregistration Andrey Vagin (1): net/8021q: create device with all possible features in wanted_features Andy Lutomirski (1): x86/boot/32: Defer resyncing initial_page_table until per-cpu is set up Aneesh Kumar K.V (1): powerpc/mm/hugetlb: Filter out hugepage size not supported by page table layout Anton Blanchard (1): powerpc: Avoid taking a data miss on every userspace instruction miss Anton Sviridenko (1): [media] solo6x10: release vb2 buffers in solo_stop_streaming() Arnaldo Carvalho de Melo (1): perf trace: Handle unpaired raw_syscalls:sys_exit event Arnd Bergmann (2): soc/tegra: Fix link errors with PMC disabled lkdtm: turn off kcov for lkdtm_rodata_do_nothing: Arvind Yadav (1): omapfb: dss: Handle return errors in dss_init_ports() Axel Lin (1): pwm: stmpe: Fix wrong register offset for hwpwm=2 case Bart Van Assche (1): scsi: core: scsi_get_device_flags_keyed(): Always return device flags Baruch Siach (1): ARM: dts: bcm2835: add index to the ethernet alias Ben Greear (1): ath10k: fix invalid STS_CAP_OFFSET_MASK Bjorn Andersson (1): leds: pm8058: Silence pointer to integer size warning Borislav Petkov (2): perf stat: Issue a HW watchdog disable hint kvm/svm: Setup MCG_CAP on AMD properly Brian King (1): scsi: ipr: Fix missed EH wakeup Changbin Du (1): perf sort: Fix segfault with basic block 'cycles' sort dimension Chen-Yu Tsai (4): drm/sun4i: Fix up error path cleanup for master bind function drm/sun4i: Set drm_crtc.port to the underlying TCON's output port node drm/sun4i: Fix TCON clock and regmap initialization sequence clk: sunxi-ng: a33: Add offset and minimum value for DDR1 PLL N factor Chris Brandt (1): ARM: dts: r7s72100: fix ethernet clock parent Chris Wilson (2): drm: Defer disabling the vblank IRQ until the next interrupt (for instant-off) agp/intel: Flush all chipset writes after updating the GGTT Christophe JAILLET (2): power: supply: ab8500_charger: Fix an error handling path power: supply: ab8500_charger: Bail out in case of error in 'ab8500_charger_init_hw_registers()' Christopher James Halse Rogers (2): drm/radeon: Fail fb creation from imported dma-bufs. drm/amdgpu: Fail fb creation from imported dma-bufs. (v2) Colin Ian King (1): staging: wilc1000: add check for kmalloc allocation failure. Dan Carpenter (3): NFC: nfcmrvl: double free on error path media: cpia2: Fix a couple off by one bugs ASoC: nuc900: Fix a loop timeout test David Carrillo-Cisneros (2): perf inject: Copy events when reordering events in pipe mode perf session: Don't rely on evlist in pipe mode David Daney (2): MIPS: BPF: Quit clobbering callee saved registers in JIT code. MIPS: BPF: Fix multiple problems in JIT skb access helpers. David Engraf (1): timers, sched_clock: Update timeout for clock wrap Davide Caratti (1): sched: act_csum: don't mangle TCP and UDP GSO packets Davidlohr Bueso (1): locking/locktorture: Fix num reader/writer corner cases Dean Jenkins (1): Bluetooth: Avoid bt_accept_unlink() double unlinking Dedy Lansky (1): wil6210: fix memory access violation in wil_memcpy_from/toio_32 Dmitry Safonov (1): x86/mm: Make mmap(MAP_32BIT) work correctly Easwar Hariharan (1): IB/hfi1: Check for QSFP presence before attempting reads Emmanuel Grumbach (1): iwlwifi: mvm: rs: don't override the rate history in the search cycle Eric Dumazet (1): bonding: refine bond_fold_stats() wrap detection Eric W. Biederman (1): userns: Don't fail follow_automount based on s_user_ns Felipe Balbi (1): usb: dwc3: make sure UX_EXIT_PX is cleared Felix Manlunas (1): vxlan: vxlan dev should inherit lowerdev's gso_max_size Fugang Duan (1): net: fec: add phy-reset-gpios PROBE_DEFER check Gabriel Krisman Bertazi (1): drm: qxl: Don't alloc fbdev if emulation is not supported Ganapathi Bhat (1): mwifiex: Fix invalid port issue Gao Feng (1): tcp: sysctl: Fix a race to avoid unexpected 0 window from space Geert Uytterhoeven (11): ARM: dts: r8a7791: Remove unit-address and reg from integrated cache ARM: dts: r8a7792: Remove unit-address and reg from integrated cache ARM: dts: r8a7793: Remove unit-address and reg from integrated cache ARM: dts: r8a7794: Remove unit-address and reg from integrated cache arm64: dts: r8a7796: Remove unit-address and reg from integrated cache ARM: dts: r8a7794: Correct clock of DU1 ARM: dts: silk: Correct clock of DU1 ARM: dts: r8a7790: Correct parent of SSI[0-9] clocks ARM: dts: r8a7791: Correct parent of SSI[0-9] clocks ARM: dts: r8a7793: Correct parent of SSI[0-9] clocks ARM: dts: koelsch: Correct clock frequency of X2 DU clock input Greg KH (1): eventpoll.h: fix epoll event masks H. Nikolaus Schaller (1): Input: tsc2007 - check for presence and power down tsc2007 during probe Hamad Kadmany (1): wil6210: fix protection against connections during reset Hannes Reinecke (1): scsi: sg: close race condition in sg_remove_sfp_usercontext() Heiko Carstens (1): s390/topology: fix typo in early topology code Iyappan Subramanian (1): drivers: net: xgene: Fix Rx checksum validation logic Jaegeuk Kim (1): f2fs: relax node version check for victim data in gc Jagdish Gediya (1): mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 Jan Kara (1): reiserfs: Make cancel_old_flush() reliable Jani Nikula (1): drm/edid: set ELD connector type in drm_edid_to_eld() Janusz Krzysztofik (1): [media] media: i2c/soc_camera: fix ov6650 sensor getting wrong clock Javier Martinez Canillas (2): Input: qt1070 - add OF device ID table ASoC: rt5677: Add OF device ID table Jayachandran C (1): tty: amba-pl011: Fix spurious TX interrupts Jeffy Chen (1): drm/rockchip: vop: Enable pm domain before vop_initial Jiada Wang (1): dmaengine: imx-sdma: add 1ms delay to ensure SDMA channel is stopped Jim Mattson (1): kvm: nVMX: Disallow userspace-injected exceptions in guest mode Jin Yao (1): perf evsel: Return exact sub event which failed with EPERM for wildcards Jiri Kosina (1): HID: elo: clear BTN_LEFT mapping Jitendra Bhivare (1): scsi: be2iscsi: Check tag in beiscsi_mccq_compl_wait Johan Hovold (1): zd1211rw: fix NULL-deref at probe Johannes Berg (2): iwlwifi: mvm: fix RX SKB header size and align it properly mac80211_hwsim: use per-interface power level Johannes Thumshirn (1): scsi: sg: check for valid direction before starting the request John Johansen (1): apparmor: Make path_max parameter readonly John Stultz (1): usb: dwc2: Make sure we disconnect the gadget state Josh Poimboeuf (1): powerpc/modules: Don't try to restore r2 after a sibling call Julien BOIBESSOT (1): tools/usbip: fixes build with musl libc toolchain Kefeng Wang (1): perf probe: Return errno when not hitting any event Kieran Bingham (3): [media] v4l: vsp1: Prevent multiple streamon race commencing pipeline early [media] v4l: vsp1: Register pipe with output WPF media: vsp1: Prevent suspending and resuming DRM pipelines Kirill A. Shutemov (1): mm: Fix false-positive VM_BUG_ON() in page_cache_{get,add}_speculative() Kuninori Morimoto (1): ASoC: rcar: ssi: don't set SSICR.CKDV = 000 with SSIWSR.CONT Laurent Pinchart (1): drm: rcar-du: Handle event when disabling CRTCs Laxman Dewangan (1): pwm: tegra: Increase precision in PWM rate calculation Leonid Yegoshin (1): MIPS: r2-on-r6-emu: Fix BLEZL and BGTZL identification Li Dongyang (1): scsi: ses: don't ask for diagnostic pages repeatedly during probe Liam Beguin (1): video: ARM CLCD: fix dma allocation size Lihong Yang (1): i40e: fix ethtool to get EEPROM data from X722 interface Limin Zhu (1): mwifiex: cfg80211: do not change virtual interface during scan processing Linus Walleij (1): ARM: dts: Adjust moxart IRQ controller and flags Long Li (2): PCI: hv: Properly handle PCI bus remove PCI: hv: Lock PCI bus on device eject Lorenzo Colitti (1): net: xfrm: allow clearing socket xfrm policies. Luca Coelho (1): mac80211: remove BUG() when interface type is invalid Luis R. Rodriguez (1): test_firmware: fix setting old custom fw path back on exit Mahesh Bandewar (2): bonding: make speed, duplex setting consistent with link state ipvlan: add L2 check for packets arriving via virtual devices Manikanta Pubbisetty (1): ath10k: update tdls teardown state to target Manish Jaggi (1): PCI: Apply Cavium ACS quirk only to CN81xx/CN83xx/CN88xx devices Mark Rutland (1): drivers/perf: arm_pmu: handle no platform_device Masami Hiramatsu (2): kprobes/x86: Fix kprobe-booster not to boost far call instructions kprobes/x86: Set kprobes pages read-only Matthias Kaehlcke (1): regulator: core: Limit propagation of parent voltage count and list Mauricio Faria de Oliveira (1): scsi: ses: don't get power status of SES device slot on probe Michael Chan (1): bnxt_en: Don't print "Link speed -1 no longer supported" messages. Michael Ellerman (1): powerpc/nohash: Fix use of mmu_has_feature() in setup_initial_memory_limit() Michael Hennerich (1): net: ieee802154: adf7242: Fix bug if defined DEBUG Michael Scott (1): Bluetooth: 6lowpan: fix delay work init in add_peer_chan() Michal Kalderon (1): qed: Fix TM block ILT allocation Mike Leach (1): coresight: Fixes coresight DT parse to get correct output port ID. Mimi Zohar (1): ima: relax requiring a file signature for new files with zero length Mintz, Yuval (2): qed: Always publish VF link from leading hwfn qed: Correct MSI-x for storage Miquel Raynal (1): mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]() Mitch Williams (1): i40e: only register client on iWarp-capable devices Mohammed Shafi Shajakhan (4): ath10k: fix a warning during channel switch with multiple vaps ath10k: disallow DFS simulation if DFS channel is not enabled ath10k: fix fetching channel during potential radar detection ath10k: fix compile time sanity check for CE4 buffer size Nate Watterson (1): iommu/iova: Fix underflow bug in __alloc_and_insert_iova_range NeilBrown (1): md/raid6: Fix anomily when recovering a single device in RAID6. Nicolai HÃ¤hnle (1): drm/ttm: never add BO that failed to validate to the LRU list Nik Unger (1): netem: apply correct delay when rate throttling Oliver Neukum (1): usb: misc: lvs: fix race condition in disconnect handling Pan Xinhui (1): powerpc/xmon: Fix an unexpected xmon on/off state change Paul E. McKenney (2): sched: Stop switched_to_rt() from sending IPIs to offline CPUs sched: Stop resched_cpu() from sending IPIs to offline CPUs Peter Ujfalusi (1): dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free Peter Zijlstra (1): rtmutex: Fix PI chain order integrity Petr Mladek (1): printk: Correctly handle preemption in console_unlock() Phil Turnbull (1): fm10k: correctly check if interface is removed Prarit Bhargava (1): PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown() Quan Nguyen (3): drivers: net: xgene: Fix hardware checksum setting drivers: net: phy: xgene: Fix mdio write drivers: net: xgene: Fix wrong logical operation Rafael J. Wysocki (1): cpufreq: Fix governor module removal race Rajendra Nayak (1): clk: qcom: msm8996: Fix the vfe1 powerdomain name Ravi Bangoria (1): perf probe: Fix concat_probe_trace_events Rob Herring (1): of: fix of_device_get_modalias returned length when truncating buffers Roger Quadros (1): ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss Samuel Thibault (1): braille-console: Fix value returned by _braille_console_setup Satish Kharat (1): scsi: fnic: Fix for "Number of Active IOs" in fnicstats becoming negative SeongJae Park (1): rcutorture/configinit: Fix build directory error message Shaohua Li (1): blk-throttle: make sure expire time isn't too big Shikhar Dogra (1): driver: (adm1275) set the m,b and R coefficients correctly for power Simon Shields (1): ARM: dts: exynos: Correct Trats2 panel reset line Sinclair Yeh (1): drm/vmwgfx: Fixes to vmwgfx_fb Srinivas Kandagatla (1): clk: qcom: msm8916: fix mnd_width for codec_digcodec Stefan Wahren (1): ARM: bcm2835: Enable missing CMA settings for VC4 driver Stephane Eranian (2): perf tools: Make perf_event__synthesize_mmap_events() scale perf stat: Fix bug in handling events in error state Stephen Hemminger (1): veth: set peer GSO values Steve Lin (1): net: ethernet: bgmac: Allow MAC address to be specified in DTB Subhransu S. Prusty (1): ALSA: hda: Add Geminilake id to SKL_PLUS Sunil Goutham (1): net: thunderx: Set max queue count taking XDP_TX into account Taeung Song (1): perf annotate: Fix a bug following symbolic link of a build-id file Takashi Sakamoto (3): ALSA: firewire-lib: add a quirk of packet without valid EOH in CIP format ALSA: firewire-digi00x: add support for console models of Digi00x series ALSA: firewire-digi00x: handle all MIDI messages on streaming packets Thomas Petazzoni (1): net: mvpp2: set dma mask and coherent dma mask on PPv2.2 Thor Thayer (1): EDAC, altera: Fix peripheral warnings for Cyclone5 Tobias Jordan (1): spi: sun6i: disable/unprepare clocks on remove Tobias Klauser (1): NFC: nfcmrvl: Include unaligned.h instead of access_ok.h Tom Hromatka (1): sysrq: Reset the watchdog timers while displaying high-resolution timers Tomasz Kramkowski (1): HID: clamp input to logical range if no null state Tommi Rantala (1): perf buildid: Do not assume that readlink() returns a null terminated string Uwe Kleine-KÃ¶nig (1): serial: imx: setup DCEDTE early and ensure DCD and RI irqs to be off Valtteri HeikkilÃ¤ (1): HID: reject input outside logical range only if null state is set Varsha Rao (1): staging: speakup: Replace BUG_ON() with WARN_ON(). Ville SyrjÃ¤lÃ¤ (1): video/hdmi: Allow "empty" HDMI infoframes Vincent StehlÃ© (1): regulator: isl9305: fix array size Xose Vazquez Perez (2): scsi: devinfo: apply to HP XP the same flags as Hitachi VSP scsi: dh: add new rdac devices Xunlei Pang (1): x86/mce: Handle broadcasted MCE gracefully with kexec Yazen Ghannam (1): x86/mce: Init some CPU features early Yixun Lan (1): clk: meson: gxbb: fix wrong clock for SARADC/SANA Yong Zhao (1): drm/amdkfd: Fix memory leaks in kfd topology Yuyang Du (1): usb: gadget: dummy_hcd: Fix wrong power status bit clear/reset in dummy_hub_control() Zhilong Liu (1): md.c:didn't unlock the mddev before return EINVAL in array_size_store lipeng (1): net: hns: Correct HNS RSS key set function arch/arm/boot/dts/am335x-pepper.dts | 2 +- arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 2 +- arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 17 ++--- arch/arm/boot/dts/omap3-n900.dts | 4 +- arch/arm/boot/dts/r7s72100.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 7 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- arch/arm/boot/dts/r8a7791.dtsi | 10 +-- arch/arm/boot/dts/r8a7792.dtsi | 3 +- arch/arm/boot/dts/r8a7793.dtsi | 10 +-- arch/arm/boot/dts/r8a7794-silk.dts | 2 +- arch/arm/boot/dts/r8a7794.dtsi | 5 +- arch/arm/configs/bcm2835_defconfig | 4 +- arch/arm/mach-bcm/Kconfig | 1 + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 +- arch/mips/kernel/mips-r2-to-r6-emul.c | 16 ++++- arch/mips/net/bpf_jit.c | 16 +++-- arch/mips/net/bpf_jit_asm.S | 23 +++---- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/kernel/module_64.c | 12 +++- arch/powerpc/lib/code-patching.c | 5 ++ arch/powerpc/mm/fault.c | 2 +- arch/powerpc/mm/hugetlbpage.c | 18 +++++ arch/powerpc/mm/tlb_nohash.c | 2 +- arch/powerpc/xmon/xmon.c | 17 +++-- arch/s390/kernel/early.c | 2 +- arch/x86/include/asm/reboot.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 48 ++++++++++---- arch/x86/kernel/kprobes/core.c | 6 ++ arch/x86/kernel/kprobes/opt.c | 3 + arch/x86/kernel/reboot.c | 5 +- arch/x86/kernel/setup.c | 15 ----- arch/x86/kernel/setup_percpu.c | 21 ++++++ arch/x86/kernel/sys_x86_64.c | 4 +- arch/x86/kvm/svm.c | 7 ++ arch/x86/kvm/x86.c | 3 +- block/blk-throttle.c | 11 ++++ drivers/char/agp/intel-gtt.c | 2 + drivers/clk/meson/gxbb.c | 4 +- drivers/clk/qcom/gcc-msm8916.c | 1 + drivers/clk/qcom/mmcc-msm8996.c | 2 +- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 18 +++-- drivers/cpufreq/cpufreq.c | 6 ++ drivers/dma/bcm2835-dma.c | 10 ++- drivers/dma/imx-sdma.c | 17 ++++- drivers/edac/altera_edac.c | 22 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +++ drivers/gpu/drm/drm_edid.c | 9 ++- drivers/gpu/drm/drm_irq.c | 14 +++- drivers/gpu/drm/qxl/qxl_fb.c | 9 ++- drivers/gpu/drm/radeon/radeon_display.c | 6 ++ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 7 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 29 ++++++--- drivers/gpu/drm/sun4i/sun4i_crtc.c | 5 ++ drivers/gpu/drm/sun4i/sun4i_drv.c | 16 +++-- drivers/gpu/drm/sun4i/sun4i_tcon.c | 22 +++++-- drivers/gpu/drm/ttm/ttm_bo.c | 12 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +- drivers/hid/hid-elo.c | 6 ++ drivers/hid/hid-input.c | 20 ++++-- drivers/hwmon/pmbus/adm1275.c | 4 +- drivers/hwtracing/coresight/of_coresight.c | 2 +- drivers/infiniband/hw/hfi1/chip.c | 7 +- drivers/input/keyboard/qt1070.c | 9 +++ drivers/input/touchscreen/tsc2007.c | 8 +++ drivers/iommu/iova.c | 2 +- drivers/leds/leds-pm8058.c | 2 +- drivers/md/md.c | 4 +- drivers/md/raid5.c | 13 +++- drivers/media/i2c/soc_camera/ov6650.c | 2 +- drivers/media/pci/solo6x10/solo6x10-v4l2.c | 11 ++++ drivers/media/platform/vsp1/vsp1_drm.c | 1 + drivers/media/platform/vsp1/vsp1_drv.c | 16 ++++- drivers/media/platform/vsp1/vsp1_video.c | 13 ++++ drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- drivers/misc/Makefile | 2 + drivers/misc/enclosure.c | 7 +- drivers/mtd/nand/fsl_ifc_nand.c | 7 ++ drivers/mtd/nand/nand_base.c | 9 ++- drivers/net/bonding/bond_main.c | 35 ++++++---- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 31 +++++---- drivers/net/ethernet/broadcom/bgmac-bcma.c | 39 ++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 ++- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 ++ drivers/net/ethernet/faraday/ftgmac100.c | 1 + drivers/net/ethernet/freescale/fec_main.c | 26 +++++--- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 23 ++++--- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 9 ++- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 5 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +++--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 12 ++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 + drivers/net/ethernet/marvell/mvpp2.c | 14 ++++ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 32 +++++++-- drivers/net/ethernet/qlogic/qed/qed_main.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 13 +++- drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ipvlan/ipvlan_core.c | 4 ++ drivers/net/phy/mdio-xgene.c | 2 +- drivers/net/veth.c | 3 + drivers/net/vxlan.c | 5 ++ drivers/net/wireless/ath/ath10k/ce.c | 2 +- drivers/net/wireless/ath/ath10k/debug.c | 9 +++ drivers/net/wireless/ath/ath10k/mac.c | 12 +++- drivers/net/wireless/ath/ath10k/wmi.c | 5 ++ drivers/net/wireless/ath/ath10k/wmi.h | 3 +- drivers/net/wireless/ath/wil6210/main.c | 20 +++++- drivers/net/wireless/ath/wil6210/wmi.c | 11 +++- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 18 ++++- drivers/net/wireless/mac80211_hwsim.c | 26 ++++---- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++ drivers/net/wireless/marvell/mwifiex/sdio.c | 4 +- drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 + drivers/nfc/nfcmrvl/fw_dnld.c | 2 +- drivers/nfc/nfcmrvl/spi.c | 5 +- drivers/nfc/pn533/i2c.c | 4 +- drivers/of/device.c | 2 +- drivers/pci/host/pci-hyperv.c | 24 ++++++- drivers/pci/pci-driver.c | 2 - drivers/pci/quirks.c | 3 + drivers/perf/arm_pmu.c | 12 +++- drivers/power/supply/ab8500_charger.c | 6 +- drivers/pwm/pwm-stmpe.c | 2 +- drivers/pwm/pwm-tegra.c | 7 +- drivers/regulator/core.c | 9 ++- drivers/scsi/be2iscsi/be_cmds.c | 6 ++ drivers/scsi/fnic/fnic_scsi.c | 16 +++-- drivers/scsi/ipr.c | 16 +++-- drivers/scsi/scsi_devinfo.c | 9 +-- drivers/scsi/scsi_dh.c | 5 +- drivers/scsi/ses.c | 12 ++-- drivers/scsi/sg.c | 58 +++++++++++++---- drivers/spi/spi-omap2-mcspi.c | 9 +-- drivers/spi/spi-sun6i.c | 2 +- drivers/staging/speakup/kobjects.c | 8 ++- drivers/staging/wilc1000/host_interface.c | 2 + drivers/tty/serial/amba-pl011.c | 23 ++++--- drivers/tty/serial/imx.c | 36 ++++++---- drivers/usb/dwc2/hcd.c | 1 + drivers/usb/dwc3/core.c | 6 ++ drivers/usb/dwc3/core.h | 1 + drivers/usb/gadget/udc/dummy_hcd.c | 20 +++--- drivers/usb/misc/lvstest.c | 1 + drivers/vfio/vfio_iommu_spapr_tce.c | 13 ++++ drivers/video/fbdev/amba-clcd.c | 4 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++-- drivers/video/hdmi.c | 51 +++++++++------ fs/f2fs/gc.c | 6 +- fs/namei.c | 3 - fs/reiserfs/journal.c | 2 +- fs/reiserfs/reiserfs.h | 1 + fs/reiserfs/super.c | 21 ++++-- include/linux/pagemap.h | 4 +- include/linux/platform_data/isl9305.h | 2 +- include/linux/regulator/driver.h | 2 + include/net/tcp.h | 8 ++- include/soc/tegra/pmc.h | 29 ++++++--- include/uapi/linux/eventpoll.h | 8 +-- kernel/locking/locktorture.c | 76 +++++++++++++--------- kernel/locking/rtmutex.c | 29 ++++++++- kernel/locking/rtmutex_common.h | 1 + kernel/printk/braille.c | 15 +++-- kernel/printk/braille.h | 13 +++- kernel/printk/printk.c | 8 ++- kernel/sched/core.c | 3 +- kernel/sched/rt.c | 2 +- kernel/time/sched_clock.c | 5 ++ kernel/time/timer_list.c | 6 ++ net/8021q/vlan_dev.c | 3 +- net/batman-adv/bridge_loop_avoidance.c | 20 ++++-- net/bluetooth/6lowpan.c | 10 ++- net/bluetooth/af_bluetooth.c | 24 +++++++ net/mac80211/iface.c | 2 +- net/sched/act_csum.c | 12 ++++ net/sched/sch_netem.c | 26 +++++--- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 7 ++ security/apparmor/lsm.c | 2 +- security/integrity/ima/ima_appraise.c | 3 +- security/selinux/hooks.c | 8 +++ sound/firewire/amdtp-stream.c | 5 +- sound/firewire/amdtp-stream.h | 3 + sound/firewire/digi00x/amdtp-dot.c | 55 +++++++++++----- sound/firewire/digi00x/digi00x.c | 13 +++- sound/firewire/digi00x/digi00x.h | 1 + sound/pci/hda/hda_intel.c | 4 +- sound/soc/codecs/rt5677.c | 7 ++ sound/soc/nuc900/nuc900-ac97.c | 4 +- sound/soc/sh/rcar/ssi.c | 9 +++ tools/perf/builtin-probe.c | 6 +- tools/perf/builtin-stat.c | 23 ++++++- tools/perf/builtin-trace.c | 43 +++++++++--- tools/perf/util/annotate.c | 10 ++- tools/perf/util/build-id.c | 6 +- tools/perf/util/event.c | 4 +- tools/perf/util/evsel.c | 12 +++- tools/perf/util/ordered-events.c | 3 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/session.c | 17 ++++- tools/perf/util/sort.c | 5 ++ tools/testing/selftests/firmware/fw_filesystem.sh | 5 +- .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- tools/usb/usbip/src/usbipd.c | 2 +- 213 files changed, 1548 insertions(+), 573 deletions(-) -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJaqvZlAAoJEN6mb/eXdyzcc9wP+gMgFLpHt3YZwL8rQCpQecKC YZNZFq3YhmKQqq3XJut4H+gmHhZzsTL469ZVZ2uEyG4cXEwKkWvQtUjx2rKlR/vY anVStCtWIU3P6Yi+SysDL8fh34mUiwtQPDYU5GFbPNTWYhIo6wRuZmyJDNixtHvt cajvBt5L90h7xhu5o7FNDyZh3ppe4e6QNM9G6bEicZ9PcckuXn2e3uWGyeUOcRJD ntPhm4pntcOiyRytLgYabfjc+S7WoQxs63A+CpPfo1uWSAcsyjyXsnAx/XxtN9UC CS3Df0GV0tA0roYAfJoult3ubjyX+RPm8yCofMBdLY89OuMvn5t0NGYs4MUCtJWS jeQu6ssjSboiIxp5ge6jo8I/CQHV+ZES3gmuZSq7MaocDq0+7q9l+qSVZRJ35rEV PungqrQdZNLb/nven+FlRFC8E/nhrzTIptfKD3baTDSjy/uu/alLBMldyJsfLDhP e9HfCBVnpKUBEeDbEkuc8h7wFiqe75qIvrYUeX+JqNhczUYfh7Dsct4xSp9xIwmA TaLd7KyqCoJbwvWHYud8Z4DlRC/wuITHvTbR/R8/dCCKy1feMgQb9nTwFMsV6o0o 4xk6yFPmM0hEA4fIXvNoDO1r66Ql3x0S11Dn8/8MI7vRhZK/1g5qLw1FYaMPKGeJ zFBMVwXJwh8hDgiEDJCM =A11n -----END PGP SIGNATURE-----

6 years, 10 months

2
1
0 0

Patch "ARM: dts: Adjust moxart IRQ controller and flags" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: dts: Adjust moxart IRQ controller and flags to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: arm-dts-adjust-moxart-irq-controller-and-flags.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Linus Walleij <linus.walleij(a)linaro.org> Date: Sat, 18 Mar 2017 17:40:01 +0100 Subject: ARM: dts: Adjust moxart IRQ controller and flags From: Linus Walleij <linus.walleij(a)linaro.org> [ Upstream commit c2a736b698008d296c5010ec39077eeb5796109f ] The moxart interrupt line flags were not respected in previous driver: instead of assigning them per-consumer, a fixes mask was set in the controller. With the migration to a standard Faraday driver we need to set up and handle the consumer flags correctly. Also remove the Moxart-specific flags when switching to using real consumer flags. Extend the register window to 0x100 bytes as we may have a few more registers in there and it doesn't hurt. Tested-by: Jonas Jensen <jonas.jensen(a)gmail.com> Signed-off-by: Jonas Jensen <jonas.jensen(a)gmail.com> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> Signed-off-by: Olof Johansson <olof(a)lixom.net> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -6,7 +6,7 @@ */ /dts-v1/; -/include/ "moxart.dtsi" +#include "moxart.dtsi" / { model = "MOXA UC-7112-LX"; --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -6,6 +6,7 @@ */ /include/ "skeleton.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { compatible = "moxa,moxart"; @@ -36,8 +37,8 @@ ranges; intc: interrupt-controller@98800000 { - compatible = "moxa,moxart-ic"; - reg = <0x98800000 0x38>; + compatible = "moxa,moxart-ic", "faraday,ftintc010"; + reg = <0x98800000 0x100>; interrupt-controller; #interrupt-cells = <2>; interrupt-mask = <0x00080000>; @@ -59,7 +60,7 @@ timer: timer@98400000 { compatible = "moxa,moxart-timer"; reg = <0x98400000 0x42>; - interrupts = <19 1>; + interrupts = <19 IRQ_TYPE_EDGE_FALLING>; clocks = <&clk_apb>; }; @@ -80,7 +81,7 @@ dma: dma@90500000 { compatible = "moxa,moxart-dma"; reg = <0x90500080 0x40>; - interrupts = <24 0>; + interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; #dma-cells = <1>; }; @@ -93,7 +94,7 @@ sdhci: sdhci@98e00000 { compatible = "moxa,moxart-sdhci"; reg = <0x98e00000 0x5C>; - interrupts = <5 0>; + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk_apb>; dmas = <&dma 5>, <&dma 5>; @@ -120,7 +121,7 @@ mac0: mac@90900000 { compatible = "moxa,moxart-mac"; reg = <0x90900000 0x90>; - interrupts = <25 0>; + interrupts = <25 IRQ_TYPE_LEVEL_HIGH>; phy-handle = <&ethphy0>; phy-mode = "mii"; status = "disabled"; @@ -129,7 +130,7 @@ mac1: mac@92000000 { compatible = "moxa,moxart-mac"; reg = <0x92000000 0x90>; - interrupts = <27 0>; + interrupts = <27 IRQ_TYPE_LEVEL_HIGH>; phy-handle = <&ethphy1>; phy-mode = "mii"; status = "disabled"; @@ -138,7 +139,7 @@ uart0: uart@98200000 { compatible = "ns16550a"; reg = <0x98200000 0x20>; - interrupts = <31 8>; + interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>; clock-frequency = <14745600>; Patches currently in stable-queue which might be from linus.walleij(a)linaro.org are queue-4.9/arm-dts-adjust-moxart-irq-controller-and-flags.patch queue-4.9/leds-pm8058-silence-pointer-to-integer-size-warning.patch queue-4.9/pwm-stmpe-fix-wrong-register-offset-for-hwpwm-2-case.patch

6 years, 10 months

1
0
0 0

Patch "ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Roger Quadros <rogerq(a)ti.com> Date: Mon, 13 Mar 2017 13:53:16 +0200 Subject: ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss From: Roger Quadros <rogerq(a)ti.com> [ Upstream commit e2d54fe76997301b49311bde7ba8ef52b47896f9 ] It seems that if L3_INIT clkdomain is kept in HW_AUTO while usb_otg_ss is in use then there are random chances that the usb_otg_ss module will fail to completely idle. i.e. IDLEST = 0x2 instead of 0x3. Preventing L3_INIT from HW_AUTO while usb_otg_ss module is in use fixes this issue. We don't know yet if usb_otg_ss instances 3 and 4 are affected by this issue or not so don't add this flag for those instances. Cc: Tero Kristo <t-kristo(a)ti.com> Signed-off-by: Roger Quadros <rogerq(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -2572,6 +2572,7 @@ static struct omap_hwmod dra7xx_usb_otg_ .class = &dra7xx_usb_otg_ss_hwmod_class, .clkdm_name = "l3init_clkdm", .main_clk = "dpll_core_h13x2_ck", + .flags = HWMOD_CLKDM_NOAUTO, .prcm = { .omap4 = { .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET, @@ -2593,6 +2594,7 @@ static struct omap_hwmod dra7xx_usb_otg_ .class = &dra7xx_usb_otg_ss_hwmod_class, .clkdm_name = "l3init_clkdm", .main_clk = "dpll_core_h13x2_ck", + .flags = HWMOD_CLKDM_NOAUTO, .prcm = { .omap4 = { .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET, Patches currently in stable-queue which might be from rogerq(a)ti.com are queue-4.9/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch

6 years, 10 months

1
0
0 0

Patch "ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: arm-brcmstb-enable-zone_dma-for-non-64-bit-capable-peripherals.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Al Cooper <alcooperx(a)gmail.com> Date: Thu, 9 Mar 2017 10:51:18 -0800 Subject: ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals From: Al Cooper <alcooperx(a)gmail.com> [ Upstream commit 3c51b9c7f1fae00c25f1e34da649a288e3fea1ae ] Some Host Controller hardware blocks, like the OHCI, EHCI and SDIO controllers, have hardware blocks that are not capable of doing 64 bit DMA. These host controllers fail on boards with >3GB of memory because the memory above 3GB is located physically >= 0x100000000 and can only be accessed using 64 DMA. The way Linux is currently configured for BRCMSTB systems, the memory given to drivers for DMA through functions like dma_alloc_coherent() comes from CMA memory and CMA memory is taken from the top of physical memory. When these drivers get a DMA buffer with an address >=0x100000000, they end up dropping the upper 32 bit of the address causing the hardware to DMA to incorrect memory, typically BMEM (custom memory carveout). This issue was discovered on a BCM97449SSV_DDR4 system with 4GB or memory. The fix is to enable CONFIG_ZONE_DMA. On ARM systems this makes sure that all DMA memory is located within the first 32 bits of address space. Signed-off-by: Al Cooper <alcooperx(a)gmail.com> Signed-off-by: Florian Fainelli <f.fainelli(a)gmail.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/mach-bcm/Kconfig | 1 + 1 file changed, 1 insertion(+) --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -199,6 +199,7 @@ config ARCH_BRCMSTB select BRCMSTB_L2_IRQ select BCM7120_L2_IRQ select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE + select ZONE_DMA if ARM_LPAE select SOC_BRCMSTB select SOC_BUS help Patches currently in stable-queue which might be from alcooperx(a)gmail.com are queue-4.9/arm-brcmstb-enable-zone_dma-for-non-64-bit-capable-peripherals.patch

6 years, 10 months

1
0
0 0

Patch "ARM: bcm2835: Enable missing CMA settings for VC4 driver" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: bcm2835: Enable missing CMA settings for VC4 driver to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: arm-bcm2835-enable-missing-cma-settings-for-vc4-driver.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Stefan Wahren <stefan.wahren(a)i2se.com> Date: Sat, 4 Mar 2017 09:43:51 +0000 Subject: ARM: bcm2835: Enable missing CMA settings for VC4 driver From: Stefan Wahren <stefan.wahren(a)i2se.com> [ Upstream commit bdd3c25423cb42171446940bca0946e0443e1a84 ] Currently bcm2835_defconfig has CMA disabled which makes the HDMI output on a Raspberry Pi 1 stop working during boot: fb: switching to vc4drmfb from simple Console: switching to colour dummy device 80x30 [drm] Initialized vc4 0.0.0 20140616 for soc:gpu on minor 0 [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [drm] Driver supports precise vblank timestamp query. vc4-drm soc:gpu: failed to allocate buffer with size 9216000 vc4-drm soc:gpu: Failed to set initial hw configuration. So enable CMA and DMA_CMA in bcm2835_defconfig. Signed-off-by: Stefan Wahren <stefan.wahren(a)i2se.com> Fixes: 4400d9ac05ee ("ARM: bcm2835: Enable the VC4 graphics driver in the defconfig") Reviewed-by: Eric Anholt <eric(a)anholt.net> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/configs/bcm2835_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -1,6 +1,5 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y -CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BSD_PROCESS_ACCT=y @@ -32,6 +31,7 @@ CONFIG_PREEMPT_VOLUNTARY=y CONFIG_AEABI=y CONFIG_KSM=y CONFIG_CLEANCACHE=y +CONFIG_CMA=y CONFIG_SECCOMP=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y @@ -52,6 +52,7 @@ CONFIG_MAC80211=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set +CONFIG_DMA_CMA=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_CONSTANTS=y @@ -62,7 +63,6 @@ CONFIG_USB_NET_SMSC95XX=y CONFIG_ZD1211RW=y CONFIG_INPUT_EVDEV=y # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_TTY_PRINTK=y Patches currently in stable-queue which might be from stefan.wahren(a)i2se.com are queue-4.9/arm-bcm2835-enable-missing-cma-settings-for-vc4-driver.patch

6 years, 10 months

1
0
0 0

Patch "apparmor: Make path_max parameter readonly" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled apparmor: Make path_max parameter readonly to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: apparmor-make-path_max-parameter-readonly.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: John Johansen <john.johansen(a)canonical.com> Date: Thu, 6 Apr 2017 06:55:24 -0700 Subject: apparmor: Make path_max parameter readonly From: John Johansen <john.johansen(a)canonical.com> [ Upstream commit 622f6e3265707ebf02ba776ac6e68003bcc31213 ] The path_max parameter determines the max size of buffers allocated but it should not be setable at run time. If can be used to cause an oops root@ubuntu:~# echo 16777216 > /sys/module/apparmor/parameters/path_max root@ubuntu:~# cat /sys/module/apparmor/parameters/path_max Killed [ 122.141911] BUG: unable to handle kernel paging request at ffff880080945fff [ 122.143497] IP: [<ffffffff81228844>] d_absolute_path+0x44/0xa0 [ 122.144742] PGD 220c067 PUD 0 [ 122.145453] Oops: 0002 [#1] SMP [ 122.146204] Modules linked in: vmw_vsock_vmci_transport vsock ppdev vmw_balloon snd_ens1371 btusb snd_ac97_codec gameport snd_rawmidi btrtl snd_seq_device ac97_bus btbcm btintel snd_pcm input_leds bluetooth snd_timer snd joydev soundcore serio_raw coretemp shpchp nfit parport_pc i2c_piix4 8250_fintek vmw_vmci parport mac_hid ib_iser rdma_cm iw_cm ib_cm ib_sa ib_mad ib_core ib_addr iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi autofs4 btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c raid1 raid0 multipath linear hid_generic usbhid hid crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd vmwgfx psmouse mptspi ttm mptscsih drm_kms_helper mptbase syscopyarea scsi_transport_spi sysfillrect [ 122.163365] ahci sysimgblt e1000 fb_sys_fops libahci drm pata_acpi fjes [ 122.164747] CPU: 3 PID: 1501 Comm: bash Not tainted 4.4.0-59-generic #80-Ubuntu [ 122.166250] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/02/2015 [ 122.168611] task: ffff88003496aa00 ti: ffff880076474000 task.ti: ffff880076474000 [ 122.170018] RIP: 0010:[<ffffffff81228844>] [<ffffffff81228844>] d_absolute_path+0x44/0xa0 [ 122.171525] RSP: 0018:ffff880076477b90 EFLAGS: 00010206 [ 122.172462] RAX: ffff880080945fff RBX: 0000000000000000 RCX: 0000000001000000 [ 122.173709] RDX: 0000000000ffffff RSI: ffff880080946000 RDI: ffff8800348a1010 [ 122.174978] RBP: ffff880076477bb8 R08: ffff880076477c80 R09: 0000000000000000 [ 122.176227] R10: 00007ffffffff000 R11: ffff88007f946000 R12: ffff88007f946000 [ 122.177496] R13: ffff880076477c80 R14: ffff8800348a1010 R15: ffff8800348a2400 [ 122.178745] FS: 00007fd459eb4700(0000) GS:ffff88007b6c0000(0000) knlGS:0000000000000000 [ 122.180176] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 122.181186] CR2: ffff880080945fff CR3: 0000000073422000 CR4: 00000000001406e0 [ 122.182469] Stack: [ 122.182843] 00ffffff00000001 ffff880080946000 0000000000000000 0000000000000000 [ 122.184409] 00000000570f789c ffff880076477c30 ffffffff81385671 ffff88007a2e7a58 [ 122.185810] 0000000000000000 ffff880076477c88 01000000008a1000 0000000000000000 [ 122.187231] Call Trace: [ 122.187680] [<ffffffff81385671>] aa_path_name+0x81/0x370 [ 122.188637] [<ffffffff813875dd>] profile_transition+0xbd/0xb80 [ 122.190181] [<ffffffff811af9bc>] ? zone_statistics+0x7c/0xa0 [ 122.191674] [<ffffffff81389b20>] apparmor_bprm_set_creds+0x9b0/0xac0 [ 122.193288] [<ffffffff812e1971>] ? ext4_xattr_get+0x81/0x220 [ 122.194793] [<ffffffff812e800c>] ? ext4_xattr_security_get+0x1c/0x30 [ 122.196392] [<ffffffff813449b9>] ? get_vfs_caps_from_disk+0x69/0x110 [ 122.198004] [<ffffffff81232d4f>] ? mnt_may_suid+0x3f/0x50 [ 122.199737] [<ffffffff81344b03>] ? cap_bprm_set_creds+0xa3/0x600 [ 122.201377] [<ffffffff81346e53>] security_bprm_set_creds+0x33/0x50 [ 122.203024] [<ffffffff81214ce5>] prepare_binprm+0x85/0x190 [ 122.204515] [<ffffffff81216545>] do_execveat_common.isra.33+0x485/0x710 [ 122.206200] [<ffffffff81216a6a>] SyS_execve+0x3a/0x50 [ 122.207615] [<ffffffff81838795>] stub_execve+0x5/0x5 [ 122.208978] [<ffffffff818384f2>] ? entry_SYSCALL_64_fastpath+0x16/0x71 [ 122.210615] Code: f8 31 c0 48 63 c2 83 ea 01 48 c7 45 e8 00 00 00 00 48 01 c6 85 d2 48 c7 45 f0 00 00 00 00 48 89 75 e0 89 55 dc 78 0c 48 8d 46 ff <c6> 46 ff 00 48 89 45 e0 48 8d 55 e0 48 8d 4d dc 48 8d 75 e8 e8 [ 122.217320] RIP [<ffffffff81228844>] d_absolute_path+0x44/0xa0 [ 122.218860] RSP <ffff880076477b90> [ 122.219919] CR2: ffff880080945fff [ 122.220936] ---[ end trace 506cdbd85eb6c55e ]--- Reported-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Signed-off-by: John Johansen <john.johansen(a)canonical.com> Signed-off-by: James Morris <james.l.morris(a)oracle.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- security/apparmor/lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -707,7 +707,7 @@ module_param_named(logsyscall, aa_g_logs /* Maximum pathname length before accesses will start getting rejected */ unsigned int aa_g_path_max = 2 * PATH_MAX; -module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR | S_IWUSR); +module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR); /* Determines how paranoid loading of policy is and how much verification * on the loaded policy is done. Patches currently in stable-queue which might be from john.johansen(a)canonical.com are queue-4.9/apparmor-make-path_max-parameter-readonly.patch

6 years, 10 months

1
0
0 0

Patch "ALSA: hda: Add Geminilake id to SKL_PLUS" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ALSA: hda: Add Geminilake id to SKL_PLUS to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: alsa-hda-add-geminilake-id-to-skl_plus.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> Date: Wed, 12 Apr 2017 09:54:00 +0530 Subject: ALSA: hda: Add Geminilake id to SKL_PLUS From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> [ Upstream commit 12ee4022f67f8854061b46e5c0a7ad6258ab66c2 ] Geminilake is Skylake family platform. So add it's id to skl_plus check. Fixes: 126cfa2f5e15 ("ALSA: hda: Add Geminilake HDMI codec ID") Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Cc: Senthilnathan Veppur <senthilnathanx.veppur(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/pci/hda/hda_intel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -369,8 +369,10 @@ enum { #define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71) #define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0) #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) +#define IS_GLK(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x3198) #define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \ - IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci) + IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci) || \ + IS_GLK(pci) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", Patches currently in stable-queue which might be from subhransu.s.prusty(a)intel.com are queue-4.9/alsa-hda-add-geminilake-id-to-skl_plus.patch

6 years, 10 months

1
0
0 0

Patch "ALSA: firewire-lib: add a quirk of packet without valid EOH in CIP format" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ALSA: firewire-lib: add a quirk of packet without valid EOH in CIP format to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: alsa-firewire-lib-add-a-quirk-of-packet-without-valid-eoh-in-cip-format.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Date: Wed, 22 Mar 2017 21:30:27 +0900 Subject: ALSA: firewire-lib: add a quirk of packet without valid EOH in CIP format From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit 2128f78f75a36a34dfef0e127273c2f820c5c904 ] In IEC 61883-1, when two quadlets CIP header is used, the most significant bit in second CIP header stands. However, packets from units with MOTU protocol version 3 have a quirk without this flag. Current packet streaming layer handles this as protocol error. This commit adds a new enumeration constant for this quirk, to handle MOTU protocol version 3. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/firewire/amdtp-stream.c | 5 +++-- sound/firewire/amdtp-stream.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -471,8 +471,9 @@ static int handle_in_packet(struct amdtp * This module supports 'Two-quadlet CIP header with SYT field'. * For convenience, also check FMT field is AM824 or not. */ - if (((cip_header[0] & CIP_EOH_MASK) == CIP_EOH) || - ((cip_header[1] & CIP_EOH_MASK) != CIP_EOH)) { + if ((((cip_header[0] & CIP_EOH_MASK) == CIP_EOH) || + ((cip_header[1] & CIP_EOH_MASK) != CIP_EOH)) && + (!(s->flags & CIP_HEADER_WITHOUT_EOH))) { dev_info_ratelimited(&s->unit->device, "Invalid CIP header for AMDTP: %08X:%08X\n", cip_header[0], cip_header[1]); --- a/sound/firewire/amdtp-stream.h +++ b/sound/firewire/amdtp-stream.h @@ -29,6 +29,8 @@ * @CIP_JUMBO_PAYLOAD: Only for in-stream. The number of data blocks in an * packet is larger than IEC 61883-6 defines. Current implementation * allows 5 times as large as IEC 61883-6 defines. + * @CIP_HEADER_WITHOUT_EOH: Only for in-stream. CIP Header doesn't include + * valid EOH. */ enum cip_flags { CIP_NONBLOCKING = 0x00, @@ -39,6 +41,7 @@ enum cip_flags { CIP_SKIP_DBC_ZERO_CHECK = 0x10, CIP_EMPTY_HAS_WRONG_DBC = 0x20, CIP_JUMBO_PAYLOAD = 0x40, + CIP_HEADER_WITHOUT_EOH = 0x80, }; /** Patches currently in stable-queue which might be from o-takashi(a)sakamocchi.jp are queue-4.9/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch queue-4.9/alsa-firewire-digi00x-add-support-for-console-models-of-digi00x-series.patch queue-4.9/alsa-firewire-lib-add-a-quirk-of-packet-without-valid-eoh-in-cip-format.patch

6 years, 10 months

1
0
0 0

Patch "ALSA: firewire-digi00x: handle all MIDI messages on streaming packets" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ALSA: firewire-digi00x: handle all MIDI messages on streaming packets to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Date: Sun, 2 Apr 2017 23:48:25 +0900 Subject: ALSA: firewire-digi00x: handle all MIDI messages on streaming packets From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit 8820a4cf0cb4cd5c6540a9a18b2cedbdfd5a6891 ] At a commit 9dc5d31cdceb ("ALSA: firewire-digi00x: handle MIDI messages in isochronous packets"), a functionality to handle MIDI messages on isochronous packet was supported. But this includes some of my misunderstanding. This commit is to fix them. For digi00x series, first data channel of data blocks in rx/tx packet includes MIDI messages. The data channel has 0x80 in 8 bit of its MSB, however it's against IEC 61883-6. Unique data format is applied: - Upper 4 bits of LSB represent port number. - 0x0: port 1. - 0x2: port 2. - 0xe: console port. - Lower 4 bits of LSB represent the number of included MIDI message bytes; 0x0/0x1/0x2. - Two bytes of middle of this data channel have MIDI bytes. Especially, MIDI messages from/to console surface are also transferred by isochronous packets, as well as physical MIDI ports. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/firewire/digi00x/amdtp-dot.c | 53 +++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 17 deletions(-) --- a/sound/firewire/digi00x/amdtp-dot.c +++ b/sound/firewire/digi00x/amdtp-dot.c @@ -28,6 +28,9 @@ */ #define MAX_MIDI_RX_BLOCKS 8 +/* 3 = MAX(DOT_MIDI_IN_PORTS, DOT_MIDI_OUT_PORTS) + 1. */ +#define MAX_MIDI_PORTS 3 + /* * The double-oh-three algorithm was discovered by Robin Gareus and Damien * Zammit in 2012, with reverse-engineering for Digi 003 Rack. @@ -42,10 +45,8 @@ struct amdtp_dot { unsigned int pcm_channels; struct dot_state state; - unsigned int midi_ports; - /* 2 = MAX(DOT_MIDI_IN_PORTS, DOT_MIDI_OUT_PORTS) */ - struct snd_rawmidi_substream *midi[2]; - int midi_fifo_used[2]; + struct snd_rawmidi_substream *midi[MAX_MIDI_PORTS]; + int midi_fifo_used[MAX_MIDI_PORTS]; int midi_fifo_limit; void (*transfer_samples)(struct amdtp_stream *s, @@ -124,8 +125,8 @@ int amdtp_dot_set_parameters(struct amdt return -EBUSY; /* - * A first data channel is for MIDI conformant data channel, the rest is - * Multi Bit Linear Audio data channel. + * A first data channel is for MIDI messages, the rest is Multi Bit + * Linear Audio data channel. */ err = amdtp_stream_set_parameters(s, rate, pcm_channels + 1); if (err < 0) @@ -135,11 +136,6 @@ int amdtp_dot_set_parameters(struct amdt p->pcm_channels = pcm_channels; - if (s->direction == AMDTP_IN_STREAM) - p->midi_ports = DOT_MIDI_IN_PORTS; - else - p->midi_ports = DOT_MIDI_OUT_PORTS; - /* * We do not know the actual MIDI FIFO size of most devices. Just * assume two bytes, i.e., one byte can be received over the bus while @@ -281,13 +277,25 @@ static void write_midi_messages(struct a b = (u8 *)&buffer[0]; len = 0; - if (port < p->midi_ports && + if (port < MAX_MIDI_PORTS && midi_ratelimit_per_packet(s, port) && p->midi[port] != NULL) len = snd_rawmidi_transmit(p->midi[port], b + 1, 2); if (len > 0) { - b[3] = (0x10 << port) | len; + /* + * Upper 4 bits of LSB represent port number. + * - 0000b: physical MIDI port 1. + * - 0010b: physical MIDI port 2. + * - 1110b: console MIDI port. + */ + if (port == 2) + b[3] = 0xe0; + else if (port == 1) + b[3] = 0x20; + else + b[3] = 0x00; + b[3] |= len; midi_use_bytes(s, port, len); } else { b[1] = 0; @@ -309,11 +317,22 @@ static void read_midi_messages(struct am for (f = 0; f < data_blocks; f++) { b = (u8 *)&buffer[0]; - port = b[3] >> 4; + len = b[3] & 0x0f; + if (len > 0) { + /* + * Upper 4 bits of LSB represent port number. + * - 0000b: physical MIDI port 1. Use port 0. + * - 1110b: console MIDI port. Use port 2. + */ + if (b[3] >> 4 > 0) + port = 2; + else + port = 0; - if (port < p->midi_ports && p->midi[port] && len > 0) - snd_rawmidi_receive(p->midi[port], b + 1, len); + if (port < MAX_MIDI_PORTS && p->midi[port]) + snd_rawmidi_receive(p->midi[port], b + 1, len); + } buffer += s->data_block_quadlets; } @@ -364,7 +383,7 @@ void amdtp_dot_midi_trigger(struct amdtp { struct amdtp_dot *p = s->protocol; - if (port < p->midi_ports) + if (port < MAX_MIDI_PORTS) ACCESS_ONCE(p->midi[port]) = midi; } Patches currently in stable-queue which might be from o-takashi(a)sakamocchi.jp are queue-4.9/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch queue-4.9/alsa-firewire-digi00x-add-support-for-console-models-of-digi00x-series.patch queue-4.9/alsa-firewire-lib-add-a-quirk-of-packet-without-valid-eoh-in-cip-format.patch

6 years, 10 months

1
0
0 0

Patch "ALSA: firewire-digi00x: add support for console models of Digi00x series" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ALSA: firewire-digi00x: add support for console models of Digi00x series to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: alsa-firewire-digi00x-add-support-for-console-models-of-digi00x-series.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Sun Mar 18 16:55:33 CET 2018 From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Date: Sun, 2 Apr 2017 23:48:24 +0900 Subject: ALSA: firewire-digi00x: add support for console models of Digi00x series From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit 13e005f9f933a35b5e55c9d36f151efe2a8383ec ] Digi00x series includes two types of unit; rack and console. As long as reading information on config rom of Digi 002 console, 'MODEL_ID' field has a different value from the one on Digi 002 rack. We've already got a test report from users with Digi 003 rack. We can assume that console type and rack type has different value in the field. This commit adds a device entry for console type. For following commits, this commit also adds a member to 'struct snd_digi00x' to identify console type. $ cd linux-firewire-utils/src $ python2 ./crpp < /sys/bus/firewire/devices/fw1/config_rom ROM header and bus information block ----------------------------------------------------------------- 400 0404f9d0 bus_info_length 4, crc_length 4, crc 63952 404 31333934 bus_name "1394" 408 60647002 irmc 0, cmc 1, isc 1, bmc 0, cyc_clk_acc 100, max_rec 7 (256) 40c 00a07e00 company_id 00a07e | 410 00a30000 device_id 0000a30000 | EUI-64 00a07e0000a30000 root directory ----------------------------------------------------------------- 414 00058a39 directory_length 5, crc 35385 418 0c0043a0 node capabilities 41c 04000001 hardware version 420 0300a07e vendor 424 81000007 --> descriptor leaf at 440 428 d1000001 --> unit directory at 42c unit directory at 42c ----------------------------------------------------------------- 42c 00046674 directory_length 4, crc 26228 430 120000a3 specifier id 434 13000001 version 438 17000001 model 43c 81000007 --> descriptor leaf at 458 descriptor leaf at 440 ----------------------------------------------------------------- 440 00055913 leaf_length 5, crc 22803 444 000050f2 descriptor_type 00, specifier_ID 50f2 448 80000000 44c 44696769 450 64657369 454 676e0000 descriptor leaf at 458 ----------------------------------------------------------------- 458 0004a6fd leaf_length 4, crc 42749 45c 00000000 textual descriptor 460 00000000 minimal ASCII 464 44696769 "Digi" 468 20303032 " 002" Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/firewire/digi00x/digi00x.c | 13 +++++++++++-- sound/firewire/digi00x/digi00x.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) --- a/sound/firewire/digi00x/digi00x.c +++ b/sound/firewire/digi00x/digi00x.c @@ -13,7 +13,8 @@ MODULE_AUTHOR("Takashi Sakamoto <o-takas MODULE_LICENSE("GPL v2"); #define VENDOR_DIGIDESIGN 0x00a07e -#define MODEL_DIGI00X 0x000002 +#define MODEL_CONSOLE 0x000001 +#define MODEL_RACK 0x000002 static int name_card(struct snd_dg00x *dg00x) { @@ -129,6 +130,8 @@ static int snd_dg00x_probe(struct fw_uni spin_lock_init(&dg00x->lock); init_waitqueue_head(&dg00x->hwdep_wait); + dg00x->is_console = entry->model_id == MODEL_CONSOLE; + /* Allocate and register this sound card later. */ INIT_DEFERRABLE_WORK(&dg00x->dwork, do_registration); snd_fw_schedule_registration(unit, &dg00x->dwork); @@ -183,7 +186,13 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID, .vendor_id = VENDOR_DIGIDESIGN, - .model_id = MODEL_DIGI00X, + .model_id = MODEL_CONSOLE, + }, + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_MODEL_ID, + .vendor_id = VENDOR_DIGIDESIGN, + .model_id = MODEL_RACK, }, {} }; --- a/sound/firewire/digi00x/digi00x.h +++ b/sound/firewire/digi00x/digi00x.h @@ -60,6 +60,7 @@ struct snd_dg00x { /* For asynchronous MIDI controls. */ struct snd_rawmidi_substream *in_control; struct snd_fw_async_midi_port out_control; + bool is_console; }; #define DG00X_ADDR_BASE 0xffffe0000000ull Patches currently in stable-queue which might be from o-takashi(a)sakamocchi.jp are queue-4.9/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch queue-4.9/alsa-firewire-digi00x-add-support-for-console-models-of-digi00x-series.patch queue-4.9/alsa-firewire-lib-add-a-quirk-of-packet-without-valid-eoh-in-cip-format.patch

6 years, 10 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror March 2018