5.0.15-stable review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 5.0.15-stable review
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.0.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.0.15-rc1
Will Deacon <[email protected]>
arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
Will Deacon <[email protected]>
locking/futex: Allow low-level atomic operations to return -EAGAIN
Dan Carpenter <[email protected]>
i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()
Ross Zwisler <[email protected]>
ASoC: Intel: avoid Oops if DMA setup fails
Oliver Neukum <[email protected]>
UAS: fix alignment of scatter/gather segments
Chen-Yu Tsai <[email protected]>
Bluetooth: hci_bcm: Fix empty regulator supplies for Intel Macs
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix not initializing L2CAP tx_credits
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Young Xiao <[email protected]>
Bluetooth: hidp: fix buffer overflow
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix device staying in blocked state
Andrew Vasquez <[email protected]>
scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
Silvio Cesare <[email protected]>
scsi: lpfc: change snprintf to scnprintf for possible overflow
Samuel Holland <[email protected]>
soc: sunxi: Fix missing dependency on REGMAP_MMIO
Hans de Goede <[email protected]>
ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
Gregory CLEMENT <[email protected]>
cpufreq: armada-37xx: fix frequency calculation for opp
Bjorn Andersson <[email protected]>
iio: adc: qcom-spmi-adc5: Fix of-based module autoloading
Alexander Shishkin <[email protected]>
intel_th: pci: Add Comet Lake support
Alan Stern <[email protected]>
usb-storage: Set virt_boundary_mask to avoid SG overflows
Johan Hovold <[email protected]>
USB: cdc-acm: fix unthrottle races
Ji-Ze Hong (Peter Hong) <[email protected]>
USB: serial: f81232: fix interrupt worker not stop
Thinh Nguyen <[email protected]>
usb: dwc3: Fix default lpm_nyet_threshold value
Marc Gonzalez <[email protected]>
usb: dwc3: Allow building USB_DWC3_QCOM without EXTCON
Prasad Sodagudi <[email protected]>
genirq: Prevent use-after-free and work list corruption
Joerg Roedel <[email protected]>
iommu/amd: Set exclusion range correctly
Peter Zijlstra <[email protected]>
perf/core: Fix perf_event_disable_inatomic() race
Olga Kornievskaia <[email protected]>
NFSv4.1 fix incorrect return value in copy_file_range
Stephen Boyd <[email protected]>
platform/x86: pmc_atom: Drop __initconst on dmi table
Keith Busch <[email protected]>
nvmet: fix discover log page when offsets are used
James Smart <[email protected]>
nvme-fc: correct csn initialization and increments on error
Ming Lei <[email protected]>
nvme: cancel request synchronously
Ming Lei <[email protected]>
blk-mq: introduce blk_mq_complete_request_sync()
Dongli Zhang <[email protected]>
virtio-blk: limit number of hw queues by nr_cpu_ids
Takashi Iwai <[email protected]>
ALSA: hda: Fix racy display power access
Olivier Moysan <[email protected]>
ASoC: stm32: sai: fix master clock management
Tzung-Bi Shih <[email protected]>
ASoC: Intel: kbl: fix wrong number of channels
Wangyan Wang <[email protected]>
drm/mediatek: no change parent rate in round_rate() for MT2701 hdmi phy
Wangyan Wang <[email protected]>
drm/mediatek: using new factor for tvdpll for MT2701 hdmi phy
Wangyan Wang <[email protected]>
drm/mediatek: remove flag CLK_SET_RATE_PARENT for MT2701 hdmi phy
Wangyan Wang <[email protected]>
drm/mediatek: make implementation of recalc_rate() for MT2701 hdmi phy
Wangyan Wang <[email protected]>
drm/mediatek: fix the rate and divder of hdmi phy for MT2701
Wen Yang <[email protected]>
drm/mediatek: fix possible object reference leak
Varun Prakash <[email protected]>
scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
[email protected] <[email protected]>
KEYS: trusted: fix -Wvarags warning
Lijun Ou <[email protected]>
RDMA/hns: Fix bug that caused srq creation to fail
Kamal Heib <[email protected]>
RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
Longpeng <[email protected]>
virtio_pci: fix a NULL pointer reference in vp_del_vqs
Ondrej Jirman <[email protected]>
drm/sun4i: tcon top: Fix NULL/invalid pointer dereference in sun8i_tcon_top_un/bind
Qian Cai <[email protected]>
slab: fix a crash by reading /proc/slab_allocators
Josh Poimboeuf <[email protected]>
objtool: Add rewind_stack_do_exit() to the noreturn list
Charles Keepax <[email protected]>
ASoC: cs35l35: Disable regulators on driver removal
tiancyin <[email protected]>
drm/amd/display: fix cursor black issue
wentalou <[email protected]>
drm/amdgpu: amdgpu_device_recover_vram always failed if only one node in shadow_list
shaoyunl <[email protected]>
drm/amdgpu: Adjust IB test timeout for XGMI configuration
Alex Deucher <[email protected]>
drm/amdkfd: Add picasso pci id
Sugar Zhang <[email protected]>
ASoC: rockchip: pdm: fix regmap_ops hang issue
Max Filippov <[email protected]>
xtensa: fix initialization of pt_regs::syscall in start_thread
YueHaibing <[email protected]>
iov_iter: Fix build error without CONFIG_CRYPTO
Jann Horn <[email protected]>
linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
Peter Zijlstra <[email protected]>
perf/x86/intel: Initialize TFA MSR
Stephane Eranian <[email protected]>
perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
Dan Carpenter <[email protected]>
drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
Annaliese McDermond <[email protected]>
ASoC: tlv320aic32x4: Fix Common Pins
Chong Qiao <[email protected]>
MIPS: KGDB: fix kgdb support for SMP platforms.
Kaike Wan <[email protected]>
IB/hfi1: Fix the allocation of RSM table
Kaike Wan <[email protected]>
IB/hfi1: Eliminate opcode tests on mr deref
Kaike Wan <[email protected]>
IB/hfi1: Clear the IOWAIT pending bits when QP is put into error state
Tony Lindgren <[email protected]>
drm/omap: hdmi4_cec: Fix CEC clock handling for PM
Pankaj Bharadiya <[email protected]>
ASoC: dapm: Fix NULL pointer dereference in snd_soc_dapm_free_kcontrol
Daniel Mack <[email protected]>
ASoC: cs4270: Set auto-increment bit for register writes
Olivier Moysan <[email protected]>
ASoC: stm32: dfsdm: fix debugfs warnings on entry creation
Olivier Moysan <[email protected]>
ASoC: stm32: dfsdm: manage multiple prepare
Maxime Jourdan <[email protected]>
clk: meson-gxbb: round the vdec dividers to closest
Charles Keepax <[email protected]>
ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
Shuming Fan <[email protected]>
ASoC: rt5682: recording has no sound after booting
Shuming Fan <[email protected]>
ASoC: rt5682: fix jack type detection issue
Shuming Fan <[email protected]>
ASoC: rt5682: Check JD status when system resume
Sylwester Nawrocki <[email protected]>
ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
John Hsu <[email protected]>
ASoC: nau8810: fix the issue of widget with prefixed name
John Hsu <[email protected]>
ASoC: nau8824: fix the issue of the widget with prefix name
KaiChieh Chuang <[email protected]>
ASoC: dpcm: prevent snd_soc_dpcm use after free
Rander Wang <[email protected]>
ASoC:intel:skl:fix a simultaneous playback & capture issue on hda platform
Rander Wang <[email protected]>
ASoC:hdac_hda:use correct format to setup hda codec
Rander Wang <[email protected]>
ASoC:soc-pcm:fix a codec fixup issue in TDM case
Olivier Moysan <[email protected]>
ASoC: stm32: sai: fix race condition in irq handler
Olivier Moysan <[email protected]>
ASoC: stm32: sai: fix exposed capabilities in spdif mode
Olivier Moysan <[email protected]>
ASoC: stm32: sai: fix iec958 controls indexation
Russell King <[email protected]>
ASoC: hdmi-codec: fix S/PDIF DAI
Philipp Puschmann <[email protected]>
ASoC: tlv320aic3x: fix reset gpio reference counting
Christian Gromm <[email protected]>
staging: most: sound: pass correct device when creating a sound card
Suresh Udipi <[email protected]>
staging: most: cdev: fix chrdev_region leak in mod_exit
Tetsuo Handa <[email protected]>
staging: wilc1000: Avoid GFP_KERNEL allocation from atomic context.
Johan Hovold <[email protected]>
staging: greybus: power_supply: fix prop-descriptor request size
Andrey Ryabinin <[email protected]>
ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
Dexuan Cui <[email protected]>
Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
YueHaibing <[email protected]>
net: stmmac: Use bfsize1 in ndesc_init_rx_desc
-------------
Diffstat:
Makefile | 4 +- arch/arm64/include/asm/futex.h | 55 ++- arch/mips/kernel/kgdb.c | 3 +- arch/x86/events/intel/core.c | 8 +- arch/xtensa/include/asm/processor.h | 21 +- block/blk-mq.c | 7 + drivers/acpi/acpi_lpss.c | 4 +- drivers/block/virtio_blk.c | 2 + drivers/bluetooth/hci_bcm.c | 20 +- drivers/clk/meson/gxbb.c | 2 + drivers/cpufreq/armada-37xx-cpufreq.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 35 +- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 5 +- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 49 ++- drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 23 ++ drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 26 +- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 5 +- drivers/hv/hv.c | 1 - drivers/hwtracing/intel_th/pci.c | 5 + drivers/i3c/master.c | 5 +- drivers/iio/adc/qcom-spmi-adc5.c | 1 + drivers/infiniband/hw/hfi1/chip.c | 26 +- drivers/infiniband/hw/hfi1/qp.c | 2 + drivers/infiniband/hw/hfi1/rc.c | 4 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 6 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 + drivers/iommu/amd_iommu_init.c | 2 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fc.c | 20 +- drivers/nvme/target/admin-cmd.c | 5 + drivers/nvme/target/discovery.c | 68 +-- drivers/nvme/target/nvmet.h | 1 + drivers/platform/x86/pmc_atom.c | 2 +- drivers/scsi/csiostor/csio_scsi.c | 5 +- drivers/scsi/lpfc/lpfc_attr.c | 192 ++++----- drivers/scsi/lpfc/lpfc_ct.c | 12 +- drivers/scsi/lpfc/lpfc_debugfs.c | 455 +++++++++++---------- drivers/scsi/lpfc/lpfc_debugfs.h | 6 +- drivers/scsi/qla2xxx/qla_attr.c | 4 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/soc/sunxi/Kconfig | 1 + drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/most/cdev/cdev.c | 2 +- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/wilc1000/linux_wlan.c | 2 +- drivers/usb/class/cdc-acm.c | 32 +- drivers/usb/dwc3/Kconfig | 6 +- drivers/usb/dwc3/core.c | 2 +- drivers/usb/musb/Kconfig | 2 +- drivers/usb/serial/f81232.c | 39 ++ drivers/usb/storage/scsiglue.c | 26 +- drivers/usb/storage/uas.c | 35 +- drivers/virtio/virtio_pci_common.c | 8 +- fs/nfs/nfs42proc.c | 3 - fs/nfs/nfs4file.c | 4 +- include/keys/trusted.h | 2 +- include/linux/blk-mq.h | 1 + include/linux/kernel.h | 4 +- include/linux/nvme.h | 9 +- include/net/bluetooth/hci_core.h | 3 + include/sound/soc.h | 2 + kernel/events/core.c | 52 ++- kernel/events/ring_buffer.c | 4 +- kernel/futex.c | 188 +++++---- kernel/irq/manage.c | 4 +- lib/iov_iter.c | 4 + lib/ubsan.c | 49 ++- mm/slab.c | 3 +- net/bluetooth/hci_conn.c | 8 + net/bluetooth/hidp/sock.c | 1 + net/bluetooth/l2cap_core.c | 9 +- security/keys/trusted.c | 4 +- sound/hda/ext/hdac_ext_bus.c | 1 - sound/hda/hdac_bus.c | 1 + sound/hda/hdac_component.c | 6 +- sound/soc/codecs/cs35l35.c | 11 + sound/soc/codecs/cs4270.c | 1 + sound/soc/codecs/hdac_hda.c | 53 ++- sound/soc/codecs/hdac_hda.h | 1 + sound/soc/codecs/hdmi-codec.c | 118 +++--- sound/soc/codecs/nau8810.c | 4 +- sound/soc/codecs/nau8824.c | 46 ++- sound/soc/codecs/rt5682.c | 56 ++- sound/soc/codecs/tlv320aic32x4.c | 2 + sound/soc/codecs/tlv320aic3x.c | 5 +- sound/soc/codecs/wm_adsp.c | 11 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/intel/common/sst-firmware.c | 8 +- sound/soc/intel/skylake/skl-pcm.c | 19 +- sound/soc/rockchip/rockchip_pdm.c | 2 + sound/soc/samsung/odroid.c | 4 +- sound/soc/soc-core.c | 1 + sound/soc/soc-dapm.c | 4 + sound/soc/soc-pcm.c | 47 ++- sound/soc/stm/stm32_adfsdm.c | 38 +- sound/soc/stm/stm32_sai_sub.c | 92 ++++- tools/objtool/check.c | 1 + 105 files changed, 1382 insertions(+), 820 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/95 net: stmmac: Use bfsize1 in ndesc_init_rx_desc
From: YueHaibing <[email protected]>
commit f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2 upstream.
gcc warn this:
drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In function ndesc_init_rx_desc:drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable]
Like enh_desc_init_rx_desc, we should use bfsize1 in ndesc_init_rx_desc to calculate 'p->des1'
--- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +1 -1
@@ -140,7 +140,7 @@ static void ndesc_init_rx_desc(struct dm p->des0 |=cpu_to_le32 (RDES0_OWN ); bfsize1 =min (bfsize, BUF_SIZE_2KiB -1 ); - p->des1 |=cpu_to_le32 (bfsize &RDES1_BUFFER1_SIZE_MASK ); + p->des1 |=cpu_to_le32 (bfsize1 &RDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ndesc_rx_set_on_chain (p, end);
Greg Kroah-Hartman
maintainerPATCH 2/95 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit a0033bd1eae4650b69be07c17cb87393da584563 upstream.
With CONFIG_DEBUG_PREEMPT=y, the put_cpu_ptr() triggers an underflow warning in preempt_count_sub().
--- drivers/hv/hv.c | 1 - 1 file changed, 1 deletion(-)
drivers/hv/hv.c +0 -1
@@ -408,7 +408,6 @@ int hv_synic_cleanup(unsigned int cpu)clockevents_unbind_device (hv_cpu->clk_evt, cpu);hv_ce_shutdown (hv_cpu->clk_evt); -put_cpu_ptr (hv_cpu); }hv_get_synint_state (VMBUS_MESSAGE_SINT , shared_sint.as_uint64);
Greg Kroah-Hartman
maintainerPATCH 3/95 ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit f0996bc2978e02d2ea898101462b960f6119b18f upstream.
Building lib/ubsan.c with gcc-9 results in a ton of nasty warnings like this one:
lib/ubsan.c warning: conflicting types for built-in function
‘__ubsan_handle_negate_overflow’; expected ‘void(void *, void *)’ [-Wbuiltin-declaration-mismatch]
The kernel's declarations of __ubsan_handle_*() often uses 'unsigned long' types in parameters while GCC these parameters as 'void *' types, hence the mismatch.
Fix this by using 'void *' to match GCC's declarations.
--- lib/ubsan.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)
lib/ubsan.c +23 -26
@@ -86,11 +86,13 @@ static bool is_inline_int(struct type_dereturn bits <= inline_bits; } -static s_max get_signed_val (struct type_descriptor *type,unsigned long val) +static s_max get_signed_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) {unsigned extra_bits =sizeof (s_max)*8 -type_bit_width (type); -return ((s_max )val) << extra_bits >> extra_bits; +unsigned long ulong_val = (unsigned long )val; + +return ((s_max )ulong_val) << extra_bits >> extra_bits; }if (type_bit_width (type) ==64 )
@@ -99,15 +101,15 @@ static s_max get_signed_val(struct type_return *(s_max *)val; } -static bool val_is_negative (struct type_descriptor *type,unsigned long val) +static bool val_is_negative (struct type_descriptor *type,void *val) {return type_is_signed (type) &&get_signed_val (type, val) <0 ; } -static u_max get_unsigned_val (struct type_descriptor *type,unsigned long val) +static u_max get_unsigned_val (struct type_descriptor *type,void *val) {if (is_inline_int (type)) -return val; +return (unsigned long )val;if (type_bit_width (type) ==64 )return *(u64 *)val;
@@ -116,7 +118,7 @@ static u_max get_unsigned_val(struct typ }static void val_to_string (char *str,size_t size,struct type_descriptor *type, -unsigned long value) +void *value) {if (type_is_int (type)) {if (type_bit_width (type) ==128 ) {
@@ -163,8 +165,8 @@ static void ubsan_epilogue(unsigned long current->in_ubsan--; } -static void handle_overflow (struct overflow_data *data,unsigned long lhs, -unsigned long rhs,char op) +static void handle_overflow (struct overflow_data *data,void *lhs, +void *rhs,char op) {struct type_descriptor *type = data->type;
@@ -191,8 +193,7 @@ static void handle_overflow(struct overf }void __ubsan_handle_add_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'+' );
@@ -200,23 +201,21 @@ void __ubsan_handle_add_overflow(structEXPORT_SYMBOL (__ubsan_handle_add_overflow);void __ubsan_handle_sub_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'-' ); }EXPORT_SYMBOL (__ubsan_handle_sub_overflow);void __ubsan_handle_mul_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {handle_overflow (data, lhs, rhs,'*' ); }EXPORT_SYMBOL (__ubsan_handle_mul_overflow);void __ubsan_handle_negate_overflow (struct overflow_data *data, -unsigned long old_val) +void *old_val) {unsigned long flags;char old_val_str[VALUE_LENGTH ];
@@ -237,8 +236,7 @@ EXPORT_SYMBOL(__ubsan_handle_negate_overvoid __ubsan_handle_divrem_overflow (struct overflow_data *data, -unsigned long lhs, -unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;char rhs_val_str[VALUE_LENGTH ];
@@ -323,7 +321,7 @@ static void ubsan_type_mismatch_common(s }void __ubsan_handle_type_mismatch (struct type_mismatch_data *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = { .location = &data->location,
@@ -332,12 +330,12 @@ void __ubsan_handle_type_mismatch(struct .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch);void __ubsan_handle_type_mismatch_v1 (struct type_mismatch_data_v1 *data, -unsigned long ptr) +void *ptr) {struct type_mismatch_data_common common_data = {
@@ -347,12 +345,12 @@ void __ubsan_handle_type_mismatch_v1(str .type_check_kind = data->type_check_kind }; -ubsan_type_mismatch_common (&common_data, ptr); +ubsan_type_mismatch_common (&common_data, (unsigned long )ptr); }EXPORT_SYMBOL (__ubsan_handle_type_mismatch_v1);void __ubsan_handle_vla_bound_not_positive (struct vla_bound_data *data, -unsigned long bound) +void *bound) {unsigned long flags;char bound_str[VALUE_LENGTH ];
@@ -369,8 +367,7 @@ void __ubsan_handle_vla_bound_not_positi }EXPORT_SYMBOL (__ubsan_handle_vla_bound_not_positive); -void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data, -unsigned long index) +void __ubsan_handle_out_of_bounds (struct out_of_bounds_data *data,void *index) {unsigned long flags;char index_str[VALUE_LENGTH ];
@@ -388,7 +385,7 @@ void __ubsan_handle_out_of_bounds(structEXPORT_SYMBOL (__ubsan_handle_out_of_bounds);void __ubsan_handle_shift_out_of_bounds (struct shift_out_of_bounds_data *data, -unsigned long lhs,unsigned long rhs) +void *lhs,void *rhs) {unsigned long flags;struct type_descriptor *rhs_type = data->rhs_type;
@@ -439,7 +436,7 @@ void __ubsan_handle_builtin_unreachable(EXPORT_SYMBOL (__ubsan_handle_builtin_unreachable);void __ubsan_handle_load_invalid_value (struct invalid_value_data *data, -unsigned long val) +void *val) {unsigned long flags;char val_str[VALUE_LENGTH ];
Greg Kroah-Hartman
maintainerPATCH 4/95 staging: greybus: power_supply: fix prop-descriptor request size
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 47830c1127ef166af787caf2f871f23089610a7f upstream.
Since moving the message buffers off the stack, the dynamically allocated get-prop-descriptor request buffer is incorrectly sized due to using the pointer rather than request-struct size when creating the operation.
Fortunately, the pointer size is always larger than this one-byte request, but this could still cause trouble on the remote end due to the unexpected message size.
--- drivers/staging/greybus/power_supply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/greybus/power_supply.c +1 -1
@@ -520,7 +520,7 @@ static int gb_power_supply_prop_descript op =gb_operation_create (connection,GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS , -sizeof (req),sizeof (*resp) + props_count * +sizeof (*req),sizeof (*resp) + props_count *sizeof (struct gb_power_supply_props_desc ),GFP_KERNEL );if (!op)
Greg Kroah-Hartman
maintainerPATCH 5/95 staging: wilc1000: Avoid GFP_KERNEL allocation from atomic context.
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit ae26aa844679cdf660e12c7055f958cb90889eb6 upstream.
Since wilc_set_multicast_list() is called with dev->addr_list_lock spinlock held, we can't use GFP_KERNEL memory allocation.
--- drivers/staging/wilc1000/linux_wlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/linux_wlan.c +1 -1
@@ -816,7 +816,7 @@ static void wilc_set_multicast_list(strureturn ; } - mc_list =kmalloc_array (dev->mc.count,ETH_ALEN ,GFP_KERNEL ); + mc_list =kmalloc_array (dev->mc.count,ETH_ALEN ,GFP_ATOMIC );if (!mc_list)return ;
Greg Kroah-Hartman
maintainerPATCH 6/95 staging: most: cdev: fix chrdev_region leak in mod_exit
In reply to Greg Kroah-HartmanFrom: Suresh Udipi <[email protected]>
commit af708900e9a48c0aa46070c8a8cdf0608a1d2025 upstream.
It looks like v4.18-rc1 commit [0] which upstreams mld-1.8.0 commit [1] missed to fix the memory leak in mod_exit function.
Do it now.
[0] aba258b7310167 ("staging: most: cdev: fix chrdev_region leak")
[1] https://github.com/microchip-ais/linux/commit/a2d8f7ae7ea381
("staging: most: cdev: fix leak for chrdev_region")
--- drivers/staging/most/cdev/cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/cdev/cdev.c +1 -1
@@ -546,7 +546,7 @@ static void __exit mod_exit(void)destroy_cdev (c);destroy_channel (c); } -unregister_chrdev_region (comp.devno,1 ); +unregister_chrdev_region (comp.devno,CHRDEV_REGION_SIZE );ida_destroy (&comp.minor_id);class_destroy (comp.class); }
Greg Kroah-Hartman
maintainerPATCH 7/95 staging: most: sound: pass correct device when creating a sound card
In reply to Greg Kroah-HartmanFrom: Christian Gromm <[email protected]>
commit 98592c1faca82a9024a64e4ecead68b19f81c299 upstream.
This patch fixes the usage of the wrong struct device when calling function snd_card_new.
--- drivers/staging/most/sound/sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/sound/sound.c +1 -1
@@ -622,7 +622,7 @@ static int audio_probe_channel(struct moINIT_LIST_HEAD (&adpt->dev_list); iface->priv = adpt;list_add_tail (&adpt->list, &adpt_list); - ret =snd_card_new (&iface->dev,-1 ,"INIC" ,THIS_MODULE , + ret =snd_card_new (iface->driver_dev,-1 ,"INIC" ,THIS_MODULE ,sizeof (*channel), &adpt->card);if (ret <0 ) goto err_free_adpt;
Greg Kroah-Hartman
maintainerPATCH 8/95 ASoC: tlv320aic3x: fix reset gpio reference counting
In reply to Greg Kroah-Hartman[ Upstream commit 82ad759143ed77673db0d93d53c1cde7b99917ee ]
This patch fixes a bug that prevents freeing the reset gpio on unloading the module.
aic3x_i2c_probe is called when loading the module and it calls list_add with a probably uninitialized list entry aic3x->list (next = prev = NULL)). So even if list_del is called it does nothing and in the end the gpio_reset is not freed. Then a repeated module probing fails silently because gpio_request fails.
When moving INIT_LIST_HEAD to aic3x_i2c_probe we also have to move list_del to aic3x_i2c_remove because aic3x_remove may be called multiple times without aic3x_i2c_remove being called which leads to a NULL pointer dereference.
--- sound/soc/codecs/tlv320aic3x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/tlv320aic3x.c +3 -2
@@ -1609,7 +1609,6 @@ static int aic3x_probe(struct snd_soc_component *component)struct aic3x_priv *aic3x =snd_soc_component_get_drvdata (component);int ret, i; -INIT_LIST_HEAD (&aic3x->list); aic3x->component = component;for (i =0 ; i <ARRAY_SIZE (aic3x->supplies); i++) {
@@ -1692,7 +1691,6 @@ static void aic3x_remove(struct snd_soc_component *component)struct aic3x_priv *aic3x =snd_soc_component_get_drvdata (component);int i; -list_del (&aic3x->list);for (i =0 ; i <ARRAY_SIZE (aic3x->supplies); i++)regulator_unregister_notifier (aic3x->supplies[i].consumer, &aic3x->disable_nb[i].nb);
@@ -1890,6 +1888,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,if (ret !=0 ) goto err_gpio; +INIT_LIST_HEAD (&aic3x->list);list_add (&aic3x->list, &reset_list);return 0 ;
@@ -1906,6 +1905,8 @@ static int aic3x_i2c_remove(struct i2c_client *client) {struct aic3x_priv *aic3x =i2c_get_clientdata (client); +list_del (&aic3x->list); +if (gpio_is_valid (aic3x->gpio_reset) && !aic3x_is_shared_reset (aic3x)) {gpio_set_value (aic3x->gpio_reset,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/95 ASoC: hdmi-codec: fix S/PDIF DAI
In reply to Greg Kroah-Hartman[ Upstream commit 2e95f984aae4cf0608d0ba2189c756f2bd50b44a ]
When using the S/PDIF DAI, there is no requirement to call snd_soc_dai_set_fmt() as there is no DAI format definition that defines S/PDIF. In any case, S/PDIF does not have separate clocks, this is embedded into the data stream.
Consequently, when attempting to use TDA998x in S/PDIF mode, the attempt to configure TDA998x via the hw_params callback fails as the hdmi_codec_daifmt is left initialised to zero.
Since the S/PDIF DAI will only be used by S/PDIF, prepare the hdmi_codec_daifmt structure for this format.
--- sound/soc/codecs/hdmi-codec.c | 118 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 59 deletions(-)
sound/soc/codecs/hdmi-codec.c +59 -59
@@ -529,73 +529,71 @@ static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, {struct hdmi_codec_priv *hcp =snd_soc_dai_get_drvdata (dai);struct hdmi_codec_daifmt cf = {0 }; -int ret =0 ;dev_dbg (dai->dev,"%s()\n" , __func__); -if (dai->id ==DAI_ID_SPDIF ) { - cf.fmt =HDMI_SPDIF ; - }else { -switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { -case SND_SOC_DAIFMT_CBM_CFM : - cf.bit_clk_master =1 ; - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFM : - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBM_CFS : - cf.bit_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFS : -break ; -default : -return -EINVAL ; - } +if (dai->id ==DAI_ID_SPDIF ) +return 0 ; + +switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { +case SND_SOC_DAIFMT_CBM_CFM : + cf.bit_clk_master =1 ; + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFM : + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBM_CFS : + cf.bit_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFS : +break ; +default : +return -EINVAL ; + } -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_NF : -break ; -case SND_SOC_DAIFMT_NB_IF : - cf.frame_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_NF : - cf.bit_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_IF : - cf.frame_clk_inv =1 ; - cf.bit_clk_inv =1 ; -break ; - } +switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { +case SND_SOC_DAIFMT_NB_NF : +break ; +case SND_SOC_DAIFMT_NB_IF : + cf.frame_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_NF : + cf.bit_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_IF : + cf.frame_clk_inv =1 ; + cf.bit_clk_inv =1 ; +break ; + } -switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { -case SND_SOC_DAIFMT_I2S : - cf.fmt =HDMI_I2S ; -break ; -case SND_SOC_DAIFMT_DSP_A : - cf.fmt =HDMI_DSP_A ; -break ; -case SND_SOC_DAIFMT_DSP_B : - cf.fmt =HDMI_DSP_B ; -break ; -case SND_SOC_DAIFMT_RIGHT_J : - cf.fmt =HDMI_RIGHT_J ; -break ; -case SND_SOC_DAIFMT_LEFT_J : - cf.fmt =HDMI_LEFT_J ; -break ; -case SND_SOC_DAIFMT_AC97 : - cf.fmt =HDMI_AC97 ; -break ; -default : -dev_err (dai->dev,"Invalid DAI interface format\n" ); -return -EINVAL ; - } +switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { +case SND_SOC_DAIFMT_I2S : + cf.fmt =HDMI_I2S ; +break ; +case SND_SOC_DAIFMT_DSP_A : + cf.fmt =HDMI_DSP_A ; +break ; +case SND_SOC_DAIFMT_DSP_B : + cf.fmt =HDMI_DSP_B ; +break ; +case SND_SOC_DAIFMT_RIGHT_J : + cf.fmt =HDMI_RIGHT_J ; +break ; +case SND_SOC_DAIFMT_LEFT_J : + cf.fmt =HDMI_LEFT_J ; +break ; +case SND_SOC_DAIFMT_AC97 : + cf.fmt =HDMI_AC97 ; +break ; +default : +dev_err (dai->dev,"Invalid DAI interface format\n" ); +return -EINVAL ; } hcp->daifmt[dai->id] = cf; -return ret; +return 0 ; }static int hdmi_codec_digital_mute (struct snd_soc_dai *dai,int mute)
@@ -792,8 +790,10 @@ static int hdmi_codec_probe(struct platform_device *pdev) i++; } -if (hcd->spdif) +if (hcd->spdif) { hcp->daidrv[i] = hdmi_spdif_dai; + hcp->daifmt[DAI_ID_SPDIF ].fmt =HDMI_SPDIF ; + }dev_set_drvdata (dev, hcp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/95 ASoC: stm32: sai: fix iec958 controls indexation
In reply to Greg Kroah-Hartman[ Upstream commit 5f8a1000c3e630c3ac06f1d664eeaa755bce8823 ]
Allow indexation of sai iec958 controls according
to device id.
--- sound/soc/stm/stm32_sai_sub.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/stm/stm32_sai_sub.c +4 -3
@@ -100,7 +100,7 @@* @slot_mask: rx or tx active slots mask. set at init or at runtime * @data_size: PCM data width. corresponds to PCM substream width. * @spdif_frm_cnt: S/PDIF playback frame counter -* @snd_aes_iec958: iec958 data +* @iec958: iec958 data * @ctrl_lock: control lock */ struct stm32_sai_sub_data {
@@ -1070,11 +1070,12 @@ static int stm32_sai_pcm_new(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *cpu_dai) {struct stm32_sai_sub_data *sai =dev_get_drvdata (cpu_dai->dev); +struct snd_kcontrol_new knew = iec958_ctls;if (STM_SAI_PROTOCOL_IS_SPDIF (sai)) {dev_dbg (&sai->pdev->dev,"%s: register iec controls" , __func__); -return snd_ctl_add (rtd->pcm->card, -snd_ctl_new1 (&iec958_ctls, sai)); + knew.device = rtd->pcm->device; +return snd_ctl_add (rtd->pcm->card,snd_ctl_new1 (&knew, sai)); }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/95 ASoC: stm32: sai: fix exposed capabilities in spdif mode
In reply to Greg Kroah-Hartman[ Upstream commit b8468192971807c43a80d6e2c41f83141cb7b211 ]
Change capabilities exposed in SAI S/PDIF mode, to match actually supported formats.
In S/PDIF mode only 32 bits stereo is supported.
--- sound/soc/stm/stm32_sai_sub.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/stm/stm32_sai_sub.c +8 -0
@@ -682,6 +682,14 @@ static int stm32_sai_startup(struct snd_pcm_substream *substream, sai->substream = substream; +if (STM_SAI_PROTOCOL_IS_SPDIF (sai)) { +snd_pcm_hw_constraint_mask64 (substream->runtime, +SNDRV_PCM_HW_PARAM_FORMAT , +SNDRV_PCM_FMTBIT_S32_LE ); +snd_pcm_hw_constraint_single (substream->runtime, +SNDRV_PCM_HW_PARAM_CHANNELS ,2 ); + } + ret =clk_prepare_enable (sai->sai_ck);if (ret <0 ) {dev_err (cpu_dai->dev,"Failed to enable clock: %d\n" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/95 ASoC: stm32: sai: fix race condition in irq handler
In reply to Greg Kroah-Hartman[ Upstream commit 26f98e82dd49b7c3cc5ef0edd882aa732a62b672 ]
When snd_pcm_stop_xrun() is called in interrupt routine, substream context may have already been released. Add protection on substream context.
--- sound/soc/stm/stm32_sai_sub.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
sound/soc/stm/stm32_sai_sub.c +12 -1
@@ -102,6 +102,7 @@* @spdif_frm_cnt: S/PDIF playback frame counter * @iec958: iec958 data * @ctrl_lock: control lock +* @irq_lock: prevent race condition with IRQ */ struct stm32_sai_sub_data {struct platform_device *pdev;
@@ -133,6 +134,7 @@ struct stm32_sai_sub_data {unsigned int spdif_frm_cnt;struct snd_aes_iec958 iec958;struct mutex ctrl_lock;/* protect resources accessed by controls */ +spinlock_t irq_lock;/* used to prevent race condition with IRQ */ };enum stm32_sai_fifo_th {
@@ -474,8 +476,10 @@ static irqreturn_t stm32_sai_isr(int irq, void *devid) status =SNDRV_PCM_STATE_XRUN ; } -if (status !=SNDRV_PCM_STATE_RUNNING ) +spin_lock (&sai->irq_lock); +if (status !=SNDRV_PCM_STATE_RUNNING && sai->substream)snd_pcm_stop_xrun (sai->substream); +spin_unlock (&sai->irq_lock);return IRQ_HANDLED ; }
@@ -679,8 +683,11 @@ static int stm32_sai_startup(struct snd_pcm_substream *substream, {struct stm32_sai_sub_data *sai =snd_soc_dai_get_drvdata (cpu_dai);int imr, cr2, ret; +unsigned long flags; +spin_lock_irqsave (&sai->irq_lock, flags); sai->substream = substream; +spin_unlock_irqrestore (&sai->irq_lock, flags);if (STM_SAI_PROTOCOL_IS_SPDIF (sai)) { snd_pcm_hw_constraint_mask64(substream->runtime,
@@ -1061,6 +1068,7 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) {struct stm32_sai_sub_data *sai =snd_soc_dai_get_drvdata (cpu_dai); +unsigned long flags;regmap_update_bits (sai->regmap,STM_SAI_IMR_REGX ,SAI_XIMR_MASK ,0 );
@@ -1071,7 +1079,9 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream,clk_rate_exclusive_put (sai->sai_mclk); +spin_lock_irqsave (&sai->irq_lock, flags); sai->substream =NULL ; +spin_unlock_irqrestore (&sai->irq_lock, flags); } static int stm32_sai_pcm_new(struct snd_soc_pcm_runtime *rtd,
@@ -1435,6 +1445,7 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) sai->pdev = pdev;mutex_init (&sai->ctrl_lock); +spin_lock_init (&sai->irq_lock);platform_set_drvdata (pdev, sai); sai->pdata =dev_get_drvdata (pdev->dev.parent);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/95 ASoC:soc-pcm:fix a codec fixup issue in TDM case
In reply to Greg Kroah-Hartman[ Upstream commit 570f18b6a8d1f0e60e8caf30e66161b6438dcc91 ]
On HDaudio platforms, if playback is started when capture is working, there is no audible output.
This can be root-caused to the use of the rx|tx_mask to store an HDaudio stream tag.
If capture is stared before playback, rx_mask would be non-zero on HDaudio platform, then the channel number of playback, which is in the same codec dai with the capture, would be changed by soc_pcm_codec_params_fixup based on the tx_mask at first, then overwritten by this function based on rx_mask at last.
According to the author of tx|rx_mask, tx_mask is for playback and rx_mask is for capture. And stream direction is checked at all other references of tx|rx_mask in ASoC, so here should be an error. This patch checks stream direction for tx|rx_mask for fixup function.
This issue would affect not only HDaudio+ASoC, but also I2S codecs if the channel number based on rx_mask is not equal to the one for tx_mask. It could be rarely reproduecd because most drivers in kernel set the same channel number to tx|rx_mask or rx_mask is zero.
Tested on all platforms using stream_tag & HDaudio and intel I2S platforms.
--- sound/soc/soc-pcm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +5 -2
@@ -954,10 +954,13 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_params = *params;/* fixup params based on TDM slot masks */ -if (codec_dai->tx_mask) +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK && + codec_dai->tx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->tx_mask); -if (codec_dai->rx_mask) + +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE && + codec_dai->rx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->rx_mask);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/95 ASoC:hdac_hda:use correct format to setup hda codec
In reply to Greg Kroah-Hartman[ Upstream commit 03d0aa4d4fddce4a5d865d819a4d98bfc3d451e6 ]
The current implementation of the hdac_hda codec results in zero-valued samples on capture and noise with headset playback when SOF is used on platforms with an on-board HDaudio codec. This is root-caused to SOF using be_hw_params_fixup, and the prepare() call using invalid runtime fields to determine the format.
This patch moves the format handling to the hw_params() callback, as done already for hdac_hdmi, to make sure the fixed-up information is taken into account but keeps the codec initialization in prepare() as the stream_tag is only available at that time. Moving everything in the prepare() callback is possible but the code is less elegant so this two-step solution was chosen.
The solution was tested with the SST driver with no regressions, and all the issues with SOF playback and capture are solved.
--- sound/soc/codecs/hdac_hda.c | 53 +++++++++++++++++++++++++++---------- sound/soc/codecs/hdac_hda.h | 1 + 2 files changed, 40 insertions(+), 14 deletions(-)
sound/soc/codecs/hdac_hda.c +39 -14
@@ -38,6 +38,9 @@ static void hdac_hda_dai_close(struct snd_pcm_substream *substream, struct snd_soc_dai *dai);static int hdac_hda_dai_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai); +static int hdac_hda_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai);static int hdac_hda_dai_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai); static int hdac_hda_dai_set_tdm_slot(struct snd_soc_dai *dai,
@@ -50,6 +53,7 @@ static const struct snd_soc_dai_ops hdac_hda_dai_ops = { .startup = hdac_hda_dai_open, .shutdown = hdac_hda_dai_close, .prepare = hdac_hda_dai_prepare, + .hw_params = hdac_hda_dai_hw_params, .hw_free = hdac_hda_dai_hw_free, .set_tdm_slot = hdac_hda_dai_set_tdm_slot, };
@@ -139,6 +143,39 @@ static int hdac_hda_dai_set_tdm_slot(struct snd_soc_dai *dai,return 0 ; } +static int hdac_hda_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct hdac_hda_priv *hda_pvt; +unsigned int format_val; +unsigned int maxbps; + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + maxbps = dai->driver->playback.sig_bits; +else + maxbps = dai->driver->capture.sig_bits; + + hda_pvt =snd_soc_component_get_drvdata (component); + format_val =snd_hdac_calc_stream_format (params_rate (params), +params_channels (params), +params_format (params), + maxbps, +0 ); +if (!format_val) { +dev_err (dai->dev, +"invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n" , +params_rate (params),params_channels (params), +params_format (params), maxbps); + +return -EINVAL ; + } + + hda_pvt->pcm[dai->id].format_val[substream->stream] = format_val; +return 0 ; +} +static int hdac_hda_dai_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -162,10 +199,9 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) {struct snd_soc_component *component = dai->component; +struct hda_pcm_stream *hda_stream;struct hdac_hda_priv *hda_pvt; -struct snd_pcm_runtime *runtime = substream->runtime;struct hdac_device *hdev; -struct hda_pcm_stream *hda_stream;unsigned int format_val;struct hda_pcm *pcm;unsigned int stream;
@@ -179,19 +215,8 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, hda_stream = &pcm->stream[substream->stream]; - format_val =snd_hdac_calc_stream_format (runtime->rate, - runtime->channels, - runtime->format, - hda_stream->maxbps, -0 ); -if (!format_val) { -dev_err (&hdev->dev, -"invalid format_val, rate=%d, ch=%d, format=%d\n" , - runtime->rate, runtime->channels, runtime->format); -return -EINVAL ; - } - stream = hda_pvt->pcm[dai->id].stream_tag[substream->stream]; + format_val = hda_pvt->pcm[dai->id].format_val[substream->stream]; ret =snd_hda_codec_prepare (&hda_pvt->codec, hda_stream, stream, format_val, substream);
sound/soc/codecs/hdac_hda.h +1 -0
@@ -8,6 +8,7 @@struct hdac_hda_pcm {int stream_tag[2 ]; +unsigned int format_val[2 ]; };struct hdac_hda_priv {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/95 ASoC:intel:skl:fix a simultaneous playback & capture issue on hda platform
In reply to Greg Kroah-Hartman[ Upstream commit c899df3e9b0bf7b76e642aed1a214582ea7012d5 ]
If playback and capture are enabled concurrently, when the capture stops the output becomes inaudile. The playback application will become stuck and underrun after a timeout.
This is caused by mistaken use of the stream_id, which should only be set for playback and not for capture
Tested on Apollolake and Kabylake with SST driver.
--- sound/soc/intel/skylake/skl-pcm.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
sound/soc/intel/skylake/skl-pcm.c +14 -5
@@ -181,6 +181,7 @@ int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params)struct hdac_stream *hstream;struct hdac_ext_stream *stream;struct hdac_ext_link *link; +unsigned char stream_tag; hstream =snd_hdac_get_stream (bus, params->stream, params->link_dma_id +1 );
@@ -199,10 +200,13 @@ int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params)snd_hdac_ext_link_stream_setup (stream, format_val); -list_for_each_entry (link, &bus->hlink_list, list) { -if (link->index == params->link_index) -snd_hdac_ext_link_set_stream_id (link, - hstream->stream_tag); + stream_tag = hstream->stream_tag; +if (stream->hstream.direction ==SNDRV_PCM_STREAM_PLAYBACK ) { +list_for_each_entry (link, &bus->hlink_list, list) { +if (link->index == params->link_index) +snd_hdac_ext_link_set_stream_id (link, + stream_tag); + } } stream->link_prepared =1 ;
@@ -645,6 +649,7 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream,struct hdac_ext_stream *link_dev =snd_soc_dai_get_dma_data (dai, substream);struct hdac_ext_link *link; +unsigned char stream_tag;dev_dbg (dai->dev,"%s: %s\n" , __func__, dai->name);
@@ -654,7 +659,11 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream,if (!link)return -EINVAL ; -snd_hdac_ext_link_clear_stream_id (link,hdac_stream (link_dev)->stream_tag); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + stream_tag =hdac_stream (link_dev)->stream_tag; +snd_hdac_ext_link_clear_stream_id (link, stream_tag); + } +snd_hdac_ext_stream_release (link_dev,HDAC_EXT_STREAM_TYPE_LINK );return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/95 ASoC: dpcm: prevent snd_soc_dpcm use after free
In reply to Greg Kroah-Hartman[ Upstream commit a9764869779081e8bf24da07ac040e8f3efcf13a ]
The dpcm get from fe_clients/be_clients
may be free before use
Add a spin lock at snd_soc_card level,
to protect the dpcm instance.
The lock may be used in atomic context, so use spin lock.
Use irq spin lock version,
since the lock may be used in interrupts.
possible race condition between
void dpcm_be_disconnect(
... list_del(&dpcm->list_be); list_del(&dpcm->list_fe); kfree(dpcm); ...
and
for_each_dpcm_fe() for_each_dpcm_be*()
race condition example
Thread 1:
snd_soc_dapm_mixer_update_power()
-> soc_dpcm_runtime_update()
-> dpcm_be_disconnect()
-> kfree(dpcm);
Thread 2:
dpcm_fe_dai_trigger()
-> dpcm_be_dai_trigger()
-> snd_soc_dpcm_can_be_free_stop()
-> if (dpcm->fe == fe)Excpetion Scenario:
two FE link to same BE FE1 -> BE FE2 -> Thread 1: switch of mixer between FE2 -> BE Thread 2: pcm_stop FE1
Exception:
Unable to handle kernel paging request at virtual address dead0000000000e0
pc=<> [<ffffff8960e2cd10>] dpcm_be_dai_trigger+0x29c/0x47c
sound/soc/soc-pcm.c:3226 if (dpcm->fe == fe)
lr=<> [<ffffff8960e2f694>] dpcm_fe_dai_do_trigger+0x94/0x26c
Backtrace: [<ffffff89602dba80>] notify_die+0x68/0xb8 [<ffffff896028c7dc>] die+0x118/0x2a8 [<ffffff89602a2f84>] __do_kernel_fault+0x13c/0x14c [<ffffff89602a27f4>] do_translation_fault+0x64/0xa0 [<ffffff8960280cf8>] do_mem_abort+0x4c/0xd0 [<ffffff8960282ad0>] el1_da+0x24/0x40 [<ffffff8960e2cd10>] dpcm_be_dai_trigger+0x29c/0x47c [<ffffff8960e2f694>] dpcm_fe_dai_do_trigger+0x94/0x26c [<ffffff8960e2edec>] dpcm_fe_dai_trigger+0x3c/0x44 [<ffffff8960de5588>] snd_pcm_do_stop+0x50/0x5c [<ffffff8960dded24>] snd_pcm_action+0xb4/0x13c [<ffffff8960ddfdb4>] snd_pcm_drop+0xa0/0x128 [<ffffff8960de69bc>] snd_pcm_common_ioctl+0x9d8/0x30f0 [<ffffff8960de1cac>] snd_pcm_ioctl_compat+0x29c/0x2f14 [<ffffff89604c9d60>] compat_SyS_ioctl+0x128/0x244 [<ffffff8960283740>] el0_svc_naked+0x34/0x38
[<ffffffffffffffff>] 0xffffffffffffffff
--- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 1 + sound/soc/soc-pcm.c | 40 +++++++++++++++++++++++++++++++++------- 3 files changed, 36 insertions(+), 7 deletions(-)
include/sound/soc.h +2 -0
@@ -1043,6 +1043,8 @@ struct snd_soc_card {struct mutex mutex;struct mutex dapm_mutex; +spinlock_t dpcm_lock; +bool instantiated;bool topology_shortname_created;
sound/soc/soc-core.c +1 -0
@@ -2790,6 +2790,7 @@ int snd_soc_register_card(struct snd_soc_card *card) card->instantiated =0 ;mutex_init (&card->mutex);mutex_init (&card->dapm_mutex); +spin_lock_init (&card->dpcm_lock);return snd_soc_bind_card (card); }
sound/soc/soc-pcm.c +33 -7
@@ -1212,6 +1212,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, struct snd_soc_pcm_runtime *be, int stream) {struct snd_soc_dpcm *dpcm; +unsigned long flags;/* only add new dpcms */ for_each_dpcm_be (fe, stream, dpcm) {
@@ -1227,8 +1228,10 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, dpcm->fe = fe; be->dpcm[stream].runtime = fe->dpcm[stream].runtime; dpcm->state =SND_SOC_DPCM_LINK_STATE_NEW ; +spin_lock_irqsave (&fe->card->dpcm_lock, flags);list_add (&dpcm->list_be, &fe->dpcm[stream].be_clients);list_add (&dpcm->list_fe, &be->dpcm[stream].fe_clients); +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags); dev_dbg(fe->dev, "connected new DPCM %s path %s %s %s\n", stream ? "capture" : "playback", fe->dai_link->name,
@@ -1274,6 +1277,7 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe,void dpcm_be_disconnect (struct snd_soc_pcm_runtime *fe,int stream) {struct snd_soc_dpcm *dpcm, *d; +unsigned long flags;for_each_dpcm_be_safe (fe, stream, dpcm, d) { dev_dbg(fe->dev, "ASoC: BE %s disconnect check for %s\n",
@@ -1293,8 +1297,10 @@ void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream)#ifdef CONFIG_DEBUG_FS debugfs_remove (dpcm->debugfs_state);#endif +spin_lock_irqsave (&fe->card->dpcm_lock, flags);list_del (&dpcm->list_be);list_del (&dpcm->list_fe); +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);kfree (dpcm); } }
@@ -1546,10 +1552,13 @@ int dpcm_process_paths(struct snd_soc_pcm_runtime *fe,void dpcm_clear_pending_state (struct snd_soc_pcm_runtime *fe,int stream) {struct snd_soc_dpcm *dpcm; +unsigned long flags; +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_be (fe, stream, dpcm) dpcm->be->dpcm[stream].runtime_update =SND_SOC_DPCM_UPDATE_NO ; +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags); } static void dpcm_be_dai_startup_unwind(struct snd_soc_pcm_runtime *fe,
@@ -2575,6 +2584,7 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)struct snd_soc_dpcm *dpcm;enum snd_soc_dpcm_trigger trigger = fe->dai_link->trigger[stream];int ret; +unsigned long flags;dev_dbg (fe->dev,"ASoC: runtime %s open on FE %s\n" , stream ?"capture" :"playback" , fe->dai_link->name);
@@ -2644,11 +2654,13 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)dpcm_be_dai_shutdown (fe, stream); disconnect:/* disconnect any non started BEs */ +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_be (fe, stream, dpcm) {struct snd_soc_pcm_runtime *be = dpcm->be;if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) dpcm->state =SND_SOC_DPCM_LINK_STATE_FREE ; } +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);return ret; }
@@ -3224,7 +3236,10 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, {struct snd_soc_dpcm *dpcm;int state; +int ret =1 ; +unsigned long flags; +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_fe (be, stream, dpcm) {if (dpcm->fe == fe)
@@ -3233,12 +3248,15 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, state = dpcm->fe->dpcm[stream].state;if (state ==SND_SOC_DPCM_STATE_START || state ==SND_SOC_DPCM_STATE_PAUSED || - state ==SND_SOC_DPCM_STATE_SUSPEND ) -return 0 ; + state ==SND_SOC_DPCM_STATE_SUSPEND ) { + ret =0 ; +break ; + } } +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);/* it's safe to free/stop this BE DAI */ -return 1 ; +return ret; }EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_free_stop);
@@ -3251,7 +3269,10 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe, {struct snd_soc_dpcm *dpcm;int state; +int ret =1 ; +unsigned long flags; +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_fe (be, stream, dpcm) {if (dpcm->fe == fe)
@@ -3261,12 +3282,15 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,if (state ==SND_SOC_DPCM_STATE_START || state ==SND_SOC_DPCM_STATE_PAUSED || state ==SND_SOC_DPCM_STATE_SUSPEND || - state ==SND_SOC_DPCM_STATE_PREPARE ) -return 0 ; + state ==SND_SOC_DPCM_STATE_PREPARE ) { + ret =0 ; +break ; + } } +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);/* it's safe to change hw_params */ -return 1 ; +return ret; }EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_params);
@@ -3305,6 +3329,7 @@ static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe,struct snd_pcm_hw_params *params = &fe->dpcm[stream].hw_params;struct snd_soc_dpcm *dpcm;ssize_t offset =0 ; +unsigned long flags;/* FE state */ offset += snprintf(buf + offset, size - offset,
@@ -3332,6 +3357,7 @@ static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe, goto out; } +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_be (fe, stream, dpcm) {struct snd_soc_pcm_runtime *be = dpcm->be; params = &dpcm->hw_params;
@@ -3352,7 +3378,7 @@ static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe,params_channels (params), params_rate(params)); } - +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags); out:return offset; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/95 ASoC: nau8824: fix the issue of the widget with prefix name
In reply to Greg Kroah-Hartman[ Upstream commit 844a4a362dbec166b44d6b9b3dd45b08cb273703 ]
The driver has two issues when machine add prefix name for codec. (1)The stream name of DAI can't find the AIF widgets. (2)The drivr can enable/disalbe the MICBIAS and SAR widgets.
The patch will fix these issues caused by prefixed name added.
--- sound/soc/codecs/nau8824.c | 46 +++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-)
sound/soc/codecs/nau8824.c +38 -8
@@ -681,8 +681,8 @@ static const struct snd_soc_dapm_widget nau8824_dapm_widgets[] = {SND_SOC_DAPM_ADC ("ADCR" ,NULL ,NAU8824_REG_ANALOG_ADC_2 ,NAU8824_ADCR_EN_SFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"HiFi Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("AIFRX" ,"HiFi Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIFRX" ,"Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_DAC ("DACL" ,NULL ,NAU8824_REG_RDAC , NAU8824_DACL_EN_SFT, 0),
@@ -831,6 +831,36 @@ static void nau8824_int_status_clear_all(struct regmap *regmap) } } +static void nau8824_dapm_disable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_disable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_disable_pin (dapm, pin); + } +} + +static void nau8824_dapm_enable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_force_enable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_force_enable_pin (dapm, pin); + } +} +static void nau8824_eject_jack (struct nau8824 *nau8824) {struct snd_soc_dapm_context *dapm = nau8824->dapm;
@@ -839,8 +869,8 @@ static void nau8824_eject_jack(struct nau8824 *nau8824)/* Clear all interruption status */ nau8824_int_status_clear_all (regmap); -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm);/* Enable the insertion interruption, disable the ejection
@@ -870,8 +900,8 @@ static void nau8824_jdet_work(struct work_struct *work)struct regmap *regmap = nau8824->regmap;int adc_value, event =0 , event_mask =0 ; -snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); -snd_soc_dapm_force_enable_pin (dapm,"SAR" ); +nau8824_dapm_enable_pin (nau8824,"MICBIAS" ); +nau8824_dapm_enable_pin (nau8824,"SAR" );snd_soc_dapm_sync (dapm);msleep (100 );
@@ -882,8 +912,8 @@ static void nau8824_jdet_work(struct work_struct *work)if (adc_value <HEADSET_SARADC_THD ) { event |=SND_JACK_HEADPHONE ; -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm); }else { event |=SND_JACK_HEADSET ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/95 ASoC: nau8810: fix the issue of widget with prefixed name
In reply to Greg Kroah-Hartman[ Upstream commit 54d1cf78b0f4ba348a7c7fb8b7d0708d71b6cc8a ]
The driver changes the stream name of DAC and ADC to avoid the issue of widget with prefixed name. When the machine adds prefixed name for codec, the stream name of DAI may not find the widgets.
--- sound/soc/codecs/nau8810.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/nau8810.c +2 -2
@@ -411,9 +411,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = {SND_SOC_DAPM_MIXER ("Mono Mixer" ,NAU8810_REG_POWER3 ,NAU8810_MOUTMX_EN_SFT ,0 , &nau8810_mono_mixer_controls[0 ],ARRAY_SIZE (nau8810_mono_mixer_controls)), -SND_SOC_DAPM_DAC ("DAC" ,"HiFi Playback" ,NAU8810_REG_POWER3 , +SND_SOC_DAPM_DAC ("DAC" ,"Playback" ,NAU8810_REG_POWER3 ,NAU8810_DAC_EN_SFT ,0 ), -SND_SOC_DAPM_ADC ("ADC" ,"HiFi Capture" ,NAU8810_REG_POWER2 , +SND_SOC_DAPM_ADC ("ADC" ,"Capture" ,NAU8810_REG_POWER2 ,NAU8810_ADC_EN_SFT ,0 ),SND_SOC_DAPM_PGA ("SpkN Out" ,NAU8810_REG_POWER3 , NAU8810_NSPK_EN_SFT, 0, NULL, 0),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/95 ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
In reply to Greg Kroah-Hartman[ Upstream commit 2b13bee3884926cba22061efa75bd315e871de24 ]
After commit fbeec965b8d1c ("ASoC: samsung: odroid: Fix 32000 sample rate handling") the audio root clock frequency is configured improperly for 44100 sample rate. Due to clock rate rounding it's 20070401 Hz instead of 22579000 Hz. This results in a too low value of the PSR clock divider in the CPU DAI driver and too fast actual sample rate for fs=44100. E.g. 1 kHz tone has actual 1780 Hz frequency (1 kHz * 20070401/22579000 * 2).
Fix this by increasing the correction passed to clk_set_rate() to take into account inaccuracy of the EPLL frequency properly.
--- sound/soc/samsung/odroid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/samsung/odroid.c +2 -2
@@ -64,11 +64,11 @@ static int odroid_card_hw_params(struct snd_pcm_substream *substream,return ret;/* -* We add 1 to the rclk_freq value in order to avoid too low clock +* We add 2 to the rclk_freq value in order to avoid too low clock * frequency values due to the EPLL output frequency not being exact * multiple of the audio sampling rate. */ - rclk_freq =params_rate (params) * rfs +1 ; + rclk_freq =params_rate (params) * rfs +2 ; ret =clk_set_rate (priv->sclk_i2s, rclk_freq);if (ret <0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/95 ASoC: rt5682: Check JD status when system resume
In reply to Greg Kroah-Hartman[ Upstream commit 4834d7070c85a5fb69637265dbbb05d13043280c ]
The IRQ function may not work when system suspend.
We remove snd_soc_dapm_force_enable_pin function call to make sure the bias off when idle and run into suspend/resume function.
--- sound/soc/codecs/rt5682.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
sound/soc/codecs/rt5682.c +17 -17
@@ -904,13 +904,20 @@ static int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) {struct rt5682_priv *rt5682 =snd_soc_component_get_drvdata (component); -struct snd_soc_dapm_context *dapm = -snd_soc_component_get_dapm (component);unsigned int val, count;if (jack_insert) { -snd_soc_dapm_force_enable_pin (dapm,"CBJ Power" ); -snd_soc_dapm_sync (dapm); + +snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , +RT5682_PWR_VREF2 ,RT5682_PWR_VREF2 ); +snd_soc_component_update_bits (component, +RT5682_PWR_ANLG_1 ,RT5682_PWR_FV2 ,0 ); +usleep_range (15000 ,20000 ); +snd_soc_component_update_bits (component, +RT5682_PWR_ANLG_1 ,RT5682_PWR_FV2 ,RT5682_PWR_FV2 ); +snd_soc_component_update_bits (component,RT5682_PWR_ANLG_3 , +RT5682_PWR_CBJ ,RT5682_PWR_CBJ ); +snd_soc_component_update_bits (component,RT5682_CBJ_CTRL_1 ,RT5682_TRIG_JD_MASK ,RT5682_TRIG_JD_HIGH );
@@ -938,8 +945,10 @@ static int rt5682_headset_detect(struct snd_soc_component *component,rt5682_enable_push_button_irq (component, false);snd_soc_component_update_bits (component,RT5682_CBJ_CTRL_1 ,RT5682_TRIG_JD_MASK ,RT5682_TRIG_JD_LOW ); -snd_soc_dapm_disable_pin (dapm,"CBJ Power" ); -snd_soc_dapm_sync (dapm); +snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , +RT5682_PWR_VREF2 ,0 ); +snd_soc_component_update_bits (component,RT5682_PWR_ANLG_3 , +RT5682_PWR_CBJ ,0 ); rt5682->jack_type =0 ; }
@@ -1585,8 +1594,6 @@ static const struct snd_soc_dapm_widget rt5682_dapm_widgets[] = { 0, NULL, 0),SND_SOC_DAPM_SUPPLY ("Vref1" ,RT5682_PWR_ANLG_1 ,RT5682_PWR_VREF1_BIT ,0 , rt5655_set_verf,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), -SND_SOC_DAPM_SUPPLY ("Vref2" ,RT5682_PWR_ANLG_1 ,RT5682_PWR_VREF2_BIT ,0 , - rt5655_set_verf,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ),/* ASRC */ SND_SOC_DAPM_SUPPLY_S("DAC STO1 ASRC", 1, RT5682_PLL_TRACK_1,
@@ -1621,9 +1628,6 @@ static const struct snd_soc_dapm_widget rt5682_dapm_widgets[] = {SND_SOC_DAPM_PGA ("BST1 CBJ" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), -SND_SOC_DAPM_SUPPLY ("CBJ Power" ,RT5682_PWR_ANLG_3 , -RT5682_PWR_CBJ_BIT ,0 ,NULL ,0 ), -/* REC Mixer */ SND_SOC_DAPM_MIXER ("RECMIX1L" ,SND_SOC_NOPM ,0 ,0 , rt5682_rec1_l_mix, ARRAY_SIZE(rt5682_rec1_l_mix)),
@@ -1786,17 +1790,13 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = {/*Vref*/ {"MICBIAS1", NULL, "Vref1"}, - {"MICBIAS1", NULL, "Vref2"}, {"MICBIAS2", NULL, "Vref1"}, - {"MICBIAS2", NULL, "Vref2"}, {"CLKDET SYS", NULL, "CLKDET"}, {"IN1P", NULL, "LDO2"}, {"BST1 CBJ", NULL, "IN1P"}, - {"BST1 CBJ", NULL, "CBJ Power"}, - {"CBJ Power", NULL, "Vref2"}, {"RECMIX1L", "CBJ Switch", "BST1 CBJ"}, {"RECMIX1L", NULL, "RECMIX1L Power"},
@@ -1906,9 +1906,7 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = { {"HP Amp", NULL, "Capless"}, {"HP Amp", NULL, "Charge Pump"}, {"HP Amp", NULL, "CLKDET SYS"}, - {"HP Amp", NULL, "CBJ Power"}, {"HP Amp", NULL, "Vref1"}, - {"HP Amp", NULL, "Vref2"}, {"HPOL Playback", "Switch", "HP Amp"}, {"HPOR Playback", "Switch", "HP Amp"}, {"HPOL", NULL, "HPOL Playback"},
@@ -2357,6 +2355,8 @@ static int rt5682_resume(struct snd_soc_component *component)regcache_cache_only (rt5682->regmap, false);regcache_sync (rt5682->regmap); +rt5682_irq (0 , rt5682); + return 0; }#else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/95 ASoC: rt5682: fix jack type detection issue
In reply to Greg Kroah-Hartman[ Upstream commit 675212bfb23394514b7f68ebf3954ba936281ccc ]
The jack type detection needs the main bias power of analog.
The modification makes sure the main bias power on/off while jack plug/unplug.
--- sound/soc/codecs/rt5682.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
sound/soc/codecs/rt5682.c +5 -7
@@ -909,7 +909,8 @@ static int rt5682_headset_detect(struct snd_soc_component *component,if (jack_insert) {snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,RT5682_PWR_VREF2 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB , +RT5682_PWR_VREF2 |RT5682_PWR_MB );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 ,RT5682_PWR_FV2 ,0 );usleep_range (15000 ,20000 );
@@ -946,7 +947,7 @@ static int rt5682_headset_detect(struct snd_soc_component *component,snd_soc_component_update_bits (component,RT5682_CBJ_CTRL_1 ,RT5682_TRIG_JD_MASK ,RT5682_TRIG_JD_LOW );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,0 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB ,0 );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_3 ,RT5682_PWR_CBJ ,0 );
@@ -2295,16 +2296,13 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,switch (level) {case SND_SOC_BIAS_PREPARE :regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG , -RT5682_PWR_MB |RT5682_PWR_BG ); +RT5682_PWR_BG ,RT5682_PWR_BG );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO );break ;case SND_SOC_BIAS_STANDBY : -regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB ,RT5682_PWR_MB );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL ,RT5682_DIG_GATE_CTRL );break ;
@@ -2312,7 +2310,7 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,0 );regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG ,0 ); +RT5682_PWR_BG ,0 );break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/95 ASoC: rt5682: recording has no sound after booting
In reply to Greg Kroah-Hartman[ Upstream commit 1c5b6a27e432e4fe170a924c8b41012271496a4c ]
If ASRC turns on, HW will use clk_dac as the reference clock whether recording or playback.
Both of clk_dac and clk_adc should set proper clock while using ASRC.
--- sound/soc/codecs/rt5682.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
sound/soc/codecs/rt5682.c +5 -9
@@ -1202,7 +1202,7 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w,struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm);struct rt5682_priv *rt5682 =snd_soc_component_get_drvdata (component); -int ref, val, reg, sft, mask, idx = -EINVAL ; +int ref, val, reg, idx = -EINVAL ;static const int div_f[] = {1 ,2 ,3 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };static const int div_o[] = {1 ,2 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };
@@ -1216,15 +1216,10 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, idx =rt5682_div_sel (rt5682, ref, div_f,ARRAY_SIZE (div_f)); -if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) { +if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) reg =RT5682_PLL_TRACK_3 ; - sft =RT5682_ADC_OSR_SFT ; - mask =RT5682_ADC_OSR_MASK ; - }else { +else reg =RT5682_PLL_TRACK_2 ; - sft =RT5682_DAC_OSR_SFT ; - mask =RT5682_DAC_OSR_MASK ; - }snd_soc_component_update_bits (component, reg,RT5682_FILTER_CLK_DIV_MASK , idx <<RT5682_FILTER_CLK_DIV_SFT );
@@ -1236,7 +1231,8 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, }snd_soc_component_update_bits (component,RT5682_ADDA_CLK_1 , - mask, idx << sft); +RT5682_ADC_OSR_MASK |RT5682_DAC_OSR_MASK , + (idx <<RT5682_ADC_OSR_SFT ) | (idx <<RT5682_DAC_OSR_SFT ));return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/95 ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
In reply to Greg Kroah-Hartman[ Upstream commit a2225a6d155fcb247fe4c6d87f7c91807462966d ]
Best to lock across handling the bus error to ensure the DSP doesn't change power state as we are reading the status registers.
--- sound/soc/codecs/wm_adsp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +8 -3
@@ -3821,11 +3821,13 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)struct regmap *regmap = dsp->regmap;int ret =0 ; +mutex_lock (&dsp->pwr_lock); + ret =regmap_read (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL , &val);if (ret) {adsp_err (dsp,"Failed to read Region Lock Ctrl register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; }if (val &ADSP2_WDT_TIMEOUT_STS_MASK ) {
@@ -3844,7 +3846,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Bus Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "bus error address = 0x%x\n",
@@ -3857,7 +3859,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Pmem Xmem Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "xmem error address = 0x%x\n",
@@ -3870,6 +3872,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)regmap_update_bits (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL ,ADSP2_CTRL_ERR_EINT ,ADSP2_CTRL_ERR_EINT ); +error: +mutex_unlock (&dsp->pwr_lock); +return IRQ_HANDLED ; }EXPORT_SYMBOL_GPL (wm_adsp2_bus_error);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/95 clk: meson-gxbb: round the vdec dividers to closest
In reply to Greg Kroah-Hartman[ Upstream commit 9b70c697e87286ade406e6a02091757307dd4b7c ]
We want the video decoder clocks to always round to closest. While the muxes are already using CLK_MUX_ROUND_CLOSEST, the corresponding CLK_DIVIDER_ROUND_CLOSEST was forgotten for the dividers.
Fix this by adding the flag to the two vdec dividers.
--- drivers/clk/meson/gxbb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/meson/gxbb.c +2 -0
@@ -2213,6 +2213,7 @@ static struct clk_regmap gxbb_vdec_1_div = { .offset = HHI_VDEC_CLK_CNTL, .shift = 0, .width = 7, + .flags = CLK_DIVIDER_ROUND_CLOSEST, }, .hw.init = &(struct clk_init_data ){ .name ="vdec_1_div" ,
@@ -2258,6 +2259,7 @@ static struct clk_regmap gxbb_vdec_hevc_div = { .offset = HHI_VDEC2_CLK_CNTL, .shift = 16, .width = 7, + .flags = CLK_DIVIDER_ROUND_CLOSEST, }, .hw.init = &(struct clk_init_data ){ .name ="vdec_hevc_div" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/95 ASoC: stm32: dfsdm: manage multiple prepare
In reply to Greg Kroah-Hartman[ Upstream commit 19441e35a43b616ea6afad91ed0d9e77268d8f6a ]
The DFSDM must be stopped when a new setting is applied. restart systematically DFSDM on multiple prepare calls, to apply changes.
--- sound/soc/stm/stm32_adfsdm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
sound/soc/stm/stm32_adfsdm.c +16 -1
@@ -9,6 +9,7 @@#include <linux/clk.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/slab.h>
@@ -37,6 +38,8 @@ struct stm32_adfsdm_priv {/* PCM buffer */ unsigned char *pcm_buff;unsigned int pos; + +struct mutex lock;/* protect against race condition on iio state */ };static const struct snd_pcm_hardware stm32_adfsdm_pcm_hw = {
@@ -62,10 +65,12 @@ static void stm32_adfsdm_shutdown(struct snd_pcm_substream *substream, {struct stm32_adfsdm_priv *priv =snd_soc_dai_get_drvdata (dai); +mutex_lock (&priv->lock);if (priv->iio_active) {iio_channel_stop_all_cb (priv->iio_cb); priv->iio_active = false; } +mutex_unlock (&priv->lock); } static int stm32_adfsdm_dai_prepare(struct snd_pcm_substream *substream,
@@ -74,13 +79,19 @@ static int stm32_adfsdm_dai_prepare(struct snd_pcm_substream *substream,struct stm32_adfsdm_priv *priv =snd_soc_dai_get_drvdata (dai);int ret; +mutex_lock (&priv->lock); +if (priv->iio_active) { +iio_channel_stop_all_cb (priv->iio_cb); + priv->iio_active = false; + } + ret =iio_write_channel_attribute (priv->iio_ch, substream->runtime->rate,0 ,IIO_CHAN_INFO_SAMP_FREQ );if (ret <0 ) {dev_err (dai->dev,"%s: Failed to set %d sampling rate\n" , __func__, substream->runtime->rate); -return ret; + goto out; }if (!priv->iio_active) {
@@ -92,6 +103,9 @@ static int stm32_adfsdm_dai_prepare(struct snd_pcm_substream *substream, __func__, ret); } +out: +mutex_unlock (&priv->lock); +return ret; }
@@ -298,6 +312,7 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) priv->dev = &pdev->dev; priv->dai_drv = stm32_adfsdm_dai; +mutex_init (&priv->lock);dev_set_drvdata (&pdev->dev, priv);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/95 ASoC: stm32: dfsdm: fix debugfs warnings on entry creation
In reply to Greg Kroah-Hartman[ Upstream commit c47255b61129857b74b0d86eaf59335348be05e0 ]
Register platform component with a prefix, to avoid warnings on debugfs entries creation, due to component name redundancy.
--- sound/soc/stm/stm32_adfsdm.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
sound/soc/stm/stm32_adfsdm.c +18 -3
@@ -304,6 +304,7 @@ MODULE_DEVICE_TABLE(of, stm32_adfsdm_of_match);static int stm32_adfsdm_probe (struct platform_device *pdev) {struct stm32_adfsdm_priv *priv; +struct snd_soc_component *component;int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );
@@ -331,9 +332,15 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)if (IS_ERR (priv->iio_cb))return PTR_ERR (priv->iio_cb); - ret =devm_snd_soc_register_component (&pdev->dev, - &stm32_adfsdm_soc_platform, -NULL ,0 ); + component =devm_kzalloc (&pdev->dev,sizeof (*component),GFP_KERNEL ); +if (!component) +return -ENOMEM ; +#ifdef CONFIG_DEBUG_FS + component->debugfs_prefix ="pcm" ; +#endif + + ret =snd_soc_add_component (&pdev->dev, component, + &stm32_adfsdm_soc_platform,NULL ,0 );if (ret <0 )dev_err (&pdev->dev,"%s: Failed to register PCM platform\n" , __func__);
@@ -341,12 +348,20 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)return ret; } +static int stm32_adfsdm_remove (struct platform_device *pdev) +{ +snd_soc_unregister_component (&pdev->dev); + +return 0 ; +} +static struct platform_driver stm32_adfsdm_driver = { .driver = { .name =STM32_ADFSDM_DRV_NAME , .of_match_table = stm32_adfsdm_of_match, }, .probe = stm32_adfsdm_probe, + .remove = stm32_adfsdm_remove, };module_platform_driver (stm32_adfsdm_driver);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/95 ASoC: cs4270: Set auto-increment bit for register writes
In reply to Greg Kroah-Hartman[ Upstream commit f0f2338a9cfaf71db895fa989ea7234e8a9b471d ]
The CS4270 does not by default increment the register address on consecutive writes. During normal operation it doesn't matter as all register accesses are done individually. At resume time after suspend, however, the regcache code gathers the biggest possible block of registers to sync and sends them one on one go.
To fix this, set the INCR bit in all cases.
--- sound/soc/codecs/cs4270.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4270.c +1 -0
@@ -642,6 +642,7 @@ static const struct regmap_config cs4270_regmap = { .reg_defaults = cs4270_reg_defaults, .num_reg_defaults = ARRAY_SIZE(cs4270_reg_defaults), .cache_type = REGCACHE_RBTREE, + .write_flag_mask = CS4270_I2C_INCR, .readable_reg = cs4270_reg_is_readable, .volatile_reg = cs4270_reg_is_volatile,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/95 ASoC: dapm: Fix NULL pointer dereference in snd_soc_dapm_free_kcontrol
In reply to Greg Kroah-Hartman[ Upstream commit cacea3a90e211f0c111975535508d446a4a928d2 ]
w_text_param can be NULL and it is being dereferenced without checking. Add the missing sanity check to prevent NULL pointer dereference.
--- sound/soc/soc-dapm.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/soc-dapm.c +4 -0
@@ -3840,6 +3840,10 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card,int count;devm_kfree (card->dev, (void *)*private_value); + +if (!w_param_text) +return ; +for (count =0 ; count < num_params; count++)devm_kfree (card->dev, (void *)w_param_text[count]);devm_kfree (card->dev, w_param_text);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/95 drm/omap: hdmi4_cec: Fix CEC clock handling for PM
In reply to Greg Kroah-Hartman[ Upstream commit 36a1da15b5df493241b0011d2185fdd724ac1ed1 ]
If CONFIG_OMAP4_DSS_HDMI_CEC is enabled in .config, deeper SoC idle states are blocked because the CEC clock gets always enabled on init.
Let's fix the issue by moving the CEC clock handling to happen later in hdmi_cec_adap_enable() as suggested by Hans Verkuil <[email protected]>. This way the CEC clock gets only enabled when needed. This can be tested by doing cec-ctl --playback to enable the CEC, and doing cec-ctl --clear to disable it.
Let's also fix the typo for "divider" in the comments while at it.
--- drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 26 ++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c +19 -7
@@ -175,6 +175,7 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)REG_FLD_MOD (core->base,HDMI_CORE_SYS_INTR_UNMASK4 ,0 ,3 ,3 );hdmi_wp_clear_irqenable (core->wp,HDMI_IRQ_CORE );hdmi_wp_set_irqstatus (core->wp,HDMI_IRQ_CORE ); +REG_FLD_MOD (core->wp->base,HDMI_WP_CLK ,0 ,5 ,0 );hdmi4_core_disable (core);return 0 ; }
@@ -182,16 +183,24 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)if (err)return err; +/* +* Initialize CEC clock divider: CEC needs 2MHz clock hence +* set the divider to 24 to get 48/24=2MHz clock +*/ +REG_FLD_MOD (core->wp->base,HDMI_WP_CLK ,0x18 ,5 ,0 ); +/* Clear TX FIFO */ if (!hdmi_cec_clear_tx_fifo (adap)) {pr_err ("cec-%s: could not clear TX FIFO\n" , adap->name); -return -EIO ; + err = -EIO ; + goto err_disable_clk; }/* Clear RX FIFO */ if (!hdmi_cec_clear_rx_fifo (adap)) {pr_err ("cec-%s: could not clear RX FIFO\n" , adap->name); -return -EIO ; + err = -EIO ; + goto err_disable_clk; }/* Clear CEC interrupts */
@@ -236,6 +245,12 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)hdmi_write_reg (core->base,HDMI_CEC_INT_STATUS_1 , temp); }return 0 ; + +err_disable_clk: +REG_FLD_MOD (core->wp->base,HDMI_WP_CLK ,0 ,5 ,0 ); +hdmi4_core_disable (core); + +return err; }static int hdmi_cec_adap_log_addr (struct cec_adapter *adap,u8 log_addr)
@@ -333,11 +348,8 @@ int hdmi4_cec_init(struct platform_device *pdev, struct hdmi_core_data *core,return ret; core->wp = wp; -/* -* Initialize CEC clock divider: CEC needs 2MHz clock hence -* set the devider to 24 to get 48/24=2MHz clock -*/ -REG_FLD_MOD (core->wp->base,HDMI_WP_CLK ,0x18 ,5 ,0 ); +/* Disable clock initially, hdmi_cec_adap_enable() manages it */ +REG_FLD_MOD (core->wp->base,HDMI_WP_CLK ,0 ,5 ,0 ); ret =cec_register_adapter (core->adap, &pdev->dev);if (ret <0 ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/95 IB/hfi1: Clear the IOWAIT pending bits when QP is put into error state
In reply to Greg Kroah-Hartman[ Upstream commit 93b289b9aff66eca7575b09f36f5abbeca8e6167 ]
When a QP is put into error state, it may be waiting for send engine resources. In this case, the QP will be removed from the send engine's waiting list, but its IOWAIT pending bits are not cleared. This will normally not have any major impact as the QP is being destroyed. However, the QP still needs to wind down its operations, such as draining the send queue by scheduling the send engine. Clearing the pending bits will avoid any potential complications. In addition, if the QP will eventually hang, clearing the pending bits can help debugging by presenting a consistent picture if the user dumps the qp_stats.
This patch clears a QP's IOWAIT_PENDING_IB and IO_PENDING_TID bits in priv->s_iowait.flags in this case.
--- drivers/infiniband/hw/hfi1/qp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/qp.c +2 -0
@@ -834,6 +834,8 @@ void notify_error_qp(struct rvt_qp *qp)if (!list_empty (&priv->s_iowait.list) && !(qp->s_flags &RVT_S_BUSY )) { qp->s_flags &= ~HFI1_S_ANY_WAIT_IO ; +iowait_clear_flag (&priv->s_iowait,IOWAIT_PENDING_IB ); +iowait_clear_flag (&priv->s_iowait,IOWAIT_PENDING_TID );list_del_init (&priv->s_iowait.list); priv->s_iowait.lock =NULL ;rvt_put_qp (qp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/95 IB/hfi1: Eliminate opcode tests on mr deref
In reply to Greg Kroah-Hartman[ Upstream commit a8639a79e85c18c16c10089edd589c7948f19bbd ]
When an old ack_queue entry is used to store an incoming request, it may need to clean up the old entry if it is still referencing the MR. Originally only RDMA READ request needed to reference MR on the responder side and therefore the opcode was tested when cleaning up the old entry. The introduction of tid rdma specific operations in the ack_queue makes the specific opcode tests wrong. Multiple opcodes (RDMA READ, TID RDMA READ, and TID RDMA WRITE) may need MR ref cleanup.
Remove the opcode specific tests associated with the ack_queue.
--- drivers/infiniband/hw/hfi1/rc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/rc.c +2 -2
@@ -2302,7 +2302,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
@@ -2376,7 +2376,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/95 IB/hfi1: Fix the allocation of RSM table
In reply to Greg Kroah-Hartman[ Upstream commit d0294344470e6b52d097aa7369173f32d11f2f52 ]
The receive side mapping (RSM) on hfi1 hardware is a special matching mechanism to direct an incoming packet to a given hardware receive context. It has 4 instances of matching capabilities (RSM0 - RSM3) that share the same RSM table (RMT). The RMT has a total of 256 entries, each of which points to a receive context.
Currently, three instances of RSM have been used:
1. RSM0 by QOS;
2. RSM1 by PSM FECN;
3. RSM2 by VNIC.
Each RSM instance should reserve enough entries in RMT to function properly. Since both PSM and VNIC could allocate any receive context between dd->first_dyn_alloc_ctxt and dd->num_rcv_contexts, PSM FECN must reserve enough RMT entries to cover the entire receive context index range (dd->num_rcv_contexts - dd->first_dyn_alloc_ctxt) instead of only the user receive contexts allocated for PSM (dd->num_user_contexts). Consequently, the sizing of dd->num_user_contexts in set_up_context_variables is incorrect.
--- drivers/infiniband/hw/hfi1/chip.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hfi1/chip.c +19 -7
@@ -13219,7 +13219,7 @@ static int set_up_context_variables(struct hfi1_devdata *dd)int total_contexts;int ret;unsigned ngroups; -int qos_rmt_count; +int rmt_count;int user_rmt_reduced;u32 n_usr_ctxts;u32 send_contexts =chip_send_contexts (dd);
@@ -13281,10 +13281,20 @@ static int set_up_context_variables(struct hfi1_devdata *dd) n_usr_ctxts = rcv_contexts - total_contexts; } -/* each user context requires an entry in the RMT */ - qos_rmt_count =qos_rmt_entries (dd,NULL ,NULL ); -if (qos_rmt_count + n_usr_ctxts >NUM_MAP_ENTRIES ) { - user_rmt_reduced =NUM_MAP_ENTRIES - qos_rmt_count; +/* +* The RMT entries are currently allocated as shown below: +* 1. QOS (0 to 128 entries); +* 2. FECN for PSM (num_user_contexts + num_vnic_contexts); +* 3. VNIC (num_vnic_contexts). +* It should be noted that PSM FECN oversubscribe num_vnic_contexts +* entries of RMT because both VNIC and PSM could allocate any receive +* context between dd->first_dyn_alloc_text and dd->num_rcv_contexts, +* and PSM FECN must reserve an RMT entry for each possible PSM receive +* context. +*/ + rmt_count =qos_rmt_entries (dd,NULL ,NULL ) + (num_vnic_contexts *2 ); +if (rmt_count + n_usr_ctxts >NUM_MAP_ENTRIES ) { + user_rmt_reduced =NUM_MAP_ENTRIES - rmt_count; dd_dev_err(dd, "RMT size is reducing the number of user receive contexts from %u to %d\n", n_usr_ctxts,
@@ -14272,9 +14282,11 @@ static void init_user_fecn_handling(struct hfi1_devdata *dd,u64 reg;int i, idx, regoff, regidx;u8 offset; +u32 total_cnt;/* there needs to be enough room in the map table */ -if (rmt->used + dd->num_user_contexts >=NUM_MAP_ENTRIES ) { + total_cnt = dd->num_rcv_contexts - dd->first_dyn_alloc_ctxt; +if (rmt->used + total_cnt >=NUM_MAP_ENTRIES ) {dd_dev_err (dd,"User FECN handling disabled - too many user contexts allocated\n" );return ; }
@@ -14328,7 +14340,7 @@ static void init_user_fecn_handling(struct hfi1_devdata *dd,/* add rule 1 */ add_rsm_rule (dd,RSM_INS_FECN , &rrd); - rmt->used += dd->num_user_contexts; + rmt->used += total_cnt; }/* Initialize RSM for VNIC */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/95 MIPS: KGDB: fix kgdb support for SMP platforms.
In reply to Greg Kroah-Hartman[ Upstream commit ab8a6d821179ab9bea1a9179f535ccba6330c1ed ]
KGDB_call_nmi_hook is called by other cpu through smp call. MIPS smp call is processed in ipi irq handler and regs is saved in
handle_int.
So kgdb_call_nmi_hook get regs by get_irq_regs and regs will be passed
to kgdb_cpu_enter.
--- arch/mips/kernel/kgdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/kgdb.c +2 -1
@@ -33,6 +33,7 @@#include <asm/processor.h> #include <asm/sigcontext.h> #include <linux/uaccess.h> +#include <asm/irq_regs.h> static struct hard_trap_info { unsigned char tt; /* Trap type code for MIPS R3xxx and R4xxx */
@@ -214,7 +215,7 @@ void kgdb_call_nmi_hook(void *ignored) old_fs =get_fs ();set_fs (get_ds ()); -kgdb_nmicallback (raw_smp_processor_id (),NULL ); +kgdb_nmicallback (raw_smp_processor_id (),get_irq_regs ());set_fs (old_fs); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/95 ASoC: tlv320aic32x4: Fix Common Pins
In reply to Greg Kroah-Hartman[ Upstream commit c63adb28f6d913310430f14c69f0a2ea55eed0cc ]
The common pins were mistakenly not added to the DAPM graph. Adding these pins will allow valid graphs to be created.
--- sound/soc/codecs/tlv320aic32x4.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/tlv320aic32x4.c +2 -0
@@ -462,6 +462,8 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {SND_SOC_DAPM_INPUT ("IN2_R" ),SND_SOC_DAPM_INPUT ("IN3_L" ),SND_SOC_DAPM_INPUT ("IN3_R" ), +SND_SOC_DAPM_INPUT ("CM_L" ), + SND_SOC_DAPM_INPUT("CM_R"), }; static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/95 drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
In reply to Greg Kroah-Hartman[ Upstream commit 2d85978341e6a32e7443d9f28639da254d53f400 ]
We don't want to overwrite "ret", it already holds the correct error code. The "regmap" variable might be a valid pointer as this point.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_hdmi.c +0 -1
@@ -1479,7 +1479,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (regmap)) ret =PTR_ERR (regmap);if (ret) { - ret =PTR_ERR (regmap);dev_err (dev,"Failed to get system configuration registers: %d\n" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/95 perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
In reply to Greg Kroah-Hartman[ Upstream commit 583feb08e7f7ac9d533b446882eb3a54737a6dbb ]
When an event is programmed with attr.wakeup_events=N (N>0), it means the caller is interested in getting a user level notification after N samples have been recorded in the kernel sampling buffer.
With precise events on Intel processors, the kernel uses PEBS. The kernel tries minimize sampling overhead by verifying
if the event configuration is compatible with multi-entry PEBS mode. If so, the kernel is notified only when the buffer has reached its threshold. Other PEBS operates in single-entry mode, the kenrel is notified for each PEBS sample.
The problem is that the current implementation look at frequency mode and event sample_type but ignores the wakeup_events field. Thus, it may not be possible to receive a notification after each precise event.
This patch fixes this problem by disabling multi-entry PEBS if wakeup_events is non-zero.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -3184,7 +3184,7 @@ static int intel_pmu_hw_config(struct perf_event *event)return ret;if (event->attr.precise_ip) { -if (!event->attr.freq) { +if (!(event->attr.freq || event->attr.wakeup_events)) { event->hw.flags |=PERF_X86_EVENT_AUTO_RELOAD ;if (!(event->attr.sample_type & ~intel_pmu_large_pebs_flags (event)))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/95 perf/x86/intel: Initialize TFA MSR
In reply to Greg Kroah-Hartman[ Upstream commit d7262457e35dbe239659e62654e56f8ddb814bed ]
Stephane reported that the TFA MSR is not initialized by the kernel, but the TFA bit could set by firmware or as a leftover from a kexec, which makes the state inconsistent.
--- arch/x86/events/intel/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/events/intel/core.c +6 -0
@@ -3563,6 +3563,12 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; +if (x86_pmu.flags &PMU_FL_TFA ) { +WARN_ON_ONCE (cpuc->tfa_shadow); + cpuc->tfa_shadow = ~0ULL ; +intel_set_tfa (cpuc, false); + } +if (x86_pmu.version >1 )flip_smm_bit (&x86_pmu.attr_freeze_on_smi);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/95 linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
In reply to Greg Kroah-Hartman[ Upstream commit a0fe2c6479aab5723239b315ef1b552673f434a3 ]
Use parentheses around uses of the argument in u64_to_user_ptr() to ensure that the cast doesn't apply to part of the argument.
There are existing uses of the macro of the form
u64_to_user_ptr(A + B)
which expands to
(void __user *)(uintptr_t)A + B
(the cast applies to the first operand of the addition, the addition is a pointer addition). This happens to still work as intended, the semantic difference doesn't cause a difference in behavior.
But I want to use u64_to_user_ptr() with a ternary operator in the argument, like so:
u64_to_user_ptr(A ? B : C)
This currently doesn't work as intended.
--- include/linux/kernel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/kernel.h +2 -2
@@ -73,8 +73,8 @@#define u64_to_user_ptr (x) ( \ { \ - typecheck(u64, x); \ - (void __user *)(uintptr_t)x; \ + typecheck(u64, (x)); \ + (void __user *)(uintptr_t)(x); \ } \ )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/95 iov_iter: Fix build error without CONFIG_CRYPTO
In reply to Greg Kroah-Hartman[ Upstream commit 27fad74a5a77fe2e1f876db7bf27efcf2ec304b2 ]
If CONFIG_CRYPTO is not set or set to m,
gcc building warn this:
lib/iov_iter.o: In function `hash_and_copy_to_iter':
iov_iter.c:(.text+0x9129): undefined reference to crypto_stats_get' iov_iter.c:(.text+0x9152): undefined reference to crypto_stats_ahash_update'
--- lib/iov_iter.c | 4 ++++ 1 file changed, 4 insertions(+)
lib/iov_iter.c +4 -0
@@ -1515,6 +1515,7 @@ EXPORT_SYMBOL(csum_and_copy_to_iter);size_t hash_and_copy_to_iter (const void *addr,size_t bytes,void *hashp,struct iov_iter *i) { +#ifdef CONFIG_CRYPTO struct ahash_request *hash = hashp;struct scatterlist sg;size_t copied;
@@ -1524,6 +1525,9 @@ size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,ahash_request_set_crypt (hash, &sg,NULL , copied);crypto_ahash_update (hash);return copied; +#else +return 0 ; +#endif }EXPORT_SYMBOL (hash_and_copy_to_iter);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/95 xtensa: fix initialization of pt_regs::syscall in start_thread
In reply to Greg Kroah-Hartman[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ]
New pt_regs should indicate that there's no syscall, not that there's syscall #0. While at it wrap macro body in do/while and parenthesize macro arguments.
--- arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/xtensa/include/asm/processor.h +12 -9
@@ -187,15 +187,18 @@ struct thread_struct {/* Clearing a0 terminates the backtrace. */ #define start_thread (regs, new_pc, new_sp) \ - memset(regs, 0, sizeof(*regs)); \ - regs->pc = new_pc; \ - regs->ps = USER_PS_VALUE; \ - regs->areg[1] = new_sp; \ - regs->areg[0] = 0; \ - regs->wmask = 1; \ - regs->depc = 0; \ - regs->windowbase = 0; \ - regs->windowstart = 1; + do { \ + memset((regs), 0, sizeof(*(regs))); \ + (regs)->pc = (new_pc); \ + (regs)->ps = USER_PS_VALUE; \ + (regs)->areg[1] = (new_sp); \ + (regs)->areg[0] = 0; \ + (regs)->wmask = 1; \ + (regs)->depc = 0; \ + (regs)->windowbase = 0; \ + (regs)->windowstart = 1; \ + (regs)->syscall = NO_SYSCALL; \ + } while (0)/* Forward declaration */ struct task_struct ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/95 ASoC: rockchip: pdm: fix regmap_ops hang issue
In reply to Greg Kroah-Hartman[ Upstream commit c85064435fe7a216ec0f0238ef2b8f7cd850a450 ]
This is because set_fmt ops maybe called when PD is off, and in such case, regmap_ops will lead system hang. enale PD before doing regmap_ops.
--- sound/soc/rockchip/rockchip_pdm.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/rockchip/rockchip_pdm.c +2 -0
@@ -208,7 +208,9 @@ static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai,return -EINVAL ; } +pm_runtime_get_sync (cpu_dai->dev);regmap_update_bits (pdm->regmap,PDM_CLK_CTRL , mask, val); +pm_runtime_put (cpu_dai->dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/95 drm/amdkfd: Add picasso pci id
In reply to Greg Kroah-Hartman[ Upstream commit e7ad88553aa1d48e950ca9a4934d246c1bee4be4 ]
Picasso is a new raven variant.
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +1 -0
@@ -320,6 +320,7 @@ static const struct kfd_deviceid supported_devices[] = { { 0x9876, &carrizo_device_info }, /* Carrizo */ { 0x9877, &carrizo_device_info }, /* Carrizo */ { 0x15DD, &raven_device_info }, /* Raven */ + { 0x15D8, &raven_device_info }, /* Raven */ #endif { 0x67A0, &hawaii_device_info }, /* Hawaii */ { 0x67A1, &hawaii_device_info }, /* Hawaii */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/95 drm/amdgpu: Adjust IB test timeout for XGMI configuration
In reply to Greg Kroah-Hartman[ Upstream commit d4162c61e253177936fcfe6c29f7b224d9a1efb8 ]
On XGMI configuration the ib test may take longer to finish
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -0
@@ -35,6 +35,7 @@#include "amdgpu_trace.h" #define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000) +#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT msecs_to_jiffies(2000)/* * IB
@@ -344,6 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)* cost waiting for it coming back under RUNTIME only */ tmo_gfx =8 *AMDGPU_IB_TEST_TIMEOUT ; + }else if (adev->gmc.xgmi.hive_id) { + tmo_gfx =AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT ; }for (i =0 ; i < adev->num_rings; ++i) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/95 drm/amdgpu: amdgpu_device_recover_vram always failed if only one node in shadow_list
In reply to Greg Kroah-Hartman[ Upstream commit 1712fb1a2f6829150032ac76eb0e39b82a549cfb ]
amdgpu_bo_restore_shadow would assign zero to r if succeeded.
r would remain zero if there is only one node in shadow_list. current code would always return failure when r <= 0.
restart the timeout for each wait was a rather problematic bug as well. The value of tmo SHOULD be changed, otherwise we wait tmo jiffies on each loop.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +9 -4
@@ -3158,11 +3158,16 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)break ;if (fence) { - r =dma_fence_wait_timeout (fence, false, tmo); + tmo =dma_fence_wait_timeout (fence, false, tmo);dma_fence_put (fence); fence = next; -if (r <=0 ) +if (tmo ==0 ) { + r = -ETIMEDOUT ;break ; + }else if (tmo <0 ) { + r = tmo; +break ; + } }else { fence = next; }
@@ -3173,8 +3178,8 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) tmo =dma_fence_wait_timeout (fence, false, tmo);dma_fence_put (fence); -if (r <=0 || tmo <=0 ) { -DRM_ERROR ("recover vram bo from shadow failed\n" ); +if (r <0 || tmo <=0 ) { +DRM_ERROR ("recover vram bo from shadow failed, r is %ld, tmo is %ld\n" , r, tmo);return -EIO ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/95 drm/amd/display: fix cursor black issue
In reply to Greg Kroah-Hartman[ Upstream commit c1cefe115d1cdc460014483319d440b2f0d07c68 ]
[Why]
the member sdr_white_level of struct dc_cursor_attributes was not initialized, then the random value result that dcn10_set_cursor_sdr_white_level() set error hw_scale value 0x20D9(normal value is 0x3c00), this cause the black cursor issue.
[how]
just initilize the obj of struct dc_cursor_attributes to zero to avoid the random value.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
@@ -4455,6 +4455,7 @@ static void handle_cursor_update(struct drm_plane *plane, amdgpu_crtc->cursor_width = plane->state->crtc_w; amdgpu_crtc->cursor_height = plane->state->crtc_h; +memset (&attributes,0 ,sizeof (attributes)); attributes.address.high_part =upper_32_bits (address); attributes.address.low_part =lower_32_bits (address); attributes.width = plane->state->crtc_w;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/95 ASoC: cs35l35: Disable regulators on driver removal
In reply to Greg Kroah-Hartman[ Upstream commit 47c4cc08cb5b34e93ab337b924c5ede77ca3c936 ]
The chips main power supplies VA and VP are enabled during probe but then never disabled, this will cause warnings from the regulator framework on driver removal. Fix this by adding a remove callback and disabling the supplies, whilst doing so follow best practice and put the chip back into reset as well.
--- sound/soc/codecs/cs35l35.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/codecs/cs35l35.c +11 -0
@@ -1635,6 +1635,16 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client,return ret; } +static int cs35l35_i2c_remove (struct i2c_client *i2c_client) +{ +struct cs35l35_private *cs35l35 =i2c_get_clientdata (i2c_client); + +regulator_bulk_disable (cs35l35->num_supplies, cs35l35->supplies); +gpiod_set_value_cansleep (cs35l35->reset_gpio,0 ); + +return 0 ; +} +static const struct of_device_id cs35l35_of_match[] = { {.compatible ="cirrus,cs35l35" }, {},
@@ -1655,6 +1665,7 @@ static struct i2c_driver cs35l35_i2c_driver = { }, .id_table = cs35l35_id, .probe = cs35l35_i2c_probe, + .remove = cs35l35_i2c_remove, };module_i2c_driver (cs35l35_i2c_driver);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/95 objtool: Add rewind_stack_do_exit() to the noreturn list
In reply to Greg Kroah-Hartman[ Upstream commit 4fa5ecda2bf96be7464eb406df8aba9d89260227 ]
This fixes the following warning seen on GCC 7.3:
arch/x86/kernel/dumpstack.o: warning: objtool: oops_end() falls through to next function show_regs()
--- tools/objtool/check.c | 1 + 1 file changed, 1 insertion(+)
tools/objtool/check.c +1 -0
@@ -165,6 +165,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,"fortify_panic" ,"usercopy_abort" ,"machine_real_restart" , + "rewind_stack_do_exit", };if (func->bind ==STB_WEAK )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/95 slab: fix a crash by reading /proc/slab_allocators
In reply to Greg Kroah-Hartman[ Upstream commit fcf88917dd435c6a4cb2830cb086ee58605a1d85 ]
The commit 510ded33e075 ("slab: implement slab_root_caches list") changes the name of the list node within "struct kmem_cache" from "list" to "root_caches_node", but leaks_show() still use the "list" which causes a crash when reading /proc/slab_allocators.
You need to have CONFIG_SLAB=y and CONFIG_MEMCG=y to see the problem, because without MEMCG all slab caches are root caches, and the "list" node happens to be the right one.
--- mm/slab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/slab.c +2 -1
@@ -4297,7 +4297,8 @@ static void show_symbol(struct seq_file *m, unsigned long address)static int leaks_show (struct seq_file *m,void *p) { - struct kmem_cache *cachep = list_entry(p, struct kmem_cache, list); + struct kmem_cache *cachep = list_entry(p, struct kmem_cache, + root_caches_node);struct page *page;struct kmem_cache_node *n;const char *name;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/95 drm/sun4i: tcon top: Fix NULL/invalid pointer dereference in sun8i_tcon_top_un/bind
In reply to Greg Kroah-Hartman[ Upstream commit 1a07a94b47b1f528f39c3e6187b5eaf02efe44ea ]
There are two problems here:
1. Not all clk_data->hws[] need to be initialized, depending on various configured quirks. This leads to NULL ptr deref in clk_hw_unregister_gate() in sun8i_tcon_top_unbind()
2. If there is error when registering the clk_data->hws[], err_unregister_gates error path will try to unregister IS_ERR()=true (invalid) pointer.
For problem (1) I have this stack trace:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008 Call trace: clk_hw_unregister+0x8/0x18 clk_hw_unregister_gate+0x14/0x28 sun8i_tcon_top_unbind+0x2c/0x60 component_unbind.isra.4+0x2c/0x50 component_bind_all+0x1d4/0x230 sun4i_drv_bind+0xc4/0x1a0 try_to_bring_up_master+0x164/0x1c0 __component_add+0xa0/0x168 component_add+0x10/0x18 sun8i_dw_hdmi_probe+0x18/0x20 platform_drv_probe+0x3c/0x70 really_probe+0xcc/0x278 driver_probe_device+0x34/0xa8
Problem (2) was identified by head scratching.
--- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +3 -2
@@ -227,7 +227,7 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, err_unregister_gates:for (i =0 ; i <CLK_NUM ; i++) -if (clk_data->hws[i]) +if (!IS_ERR_OR_NULL (clk_data->hws[i]))clk_hw_unregister_gate (clk_data->hws[i]);clk_disable_unprepare (tcon_top->bus); err_assert_reset:
@@ -245,7 +245,8 @@ static void sun8i_tcon_top_unbind(struct device *dev, struct device *master,of_clk_del_provider (dev->of_node);for (i =0 ; i <CLK_NUM ; i++) -clk_hw_unregister_gate (clk_data->hws[i]); +if (clk_data->hws[i]) +clk_hw_unregister_gate (clk_data->hws[i]);clk_disable_unprepare (tcon_top->bus);reset_control_assert (tcon_top->rst);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/95 virtio_pci: fix a NULL pointer reference in vp_del_vqs
In reply to Greg Kroah-Hartman[ Upstream commit 6a8aae68c87349dbbcd46eac380bc43cdb98a13b ]
If the msix_affinity_masks is alloced failed, then we'll try to free some resources in vp_free_vectors() that may access it directly.
We met the following stack in our production:
[ 29.296767] BUG: unable to handle kernel NULL pointer dereference at (null) [ 29.311151] IP: [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.324787] PGD 0 [ 29.333224] Oops: 0000 [#1] SMP [...] [ 29.425175] RIP: 0010:[<ffffffffc04fe35a>] [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.441405] RSP: 0018:ffff9a55c2dcfa10 EFLAGS: 00010206 [ 29.453491] RAX: 0000000000000000 RBX: ffff9a55c322c400 RCX: 0000000000000000 [ 29.467488] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9a55c322c400 [ 29.481461] RBP: ffff9a55c2dcfa20 R08: 0000000000000000 R09: ffffc1b6806ff020 [ 29.495427] R10: 0000000000000e95 R11: 0000000000aaaaaa R12: 0000000000000000 [ 29.509414] R13: 0000000000010000 R14: ffff9a55bd2d9e98 R15: ffff9a55c322c400 [ 29.523407] FS: 00007fdcba69f8c0(0000) GS:ffff9a55c2840000(0000) knlGS:0000000000000000 [ 29.538472] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.551621] CR2: 0000000000000000 CR3: 000000003ce52000 CR4: 00000000003607a0 [ 29.565886] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.580055] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.594122] Call Trace: [ 29.603446] [<ffffffffc04fe8a2>] vp_request_msix_vectors+0xe2/0x260 [virtio_pci] [ 29.618017] [<ffffffffc04fedc5>] vp_try_to_find_vqs+0x95/0x3b0 [virtio_pci] [ 29.632152] [<ffffffffc04ff117>] vp_find_vqs+0x37/0xb0 [virtio_pci] [ 29.645582] [<ffffffffc057bf63>] init_vq+0x153/0x260 [virtio_blk] [ 29.658831] [<ffffffffc057c1e8>] virtblk_probe+0xe8/0x87f [virtio_blk]
[...]
--- drivers/virtio/virtio_pci_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci_common.c +5 -3
@@ -255,9 +255,11 @@ void vp_del_vqs(struct virtio_device *vdev)for (i =0 ; i < vp_dev->msix_used_vectors; ++i)free_irq (pci_irq_vector (vp_dev->pci_dev, i), vp_dev); -for (i =0 ; i < vp_dev->msix_vectors; i++) -if (vp_dev->msix_affinity_masks[i]) -free_cpumask_var (vp_dev->msix_affinity_masks[i]); +if (vp_dev->msix_affinity_masks) { +for (i =0 ; i < vp_dev->msix_vectors; i++) +if (vp_dev->msix_affinity_masks[i]) +free_cpumask_var (vp_dev->msix_affinity_masks[i]); + }if (vp_dev->msix_enabled) {/* Disable the vector used for configuration */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/95 RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
In reply to Greg Kroah-Hartman[ Upstream commit ea7a5c706fa49273cf6d1d9def053ecb50db2076 ]
Make sure to free the DSR on pvrdma_pci_remove() to avoid the memory leak.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +2 -0
@@ -1125,6 +1125,8 @@ static void pvrdma_pci_remove(struct pci_dev *pdev)pvrdma_page_dir_cleanup (dev, &dev->cq_pdir);pvrdma_page_dir_cleanup (dev, &dev->async_pdir);pvrdma_free_slots (dev); +dma_free_coherent (&pdev->dev,sizeof (*dev->dsr), dev->dsr, + dev->dsrbase);iounmap (dev->regs);kfree (dev->sgid_tbl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/95 RDMA/hns: Fix bug that caused srq creation to fail
In reply to Greg Kroah-Hartman[ Upstream commit 4772e03d239484f3461e33c79d721c8ea03f7416 ]
Due to the incorrect use of the seg and obj information, the position of the mtt is calculated incorrectly, and the free space of the page is not enough to store the entire mtt, resulting in access to the next page. This patch fixes this problem.
Unable to handle kernel paging request at virtual address ffff00006e3cd000 ... Call trace: hns_roce_write_mtt+0x154/0x2f0 [hns_roce] hns_roce_buf_write_mtt+0xa8/0xd8 [hns_roce] hns_roce_create_srq+0x74c/0x808 [hns_roce] ib_create_srq+0x28/0xc8
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 6 ++++-- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -2
@@ -763,6 +763,8 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev, idx_offset = (obj & (table->num_obj -1 )) % obj_per_chunk; dma_offset = offset = idx_offset * table->obj_size; }else { +u32 seg_size =64 ;/* 8 bytes per BA and 8 BA per segment */ +hns_roce_calc_hem_mhop (hr_dev, table, &mhop_obj, &mhop);/* mtt mhop */ i = mhop.l0_idx;
@@ -774,8 +776,8 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev, hem_idx = i; hem = table->hem[hem_idx]; - dma_offset = offset = (obj & (table->num_obj -1 )) * - table->obj_size % mhop.bt_chunk_size; + dma_offset = offset = (obj & (table->num_obj -1 )) * seg_size % + mhop.bt_chunk_size;if (mhop.hop_num ==2 ) dma_offset = offset =0 ; }
drivers/infiniband/hw/hns/hns_roce_mr.c +2 -2
@@ -746,7 +746,6 @@ static int hns_roce_write_mtt_chunk(struct hns_roce_dev *hr_dev,struct hns_roce_hem_table *table;dma_addr_t dma_handle;__le64 *mtts; -u32 s = start_index *sizeof (u64);u32 bt_page_size;u32 i;
@@ -780,7 +779,8 @@ static int hns_roce_write_mtt_chunk(struct hns_roce_dev *hr_dev,return -EINVAL ; mtts =hns_roce_table_find (hr_dev, table, - mtt->first_seg + s / hr_dev->caps.mtt_entry_sz, + mtt->first_seg + + start_index /HNS_ROCE_MTT_ENTRY_PER_SEG , &dma_handle);if (!mtts)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/95 KEYS: trusted: fix -Wvarags warning
In reply to Greg Kroah-Hartman[ Upstream commit be24b37e22c20cbaa891971616784dd0f35211e8 ]
Fixes the warning reported by Clang:security/keys/trusted.c:146:17: warning: passing an object that undergoes default
argument promotion to 'va_start' has undefined behavior [-Wvarargs]
va_start(argp, h3);
^
security/keys/trusted.c:126:37: note: parameter of type 'unsigned
char' is declared here
unsigned char *h2, unsigned char h3, ...)
^Specifically, it seems that both the C90 (4.8.1.1) and C11 (7.16.1.4) standards explicitly call this out as undefined behavior:
The parameter parmN is the identifier of the rightmost parameter in the variable parameter list in the function definition (the one just before the ...). If the parameter parmN is declared with ... or with a type that is not compatible with the type that results after application of the default argument promotions, the behavior is undefined.
--- include/keys/trusted.h | 2 +- security/keys/trusted.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/keys/trusted.h +1 -1
@@ -38,7 +38,7 @@ enum {int TSS_authhmac (unsigned char *digest,const unsigned char *key,unsigned int keylen,unsigned char *h1, -unsigned char *h2,unsigned char h3, ...); +unsigned char *h2,unsigned int h3, ...); int TSS_checkhmac1(unsigned char *buffer, const uint32_t command, const unsigned char *ononce,
security/keys/trusted.c +2 -2
@@ -123,7 +123,7 @@ static int TSS_rawhmac(unsigned char *digest, const unsigned char *key,*/ int TSS_authhmac (unsigned char *digest,const unsigned char *key,unsigned int keylen,unsigned char *h1, -unsigned char *h2,unsigned char h3, ...) +unsigned char *h2,unsigned int h3, ...) {unsigned char paramdigest[SHA1_DIGEST_SIZE ];struct sdesc *sdesc;
@@ -139,7 +139,7 @@ int TSS_authhmac(unsigned char *digest, const unsigned char *key,return PTR_ERR (sdesc); } - c = h3; + c = !!h3; ret =crypto_shash_init (&sdesc->shash);if (ret <0 ) goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/95 scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
In reply to Greg Kroah-Hartman[ Upstream commit 5c2442fd78998af60e13aba506d103f7f43f8701 ]
If scsi cmd sglist is not suitable for DDP then csiostor driver uses preallocated buffers for DDP, because of this data copy is required from DDP buffer to scsi cmd sglist before calling ->scsi_done().
--- drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/csiostor/csio_scsi.c +4 -1
@@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: -if (req->nsge >0 ) +if (req->nsge >0 ) {scsi_dma_unmap (cmnd); +if (req->dcopy && (host_status ==DID_OK )) + host_status =csio_scsi_copy_to_sgl (hw, req); + } cmnd->result = (((host_status) <<16 ) | scsi_status); cmnd->scsi_done (cmnd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/95 drm/mediatek: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 2ae2c3316fb77dcf64275d011596b60104c45426 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/mediatek/mtk_hdmi.c:1521:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function. drivers/gpu/drm/mediatek/mtk_hdmi.c:1524:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_hdmi.c +1 -0
@@ -1514,6 +1514,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,of_node_put (remote); hdmi->ddc_adpt =of_find_i2c_adapter_by_node (i2c_np); +of_node_put (i2c_np);if (!hdmi->ddc_adpt) {dev_err (dev,"Failed to get ddc i2c adapter by node\n" );return -EINVAL ;
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 56/95 drm/mediatek: fix the rate and divder of hdmi phy for MT2701
In reply to Greg Kroah-Hartman[ Upstream commit 0c24613cda163dedfa229afc8eff6072e57fac8d ]
Due to a clerical error,there is one zero less for 12800000. Fix it for 128000000
--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +2 -2
@@ -116,8 +116,8 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,if (rate <=64000000 ) pos_div =3 ; -else if (rate <=12800000 ) - pos_div =1 ; +else if (rate <=128000000 ) + pos_div =2 ;else pos_div =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/95 drm/mediatek: make implementation of recalc_rate() for MT2701 hdmi phy
In reply to Greg Kroah-Hartman[ Upstream commit 321b628e6f5a3af999f75eadd373adbcb8b4cb1f ]
Recalculate the rate of this clock, by querying hardware to make implementation of recalc_rate() to match the definition.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 8 ---- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 2 - .../gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 38 +++++++++++++++++-- .../gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++ 4 files changed, 42 insertions(+), 14 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0 -8
@@ -29,14 +29,6 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,return rate; } -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - -return hdmi_phy->pll_rate; -} -void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits) {
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0 -2
@@ -50,8 +50,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw);long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate); -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +34 -4
@@ -79,7 +79,6 @@ static int mtk_hdmi_pll_prepare(struct clk_hw *hw)mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );usleep_range (80 ,100 );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN ); -mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );
@@ -94,7 +93,6 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK ); -mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN );usleep_range (80 ,100 );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );
@@ -123,6 +121,7 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON6 ,RG_HTPLL_PREDIV_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON6 ,RG_HTPLL_POSDIV_MASK ); +mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_mask (hdmi_phy,HDMI_CON6 , (0x1 <<RG_HTPLL_IC ),RG_HTPLL_IC_MASK ); mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6, (0x1 << RG_HTPLL_IR),
@@ -154,6 +153,39 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); +unsigned long out_rate, val; + + val = (readl (hdmi_phy->regs +HDMI_CON6 ) + &RG_HTPLL_PREDIV_MASK ) >>RG_HTPLL_PREDIV ; +switch (val) { +case 0x00 : + out_rate = parent_rate; +break ; +case 0x01 : + out_rate = parent_rate /2 ; +break ; +default : + out_rate = parent_rate /4 ; +break ; + } + + val = (readl (hdmi_phy->regs +HDMI_CON6 ) + &RG_HTPLL_FBKDIV_MASK ) >>RG_HTPLL_FBKDIV ; + out_rate *= (val +1 ) *2 ; + val = (readl (hdmi_phy->regs +HDMI_CON2 ) + &RG_HDMITX_TX_POSDIV_MASK ); + out_rate >>= (val >>RG_HDMITX_TX_POSDIV ); + +if (readl (hdmi_phy->regs +HDMI_CON2 ) &RG_HDMITX_EN_TX_POSDIV ) + out_rate /=5 ; + +return out_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
@@ -174,7 +206,6 @@ static void mtk_hdmi_phy_enable_tmds(struct mtk_hdmi_phy *hdmi_phy)mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );usleep_range (80 ,100 );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN ); -mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );
@@ -186,7 +217,6 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK ); -mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN );usleep_range (80 ,100 );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +8 -0
@@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + +return hdmi_phy->pll_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/95 drm/mediatek: remove flag CLK_SET_RATE_PARENT for MT2701 hdmi phy
In reply to Greg Kroah-Hartman[ Upstream commit 827abdd024207146822f66ba3ba74867135866b9 ]
This is the first step to make MT2701 hdmi stable. The parent rate of hdmi phy had set by DPI driver.
We should not set or change the parent rate of MT2701 hdmi phy, as a result we should remove the flags of "CLK_SET_RATE_PARENT" from the clock of MT2701 hdmi phy.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 13 +++++-------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 1 + drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 1 + drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 1 + 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +5 -8
@@ -102,13 +102,11 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)return NULL ; } -static void mtk_hdmi_phy_clk_get_ops (struct mtk_hdmi_phy *hdmi_phy, -const struct clk_ops **ops) +static void mtk_hdmi_phy_clk_get_data (struct mtk_hdmi_phy *hdmi_phy, +struct clk_init_data *clk_init) { -if (hdmi_phy && hdmi_phy->conf && hdmi_phy->conf->hdmi_phy_clk_ops) - *ops = hdmi_phy->conf->hdmi_phy_clk_ops; -else -dev_err (hdmi_phy->dev,"Failed to get clk ops of phy\n" ); + clk_init->flags = hdmi_phy->conf->flags; + clk_init->ops = hdmi_phy->conf->hdmi_phy_clk_ops; }static int mtk_hdmi_phy_probe (struct platform_device *pdev)
@@ -121,7 +119,6 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)struct clk_init_data clk_init = { .num_parents =1 , .parent_names = (const char *const *)&ref_clk_name, - .flags =CLK_SET_RATE_PARENT |CLK_SET_RATE_GATE , };struct phy *phy;
@@ -159,7 +156,7 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) hdmi_phy->dev = dev; hdmi_phy->conf = (struct mtk_hdmi_phy_conf *)of_device_get_match_data (dev); -mtk_hdmi_phy_clk_get_ops (hdmi_phy, &clk_init.ops); +mtk_hdmi_phy_clk_get_data (hdmi_phy, &clk_init); hdmi_phy->pll_hw.init = &clk_init; hdmi_phy->pll =devm_clk_register (dev, &hdmi_phy->pll_hw);if (IS_ERR (hdmi_phy->pll)) {
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1 -0
@@ -21,6 +21,7 @@ struct mtk_hdmi_phy;struct mtk_hdmi_phy_conf {bool tz_disabled; +unsigned long flags;const struct clk_ops *hdmi_phy_clk_ops;void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy);void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +1 -0
@@ -232,6 +232,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = { .tz_disabled = true, + .flags =CLK_SET_RATE_GATE , .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +1 -0
@@ -317,6 +317,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy) }struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf = { + .flags =CLK_SET_RATE_PARENT |CLK_SET_RATE_GATE , .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/95 drm/mediatek: using new factor for tvdpll for MT2701 hdmi phy
In reply to Greg Kroah-Hartman[ Upstream commit 8eeb3946feeb00486ac0909e2309da87db8988a5 ]
This is the second step to make MT2701 HDMI stable. The factor depends on the divider of DPI in MT2701, therefore, we should fix this factor to the right and new one.
Test: search ok
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +3 -5
@@ -662,13 +662,11 @@ static unsigned int mt8173_calculate_factor(int clock)static unsigned int mt2701_calculate_factor (int clock) {if (clock <=64000 ) -return 16 ; -else if (clock <=128000 ) -return 8 ; -else if (clock <=256000 )return 4 ; -else +else if (clock <=128000 )return 2 ; +else +return 1 ; }static const struct mtk_dpi_conf mt8173_conf = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/95 drm/mediatek: no change parent rate in round_rate() for MT2701 hdmi phy
In reply to Greg Kroah-Hartman[ Upstream commit 9ee76098a1b8ae21cccac641b735ee4d3a77bccf ]
This is the third step to make MT2701 HDMI stable. We should not change the rate of parent for hdmi phy when doing round_rate for this clock. The parent clock of hdmi phy must be the same as it. We change it when doing set_rate only.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 14 -------------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 2 -- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 6 ++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 14 ++++++++++++++ 4 files changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0 -14
@@ -15,20 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { .owner = THIS_MODULE, }; -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - - hdmi_phy->pll_rate = rate; -if (rate <=74250000 ) - *parent_rate = rate; -else - *parent_rate = rate /2 ; - -return rate; -} -void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits) {
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0 -2
@@ -49,8 +49,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,void mtk_hdmi_phy_mask (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 val,u32 mask);struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw); -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +6 -0
@@ -106,6 +106,12 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)usleep_range (80 ,100 ); } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +return rate; +} +static int mtk_hdmi_pll_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) {
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +14 -0
@@ -199,6 +199,20 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)usleep_range (100 ,150 ); } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; +if (rate <=74250000 ) + *parent_rate = rate; +else + *parent_rate = rate /2 ; + +return rate; +} +static int mtk_hdmi_pll_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/95 ASoC: Intel: kbl: fix wrong number of channels
In reply to Greg Kroah-Hartman[ Upstream commit d6ba3f815bc5f3c4249d15c8bc5fbb012651b4a4 ]
Fix wrong setting on number of channels. The context wants to set constraint to 2 channels instead of 4.
--- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
@@ -405,7 +405,7 @@ static const struct snd_pcm_hw_constraint_list constraints_dmic_channels = { };static const unsigned int dmic_2ch[] = { -4 , +2 , };static const struct snd_pcm_hw_constraint_list constraints_dmic_2ch = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/95 ASoC: stm32: sai: fix master clock management
In reply to Greg Kroah-Hartman[ Upstream commit e37c2deafe7058cf7989c4c47bbf1140cc867d89 ]
When master clock is used, master clock rate is set exclusively. Parent clocks of master clock cannot be changed after a call to clk_set_rate_exclusive(). So the parent clock of SAI kernel clock must be set before.
Ensure also that exclusive rate operations are balanced in STM32 SAI driver.
--- sound/soc/stm/stm32_sai_sub.c | 64 +++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 17 deletions(-)
sound/soc/stm/stm32_sai_sub.c +47 -17
@@ -70,6 +70,7 @@#define SAI_IEC60958_STATUS_BYTES 24#define SAI_MCLK_NAME_LEN 32 +#define SAI_RATE_11K 11025/** * struct stm32_sai_sub_data - private data of SAI sub block (block A or B)
@@ -309,6 +310,25 @@ static int stm32_sai_set_clk_div(struct stm32_sai_sub_data *sai,return ret; } +static int stm32_sai_set_parent_clock (struct stm32_sai_sub_data *sai, +unsigned int rate) +{ +struct platform_device *pdev = sai->pdev; +struct clk *parent_clk = sai->pdata->clk_x8k; +int ret; + +if (!(rate %SAI_RATE_11K )) + parent_clk = sai->pdata->clk_x11k; + + ret =clk_set_parent (sai->sai_ck, parent_clk); +if (ret) +dev_err (&pdev->dev," Error %d setting sai_ck parent clock. %s" , + ret, ret == -EBUSY ? +"Active stream rates conflict\n" :"\n" ); + +return ret; +} +static long stm32_sai_mclk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *prate) {
@@ -490,25 +510,29 @@ static int stm32_sai_set_sysclk(struct snd_soc_dai *cpu_dai,struct stm32_sai_sub_data *sai =snd_soc_dai_get_drvdata (cpu_dai);int ret; -if (dir ==SND_SOC_CLOCK_OUT ) { +if (dir ==SND_SOC_CLOCK_OUT && sai->sai_mclk) { ret =regmap_update_bits (sai->regmap,STM_SAI_CR1_REGX ,SAI_XCR1_NODIV , (unsigned int )~SAI_XCR1_NODIV );if (ret <0 )return ret; -dev_dbg (cpu_dai->dev,"SAI MCLK frequency is %uHz\n" , freq); - sai->mclk_rate = freq; +/* If master clock is used, set parent clock now */ + ret =stm32_sai_set_parent_clock (sai, freq); +if (ret) +return ret; -if (sai->sai_mclk) { - ret =clk_set_rate_exclusive (sai->sai_mclk, - sai->mclk_rate); -if (ret) { -dev_err (cpu_dai->dev, -"Could not set mclk rate\n" ); -return ret; - } + ret =clk_set_rate_exclusive (sai->sai_mclk, freq); +if (ret) { +dev_err (cpu_dai->dev, + ret == -EBUSY ? +"Active streams have incompatible rates" : +"Could not set mclk rate\n" ); +return ret; } + +dev_dbg (cpu_dai->dev,"SAI MCLK frequency is %uHz\n" , freq); + sai->mclk_rate = freq; }return 0 ;
@@ -916,11 +940,13 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai,int cr1, mask, div =0 ;int sai_clk_rate, mclk_ratio, den;unsigned int rate =params_rate (params); +int ret; -if (!(rate %11025 )) -clk_set_parent (sai->sai_ck, sai->pdata->clk_x11k); -else -clk_set_parent (sai->sai_ck, sai->pdata->clk_x8k); +if (!sai->sai_mclk) { + ret =stm32_sai_set_parent_clock (sai, rate); +if (ret) +return ret; + } sai_clk_rate =clk_get_rate (sai->sai_ck);if (STM_SAI_IS_F4 (sai->pdata)) {
@@ -1075,9 +1101,13 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream,regmap_update_bits (sai->regmap,STM_SAI_CR1_REGX ,SAI_XCR1_NODIV ,SAI_XCR1_NODIV ); -clk_disable_unprepare (sai->sai_ck); +/* Release mclk rate only if rate was actually set */ +if (sai->mclk_rate) { +clk_rate_exclusive_put (sai->sai_mclk); + sai->mclk_rate =0 ; + } -clk_rate_exclusive_put (sai->sai_mclk); +clk_disable_unprepare (sai->sai_ck);spin_lock_irqsave (&sai->irq_lock, flags); sai->substream =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/95 ALSA: hda: Fix racy display power access
In reply to Greg Kroah-Hartman[ Upstream commit d7a181da2dfa3190487c446042ba01e07d851c74 ]
snd_hdac_display_power() doesn't handle the concurrent calls carefully enough, and it may lead to the doubly get_power or put_power calls, when a runtime PM and an async work get called in racy way.
This patch addresses it by reusing the bus->lock mutex that has been used for protecting the link state change in ext bus code, so that it can protect against racy display state changes. The initialization of bus->lock was moved from snd_hdac_ext_bus_init() to snd_hdac_bus_init() as well accordingly.
Testcase: igt/i915_pm_rpm/module-reload #glk-dsi
--- sound/hda/ext/hdac_ext_bus.c | 1 - sound/hda/hdac_bus.c | 1 + sound/hda/hdac_component.c | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-)
sound/hda/ext/hdac_ext_bus.c +0 -1
@@ -107,7 +107,6 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,INIT_LIST_HEAD (&bus->hlink_list); bus->idx = idx++; -mutex_init (&bus->lock); bus->cmd_dma_state = true;return 0 ;
sound/hda/hdac_bus.c +1 -0
@@ -38,6 +38,7 @@ int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,INIT_WORK (&bus->unsol_work, snd_hdac_bus_process_unsol_events);spin_lock_init (&bus->reg_lock);mutex_init (&bus->cmd_mutex); +mutex_init (&bus->lock); bus->irq =-1 ;return 0 ; }
sound/hda/hdac_component.c +5 -1
@@ -69,13 +69,15 @@ void snd_hdac_display_power(struct hdac_bus *bus, unsigned int idx, bool enable)dev_dbg (bus->dev,"display power %s\n" , enable ?"enable" :"disable" ); + +mutex_lock (&bus->lock);if (enable)set_bit (idx, &bus->display_power_status);else clear_bit (idx, &bus->display_power_status);if (!acomp || !acomp->ops) -return ; + goto unlock;if (bus->display_power_status) {if (!bus->display_power_active) {
@@ -92,6 +94,8 @@ void snd_hdac_display_power(struct hdac_bus *bus, unsigned int idx, bool enable) bus->display_power_active = false; } } + unlock: +mutex_unlock (&bus->lock); }EXPORT_SYMBOL_GPL (snd_hdac_display_power);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/95 virtio-blk: limit number of hw queues by nr_cpu_ids
In reply to Greg Kroah-Hartman[ Upstream commit bf348f9b78d413e75bb079462751a1d86b6de36c ]
When tag_set->nr_maps is 1, the block layer limits the number of hw queues by nr_cpu_ids. No matter how many hw queues are used by virtio-blk, as it has (tag_set->nr_maps == 1), it can use at most nr_cpu_ids hw queues.
In addition, specifically for pci scenario, when the 'num-queues' specified by qemu is more than maxcpus, virtio-blk would not be able to allocate more than maxcpus vectors in order to have a vector for each queue. As a result, it falls back into MSI-X with one vector for config and one shared for queues.
Considering above reasons, this patch limits the number of hw queues used by virtio-blk by nr_cpu_ids.
--- drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/virtio_blk.c +2 -0
@@ -513,6 +513,8 @@ static int init_vq(struct virtio_blk *vblk)if (err) num_vqs =1 ; + num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs); + vblk->vqs =kmalloc_array (num_vqs,sizeof (*vblk->vqs),GFP_KERNEL );if (!vblk->vqs)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/95 blk-mq: introduce blk_mq_complete_request_sync()
In reply to Greg Kroah-Hartman[ Upstream commit 1b8f21b74c3c9c82fce5a751d7aefb7cc0b8d33d ]
In NVMe's error handler, follows the typical steps of tearing down hardware for recovering controller:
1) stop blk_mq hw queues
2) stop the real hw queues
3) cancel in-flight requests via blk_mq_tagset_busy_iter(tags, cancel_request, ...)cancel_request():
mark the request as abort blk_mq_complete_request(req);
4) destroy real hw queues
However, there may be race between #3 and #4, because blk_mq_complete_request() may run q->mq_ops->complete(rq) remotelly and asynchronously, and ->complete(rq) may be run after #4.
This patch introduces blk_mq_complete_request_sync() for fixing the above race.
--- block/blk-mq.c | 7 +++++++ include/linux/blk-mq.h | 1 + 2 files changed, 8 insertions(+)
block/blk-mq.c +7 -0
@@ -657,6 +657,13 @@ bool blk_mq_complete_request(struct request *rq) }EXPORT_SYMBOL (blk_mq_complete_request); +void blk_mq_complete_request_sync (struct request *rq) +{ +WRITE_ONCE (rq->state,MQ_RQ_COMPLETE ); + rq->q->mq_ops->complete (rq); +} +EXPORT_SYMBOL_GPL (blk_mq_complete_request_sync); +int blk_mq_request_started (struct request *rq) {return blk_mq_rq_state (rq) !=MQ_RQ_IDLE ;
include/linux/blk-mq.h +1 -0
@@ -306,6 +306,7 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,void blk_mq_kick_requeue_list (struct request_queue *q);void blk_mq_delay_kick_requeue_list (struct request_queue *q,unsigned long msecs);bool blk_mq_complete_request (struct request *rq); +void blk_mq_complete_request_sync (struct request *rq);bool blk_mq_bio_list_merge (struct request_queue *q,struct list_head *list,struct bio *bio);bool blk_mq_queue_stopped (struct request_queue *q);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/95 nvme: cancel request synchronously
In reply to Greg Kroah-Hartman[ Upstream commit eb3afb75b57c28599af0dfa03a99579d410749e9 ]
nvme_cancel_request() is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.
One issue is reported by our customer on NVMe RDMA, in which freed ib queue pair may be used in nvme_rdma_complete_rq().
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -291,7 +291,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) "Cancelling I/O %d", req->tag);nvme_req (req)->status =NVME_SC_ABORT_REQ ; -blk_mq_complete_request (req); +blk_mq_complete_request_sync (req);return true; }EXPORT_SYMBOL_GPL (nvme_cancel_request);
Signature · 1 line
2.20.1
PATCH 66/95 nvme: cancel request synchronously
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.
Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
Quoted 30 lines
One issue is reported by our customer on NVMe RDMA, in which freed ib queue pair may be used in
nvme_rdma_complete_rq().Cc Sagi Grimberg <sagi at grimberg.me>Cc Bart Van Assche <bvanassche at acm.org>Cc James Smart <james.smart at broadcom.com>Cc linux-nvme at lists.infradead.orgReviewed-by Keith Busch <keith.busch at intel.com>Reviewed-by Christoph Hellwig <hch at lst.de>Signed-off-by Ming Lei <ming.lei at redhat.com>Signed-off-by Jens Axboe <axboe at kernel.dk>Signed-off-by Sasha Levin <sashal at kernel.org>--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/nvme/host/core.c +1
-1@@ -291,7 +291,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) "Cancelling I/O %d", req->tag);nvme_req (req)->status =NVME_SC_ABORT_REQ ; -blk_mq_complete_request (req); +blk_mq_complete_request_sync (req);return true; }EXPORT_SYMBOL_GPL (nvme_cancel_request);
PATCH 66/95 nvme: cancel request synchronously
Quoted 11 lines · Max Gurtovoy
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
In theory, it can't.
1) in case of error recovery
It is driver's responsibility to sync normal completion and handling error. NVMe PCI calls nvme_dev_disable() to shutdown controller, and there won't be good request any more after nvme_dev_disable() returns. I am not very familiar with NVMe RDMA code, but nvme_rdma_stop_io_queues() is supposed to do that for avoiding race with normal completion. Otherwise, it isn't enough by simply canceling in-flight requests.
2) in case of device removalblk_cleanup_queue() drains all in-queue requests, so there can't be such issue.
Thanks,
Ming
PATCH 66/95 nvme: cancel request synchronously
Quoted 13 lines · Ming Lei
Quoted 10 lines · Max Gurtovoy
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
In theory, it can't.
Quoted 8 lines
1) in case of error recovery
It is driver's responsibility to sync normal completion and handling error. NVMe PCI calls
nvme_dev_disable()to shutdown controller, and there won't be good request any more afternvme_dev_disable()returns. I am not very familiar with NVMe RDMA code, butnvme_rdma_stop_io_queues()is supposed to do that for avoiding race with normal completion. Otherwise, it isn't enough by simply canceling in-flight requests.
Indeed nvme_rdma_stop_io_queues will guaranty that we won't get anything from the wire/HCA anymore.
But what happens to IO's that were completed before "nvme_rdma_stop_io_queues" in async way:
1. nvme_end_request --> blk_mq_complete_request (async)
2. error recovery starts (queues are stopped)
3. block layer calls ops->complete(rq) on rq from step #1
if the blk_mq_quiesce_queue + blk_mq_unquiesce_queue don't sync the requests from #1, i think it might be problematic..
Quoted 8 lines
2) in case of device removal
blk_cleanup_queue()drains all in-queue requests, so there can't be such issue.Thanks,
Ming
PATCH 66/95 nvme: cancel request synchronously
Quoted 31 lines · Max Gurtovoy
Quoted 13 lines · Ming Lei
Quoted 10 lines · Max Gurtovoy
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
In theory, it can't.
Quoted 8 lines
1) in case of error recovery
It is driver's responsibility to sync normal completion and handling error. NVMe PCI calls
nvme_dev_disable()to shutdown controller, and there won't be good request any more afternvme_dev_disable()returns. I am not very familiar with NVMe RDMA code, butnvme_rdma_stop_io_queues()is supposed to do that for avoiding race with normal completion. Otherwise, it isn't enough by simply canceling in-flight requests.Indeed
nvme_rdma_stop_io_queueswill guaranty that we won't get anything from the wire/HCA anymore.But what happens to IO's that were completed before "
nvme_rdma_stop_io_queues" in async way:
Quoted 8 lines
1.
nvme_end_request-->blk_mq_complete_request(async)2. error recovery starts (queues are stopped)
3. block layer calls
ops->complete(rq)on rq from step #1if the
blk_mq_quiesce_queue+blk_mq_unquiesce_queuedon't sync the requests from #1, i think it might be problematic..
You are right, we might have to wait until there isn't any in-flight request which is marked as transient MQ_RQ_COMPLETE before destroying hw queue.
Thanks,
Ming
PATCH 66/95 nvme: cancel request synchronously
Quoted 32 lines · Ming Lei
Quoted 31 lines · Max Gurtovoy
Quoted 13 lines · Ming Lei
Quoted 10 lines · Max Gurtovoy
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
In theory, it can't.
Quoted 8 lines
1) in case of error recovery
It is driver's responsibility to sync normal completion and handling error. NVMe PCI calls
nvme_dev_disable()to shutdown controller, and there won't be good request any more afternvme_dev_disable()returns. I am not very familiar with NVMe RDMA code, butnvme_rdma_stop_io_queues()is supposed to do that for avoiding race with normal completion. Otherwise, it isn't enough by simply canceling in-flight requests.Indeed
nvme_rdma_stop_io_queueswill guaranty that we won't get anything from the wire/HCA anymore.But what happens to IO's that were completed before "
nvme_rdma_stop_io_queues" in async way:1.
nvme_end_request-->blk_mq_complete_request(async)
Quoted 8 lines
Quoted 6 lines
2. error recovery starts (queues are stopped)
3. block layer calls
ops->complete(rq)on rq from step #1if the
blk_mq_quiesce_queue+blk_mq_unquiesce_queuedon't sync the requests from #1, i think it might be problematic..You are right, we might have to wait until there isn't any in-flight request which is marked as transient
MQ_RQ_COMPLETEbefore destroying hw queue.
is there an API in the block layer to guaranty that ?
Quoted 3 lines
Thanks,
Ming
PATCH 66/95 nvme: cancel request synchronously
Quoted 36 lines · Max Gurtovoy
Quoted 34 lines · Ming Lei
Quoted 33 lines · Max Gurtovoy
Quoted 13 lines · Ming Lei
Quoted 10 lines · Max Gurtovoy
Quoted 5 lines · Greg Kroah-Hartman
[ Upstream commit
eb3afb75b57c28599af0dfa03a99579d410749e9]
nvme_cancel_request()is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.Ming,
If the completion is async in the block layer, can't a "good" request (not a canceled one..) complete after real HW queue is destroyed ?
In theory, it can't.
Quoted 8 lines
1) in case of error recovery
It is driver's responsibility to sync normal completion and handling error. NVMe PCI calls
nvme_dev_disable()to shutdown controller, and there won't be good request any more afternvme_dev_disable()returns. I am not very familiar with NVMe RDMA code, butnvme_rdma_stop_io_queues()is supposed to do that for avoiding race with normal completion. Otherwise, it isn't enough by simply canceling in-flight requests.Indeed
nvme_rdma_stop_io_queueswill guaranty that we won't get anything from the wire/HCA anymore.But what happens to IO's that were completed before "
nvme_rdma_stop_io_queues" in async way:1.
nvme_end_request-->blk_mq_complete_request(async)2. error recovery starts (queues are stopped)
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
3. block layer calls
ops->complete(rq)on rq from step #1if the
blk_mq_quiesce_queue+blk_mq_unquiesce_queuedon't sync the requests from #1, i think it might be problematic..You are right, we might have to wait until there isn't any in-flight request which is marked as transient
MQ_RQ_COMPLETEbefore destroying hw queue.is there an API in the block layer to guaranty that ?
So far there isn't yet.
And it can be built easily against blk_mq_tagset_busy_iter(), then called in delay-spin style for checking if there is any request marked as MQ_RQ_COMPLETE.
Thanks,
Ming
Sagi Grimberg
maintainerPATCH 66/95 nvme: cancel request synchronously
Quoted 8 lines
Quoted 2 lines
is there an API in the block layer to guaranty that ?
So far there isn't yet.
And it can be built easily against
blk_mq_tagset_busy_iter(), then called in delay-spin style for checking if there is any request marked asMQ_RQ_COMPLETE.
This will probably make blk_mq_complete_request_sync() redundant wouldn't it?
PATCH 66/95 nvme: cancel request synchronously
Quoted 11 lines · Sagi Grimberg
Quoted 8 lines
Quoted 2 lines
is there an API in the block layer to guaranty that ?
So far there isn't yet.
And it can be built easily against
blk_mq_tagset_busy_iter(), then called in delay-spin style for checking if there is any request marked asMQ_RQ_COMPLETE.This will probably make
blk_mq_complete_request_sync()redundant wouldn't it?
Suppose there is new API to drain completed request: blk_mq_wait_completing_rq(), which has to be called before canceling request.
And it can be used to wait the canceled request too, or keep blk_mq_complete_request_sync() for avoiding the wait.
Either way should be fine, IMO.
Thanks,
Ming
Greg Kroah-Hartman
maintainerPATCH 67/95 nvme-fc: correct csn initialization and increments on error
In reply to Greg Kroah-Hartman[ Upstream commit 67f471b6ed3b09033c4ac77ea03f92afdb1989fe ]
This patch fixes a long-standing bug that initialized the FC-NVME cmnd iu CSN value to 1. Early FC-NVME specs had the connection starting with CSN=1. By the time the spec reached approval, the language had changed to state a connection should start with CSN=0. This patch corrects the initialization value for FC-NVME connections.
Additionally, in reviewing the transport, the CSN value is assigned to the new IU early in the start routine. It's possible that a later dma map request may fail, causing the command to never be sent to the controller. Change the location of the assignment so that it is immediately prior to calling the lldd. Add a comment block to explain the impacts if the lldd were to additionally fail sending the command.
--- drivers/nvme/host/fc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/nvme/host/fc.c +15 -5
@@ -1857,7 +1857,7 @@ nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx)memset (queue,0 ,sizeof (*queue)); queue->ctrl = ctrl; queue->qnum = idx; -atomic_set (&queue->csn,1 ); +atomic_set (&queue->csn,0 ); queue->dev = ctrl->dev;if (idx >0 )
@@ -1899,7 +1899,7 @@ nvme_fc_free_queue(struct nvme_fc_queue *queue)*/ queue->connection_id =0 ; -atomic_set (&queue->csn,1 ); +atomic_set (&queue->csn,0 ); } static void
@@ -2195,7 +2195,6 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue, {struct nvme_fc_cmd_iu *cmdiu = &op->cmd_iu;struct nvme_command *sqe = &cmdiu->sqe; -u32 csn;int ret, opstate;/*
@@ -2210,8 +2209,6 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,/* format the FC-NVME CMD IU and fcp_req */ cmdiu->connection_id =cpu_to_be64 (queue->connection_id); - csn =atomic_inc_return (&queue->csn); - cmdiu->csn =cpu_to_be32 (csn); cmdiu->data_len =cpu_to_be32 (data_len);switch (io_dir) {case NVMEFC_FCP_WRITE :
@@ -2269,11 +2266,24 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,if (!(op->flags &FCOP_FLAGS_AEN ))blk_mq_start_request (op->rq); + cmdiu->csn =cpu_to_be32 (atomic_inc_return (&queue->csn)); ret = ctrl->lport->ops->fcp_io (&ctrl->lport->localport, &ctrl->rport->remoteport, queue->lldd_handle, &op->fcp_req);if (ret) { +/* +* If the lld fails to send the command is there an issue with +* the csn value? If the command that fails is the Connect, +* no - as the connection won't be live. If it is a command +* post-connect, it's possible a gap in csn may be created. +* Does this matter? As Linux initiators don't send fused +* commands, no. The gap would exist, but as there's nothing +* that depends on csn order to be delivered on the target +* side, it shouldn't hurt. It would be difficult for a +* target to even detect the csn gap as it has no idea when the +* cmd with the csn was supposed to arrive. +*/ opstate =atomic_xchg (&op->state,FCPOP_STATE_COMPLETE );__nvme_fc_fcpop_chk_teardowns (ctrl, op, opstate);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/95 nvmet: fix discover log page when offsets are used
In reply to Greg Kroah-Hartman[ Upstream commit d808b7f759b50acf0784ce6230ffa63e12ef465d ]
The nvme target hadn't been taking the Get Log Page offset parameter into consideration, and so has been returning corrupted log pages when offsets are used. Since many tools, including nvme-cli, split the log request to 4k, we've been breaking discovery log responses when more than 3 subsystems exist.
Fix the returned data by internally generating the entire discovery log page and copying only the requested bytes into the user buffer. The command log page offset type has been modified to a native __le64 to make it easier to extract the value from a command.
--- drivers/nvme/target/admin-cmd.c | 5 +++ drivers/nvme/target/discovery.c | 68 ++++++++++++++++++++++----------- drivers/nvme/target/nvmet.h | 1 + include/linux/nvme.h | 9 ++++- 4 files changed, 58 insertions(+), 25 deletions(-)
drivers/nvme/target/admin-cmd.c +5 -0
@@ -32,6 +32,11 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd)return len; } +u64 nvmet_get_log_page_offset (struct nvme_command *cmd) +{ +return le64_to_cpu (cmd->get_log_page.lpo); +} +static void nvmet_execute_get_log_page_noop (struct nvmet_req *req) {nvmet_req_complete (req,nvmet_zero_sgl (req,0 , req->data_len));
drivers/nvme/target/discovery.c +45 -23
107 lines not on this page · raw message
drivers/nvme/target/nvmet.h +1 -0
@@ -436,6 +436,7 @@ u16 nvmet_copy_from_sgl(struct nvmet_req *req, off_t off, void *buf,u16 nvmet_zero_sgl (struct nvmet_req *req,off_t off,size_t len);u32 nvmet_get_log_page_len (struct nvme_command *cmd); +u64 nvmet_get_log_page_offset (struct nvme_command *cmd);extern struct list_head *nvmet_ports; void nvmet_port_disc_changed(struct nvmet_port *port,
include/linux/nvme.h +7 -2
@@ -975,8 +975,13 @@ struct nvme_get_log_page_command {__le16 numdl;__le16 numdu;__u16 rsvd11; -__le32 lpol; -__le32 lpou; +union { +struct { +__le32 lpol; +__le32 lpou; + }; +__le64 lpo; + };__u32 rsvd14[2 ]; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/95 platform/x86: pmc_atom: Drop __initconst on dmi table
In reply to Greg Kroah-Hartman[ Upstream commit b995dcca7cf12f208cfd95fd9d5768dca7cccec7 ]
It's used by probe and that isn't an init function. Drop this so that we don't get a section mismatch.
--- drivers/platform/x86/pmc_atom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/pmc_atom.c +1 -1
@@ -396,7 +396,7 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)* Some systems need one or more of their pmc_plt_clks to be * marked as critical. */ -static const struct dmi_system_id critclk_systems[]__initconst = { +static const struct dmi_system_id critclk_systems[] = { { .ident ="MPL CEC1x" , .matches = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/95 NFSv4.1 fix incorrect return value in copy_file_range
In reply to Greg Kroah-Hartman[ Upstream commit 0769663b4f580566ef6cdf366f3073dbe8022c39 ]
According to the NFSv4.2 spec if the input and output file is the same file, operation should fail with EINVAL. However, linux copy_file_range() system call has no such restrictions. Therefore, in such case let's return EOPNOTSUPP and allow VFS to fallback to doing do_splice_direct(). Also when copy_file_range is called on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support COPY functionality), we also need to return EOPNOTSUPP and fallback to a regular copy.
Fixes xfstest generic/075, generic/091, generic/112, generic/263 for all NFSv4.x versions.
--- fs/nfs/nfs42proc.c | 3 --- fs/nfs/nfs4file.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-)
fs/nfs/nfs42proc.c +0 -3
@@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src, };ssize_t err, err2; -if (!nfs_server_capable (file_inode (dst),NFS_CAP_COPY )) -return -EOPNOTSUPP ; - src_lock =nfs_get_lock_context (nfs_file_open_context (src));if (IS_ERR (src_lock))return PTR_ERR (src_lock);
fs/nfs/nfs4file.c +3 -1
@@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, size_t count, unsigned int flags) { + if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY)) + return -EOPNOTSUPP;if (file_inode (file_in) ==file_inode (file_out)) - return -EINVAL; +return -EOPNOTSUPP ;return nfs42_proc_copy (file_in, pos_in, file_out, pos_out, count); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/95 perf/core: Fix perf_event_disable_inatomic() race
In reply to Greg Kroah-Hartman[ Upstream commit 1d54ad944074010609562da5c89e4f5df2f4e5db ]
Thomas-Mich Richter reported he triggered a WARN()ing from event_function_local() on his s390. The problem boils down to:
CPU-A CPU-B perf_event_overflow() perf_event_disable_inatomic() @pending_disable = 1 irq_work_queue(); sched-out event_sched_out() @pending_disable = 0 sched-in perf_event_overflow() perf_event_disable_inatomic() @pending_disable = 1; irq_work_queue(); // FAILS irq_work_run() perf_pending_event() if (@pending_disable) perf_event_disable_local(); // WHOOPS
The problem exists in generic, but s390 is particularly sensitive because it doesn't implement arch_irq_work_raise(), nor does it call irq_work_run() from it's PMU interrupt handler (nor would that be sufficient in this case, because s390 also generates perf_event_overflow() from pmu::stop). Add to that the fact that s390 is a virtual architecture and (virtual) CPU-A can stall long enough for the above race to happen, even if it would self-IPI.
Adding a irq_work_sync() to event_sched_in() would work for all hardare PMUs that properly use irq_work_run() but fails for software PMUs.
Instead encode the CPU number in @pending_disable, such that we can tell which CPU requested the disable. This then allows us to detect the above scenario and even redirect the IPI to make up for the failed queue.
--- kernel/events/core.c | 52 ++++++++++++++++++++++++++++++------- kernel/events/ring_buffer.c | 4 +-- 2 files changed, 45 insertions(+), 11 deletions(-)
kernel/events/core.c +43 -9
@@ -2007,8 +2007,8 @@ event_sched_out(struct perf_event *event, event->pmu->del (event,0 ); event->oncpu =-1 ; -if (event->pending_disable) { - event->pending_disable =0 ; +if (READ_ONCE (event->pending_disable) >=0 ) { +WRITE_ONCE (event->pending_disable,-1 ); state =PERF_EVENT_STATE_OFF ; }perf_event_set_state (event, state);
@@ -2196,7 +2196,8 @@ EXPORT_SYMBOL_GPL(perf_event_disable);void perf_event_disable_inatomic (struct perf_event *event) { - event->pending_disable =1 ; +WRITE_ONCE (event->pending_disable,smp_processor_id ()); +/* can fail, see perf_pending_event_disable() */ irq_work_queue (&event->pending); }
@@ -5803,10 +5804,45 @@ void perf_event_wakeup(struct perf_event *event) } } +static void perf_pending_event_disable (struct perf_event *event) +{ +int cpu =READ_ONCE (event->pending_disable); + +if (cpu <0 ) +return ; + +if (cpu ==smp_processor_id ()) { +WRITE_ONCE (event->pending_disable,-1 ); +perf_event_disable_local (event); +return ; + } + +/* +* CPU-A CPU-B +* +* perf_event_disable_inatomic() +* @pending_disable = CPU-A; +* irq_work_queue(); +* +* sched-out +* @pending_disable = -1; +* +* sched-in +* perf_event_disable_inatomic() +* @pending_disable = CPU-B; +* irq_work_queue(); // FAILS +* +* irq_work_run() +* perf_pending_event() +* +* But the event runs on CPU-B and wants disabling there. +*/ +irq_work_queue_on (&event->pending, cpu); +} +static void perf_pending_event (struct irq_work *entry) { -struct perf_event *event =container_of (entry, - struct perf_event, pending); + struct perf_event *event = container_of(entry, struct perf_event, pending);int rctx; rctx =perf_swevent_get_recursion_context ();
@@ -5815,10 +5851,7 @@ static void perf_pending_event(struct irq_work *entry)* and we won't recurse 'further'. */ -if (event->pending_disable) { - event->pending_disable =0 ; -perf_event_disable_local (event); - } +perf_pending_event_disable (event);if (event->pending_wakeup) { event->pending_wakeup =0 ;
@@ -9998,6 +10031,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,init_waitqueue_head (&event->waitq); + event->pending_disable =-1 ;init_irq_work (&event->pending, perf_pending_event);mutex_init (&event->mmap_mutex);
kernel/events/ring_buffer.c +2 -2
@@ -393,7 +393,7 @@ void *perf_aux_output_begin(struct perf_output_handle *handle,* store that will be enabled on successful return */ if (!handle->size) {/* A, matches D */ - event->pending_disable =1 ; + event->pending_disable =smp_processor_id ();perf_output_wakeup (handle);local_set (&rb->aux_nest,0 ); goto err_put;
@@ -478,7 +478,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size)if (wakeup) {if (handle->aux_flags &PERF_AUX_FLAG_TRUNCATED ) - handle->event->pending_disable =1 ; + handle->event->pending_disable =smp_processor_id ();perf_output_wakeup (handle); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/95 iommu/amd: Set exclusion range correctly
In reply to Greg Kroah-Hartman[ Upstream commit 3c677d206210f53a4be972211066c0f1cd47fe12 ]
The exlcusion range limit register needs to contain the base-address of the last page that is part of the range, as bits 0-11 of this register are treated as 0xfff by the hardware for comparisons.
So correctly set the exclusion range in the hardware to the last page which is _in_ the range.
--- drivers/iommu/amd_iommu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu_init.c +1 -1
@@ -358,7 +358,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val)static void iommu_set_exclusion_range (struct amd_iommu *iommu) {u64 start = iommu->exclusion_start &PAGE_MASK ; -u64 limit = (start + iommu->exclusion_length) &PAGE_MASK ; +u64 limit = (start + iommu->exclusion_length -1 ) &PAGE_MASK ;u64 entry;if (!iommu->exclusion_start)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/95 genirq: Prevent use-after-free and work list corruption
In reply to Greg Kroah-Hartman[ Upstream commit 59c39840f5abf4a71e1810a8da71aaccd6c17d26 ]
When irq_set_affinity_notifier() replaces the notifier, then the reference count on the old notifier is dropped which causes it to be freed. But nothing ensures that the old notifier is not longer queued in the work list. If it is queued this results in a use after free and possibly in work list corruption.
Ensure that the work is canceled before the reference is dropped.
--- kernel/irq/manage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/irq/manage.c +3 -1
@@ -356,8 +356,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) desc->affinity_notify = notify;raw_spin_unlock_irqrestore (&desc->lock, flags); -if (old_notify) +if (old_notify) { +cancel_work_sync (&old_notify->work);kref_put (&old_notify->kref, old_notify->release); + }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/95 usb: dwc3: Allow building USB_DWC3_QCOM without EXTCON
In reply to Greg Kroah-HartmanFrom: Marc Gonzalez <[email protected]>
commit 77a4946516fe488b6a33390de6d749f934a243ba upstream.
Keep EXTCON support optional, as some platforms do not need it.
Do the same for USB_DWC3_OMAP while we're at it.
--- drivers/usb/dwc3/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/dwc3/Kconfig +4 -2
@@ -52,7 +52,8 @@ comment "Platform Glue Driver Support" config USB_DWC3_OMAP tristate "Texas Instruments OMAP5 and similar Platforms" - depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST) + depends on ARCH_OMAP2PLUS || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
@@ -113,7 +114,8 @@ config USB_DWC3_ST config USB_DWC3_QCOM tristate "Qualcomm Platform" - depends on EXTCON && (ARCH_QCOM || COMPILE_TEST) + depends on ARCH_QCOM || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
Greg Kroah-Hartman
maintainerPATCH 75/95 usb: dwc3: Fix default lpm_nyet_threshold value
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 8d791929b2fbdf7734c1596d808e55cb457f4562 upstream.
The max possible value for DCTL.LPM_NYET_THRES is 15 and not 255. Change the default value to 15.
--- drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/core.c +1 -1
@@ -1218,7 +1218,7 @@ static void dwc3_get_properties(struct du8 tx_max_burst_prd;/* default to highest possible threshold */ - lpm_nyet_threshold =0xff ; + lpm_nyet_threshold =0xf ;/* default to -3.5dB de-emphasis */ tx_de_emphasis =1 ;
Greg Kroah-Hartman
maintainerPATCH 76/95 USB: serial: f81232: fix interrupt worker not stop
In reply to Greg Kroah-HartmanFrom: Ji-Ze Hong (Peter Hong) <[email protected]>
commit 804dbee1e49774918339c1e5a87400988c0819e8 upstream.
The F81232 will use interrupt worker to handle MSR change. This patch will fix the issue that interrupt work should stop in close() and suspend().
This also fixes line-status events being disabled after a suspend cycle until the port is re-opened.
--- drivers/usb/serial/f81232.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/usb/serial/f81232.c +39 -0
@@ -556,9 +556,12 @@ static int f81232_open(struct tty_structstatic void f81232_close (struct usb_serial_port *port) { +struct f81232_private *port_priv =usb_get_serial_port_data (port); +f81232_port_disable (port);usb_serial_generic_close (port);usb_kill_urb (port->interrupt_in_urb); +flush_work (&port_priv->interrupt_work); }static void f81232_dtr_rts (struct usb_serial_port *port,int on)
@@ -632,6 +635,40 @@ static int f81232_port_remove(struct usbreturn 0 ; } +static int f81232_suspend (struct usb_serial *serial,pm_message_t message) +{ +struct usb_serial_port *port = serial->port[0 ]; +struct f81232_private *port_priv =usb_get_serial_port_data (port); +int i; + +for (i =0 ; i <ARRAY_SIZE (port->read_urbs); ++i) +usb_kill_urb (port->read_urbs[i]); + +usb_kill_urb (port->interrupt_in_urb); + +if (port_priv) +flush_work (&port_priv->interrupt_work); + +return 0 ; +} + +static int f81232_resume (struct usb_serial *serial) +{ +struct usb_serial_port *port = serial->port[0 ]; +int result; + +if (tty_port_initialized (&port->port)) { + result =usb_submit_urb (port->interrupt_in_urb,GFP_NOIO ); +if (result) { +dev_err (&port->dev,"submit interrupt urb failed: %d\n" , + result); +return result; + } + } + +return usb_serial_generic_resume (serial); +} +static struct usb_serial_driver f81232_device = { .driver = { .owner =THIS_MODULE ,
@@ -655,6 +692,8 @@ static struct usb_serial_driver f81232_d .read_int_callback = f81232_read_int_callback, .port_probe = f81232_port_probe, .port_remove = f81232_port_remove, + .suspend = f81232_suspend, + .resume = f81232_resume, };static struct usb_serial_driver *const serial_drivers[] = {
Greg Kroah-Hartman
maintainerPATCH 77/95 USB: cdc-acm: fix unthrottle races
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 764478f41130f1b8d8057575b89e69980a0f600d upstream.
Fix two long-standing bugs which could potentially lead to memory corruption or leave the port throttled until it is reopened (on weakly ordered systems), respectively, when read-URB completion races with unthrottle().
First, the URB must not be marked as free before processing is complete to prevent it from being submitted by unthrottle() on another CPU.
CPU 1 CPU 2 ================ ================ complete() unthrottle() process_urb(); smp_mb__before_atomic(); set_bit(i, free); if (test_and_clear_bit(i, free)) submit_urb();
Second, the URB must be marked as free before checking the throttled flag to prevent unthrottle() on another CPU from failing to observe that the URB needs to be submitted if complete() sees that the throttled flag is set.
CPU 1 CPU 2 ================ ================ complete() unthrottle() set_bit(i, free); throttled = 0; smp_mb__after_atomic(); smp_mb(); if (throttled) if (test_and_clear_bit(i, free)) return; submit_urb();
Note that test_and_clear_bit() only implies barriers when the test is successful. To handle the case where the URB is still in use an explicit barrier needs to be added to unthrottle() for the second race condition.
Also note that the first race was fixed by 36e59e0d70d6 ("cdc-acm: fix race between callback and unthrottle") back in 2015, but the bug was reintroduced a year later.
--- drivers/usb/class/cdc-acm.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/usb/class/cdc-acm.c +25 -7
@@ -470,12 +470,12 @@ static void acm_read_bulk_callback(strucstruct acm *acm = rb->instance;unsigned long flags;int status = urb->status; +bool stopped = false; +bool stalled = false;dev_vdbg (&acm->data->dev,"got urb %d, len %d, status %d\n" , rb->index, urb->actual_length, status); -set_bit (rb->index, &acm->read_urbs_free); -if (!acm->dev) {dev_dbg (&acm->data->dev,"%s - disconnected\n" , __func__);return ;
@@ -488,15 +488,16 @@ static void acm_read_bulk_callback(strucbreak ;case -EPIPE :set_bit (EVENT_RX_STALL , &acm->flags); -schedule_work (&acm->work); -return ; + stalled = true; +break ;case -ENOENT :case -ECONNRESET :case -ESHUTDOWN :dev_dbg (&acm->data->dev,"%s - urb shutting down with status: %d\n" , __func__, status); -return ; + stopped = true; +break ;default : dev_dbg(&acm->data->dev, "%s - nonzero urb status received: %d\n",
@@ -505,10 +506,24 @@ static void acm_read_bulk_callback(struc }/* -* Unthrottle may run on another CPU which needs to see events -* in the same order. Submission has an implict barrier +* Make sure URB processing is done before marking as free to avoid +* racing with unthrottle() on another CPU. Matches the barriers +* implied by the test_and_clear_bit() in acm_submit_read_urb(). */ smp_mb__before_atomic (); +set_bit (rb->index, &acm->read_urbs_free); +/* +* Make sure URB is marked as free before checking the throttled flag +* to avoid racing with unthrottle() on another CPU. Matches the +* smp_mb() in unthrottle(). +*/ +smp_mb__after_atomic (); + +if (stopped || stalled) { +if (stalled) +schedule_work (&acm->work); +return ; + }/* throttle device if requested by tty */ spin_lock_irqsave (&acm->read_lock, flags);
@@ -842,6 +857,9 @@ static void acm_tty_unthrottle(struct tt acm->throttle_req =0 ;spin_unlock_irq (&acm->read_lock); +/* Matches the smp_mb__after_atomic() in acm_read_bulk_callback(). */ +smp_mb (); +if (was_throttled)acm_submit_read_urbs (acm,GFP_KERNEL ); }
Greg Kroah-Hartman
maintainerPATCH 78/95 usb-storage: Set virt_boundary_mask to avoid SG overflows
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 747668dbc061b3e62bc1982767a3a1f9815fcf0e upstream.
The USB subsystem has always had an unusual requirement for its scatter-gather transfers: Each element in the scatterlist (except the last one) must have a length divisible by the bulk maxpacket size. This is a particular issue for USB mass storage, which uses SG lists created by the block layer rather than setting up its own.
So far we have scraped by okay because most devices have a logical block size of 512 bytes or larger, and the bulk maxpacket sizes for USB 2 and below are all <= 512. However, USB 3 has a bulk maxpacket size of 1024. Since the xhci-hcd driver includes native SG support, this hasn't mattered much. But now people are trying to use USB-3 mass storage devices with USBIP, and the vhci-hcd driver currently does not have full SG support.
The result is an overflow error, when the driver attempts to implement an SG transfer of 63 512-byte blocks as a single
3584-byte (7 blocks) transfer followed by seven 4096-byte (8 blocks) transfers. The device instead sends 31 1024-byte packets followed by a 512-byte packet, and this overruns the first SG buffer.
Ideally this would be fixed by adding better SG support to vhci-hcd. But for now it appears we can work around the problem by asking the block layer to respect the maxpacket limitation, through the use of the virt_boundary_mask.
--- drivers/usb/storage/scsiglue.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/usb/storage/scsiglue.c +12 -14
@@ -65,6 +65,7 @@ static const char* host_info(struct Scsistatic int slave_alloc (struct scsi_device *sdev) {struct us_data *us =host_to_us (sdev->host); +int maxp;/* * Set the INQUIRY transfer length to 36. We don't use any of
@@ -74,20 +75,17 @@ static int slave_alloc (struct scsi_devi sdev->inquiry_len =36 ;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. -* -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* USB has unusual scatter-gather requirements: the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. Fortunately this value is always a +* power of 2. Inform the block layer about this requirement. +*/ + maxp =usb_maxpacket (us->pusb_dev, us->recv_bulk_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* Some host controllers may have alignment requirements. +* We'll play it safe by requiring 512-byte alignment always. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 79/95 intel_th: pci: Add Comet Lake support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit e60e9a4b231a20a199d7a61caadc48693c30d695 upstream.
This adds support for Intel TH on Comet Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -165,6 +165,11 @@ static const struct pci_device_id intel_ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Comet Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x02a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Greg Kroah-Hartman
maintainerPATCH 80/95 iio: adc: qcom-spmi-adc5: Fix of-based module autoloading
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
commit 447ccb4e0834a9f9f0dd5643e421c7f1a1649e6a upstream.
The of_device_id table needs to be registered as module alias in order for automatic module loading to pick the kernel module based on the DeviceTree compatible. So add MODULE_DEVICE_TABLE() to make this happen.
--- drivers/iio/adc/qcom-spmi-adc5.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/qcom-spmi-adc5.c +1 -0
@@ -664,6 +664,7 @@ static const struct of_device_id adc5_ma }, { } }; +MODULE_DEVICE_TABLE (of, adc5_match_table);static int adc5_get_dt_data (struct adc5_chip *adc,struct device_node *node) {
Greg Kroah-Hartman
maintainerPATCH 81/95 cpufreq: armada-37xx: fix frequency calculation for opp
In reply to Greg Kroah-HartmanFrom: Gregory CLEMENT <[email protected]>
commit 8db82563451f976597ab7b282ec655e4390a4088 upstream.
The frequency calculation was based on the current(max) frequency of the CPU. However for low frequency, the value used was already the parent frequency divided by a factor of 2.
Instead of using this frequency, this fix directly get the frequency from the parent clock.
--- drivers/cpufreq/armada-37xx-cpufreq.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/cpufreq/armada-37xx-cpufreq.c +19 -3
@@ -359,11 +359,11 @@ static int __init armada37xx_cpufreq_dristruct armada_37xx_dvfs *dvfs;struct platform_device *pdev;unsigned long freq; -unsigned int cur_frequency; +unsigned int cur_frequency, base_frequency;struct regmap *nb_pm_base, *avs_base;struct device *cpu_dev;int load_lvl, ret; -struct clk *clk; +struct clk *clk, *parent; nb_pm_base =syscon_regmap_lookup_by_compatible ("marvell,armada-3700-nb-pm" );
@@ -399,6 +399,22 @@ static int __init armada37xx_cpufreq_drireturn PTR_ERR (clk); } + parent =clk_get_parent (clk); +if (IS_ERR (parent)) { +dev_err (cpu_dev,"Cannot get parent clock for CPU0\n" ); +clk_put (clk); +return PTR_ERR (parent); + } + +/* Get parent CPU frequency */ + base_frequency =clk_get_rate (parent); + +if (!base_frequency) { +dev_err (cpu_dev,"Failed to get parent clock rate for CPU\n" ); +clk_put (clk); +return -EINVAL ; + } +/* Get nominal (current) CPU frequency */ cur_frequency =clk_get_rate (clk);if (!cur_frequency) {
@@ -431,7 +447,7 @@ static int __init armada37xx_cpufreq_drifor (load_lvl =ARMADA_37XX_DVFS_LOAD_0 ; load_lvl <LOAD_LEVEL_NR ; load_lvl++) {unsigned long u_volt = avs_map[dvfs->avs[load_lvl]] *1000 ; - freq = cur_frequency / dvfs->divider[load_lvl]; + freq = base_frequency / dvfs->divider[load_lvl]; ret =dev_pm_opp_add (cpu_dev, freq, u_volt);if (ret) goto remove_opp;
Greg Kroah-Hartman
maintainerPATCH 82/95 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit c8afd03486c26accdda4846e5561aa3f8e862a9d upstream.
Commit 48402cee6889 ("ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq") makes acpi_lpss_{suspend_late,resume_early}() bail early on BYT/CHT as resume_from_noirq is set.
This means that on resume from hibernate dw_i2c_plat_resume() doesn't get called by the restore_early callback, acpi_lpss_resume_early(). Instead it should be called by the restore_noirq callback matching how things are done when resume_from_noirq is set and we are doing a regular resume.
Change the restore_noirq callback to acpi_lpss_resume_noirq so that dw_i2c_plat_resume() gets properly called when resume_from_noirq is set and we are resuming from hibernate.
Likewise also change the poweroff_noirq callback so that dw_i2c_plat_suspend gets called properly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202139
--- drivers/acpi/acpi_lpss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpi_lpss.c +2 -2
@@ -1142,8 +1142,8 @@ static struct dev_pm_domain acpi_lpss_pm .thaw_noirq = acpi_subsys_thaw_noirq, .poweroff = acpi_subsys_suspend, .poweroff_late = acpi_lpss_suspend_late, - .poweroff_noirq = acpi_subsys_suspend_noirq, - .restore_noirq = acpi_subsys_resume_noirq, + .poweroff_noirq = acpi_lpss_suspend_noirq, + .restore_noirq = acpi_lpss_resume_noirq, .restore_early = acpi_lpss_resume_early, #endif .runtime_suspend = acpi_lpss_runtime_suspend,
Greg Kroah-Hartman
maintainerPATCH 83/95 soc: sunxi: Fix missing dependency on REGMAP_MMIO
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
commit a84014e1db35d8e7af09878d0b4bf30804fb17d5 upstream.
When enabling ARCH_SUNXI from allnoconfig, SUNXI_SRAM is enabled, but not REGMAP_MMIO, so the kernel fails to link with an undefined reference to __devm_regmap_init_mmio_clk. Select REGMAP_MMIO, as suggested in drivers/base/regmap/Kconfig.
This creates the following dependency loop:
drivers/of/Kconfig:68: symbol OF_IRQ depends on IRQ_DOMAIN kernel/irq/Kconfig:63: symbol IRQ_DOMAIN is selected by REGMAP drivers/base/regmap/Kconfig:7: symbol REGMAP default is visible depending on REGMAP_MMIO drivers/base/regmap/Kconfig:39: symbol REGMAP_MMIO is selected by SUNXI_SRAM drivers/soc/sunxi/Kconfig:4: symbol SUNXI_SRAM is selected by USB_MUSB_SUNXI drivers/usb/musb/Kconfig:63: symbol USB_MUSB_SUNXI depends on GENERIC_PHY drivers/phy/Kconfig:7: symbol GENERIC_PHY is selected by PHY_BCM_NS_USB3 drivers/phy/broadcom/Kconfig:29: symbol PHY_BCM_NS_USB3 depends on MDIO_BUS drivers/net/phy/Kconfig:12: symbol MDIO_BUS default is visible depending on PHYLIB drivers/net/phy/Kconfig:181: symbol PHYLIB is selected by ARC_EMAC_CORE drivers/net/ethernet/arc/Kconfig:18: symbol ARC_EMAC_CORE is selected by ARC_EMAC drivers/net/ethernet/arc/Kconfig:24: symbol ARC_EMAC depends on OF_IRQ
To fix the circular dependency, make USB_MUSB_SUNXI select GENERIC_PHY instead of depending on it. This matches the use of GENERIC_PHY by all but two other drivers.
--- drivers/soc/sunxi/Kconfig | 1 + drivers/usb/musb/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/soc/sunxi/Kconfig +1 -0
@@ -4,6 +4,7 @@ config SUNXI_SRAM bool default ARCH_SUNXI + select REGMAP_MMIO help Say y here to enable the SRAM controller support. This device is responsible on mapping the SRAM in the sunXi SoCs
drivers/usb/musb/Kconfig +1 -1
@@ -66,7 +66,7 @@ config USB_MUSB_SUNXI depends on NOP_USB_XCEIV depends on PHY_SUN4I_USB depends on EXTCON - depends on GENERIC_PHY + select GENERIC_PHY select SUNXI_SRAM config USB_MUSB_DAVINCI
Greg Kroah-Hartman
maintainerPATCH 84/95 scsi: lpfc: change snprintf to scnprintf for possible overflow
In reply to Greg Kroah-HartmanFrom: Silvio Cesare <[email protected]>
commit e7f7b6f38a44697428f5a2e7c606de028df2b0e3 upstream.
Change snprintf to scnprintf. There are generally two cases where using snprintf causes problems.
1) Uses of size += snprintf(buf, SIZE - size, fmt, ...)
In this case, if snprintf would have written more characters than what the buffer size (SIZE) is, then size will end up larger than SIZE. In later uses of snprintf, SIZE - size will result in a negative number, leading to problems. Note that size might already be too large by using size = snprintf before the code reaches a case of size += snprintf.
2) If size is ultimately used as a length parameter for a copy back to user space, then it will potentially allow for a buffer overflow and information disclosure when size is greater than SIZE. When the size is used to index the buffer directly, we can have memory corruption. This also means when size = snprintf... is used, it may also cause problems since size may become large. Copying to userspace is mitigated by the HARDENED_USERCOPY kernel configuration.
The solution to these issues is to use scnprintf which returns the number of characters actually written to the buffer, so the size variable will never exceed SIZE.
--- drivers/scsi/lpfc/lpfc_attr.c | 192 ++++++++-------- drivers/scsi/lpfc/lpfc_ct.c | 12 - drivers/scsi/lpfc/lpfc_debugfs.c | 455 +++++++++++++++++++-------------------- drivers/scsi/lpfc/lpfc_debugfs.h | 6 4 files changed, 336 insertions(+), 329 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +98 -94
@@ -117,7 +117,7 @@ static ssize_t lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n"); + return scnprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n"); }/**
@@ -137,9 +137,9 @@ lpfc_enable_fip_show(struct device *dev,struct lpfc_hba *phba = vport->phba;if (phba->hba_flag &HBA_FIP_SUPPORT ) -return snprintf (buf,PAGE_SIZE ,"1\n" ); +return scnprintf (buf,PAGE_SIZE ,"1\n" );else -return snprintf (buf,PAGE_SIZE ,"0\n" ); +return scnprintf (buf,PAGE_SIZE ,"0\n" ); } static ssize_t
@@ -517,14 +517,15 @@ lpfc_bg_info_show(struct device *dev, ststruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -if (phba->cfg_enable_bg) +if (phba->cfg_enable_bg) {if (phba->sli3_options &LPFC_SLI3_BG_ENABLED ) -return snprintf (buf,PAGE_SIZE ,"BlockGuard Enabled\n" ); +return scnprintf (buf,PAGE_SIZE , +"BlockGuard Enabled\n" );else -return snprintf (buf,PAGE_SIZE , +return scnprintf (buf,PAGE_SIZE ,"BlockGuard Not Supported\n" ); -else -return snprintf (buf,PAGE_SIZE , + }else +return scnprintf (buf,PAGE_SIZE ,"BlockGuard Disabled\n" ); }
@@ -536,7 +537,7 @@ lpfc_bg_guard_err_show(struct device *destruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_guard_err_cnt); }
@@ -548,7 +549,7 @@ lpfc_bg_apptag_err_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_apptag_err_cnt); }
@@ -560,7 +561,7 @@ lpfc_bg_reftag_err_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%llu\n" , +return scnprintf (buf,PAGE_SIZE ,"%llu\n" , (unsigned long long )phba->bg_reftag_err_cnt); }
@@ -578,7 +579,7 @@ lpfc_info_show(struct device *dev, struc {struct Scsi_Host *host =class_to_shost (dev); -return snprintf (buf,PAGE_SIZE ,"%s\n" ,lpfc_info (host)); +return scnprintf (buf,PAGE_SIZE ,"%s\n" ,lpfc_info (host)); }/**
@@ -597,7 +598,7 @@ lpfc_serialnum_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->SerialNumber); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->SerialNumber); }/**
@@ -619,7 +620,7 @@ lpfc_temp_sensor_show(struct device *devstruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" ,phba->temp_sensor_support); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->temp_sensor_support); }/**
@@ -638,7 +639,7 @@ lpfc_modeldesc_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ModelDesc); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ModelDesc); }/**
@@ -657,7 +658,7 @@ lpfc_modelname_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ModelName); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ModelName); }/**
@@ -676,7 +677,7 @@ lpfc_programtype_show(struct device *devstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->ProgramType); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->ProgramType); }/**
@@ -694,7 +695,7 @@ lpfc_mlomgmt_show(struct device *dev, ststruct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (phba->sli.sli_flag &LPFC_MENLO_MAINT )); }
@@ -714,7 +715,7 @@ lpfc_vportnum_show(struct device *dev, sstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s\n" ,phba->Port); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , phba->Port); }/**
@@ -742,10 +743,10 @@ lpfc_fwrev_show(struct device *dev, stru sli_family = phba->sli4_hba.pc_sli4_params.sli_family;if (phba->sli_rev <LPFC_SLI_REV4 ) - len =snprintf (buf,PAGE_SIZE ,"%s, sli-%d\n" , + len =scnprintf (buf,PAGE_SIZE ,"%s, sli-%d\n" , fwrev, phba->sli_rev);else - len =snprintf (buf,PAGE_SIZE ,"%s, sli-%d:%d:%x\n" , + len =scnprintf (buf,PAGE_SIZE ,"%s, sli-%d:%d:%x\n" , fwrev, phba->sli_rev, if_type, sli_family);return len;
@@ -769,7 +770,7 @@ lpfc_hdw_show(struct device *dev, structlpfc_vpd_t *vp = &phba->vpd;lpfc_jedec_to_ascii (vp->rev.biuRev, hdw); -return snprintf (buf,PAGE_SIZE ,"%s\n" , hdw); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , hdw); }/**
@@ -790,10 +791,11 @@ lpfc_option_rom_version_show(struct devichar fwrev[FW_REV_STR_SIZE ];if (phba->sli_rev <LPFC_SLI_REV4 ) -return snprintf (buf,PAGE_SIZE ,"%s\n" , phba->OptionROMVersion); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , + phba->OptionROMVersion);lpfc_decode_firmware_rev (phba, fwrev,1 ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , fwrev); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , fwrev); }/**
@@ -824,20 +826,20 @@ lpfc_link_state_show(struct device *dev,case LPFC_LINK_DOWN :case LPFC_HBA_ERROR :if (phba->hba_flag &LINK_DISABLED ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Down - User disabled\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Down\n" );break ;case LPFC_LINK_UP :case LPFC_CLEAR_LA :case LPFC_HBA_READY : - len +=snprintf (buf + len,PAGE_SIZE -len,"Link Up - " ); + len +=scnprintf (buf + len,PAGE_SIZE -len,"Link Up - " );switch (vport->port_state) {case LPFC_LOCAL_CFG_LINK : - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"Configuring Link\n" );break ;case LPFC_FDISC :
@@ -847,38 +849,40 @@ lpfc_link_state_show(struct device *dev,case LPFC_NS_QRY :case LPFC_BUILD_DISC_LIST :case LPFC_DISC_AUTH : - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Discovery\n" );break ;case LPFC_VPORT_READY : - len +=snprintf (buf + len,PAGE_SIZE - len,"Ready\n" ); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Ready\n" );break ;case LPFC_VPORT_FAILED : - len +=snprintf (buf + len,PAGE_SIZE - len,"Failed\n" ); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Failed\n" );break ;case LPFC_VPORT_UNKNOWN : - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Unknown\n" );break ; }if (phba->sli.sli_flag &LPFC_MENLO_MAINT ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Menlo Maint Mode\n" );else if (phba->fc_topology ==LPFC_TOPOLOGY_LOOP ) {if (vport->fc_flag &FC_PUBLIC_LOOP ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Public Loop\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Private Loop\n" ); }else {if (vport->fc_flag &FC_FABRIC ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Fabric\n" );else - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len," Point-2-Point\n" ); } }
@@ -890,28 +894,28 @@ lpfc_link_state_show(struct device *dev,struct lpfc_trunk_link link = phba->trunk_link;if (bf_get (lpfc_conf_trunk_port0, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 0: Link %s %s\n" , (link.link0.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link0.fault]);if (bf_get (lpfc_conf_trunk_port1, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 1: Link %s %s\n" , (link.link1.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link1.fault]);if (bf_get (lpfc_conf_trunk_port2, &phba->sli4_hba)) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"Trunk port 2: Link %s %s\n" , (link.link2.state ==LPFC_LINK_UP ) ?"Up" :"Down. " , trunk_errmsg[link.link2.fault]);if (bf_get (lpfc_conf_trunk_port3, &phba->sli4_hba)) - len += snprintf(buf + len, PAGE_SIZE - len, + len += scnprintf(buf + len, PAGE_SIZE - len, "Trunk port 3: Link %s %s\n", (link.link3.state == LPFC_LINK_UP) ? "Up" : "Down. ",
@@ -939,15 +943,15 @@ lpfc_sli4_protocol_show(struct device *dstruct lpfc_hba *phba = vport->phba;if (phba->sli_rev <LPFC_SLI_REV4 ) -return snprintf (buf,PAGE_SIZE ,"fc\n" ); +return scnprintf (buf,PAGE_SIZE ,"fc\n" );if (phba->sli4_hba.lnk_info.lnk_dv ==LPFC_LNK_DAT_VAL ) {if (phba->sli4_hba.lnk_info.lnk_tp ==LPFC_LNK_TYPE_GE ) -return snprintf (buf,PAGE_SIZE ,"fcoe\n" ); +return scnprintf (buf,PAGE_SIZE ,"fcoe\n" );if (phba->sli4_hba.lnk_info.lnk_tp ==LPFC_LNK_TYPE_FC ) -return snprintf (buf,PAGE_SIZE ,"fc\n" ); +return scnprintf (buf,PAGE_SIZE ,"fc\n" ); } -return snprintf (buf,PAGE_SIZE ,"unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"unknown\n" ); }/**
@@ -967,7 +971,7 @@ lpfc_oas_supported_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->sli4_hba.pc_sli4_params.oas_supported); }
@@ -1025,7 +1029,7 @@ lpfc_num_discovered_ports_show(struct destruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , vport->fc_map_cnt + vport->fc_unmap_cnt); }
@@ -1539,7 +1543,7 @@ lpfc_nport_evt_cnt_show(struct device *dstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->nport_event_cnt); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->nport_event_cnt); }int
@@ -1628,7 +1632,7 @@ lpfc_board_mode_show(struct device *dev,else state ="online" ; -return snprintf (buf,PAGE_SIZE ,"%s\n" , state); +return scnprintf (buf,PAGE_SIZE ,"%s\n" , state); }/**
@@ -1854,8 +1858,8 @@ lpfc_max_rpi_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba,NULL ,NULL , &cnt,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1882,8 +1886,8 @@ lpfc_used_rpi_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba,NULL ,NULL , &cnt, &acnt,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1910,8 +1914,8 @@ lpfc_max_xri_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba, &cnt,NULL ,NULL ,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1938,8 +1942,8 @@ lpfc_used_xri_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba, &cnt, &acnt,NULL ,NULL ,NULL ,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1966,8 +1970,8 @@ lpfc_max_vpi_show(struct device *dev, stuint32_t cnt;if (lpfc_get_hba_info (phba,NULL ,NULL ,NULL ,NULL , &cnt,NULL )) -return snprintf (buf,PAGE_SIZE ,"%d\n" , cnt); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , cnt); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -1994,8 +1998,8 @@ lpfc_used_vpi_show(struct device *dev, suint32_t cnt, acnt;if (lpfc_get_hba_info (phba,NULL ,NULL ,NULL ,NULL , &cnt, &acnt)) -return snprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); -return snprintf (buf,PAGE_SIZE ,"Unknown\n" ); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , (cnt - acnt)); +return scnprintf (buf,PAGE_SIZE ,"Unknown\n" ); }/**
@@ -2020,10 +2024,10 @@ lpfc_npiv_info_show(struct device *dev,struct lpfc_hba *phba = vport->phba;if (!(phba->max_vpi)) -return snprintf (buf,PAGE_SIZE ,"NPIV Not Supported\n" ); +return scnprintf (buf,PAGE_SIZE ,"NPIV Not Supported\n" );if (vport->port_type ==LPFC_PHYSICAL_PORT ) -return snprintf (buf,PAGE_SIZE ,"NPIV Physical\n" ); -return snprintf (buf,PAGE_SIZE ,"NPIV Virtual (VPI %d)\n" , vport->vpi); +return scnprintf (buf,PAGE_SIZE ,"NPIV Physical\n" ); +return scnprintf (buf,PAGE_SIZE ,"NPIV Virtual (VPI %d)\n" , vport->vpi); }/**
@@ -2045,7 +2049,7 @@ lpfc_poll_show(struct device *dev, strucstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%#x\n" , phba->cfg_poll); +return scnprintf (buf,PAGE_SIZE ,"%#x\n" , phba->cfg_poll); }/**
@@ -2149,7 +2153,7 @@ lpfc_fips_level_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_level); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_level); }/**
@@ -2168,7 +2172,7 @@ lpfc_fips_rev_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_spec_rev); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->fips_spec_rev); }/**
@@ -2187,7 +2191,7 @@ lpfc_dss_show(struct device *dev, structstruct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"%s - %sOperational\n" , +return scnprintf (buf,PAGE_SIZE ,"%s - %sOperational\n" , (phba->cfg_enable_dss) ?"Enabled" :"Disabled" , (phba->sli3_options &LPFC_SLI3_DSS_ENABLED ) ?"" :"Not " );
@@ -2216,7 +2220,7 @@ lpfc_sriov_hw_max_virtfn_show(struct devuint16_t max_nr_virtfn; max_nr_virtfn =lpfc_sli_sriov_nr_virtfn_get (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , max_nr_virtfn); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , max_nr_virtfn); }static inline bool lpfc_rangecheck (uint val,uint min,uint max)
@@ -2276,7 +2280,7 @@ lpfc_##attr##_show(struct device *dev, sstruct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\struct lpfc_hba *phba = vport->phba;\ -return snprintf (buf,PAGE_SIZE ,"%d\n" ,\ +return scnprintf (buf,PAGE_SIZE ,"%d\n" ,\ phba->cfg_##attr);\ }
@@ -2304,7 +2308,7 @@ lpfc_##attr##_show(struct device *dev, sstruct lpfc_hba *phba = vport->phba;\uint val =0 ;\ val = phba->cfg_##attr;\ - return snprintf(buf, PAGE_SIZE, "%#x\n",\ + return scnprintf(buf, PAGE_SIZE, "%#x\n",\ phba->cfg_##attr);\ }
@@ -2440,7 +2444,7 @@ lpfc_##attr##_show(struct device *dev, s { \struct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\ - return snprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\ + return scnprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\ }/**
@@ -2465,7 +2469,7 @@ lpfc_##attr##_show(struct device *dev, s { \struct Scsi_Host *shost =class_to_shost (dev);\struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\ - return snprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\ + return scnprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\ }/**
@@ -2736,7 +2740,7 @@ lpfc_soft_wwpn_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , (unsigned long long )phba->cfg_soft_wwpn); }
@@ -2833,7 +2837,7 @@ lpfc_soft_wwnn_show(struct device *dev, {struct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , (unsigned long long )phba->cfg_soft_wwnn); }
@@ -2899,7 +2903,7 @@ lpfc_oas_tgt_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" ,wwn_to_u64 (phba->cfg_oas_tgt_wwpn)); }
@@ -2967,7 +2971,7 @@ lpfc_oas_priority_show(struct device *destruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_priority); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_priority); }/**
@@ -3030,7 +3034,7 @@ lpfc_oas_vpt_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" , +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" ,wwn_to_u64 (phba->cfg_oas_vpt_wwpn)); }
@@ -3101,7 +3105,7 @@ lpfc_oas_lun_state_show(struct device *dstruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_state); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_state); }/**
@@ -3165,7 +3169,7 @@ lpfc_oas_lun_status_show(struct device *if (!(phba->cfg_oas_flags &OAS_LUN_VALID ))return -EFAULT ; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_status); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->cfg_oas_lun_status); } static DEVICE_ATTR(lpfc_xlane_lun_status, S_IRUGO, lpfc_oas_lun_status_show, NULL);
@@ -3317,7 +3321,7 @@ lpfc_oas_lun_show(struct device *dev, stif (oas_lun !=NOT_OAS_ENABLED_LUN ) phba->cfg_oas_flags |=OAS_LUN_VALID ; - len +=snprintf (buf + len,PAGE_SIZE -len,"0x%llx" , oas_lun); + len +=scnprintf (buf + len,PAGE_SIZE -len,"0x%llx" , oas_lun);return len; }
@@ -3451,7 +3455,7 @@ lpfc_iocb_hw_show(struct device *dev, ststruct Scsi_Host *shost =class_to_shost (dev);struct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba; -return snprintf (buf,PAGE_SIZE ,"%d\n" , phba->iocb_max); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , phba->iocb_max); } static DEVICE_ATTR(iocb_hw, S_IRUGO,
@@ -3463,7 +3467,7 @@ lpfc_txq_hw_show(struct device *dev, strstruct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba;struct lpfc_sli_ring *pring =lpfc_phba_elsring (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , pring ? pring->txq_max :0 ); }
@@ -3477,7 +3481,7 @@ lpfc_txcmplq_hw_show(struct device *dev,struct lpfc_hba *phba = ((struct lpfc_vport *) shost->hostdata)->phba;struct lpfc_sli_ring *pring =lpfc_phba_elsring (phba); -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return scnprintf (buf,PAGE_SIZE ,"%d\n" , pring ? pring->txcmplq_max :0 ); }
@@ -3513,7 +3517,7 @@ lpfc_nodev_tmo_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -return snprintf (buf,PAGE_SIZE ,"%d\n" , vport->cfg_devloss_tmo); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , vport->cfg_devloss_tmo); }/**
@@ -5016,19 +5020,19 @@ lpfc_fcp_cpu_map_show(struct device *devswitch (phba->cfg_fcp_cpu_map) {case 0 : - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"fcp_cpu_map: No mapping (%d)\n" , phba->cfg_fcp_cpu_map);return len;case 1 : - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"fcp_cpu_map: HBA centric mapping (%d): " "%d online CPUs\n" , phba->cfg_fcp_cpu_map, phba->sli4_hba.num_online_cpu);break ;case 2 : - len += snprintf(buf + len, PAGE_SIZE-len, + len += scnprintf(buf + len, PAGE_SIZE-len, "fcp_cpu_map: Driver centric mapping (%d): " "%d online CPUs\n", phba->cfg_fcp_cpu_map,
@@ -5041,14 +5045,14 @@ lpfc_fcp_cpu_map_show(struct device *dev/* margin should fit in this and the truncated message */ if (cpup->irq ==LPFC_VECTOR_MAP_EMPTY ) - len +=snprintf (buf + len,PAGE_SIZE -len, + len +=scnprintf (buf + len,PAGE_SIZE -len,"CPU %02d io_chan %02d " "physid %d coreid %d\n" , phba->sli4_hba.curr_disp_cpu, cpup->channel_id, cpup->phys_id, cpup->core_id);else - len += snprintf(buf + len, PAGE_SIZE-len, + len += scnprintf(buf + len, PAGE_SIZE-len, "CPU %02d io_chan %02d " "physid %d coreid %d IRQ %d\n", phba->sli4_hba.curr_disp_cpu,
@@ -5061,7 +5065,7 @@ lpfc_fcp_cpu_map_show(struct device *devif (phba->sli4_hba.curr_disp_cpu < phba->sli4_hba.num_present_cpu && (len >= (PAGE_SIZE -64 ))) { - len +=snprintf (buf + len,PAGE_SIZE -len,"more...\n" ); + len +=scnprintf (buf + len,PAGE_SIZE -len,"more...\n" );break ; } }
@@ -5586,10 +5590,10 @@ lpfc_sg_seg_cnt_show(struct device *dev,struct lpfc_hba *phba = vport->phba;int len; - len =snprintf (buf,PAGE_SIZE ,"SGL sz: %d total SGEs: %d\n" , + len =scnprintf (buf,PAGE_SIZE ,"SGL sz: %d total SGEs: %d\n" , phba->cfg_sg_dma_buf_size, phba->cfg_total_seg_cnt); - len +=snprintf (buf + len,PAGE_SIZE ,"Cfg: %d SCSI: %d NVME: %d\n" , + len +=scnprintf (buf + len,PAGE_SIZE ,"Cfg: %d SCSI: %d NVME: %d\n" , phba->cfg_sg_seg_cnt, phba->cfg_scsi_seg_cnt, phba->cfg_nvme_seg_cnt);return len;
@@ -6586,7 +6590,7 @@ lpfc_show_rport_##field (struct device * { \struct fc_rport *rport =transport_class_to_rport (dev); \struct lpfc_rport_data *rdata = rport->hostdata; \ -return snprintf (buf, sz, format_string, \ +return scnprintf (buf, sz, format_string, \ (rdata->target) ? cast rdata->target->field : 0); \ }
drivers/scsi/lpfc/lpfc_ct.c +6 -6
@@ -1430,7 +1430,7 @@ lpfc_vport_symbolic_port_name(struct lpf* Name object. NPIV is not in play so this integer * value is sufficient and unique per FC-ID. */ - n =snprintf (symbol, size,"%d" , vport->phba->brd_no); + n =scnprintf (symbol, size,"%d" , vport->phba->brd_no);return n; }
@@ -1444,26 +1444,26 @@ lpfc_vport_symbolic_node_name(struct lpflpfc_decode_firmware_rev (vport->phba, fwrev,0 ); - n =snprintf (symbol, size,"Emulex %s" , vport->phba->ModelName); + n =scnprintf (symbol, size,"Emulex %s" , vport->phba->ModelName);if (size < n)return n; - n +=snprintf (symbol + n, size - n," FV%s" , fwrev); + n +=scnprintf (symbol + n, size - n," FV%s" , fwrev);if (size < n)return n; - n +=snprintf (symbol + n, size - n," DV%s." , + n +=scnprintf (symbol + n, size - n," DV%s." , lpfc_release_version);if (size < n)return n; - n +=snprintf (symbol + n, size - n," HN:%s." , + n +=scnprintf (symbol + n, size - n," HN:%s." ,init_utsname ()->nodename);if (size < n)return n;/* Note :- OS name is "Linux" */ - n +=snprintf (symbol + n, size - n," OS:%s\n" , + n +=scnprintf (symbol + n, size - n," OS:%s\n" ,init_utsname ()->sysname);return n; }
drivers/scsi/lpfc/lpfc_debugfs.c +229 -226
1,386 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_debugfs.h +3 -3
@@ -342,7 +342,7 @@ lpfc_debug_dump_qe(struct lpfc_queue *q, pword = q->qe[idx].address; len =0 ; - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len,"QE[%04d]: " , idx); + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"QE[%04d]: " , idx);if (qe_word_cnt >8 )printk (KERN_ERR "%s\n" , line_buf);
@@ -353,11 +353,11 @@ lpfc_debug_dump_qe(struct lpfc_queue *q,if (qe_word_cnt >8 ) { len =0 ;memset (line_buf,0 ,LPFC_LBUF_SZ ); - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len, + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"%03d: " , i); } } - len +=snprintf (line_buf+len,LPFC_LBUF_SZ -len,"%08x " , + len +=scnprintf (line_buf+len,LPFC_LBUF_SZ -len,"%08x " , ((uint32_t )*pword) &0xffffffff ); pword++; }
Greg Kroah-Hartman
maintainerPATCH 85/95 scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
In reply to Greg Kroah-HartmanFrom: Andrew Vasquez <[email protected]>
commit 5cbdae10bf11f96e30b4d14de7b08c8b490e903c upstream.
Commit e6f77540c067 ("scsi: qla2xxx: Fix an integer overflow in sysfs code") incorrectly set 'optrom_region_size' to 'start+size', which can overflow option-rom boundaries when 'start' is non-zero. Continue setting optrom_region_size to the proper adjusted value of 'size'.
--- drivers/scsi/qla2xxx/qla_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -2
@@ -364,7 +364,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SREADING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
@@ -437,7 +437,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state =QLA_SWRITING ; ha->optrom_buffer =vmalloc (ha->optrom_region_size);
Greg Kroah-Hartman
maintainerPATCH 86/95 scsi: qla2xxx: Fix device staying in blocked state
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 2137490f2147a8d0799b72b9a1023efb012d40c7 upstream.
This patch fixes issue reported by some of the customers, who discovered that after cable pull scenario the devices disappear and path seems to remain in blocked state. Once the device reappears, driver does not seem to update path to online. This issue appears because of the defer flag creating race condition where the same session reappears. This patch fixes this issue by indicating SCSI-ML of device lost when qlt_free_session_done() is called from qlt_unreg_sess().
--- drivers/scsi/qla2xxx/qla_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +2 -2
@@ -977,6 +977,8 @@ void qlt_free_session_done(struct work_s sess->send_els_logo);if (!IS_SW_RESV_ADDR (sess->d_id)) { +qla2x00_mark_device_lost (vha, sess,0 ,0 ); +if (sess->send_els_logo) {qlt_port_logo_t logo;
@@ -1157,8 +1159,6 @@ void qlt_unreg_sess(struct fc_port *sessif (sess->se_sess) vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map (sess); -qla2x00_mark_device_lost (vha, sess,0 ,0 ); - sess->deleted =QLA_SESS_DELETION_IN_PROGRESS ; sess->disc_state =DSC_DELETE_PEND ; sess->last_rscn_gen = sess->rscn_gen;
Greg Kroah-Hartman
maintainerPATCH 87/95 Bluetooth: hidp: fix buffer overflow
In reply to Greg Kroah-HartmanFrom: Young Xiao <[email protected]>
commit a1616a5ac99ede5d605047a9012481ce7ff18b16 upstream.
Struct ca is copied from userspace. It is not checked whether the "name" field is NULL terminated, which allows local users to obtain potentially sensitive information from kernel stack memory, via a HIDPCONNADD command.
This vulnerability is similar to CVE-2011-1079.
--- net/bluetooth/hidp/sock.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/hidp/sock.c +1 -0
@@ -75,6 +75,7 @@ static int do_hidp_sock_ioctl(struct socsockfd_put (csock);return err; } + ca.name[sizeof (ca.name)-1 ] =0 ; err =hidp_connection_add (&ca, csock, isock);if (!err &©_to_user (argp, &ca,sizeof (ca)))
Greg Kroah-Hartman
maintainerPATCH 88/95 Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
The minimum encryption key size for LE connections is 56 bits and to align LE with BR/EDR, enforce 56 bits of minimum encryption key size for BR/EDR connections as well.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_conn.c | 8 ++++++++ 2 files changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -190,6 +190,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
net/bluetooth/hci_conn.c +8 -0
@@ -1276,6 +1276,14 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +*/ +if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) +return 0 ; +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 89/95 Bluetooth: Fix not initializing L2CAP tx_credits
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
commit ba8f5289f706aed94cc95b15cc5b89e22062f61f upstream.
l2cap_le_flowctl_init was reseting the tx_credits which works only for outgoing connection since that set the tx_credits on the response, for incoming connections that was not the case which leaves the channel without any credits causing it to be suspended.
--- net/bluetooth/l2cap_core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +4 -5
@@ -510,12 +510,12 @@ void l2cap_chan_set_defaults(struct l2ca }EXPORT_SYMBOL_GPL (l2cap_chan_set_defaults); -static void l2cap_le_flowctl_init (struct l2cap_chan *chan) +static void l2cap_le_flowctl_init (struct l2cap_chan *chan,u16 tx_credits) { chan->sdu =NULL ; chan->sdu_last_frag =NULL ; chan->sdu_len =0 ; - chan->tx_credits =0 ; + chan->tx_credits = tx_credits;/* Derive MPS from connection MTU to stop HCI fragmentation */ chan->mps =min_t (u16, chan->imtu, chan->conn->mtu -L2CAP_HDR_SIZE );/* Give enough credits for a full packet */
@@ -1281,7 +1281,7 @@ static void l2cap_le_connect(struct l2caif (test_and_set_bit (FLAG_LE_CONN_REQ_SENT , &chan->flags))return ; -l2cap_le_flowctl_init (chan); +l2cap_le_flowctl_init (chan,0 ); req.psm = chan->psm; req.scid =cpu_to_le16 (chan->scid);
@@ -5531,11 +5531,10 @@ static int l2cap_le_connect_req(struct l chan->dcid = scid; chan->omtu = mtu; chan->remote_mps = mps; - chan->tx_credits =__le16_to_cpu (req->credits);__l2cap_chan_add (conn, chan); -l2cap_le_flowctl_init (chan); +l2cap_le_flowctl_init (chan,__le16_to_cpu (req->credits)); dcid = chan->scid; credits = chan->rx_credits;
Greg Kroah-Hartman
maintainerPATCH 90/95 Bluetooth: hci_bcm: Fix empty regulator supplies for Intel Macs
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 62611abc8f37d00e3b0cff0eb2d72fa92b05fd27 upstream.
The code path for Macs goes through bcm_apple_get_resources(), which skips over the code that sets up the regulator supplies. As a result, the call to regulator_bulk_enable() / regulator_bulk_disable() results in a NULL pointer dereference.
This was reported on the kernel.org Bugzilla, bug 202963.
Unbreak Broadcom Bluetooth support on Intel Macs by checking if the supplies were set up before enabling or disabling them.
The same does not need to be done for the clocks, as the common clock framework API checks for NULL pointers.
--- drivers/bluetooth/hci_bcm.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/bluetooth/hci_bcm.c +16 -4
@@ -228,9 +228,15 @@ static int bcm_gpio_set_power(struct bcmint err;if (powered && !dev->res_enabled) { - err =regulator_bulk_enable (BCM_NUM_SUPPLIES , dev->supplies); -if (err) -return err; +/* Intel Macs use bcm_apple_get_resources() and don't +* have regulator supplies configured. +*/ +if (dev->supplies[0 ].supply) { + err =regulator_bulk_enable (BCM_NUM_SUPPLIES , + dev->supplies); +if (err) +return err; + }/* LPO clock needs to be 32.768 kHz */ err =clk_set_rate (dev->lpo_clk,32768 );
@@ -259,7 +265,13 @@ static int bcm_gpio_set_power(struct bcmif (!powered && dev->res_enabled) {clk_disable_unprepare (dev->txco_clk);clk_disable_unprepare (dev->lpo_clk); -regulator_bulk_disable (BCM_NUM_SUPPLIES , dev->supplies); + +/* Intel Macs use bcm_apple_get_resources() and don't +* have regulator supplies configured. +*/ +if (dev->supplies[0 ].supply) +regulator_bulk_disable (BCM_NUM_SUPPLIES , + dev->supplies); }/* wait for device to power on and come out of reset */
Greg Kroah-Hartman
maintainerPATCH 91/95 UAS: fix alignment of scatter/gather segments
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 3ae62a42090f1ed48e2313ed256a1182a85fb575 upstream.
This is the UAS version of
747668dbc061b3e62bc1982767a3a1f9815fcf0e
usb-storage: Set virt_boundary_mask to avoid SG overflows
We are not as likely to be vulnerable as storage, as it is unlikelier that UAS is run over a controller without native support for SG, but the issue exists.
The issue has been existing since the inception of the driver.
--- drivers/usb/storage/uas.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
drivers/usb/storage/uas.c +22 -13
@@ -796,24 +796,33 @@ static int uas_slave_alloc(struct scsi_d {struct uas_dev_info *devinfo = (struct uas_dev_info *)sdev->host->hostdata; +int maxp; sdev->hostdata = devinfo;/* -* USB has unusual DMA-alignment requirements: Although the -* starting address of each scatter-gather element doesn't matter, -* the length of each element except the last must be divisible -* by the Bulk maxpacket value. There's currently no way to -* express this by block-layer constraints, so we'll cop out -* and simply require addresses to be aligned at 512-byte -* boundaries. This is okay since most block I/O involves -* hardware sectors that are multiples of 512 bytes in length, -* and since host controllers up through USB 2.0 have maxpacket -* values no larger than 512. +* We have two requirements here. We must satisfy the requirements +* of the physical HC and the demands of the protocol, as we +* definitely want no additional memory allocation in this path +* ruling out using bounce buffers. * -* But it doesn't suffice for Wireless USB, where Bulk maxpacket -* values can be as large as 2048. To make that work properly -* will require changes to the block layer. +* For a transmission on USB to continue we must never send +* a package that is smaller than maxpacket. Hence the length of each +* scatterlist element except the last must be divisible by the +* Bulk maxpacket value. +* If the HC does not ensure that through SG, +* the upper layer must do that. We must assume nothing +* about the capabilities off the HC, so we use the most +* pessimistic requirement. +*/ + + maxp =usb_maxpacket (devinfo->udev, devinfo->data_in_pipe,0 ); +blk_queue_virt_boundary (sdev->request_queue, maxp -1 ); + +/* +* The protocol has no requirements on alignment in the strict sense. +* Controllers may or may not have alignment restrictions. +* As this is not exported, we use an extremely conservative guess. */ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 ));
Greg Kroah-Hartman
maintainerPATCH 92/95 ASoC: Intel: avoid Oops if DMA setup fails
In reply to Greg Kroah-HartmanFrom: Ross Zwisler <[email protected]>
commit 0efa3334d65b7f421ba12382dfa58f6ff5bf83c4 upstream.
Currently in sst_dsp_new() if we get an error return from sst_dma_new() we just print an error message and then still complete the function successfully. This means that we are trying to run without sst->dma properly set up, which will result in NULL pointer dereference when sst->dma is later used. This was happening for me in sst_dsp_dma_get_channel():
struct sst_dma *dma = dsp->dma;
...
dma->ch = dma_request_channel(mask, dma_chan_filter, dsp);This resulted in:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: sst_dsp_dma_get_channel+0x4f/0x125 [snd_soc_sst_firmware]
Fix this by adding proper error handling for the case where we fail to set up DMA.
This change only affects Haswell and Broadwell systems. Baytrail systems explicilty opt-out of DMA via sst->pdata->resindex_dma_base being set to -1.
--- sound/soc/intel/common/sst-firmware.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/intel/common/sst-firmware.c +6 -2
@@ -1251,11 +1251,15 @@ struct sst_dsp *sst_dsp_new(struct devic goto irq_err; err =sst_dma_new (sst); -if (err) -dev_warn (dev,"sst_dma_new failed %d\n" , err); +if (err) { +dev_err (dev,"sst_dma_new failed %d\n" , err); + goto dma_err; + }return sst; +dma_err: +free_irq (sst->irq, sst); irq_err:if (sst->ops->free) sst->ops->free (sst);
Greg Kroah-Hartman
maintainerPATCH 93/95 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 476c7e1d34f2a03b1aa5a924c50703053fe5f77c upstream.
The problem here is that addr can be I3C_BROADCAST_ADDR (126). That means we're shifting by (126 * 2) % 64 which is 60. The I3C_ADDR_SLOT_STATUS_MASK is an enum which is an unsigned int in GCC so shifts greater than 31 are undefined.
--- drivers/i3c/master.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/i3c/master.c +3 -2
@@ -385,8 +385,9 @@ static void i3c_bus_set_addr_slot_statusreturn ; ptr = bus->addrslots + (bitpos /BITS_PER_LONG ); - *ptr &= ~(I3C_ADDR_SLOT_STATUS_MASK << (bitpos %BITS_PER_LONG )); - *ptr |= status << (bitpos %BITS_PER_LONG ); + *ptr &= ~((unsigned long )I3C_ADDR_SLOT_STATUS_MASK << + (bitpos %BITS_PER_LONG )); + *ptr |= (unsigned long )status << (bitpos %BITS_PER_LONG ); }static bool i3c_bus_dev_addr_is_avail (struct i3c_bus *bus,u8 addr)
Greg Kroah-Hartman
maintainerPATCH 94/95 locking/futex: Allow low-level atomic operations to return -EAGAIN
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 6b4f4bc9cb22875f97023984a625386f0c7cc1c0 upstream.
Some futex() operations, including FUTEX_WAKE_OP, require the kernel to perform an atomic read-modify-write of the futex word via the userspace mapping. These operations are implemented by each architecture in arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which are called in atomic context with the relevant hash bucket locks held.
Although these routines may return -EFAULT in response to a page fault generated when accessing userspace, they are expected to succeed (i.e. return 0) in all other cases. This poses a problem for architectures that do not provide bounded forward progress guarantees or fairness of contended atomic operations and can lead to starvation in some cases.
In these problematic scenarios, we must return back to the core futex code so that we can drop the hash bucket locks and reschedule if necessary, much like we do in the case of a page fault.
Allow architectures to return -EAGAIN from their implementations of arch_futex_atomic_op_inuser() and futex_atomic_cmpxchg_inatomic(), which will cause the core futex code to reschedule if necessary and return back to the architecture code later on.
--- kernel/futex.c | 188 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 117 insertions(+), 71 deletions(-)
kernel/futex.c +117 -71
@@ -1314,13 +1314,15 @@ static int lookup_pi_state(u32 __user *ustatic int lock_pi_update_atomic (u32 __user *uaddr,u32 uval,u32 newval) { +int err;u32 uninitialized_var (curval );if (unlikely (should_fail_futex (true)))return -EFAULT ; -if (unlikely (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval))) -return -EFAULT ; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (unlikely (err)) +return err;/* If user space value changed, let the caller retry */ return curval != uval ? -EAGAIN :0 ;
@@ -1506,10 +1508,8 @@ static int wake_futex_pi(u32 __user *uadif (unlikely (should_fail_futex (true))) ret = -EFAULT ; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) { - ret = -EFAULT ; - - }else if (curval != uval) { + ret =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (!ret && (curval != uval)) {/* * If a unconditional UNLOCK_PI operation (user space did not * try the TID->0 transition) raced with a waiter setting the
@@ -1704,32 +1704,32 @@ retry_private:double_lock_hb (hb1, hb2); op_ret =futex_atomic_op_inuser (op, uaddr2);if (unlikely (op_ret <0 )) { -double_unlock_hb (hb1, hb2); -#ifndef CONFIG_MMU -/* -* we don't get EFAULT from MMU faults if we don't have an MMU, -* but we might get them from range checking -*/ - ret = op_ret; - goto out_put_keys; -#endif - -if (unlikely (op_ret != -EFAULT )) { +if (!IS_ENABLED (CONFIG_MMU ) || +unlikely (op_ret != -EFAULT && op_ret != -EAGAIN )) { +/* +* we don't get EFAULT from MMU faults if we don't have +* an MMU, but we might get them from range checking +*/ ret = op_ret; goto out_put_keys; } - ret =fault_in_user_writeable (uaddr2); -if (ret) - goto out_put_keys; +if (op_ret == -EFAULT ) { + ret =fault_in_user_writeable (uaddr2); +if (ret) + goto out_put_keys; + } -if (!(flags &FLAGS_SHARED )) +if (!(flags &FLAGS_SHARED )) { +cond_resched (); goto retry_private; + }put_futex_key (&key2);put_futex_key (&key1); +cond_resched (); goto retry; }
@@ -2354,7 +2354,7 @@ static int fixup_pi_state_owner(u32 __usu32 uval,uninitialized_var (curval ), newval;struct task_struct *oldowner, *newowner;u32 newtid; -int ret; +int ret, err =0 ;lockdep_assert_held (q->lock_ptr);
@@ -2425,14 +2425,17 @@ retry:if (!pi_state->owner) newtid |=FUTEX_OWNER_DIED ; -if (get_futex_value_locked (&uval, uaddr)) - goto handle_fault; + err =get_futex_value_locked (&uval, uaddr); +if (err) + goto handle_err;for (;;) { newval = (uval &FUTEX_OWNER_DIED ) | newtid; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) - goto handle_fault; + err =cmpxchg_futex_value_locked (&curval, uaddr, uval, newval); +if (err) + goto handle_err; +if (curval == uval)break ; uval = curval;
@@ -2460,23 +2463,37 @@ retry:return 0 ;/* -* To handle the page fault we need to drop the locks here. That gives -* the other task (either the highest priority waiter itself or the -* task which stole the rtmutex) the chance to try the fixup of the -* pi_state. So once we are back from handling the fault we need to -* check the pi_state after reacquiring the locks and before trying to -* do another fixup. When the fixup has been done already we simply -* return. +* In order to reschedule or handle a page fault, we need to drop the +* locks here. In the case of a fault, this gives the other task +* (either the highest priority waiter itself or the task which stole +* the rtmutex) the chance to try the fixup of the pi_state. So once we +* are back from handling the fault we need to check the pi_state after +* reacquiring the locks and before trying to do another fixup. When +* the fixup has been done already we simply return. * * Note: we hold both hb->lock and pi_mutex->wait_lock. We can safely * drop hb->lock since the caller owns the hb -> futex_q relation. * Dropping the pi_mutex->wait_lock requires the state revalidate. */ -handle_fault: +handle_err:raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (q->lock_ptr); - ret =fault_in_user_writeable (uaddr); +switch (err) { +case -EFAULT : + ret =fault_in_user_writeable (uaddr); +break ; + +case -EAGAIN : +cond_resched (); + ret =0 ; +break ; + +default : +WARN_ON_ONCE (1 ); + ret = err; +break ; + }spin_lock (q->lock_ptr);raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);
@@ -3045,10 +3062,8 @@ retry:* A unconditional UNLOCK_PI op raced against a waiter * setting the FUTEX_WAITERS bit. Try again. */ -if (ret == -EAGAIN ) { -put_futex_key (&key); - goto retry; - } +if (ret == -EAGAIN ) + goto pi_retry;/* * wake_futex_pi has detected invalid state. Tell user * space.
@@ -3063,9 +3078,19 @@ retry:* preserve the WAITERS bit not the OWNER_DIED one. We are the * owner. */ -if (cmpxchg_futex_value_locked (&curval, uaddr, uval,0 )) { +if ((ret =cmpxchg_futex_value_locked (&curval, uaddr, uval,0 ))) {spin_unlock (&hb->lock); - goto pi_faulted; +switch (ret) { +case -EFAULT : + goto pi_faulted; + +case -EAGAIN : + goto pi_retry; + +default : +WARN_ON_ONCE (1 ); + goto out_putkey; + } }/*
@@ -3079,6 +3104,11 @@ out_putkey:put_futex_key (&key);return ret; +pi_retry: +put_futex_key (&key); +cond_resched (); + goto retry; + pi_faulted:put_futex_key (&key);
@@ -3439,6 +3469,7 @@ err_unlock:static int handle_futex_death (u32 __user *uaddr,struct task_struct *curr,int pi) {u32 uval,uninitialized_var (nval ), mval; +int err;/* Futex address must be 32bit aligned */ if ((((unsigned long )uaddr) %sizeof (*uaddr)) !=0 )
@@ -3448,42 +3479,57 @@ retry:if (get_user (uval, uaddr))return -1 ; -if ((uval &FUTEX_TID_MASK ) ==task_pid_vnr (curr)) { -/* -* Ok, this dying thread is truly holding a futex -* of interest. Set the OWNER_DIED bit atomically -* via cmpxchg, and if the value had FUTEX_WAITERS -* set, wake up a waiter (if any). (We have to do a -* futex_wake() even if OWNER_DIED is already set - -* to handle the rare but possible case of recursive -* thread-death.) The rest of the cleanup is done in -* userspace. -*/ - mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; -/* -* We are not holding a lock here, but we want to have -* the pagefault_disable/enable() protection because -* we want to handle the fault gracefully. If the -* access fails we try to fault in the futex with R/W -* verification via get_user_pages. get_user() above -* does not guarantee R/W access. If that fails we -* give up and leave the futex locked. -*/ -if (cmpxchg_futex_value_locked (&nval, uaddr, uval, mval)) { +if ((uval &FUTEX_TID_MASK ) !=task_pid_vnr (curr)) +return 0 ; + +/* +* Ok, this dying thread is truly holding a futex +* of interest. Set the OWNER_DIED bit atomically +* via cmpxchg, and if the value had FUTEX_WAITERS +* set, wake up a waiter (if any). (We have to do a +* futex_wake() even if OWNER_DIED is already set - +* to handle the rare but possible case of recursive +* thread-death.) The rest of the cleanup is done in +* userspace. +*/ + mval = (uval &FUTEX_WAITERS ) |FUTEX_OWNER_DIED ; + +/* +* We are not holding a lock here, but we want to have +* the pagefault_disable/enable() protection because +* we want to handle the fault gracefully. If the +* access fails we try to fault in the futex with R/W +* verification via get_user_pages. get_user() above +* does not guarantee R/W access. If that fails we +* give up and leave the futex locked. +*/ +if ((err =cmpxchg_futex_value_locked (&nval, uaddr, uval, mval))) { +switch (err) { +case -EFAULT :if (fault_in_user_writeable (uaddr))return -1 ; goto retry; - } -if (nval != uval) + +case -EAGAIN : +cond_resched (); goto retry; -/* -* Wake robust non-PI futexes here. The wakeup of -* PI futexes happens in exit_pi_state(): -*/ -if (!pi && (uval &FUTEX_WAITERS )) -futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +default : +WARN_ON_ONCE (1 ); +return err; + } } + +if (nval != uval) + goto retry; + +/* +* Wake robust non-PI futexes here. The wakeup of +* PI futexes happens in exit_pi_state(): +*/ +if (!pi && (uval &FUTEX_WAITERS )) +futex_wake (uaddr,1 ,1 ,FUTEX_BITSET_MATCH_ANY ); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 95/95 arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 03110a5cb2161690ae5ac04994d47ed0cd6cef75 upstream.
Our futex implementation makes use of LDXR/STXR loops to perform atomic updates to user memory from atomic context. This can lead to latency problems if we end up spinning around the LL/SC sequence at the expense of doing something useful.
Rework our futex atomic operations so that we return -EAGAIN if we fail to update the futex word after 128 attempts. The core futex code will reschedule if necessary and we'll try again later.
--- arch/arm64/include/asm/futex.h | 55 +++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-)
arch/arm64/include/asm/futex.h +34 -21
@@ -23,26 +23,34 @@#include <asm/errno.h> +#define FUTEX_MAX_LOOPS 128/* What's the largest number you can think of? */ +#define __futex_atomic_op (insn, ret, oldval, uaddr, tmp, oparg) \ do { \ + unsigned int loops = FUTEX_MAX_LOOPS; \ + \ uaccess_enable(); \ asm volatile( \ " prfm pstl1strm, %2\n" \ "1: ldxr %w1, %2\n" \ insn "\n" \ "2: stlxr %w0, %w3, %2\n" \ -" cbnz %w0, 1b\n" \ -" dmb ish\n" \ +" cbz %w0, 3f\n" \ +" sub %w4, %w4, %w0\n" \ +" cbnz %w4, 1b\n" \ +" mov %w0, %w7\n" \ "3:\n" \ +" dmb ish\n" \ " .pushsection .fixup,\"ax\"\n" \ " .align 2\n" \ -"4: mov %w0, %w5\n" \ +"4: mov %w0, %w6\n" \ " b 3b\n" \ " .popsection\n" \ _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ - : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp) \ - : "r" (oparg), "Ir" (-EFAULT) \ + : "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp), \ + "+r" (loops) \ + : "r" (oparg), "Ir" (-EFAULT), "Ir" (-EAGAIN) \ : "memory"); \ uaccess_disable(); \ } while (0)
@@ -57,23 +65,23 @@ arch_futex_atomic_op_inuser(int op, intswitch (op) {case FUTEX_OP_SET : -__futex_atomic_op ("mov %w3, %w4" , +__futex_atomic_op ("mov %w3, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ADD : -__futex_atomic_op ("add %w3, %w1, %w4" , +__futex_atomic_op ("add %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_OR : -__futex_atomic_op ("orr %w3, %w1, %w4" , +__futex_atomic_op ("orr %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;case FUTEX_OP_ANDN : -__futex_atomic_op ("and %w3, %w1, %w4" , +__futex_atomic_op ("and %w3, %w1, %w5" , ret, oldval, uaddr, tmp, ~oparg);break ;case FUTEX_OP_XOR : -__futex_atomic_op ("eor %w3, %w1, %w4" , +__futex_atomic_op ("eor %w3, %w1, %w5" , ret, oldval, uaddr, tmp, oparg);break ;default :
@@ -93,6 +101,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 oldval, u32 newval) {int ret =0 ; +unsigned int loops =FUTEX_MAX_LOOPS ;u32 val, tmp;u32 __user *uaddr;
@@ -104,20 +113,24 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, asmvolatile ("// futex_atomic_cmpxchg_inatomic\n" " prfm pstl1strm, %2\n" "1: ldxr %w1, %2\n" -" sub %w3, %w1, %w4\n" -" cbnz %w3, 3f\n" -"2: stlxr %w3, %w5, %2\n" -" cbnz %w3, 1b\n" -" dmb ish\n" +" sub %w3, %w1, %w5\n" +" cbnz %w3, 4f\n" +"2: stlxr %w3, %w6, %2\n" +" cbz %w3, 3f\n" +" sub %w4, %w4, %w3\n" +" cbnz %w4, 1b\n" +" mov %w0, %w8\n" "3:\n" +" dmb ish\n" +"4:\n" " .pushsection .fixup,\"ax\"\n" -"4: mov %w0, %w6\n" -" b 3b\n" +"5: mov %w0, %w7\n" +" b 4b\n" " .popsection\n" - _ASM_EXTABLE(1b, 4b) - _ASM_EXTABLE(2b, 4b) - : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp) - : "r" (oldval), "r" (newval), "Ir" (-EFAULT) + _ASM_EXTABLE(1b, 5b) + _ASM_EXTABLE(2b, 5b) + : "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp), "+r" (loops) + : "r" (oldval), "r" (newval), "Ir" (-EFAULT), "Ir" (-EAGAIN) : "memory");uaccess_disable ();
stable-rc/linux-5.0.y boot: 143 boots: 1 failed, 141 passed with 1 untried/unknown (v5.0.14-96-gdf1376651d49)
stable-rc/linux-5.0.y boot: 143 boots: 1 failed, 141 passed with 1 untried/unknown (v5.0.14-96-gdf1376651d49)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.0.y/kernel/v5.0.14-96-gdf1376651d49/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.0.y/kernel/v5.0.14-96-gdf1376651d49/
Tree: stable-rc
Branch: linux-5.0.y
Git Describe: v5.0.14-96-gdf1376651d49
Git Commit: df1376651d496484d341d374c3d2566a089b1969
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 77 unique boards, 25 SoC families, 15 builds out of 208
Boot Failure Detected:
arm:
multi_v7_defconfig:
gcc-8:
stih410-b2120: 1 failed lab---
For more info write to <[email protected]>
Greg Kroah-Hartman
maintainerQuoted 12 lines · kernelci.org bot
stable-rc/linux-5.0.y boot: 143 boots: 1 failed, 141 passed with 1 untried/unknown (v5.0.14-96-gdf1376651d49)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.0.y/kernel/v5.0.14-96-gdf1376651d49/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.0.y/kernel/v5.0.14-96-gdf1376651d49/Tree: stable-rc
Branch: linux-5.0.y
Git Describe: v5.0.14-96-gdf1376651d49
Git Commit:df1376651d496484d341d374c3d2566a089b1969
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 77 unique boards, 25 SoC families, 15 builds out of 208
Quoted 6 lines
Boot Failure Detected:
arm:
multi_v7_defconfig: gcc-8: stih410-b2120: 1 failed lab
Is this a "real" issue?
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.0.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.0.15-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.0.y
git commit: df1376651d496484d341d374c3d2566a089b1969
git describe: v5.0.14-96-gdf1376651d49
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.0-oe/build/v5.0.14-96-gdf1376651d49
No regressions (compared to build v5.0.14)
No fixes (compared to build v5.0.14)
Ran 24978 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-fs-tests
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 17 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.0.y
and the diffstat can be found below.
Quoted 7 lines
Quoted 4 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Thanks for testing 4 of these (no 5.1?) and letting me know.
greg k-h
Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Naresh Kamboju
Quoted 17 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.0.y
and the diffstat can be found below.thanks,
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.Thanks for testing 4 of these (no 5.1?) and letting me know.
5.1 results coming shortly. I had to fix a bug in my builder setup.
Guenter
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.0.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.0:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 5.0.15-rc1-gdf13766
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 349 pass: 349 fail: 0
Guenter
Quoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
Quoted 6 lines
Build results:
total: 159 pass: 159 fail: 0
Qemu test results:
total: 349 pass: 349 fail: 0Guenter
compiled booted and no regressions on my system.
Thanks,
vandana
Greg Kroah-Hartman
maintainerQuoted 12 lines · Vandana BN
Quoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
Quoted 8 lines
Quoted 6 lines
Build results:
total: 159 pass: 159 fail: 0
Qemu test results:
total: 349 pass: 349 fail: 0Guenter
compiled booted and no regressions on my system.
Did you mean to send this twice for the 5.0 release?
Anyway, thanks for testing :)
greg k-h
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.0.15 release. There are 95 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines
Responses should be made by Sat 11 May 2019 06:11:22 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.15-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.0.y
and the diffstat can be found below.
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah