Linux 6.6.111
Greg Kroah-Hartman
maintainerI'm announcing the release of the 6.6.111 kernel.
All users of the 6.6 kernel series must upgrade.
The updated 6.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/kernel/fpsimd.c | 8 +- arch/riscv/include/asm/processor.h | 33 +-------- arch/x86/kvm/emulate.c | 9 +- arch/x86/kvm/kvm_emulate.h | 3 arch/x86/kvm/x86.c | 15 ++-- crypto/rng.c | 8 ++ drivers/hid/hid-mcp2221.c | 4 + drivers/md/dm-integrity.c | 2 drivers/media/i2c/tc358743.c | 4 - drivers/media/tuners/xc5000.c | 41 +++++------- drivers/net/can/rcar/rcar_canfd.c | 7 +- drivers/net/can/spi/hi311x.c | 33 +++++---- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 1 drivers/platform/x86/amd/pmc/pmc-quirks.c | 15 ++++ drivers/staging/axis-fifo/axis-fifo.c | 68 +++++++++----------- drivers/tty/serial/Kconfig | 2 drivers/usb/serial/option.c | 6 + fs/btrfs/ref-verify.c | 9 ++ include/linux/device.h | 3 net/9p/trans_fd.c | 8 +- sound/soc/amd/acp/amd.h | 2 sound/soc/codecs/rt5682s.c | 17 ++--- sound/usb/midi.c | 10 +- tools/lib/subcmd/help.c | 3 25 files changed, 165 insertions(+), 148 deletions(-)
Arnaud Lecomte (1):
hid: fix I2C read buffer overflow in raw_event() for mcp2221
Bitterblue Smith (1):
wifi: rtlwifi: rtl8192cu: Don't claim USB ID 07b8:8188
Charlie Jenkins (2):
riscv: mm: Use hint address in mmap if available
riscv: mm: Do not restrict mmap address based on hint
Chen Yufeng (1):
can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled
Christoffer Sandberg (1):
platform/x86/amd/pmc: Add Stellaris Slim Gen6 AMD to spurious 8042 quirks list
David Sterba (1):
btrfs: ref-verify: handle damaged extent root tree
Duoming Zhou (2):
media: tuner: xc5000: Fix use-after-free in xc5000_release
media: i2c: tc358743: Fix use-after-free bugs caused by orphan timer in probe
Duy Nguyen (1):
can: rcar_canfd: Fix controller mode setting
Greg Kroah-Hartman (1):
Linux 6.6.111
Herbert Xu (1):
crypto: rng - Ensure set_ent is always present
Jack Yu (1):
ASoC: rt5682s: Adjust SAR ADC button mode to fix noise issue
Jeongjun Park (1):
ALSA: usb-audio: fix race condition to UAF in snd_usbmidi_free
Mikulas Patocka (1):
dm-integrity: limit MAX_TAG_SIZE to 255
Nalivayko Sergey (1):
net/9p: fix double req put in p9_fd_cancelled
Ovidiu Panait (3):
staging: axis-fifo: fix maximum TX packet length check
staging: axis-fifo: fix TX handling on copy_from_user() failure
staging: axis-fifo: flush RX FIFO on read errors
Rafael J. Wysocki (1):
driver core/PM: Set power.no_callbacks along with power.no_pm
Raphael Gallais-Pou (1):
serial: stm32: allow selecting console when the driver is module
Ricardo Ribalda (1):
media: tunner: xc5000: Refactor firmware load
Sean Christopherson (1):
KVM: x86: Don't (re)check L1 intercepts when completing userspace I/O
Takashi Iwai (1):
ALSA: usb-audio: Kill timer properly at removal
Venkata Prasad Potturu (1):
ASoC: amd: acp: Adjust pdm gain value
Will Deacon (1):
KVM: arm64: Fix softirq masking in FPSIMD register saving sequence
Xiaowei Li (1):
USB: serial: option: add SIMCom 8230C compositions
aprilgrimoire (1):
platform/x86/amd/pmc: Add MECHREVO Yilong15Pro to spurious_8042 list
hupu (1):
perf subcmd: avoid crash in exclude_cmds when excludes is empty
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 6 -SUBLEVEL = 110 +SUBLEVEL = 111 EXTRAVERSION = NAME = Pinguïn Aangedreven
arch/arm64/kernel/fpsimd.c +6 -2
@@ -1873,13 +1873,17 @@ static void fpsimd_flush_cpu_state(void)*/ void fpsimd_save_and_flush_cpu_state (void ) { +unsigned long flags; +if (!system_supports_fpsimd ())return ;WARN_ON (preemptible ()); -get_cpu_fpsimd_context (); +local_irq_save (flags); +__get_cpu_fpsimd_context ();fpsimd_save ();fpsimd_flush_cpu_state (); -put_cpu_fpsimd_context (); +__put_cpu_fpsimd_context (); +local_irq_restore (flags); }#ifdef CONFIG_KERNEL_MODE_NEON
arch/riscv/include/asm/processor.h +5 -28
@@ -13,42 +13,19 @@#include <asm/ptrace.h> -#ifdef CONFIG_64BIT -#define DEFAULT_MAP_WINDOW (UL(1) << (MMAP_VA_BITS - 1)) -#define STACK_TOP_MAX TASK_SIZE -#define arch_get_mmap_end (addr, len, flags) \ ({ \ - unsigned long mmap_end; \ - typeof(addr) _addr = (addr); \ - if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ - mmap_end = STACK_TOP_MAX; \ - else if ((_addr) >= VA_USER_SV57) \ - mmap_end = STACK_TOP_MAX; \ - else if ((((_addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) \ - mmap_end = VA_USER_SV48; \ - else \ - mmap_end = VA_USER_SV39; \ - mmap_end; \ + STACK_TOP_MAX; \ })#define arch_get_mmap_base (addr, base) \ ({ \ - unsigned long mmap_base; \ - typeof(addr) _addr = (addr); \ - typeof(base) _base = (base); \ - unsigned long rnd_gap = DEFAULT_MAP_WINDOW - (_base); \ - if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ - mmap_base = (_base); \ - else if (((_addr) >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) \ - mmap_base = VA_USER_SV57 - rnd_gap; \ - else if ((((_addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) \ - mmap_base = VA_USER_SV48 - rnd_gap; \ - else \ - mmap_base = VA_USER_SV39 - rnd_gap; \ - mmap_base; \ + base; \ }) +#ifdef CONFIG_64BIT +#define DEFAULT_MAP_WINDOW (UL(1) << (MMAP_VA_BITS - 1)) +#define STACK_TOP_MAX TASK_SIZE#else #define DEFAULT_MAP_WINDOW TASK_SIZE#define STACK_TOP_MAX TASK_SIZE
arch/x86/kvm/emulate.c +4 -5
@@ -5134,12 +5134,11 @@ void init_decode_cache(struct x86_emulate_ctxt *ctxt) ctxt->mem_read.end =0 ; } -int x86_emulate_insn (struct x86_emulate_ctxt *ctxt) +int x86_emulate_insn (struct x86_emulate_ctxt *ctxt,bool check_intercepts) {const struct x86_emulate_ops *ops = ctxt->ops;int rc =X86EMUL_CONTINUE ;int saved_dst_type = ctxt->dst.type; -bool is_guest_mode = ctxt->ops->is_guest_mode (ctxt); ctxt->mem_read.pos =0 ;
@@ -5187,7 +5186,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)fetch_possible_mmx_operand (&ctxt->dst); } -if (unlikely (is_guest_mode) && ctxt->intercept) { +if (unlikely (check_intercepts) && ctxt->intercept) { rc =emulator_check_intercept (ctxt, ctxt->intercept,X86_ICPT_PRE_EXCEPT );if (rc !=X86EMUL_CONTINUE )
@@ -5216,7 +5215,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) goto done; } -if (unlikely (is_guest_mode) && (ctxt->d & Intercept)) { +if (unlikely (check_intercepts) && (ctxt->d & Intercept)) { rc =emulator_check_intercept (ctxt, ctxt->intercept,X86_ICPT_POST_EXCEPT );if (rc !=X86EMUL_CONTINUE )
@@ -5270,7 +5269,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) special_insn: -if (unlikely (is_guest_mode) && (ctxt->d & Intercept)) { +if (unlikely (check_intercepts) && (ctxt->d & Intercept)) { rc =emulator_check_intercept (ctxt, ctxt->intercept,X86_ICPT_POST_MEMACCESS );if (rc !=X86EMUL_CONTINUE )
arch/x86/kvm/kvm_emulate.h +1 -2
@@ -220,7 +220,6 @@ struct x86_emulate_ops {void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt,bool masked);bool (*is_smm)(struct x86_emulate_ctxt *ctxt); -bool (*is_guest_mode)(struct x86_emulate_ctxt *ctxt);int (*leave_smm)(struct x86_emulate_ctxt *ctxt);void (*triple_fault)(struct x86_emulate_ctxt *ctxt);int (*set_xcr)(struct x86_emulate_ctxt *ctxt,u32 index,u64 xcr);
@@ -498,7 +497,7 @@ bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt);#define EMULATION_RESTART 1#define EMULATION_INTERCEPTED 2void init_decode_cache (struct x86_emulate_ctxt *ctxt); -int x86_emulate_insn (struct x86_emulate_ctxt *ctxt); +int x86_emulate_insn (struct x86_emulate_ctxt *ctxt,bool check_intercepts);int emulator_task_switch (struct x86_emulate_ctxt *ctxt,u16 tss_selector,int idt_index,int reason,bool has_error_code,u32 error_code);
arch/x86/kvm/x86.c +8 -7
@@ -8308,11 +8308,6 @@ static bool emulator_is_smm(struct x86_emulate_ctxt *ctxt)return is_smm (emul_to_vcpu (ctxt)); } -static bool emulator_is_guest_mode (struct x86_emulate_ctxt *ctxt) -{ -return is_guest_mode (emul_to_vcpu (ctxt)); -} -#ifndef CONFIG_KVM_SMM static int emulator_leave_smm (struct x86_emulate_ctxt *ctxt) {
@@ -8379,7 +8374,6 @@ static const struct x86_emulate_ops emulate_ops = { .guest_has_rdpid = emulator_guest_has_rdpid, .set_nmi_mask = emulator_set_nmi_mask, .is_smm = emulator_is_smm, - .is_guest_mode = emulator_is_guest_mode, .leave_smm = emulator_leave_smm, .triple_fault = emulator_triple_fault, .set_xcr = emulator_set_xcr,
@@ -8999,7 +8993,14 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, ctxt->exception.address =0 ; } - r =x86_emulate_insn (ctxt); +/* +* Check L1's instruction intercepts when emulating instructions for +* L2, unless KVM is re-emulating a previously decoded instruction, +* e.g. to complete userspace I/O, in which case KVM has already +* checked the intercepts. +*/ + r =x86_emulate_insn (ctxt,is_guest_mode (vcpu) && + !(emulation_type &EMULTYPE_NO_DECODE ));if (r ==EMULATION_INTERCEPTED )return 1 ;
crypto/rng.c +8 -0
@@ -197,6 +197,11 @@ int crypto_del_default_rng(void)EXPORT_SYMBOL_GPL (crypto_del_default_rng);#endif +static void rng_default_set_ent (struct crypto_rng *tfm,const u8 *data, +unsigned int len) +{ +} +int crypto_register_rng (struct rng_alg *alg) {struct crypto_istat_rng *istat =rng_get_stat (alg);
@@ -212,6 +217,9 @@ int crypto_register_rng(struct rng_alg *alg)if (IS_ENABLED (CONFIG_CRYPTO_STATS ))memset (istat,0 ,sizeof (*istat)); +if (!alg->set_ent) + alg->set_ent = rng_default_set_ent; +return crypto_register_alg (base); }EXPORT_SYMBOL_GPL (crypto_register_rng);
drivers/hid/hid-mcp2221.c +4 -0
@@ -814,6 +814,10 @@ static int mcp2221_raw_event(struct hid_device *hdev, }if (data[2 ] ==MCP2221_I2C_READ_COMPL || data[2 ] ==MCP2221_I2C_READ_PARTIAL ) { +if (!mcp->rxbuf || mcp->rxbuf_idx <0 || data[3 ] >60 ) { + mcp->status = -EINVAL ; +break ; + } buf = mcp->rxbuf;memcpy (&buf[mcp->rxbuf_idx], &data[4 ], data[3 ]); mcp->rxbuf_idx = mcp->rxbuf_idx + data[3 ];
drivers/md/dm-integrity.c +1 -1
@@ -129,7 +129,7 @@ struct journal_sector {commit_id_t commit_id; }; -#define MAX_TAG_SIZE (JOURNAL_SECTOR_DATA - JOURNAL_MAC_PER_SECTOR - offsetof(struct journal_entry, last_bytes[MAX_SECTORS_PER_BLOCK])) +#define MAX_TAG_SIZE 255#define METADATA_PADDING_SECTORS 8
drivers/media/i2c/tc358743.c +2 -2
@@ -2180,10 +2180,10 @@ static int tc358743_probe(struct i2c_client *client) err_work_queues:cec_unregister_adapter (state->cec_adap);if (!state->i2c_client->irq) { -del_timer (&state->timer); +timer_delete_sync (&state->timer);flush_work (&state->work_i2c_poll); } -cancel_delayed_work (&state->delayed_work_enable_hotplug); +cancel_delayed_work_sync (&state->delayed_work_enable_hotplug);mutex_destroy (&state->confctl_mutex); err_hdl:media_entity_cleanup (&sd->entity);
drivers/media/tuners/xc5000.c +18 -23
78 lines not on this page · raw message
drivers/net/can/rcar/rcar_canfd.c +4 -3
@@ -738,9 +738,6 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)/* Reset Global error flags */ rcar_canfd_write (gpriv->base,RCANFD_GERFL ,0x0 ); -/* Set the controller into appropriate mode */ -rcar_canfd_set_mode (gpriv); -/* Transition all Channels to reset mode */ for_each_set_bit (ch, &gpriv->channels_mask, gpriv->info->max_channels) { rcar_canfd_clear_bit(gpriv->base,
@@ -760,6 +757,10 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)return err; } } + +/* Set the controller into appropriate mode */ +rcar_canfd_set_mode (gpriv); +return 0 ; }
drivers/net/can/spi/hi311x.c +17 -16
@@ -545,8 +545,6 @@ static int hi3110_stop(struct net_device *net) priv->force_quit =1 ;free_irq (spi->irq, priv); -destroy_workqueue (priv->wq); - priv->wq =NULL ;mutex_lock (&priv->hi3110_lock);
@@ -771,34 +769,23 @@ static int hi3110_open(struct net_device *net) goto out_close; } - priv->wq =alloc_workqueue ("hi3110_wq" ,WQ_FREEZABLE |WQ_MEM_RECLAIM , -0 ); -if (!priv->wq) { - ret = -ENOMEM ; - goto out_free_irq; - } -INIT_WORK (&priv->tx_work, hi3110_tx_work_handler); -INIT_WORK (&priv->restart_work, hi3110_restart_work_handler); - ret =hi3110_hw_reset (spi);if (ret) - goto out_free_wq; + goto out_free_irq; ret =hi3110_setup (net);if (ret) - goto out_free_wq; + goto out_free_irq; ret =hi3110_set_normal_mode (spi);if (ret) - goto out_free_wq; + goto out_free_irq;netif_wake_queue (net);mutex_unlock (&priv->hi3110_lock);return 0 ; - out_free_wq: -destroy_workqueue (priv->wq); out_free_irq:free_irq (spi->irq, priv);hi3110_hw_sleep (spi);
@@ -915,6 +902,15 @@ static int hi3110_can_probe(struct spi_device *spi)if (ret) goto out_clk; + priv->wq =alloc_workqueue ("hi3110_wq" ,WQ_FREEZABLE |WQ_MEM_RECLAIM , +0 ); +if (!priv->wq) { + ret = -ENOMEM ; + goto out_clk; + } +INIT_WORK (&priv->tx_work, hi3110_tx_work_handler); +INIT_WORK (&priv->restart_work, hi3110_restart_work_handler); + priv->spi = spi;mutex_init (&priv->hi3110_lock);
@@ -950,6 +946,8 @@ static int hi3110_can_probe(struct spi_device *spi)return 0 ; error_probe: +destroy_workqueue (priv->wq); + priv->wq =NULL ;hi3110_power_enable (priv->power,0 ); out_clk:
@@ -970,6 +968,9 @@ static void hi3110_can_remove(struct spi_device *spi)hi3110_power_enable (priv->power,0 ); +destroy_workqueue (priv->wq); + priv->wq =NULL ; +clk_disable_unprepare (priv->clk);free_candev (net);
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c +0 -1
@@ -294,7 +294,6 @@ static const struct usb_device_id rtl8192c_usb_ids[] = { {RTL_USB_DEVICE(0x050d, 0x1102, rtl92cu_hal_cfg)}, /*Belkin - Edimax*/ {RTL_USB_DEVICE(0x050d, 0x11f2, rtl92cu_hal_cfg)}, /*Belkin - ISY*/ {RTL_USB_DEVICE(0x06f8, 0xe033, rtl92cu_hal_cfg)}, /*Hercules - Edimax*/ - {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/ {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/ {RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/ {RTL_USB_DEVICE(0x0846, 0x9043, rtl92cu_hal_cfg)}, /*NG WNA1000Mv2*/
drivers/platform/x86/amd/pmc/pmc-quirks.c +15 -0
@@ -233,6 +233,14 @@ static const struct dmi_system_id fwbug_list[] = { DMI_MATCH(DMI_BOARD_NAME, "WUJIE14-GX4HRXL"), } }, + { + .ident = "MECHREVO Yilong15Pro Series GM5HG7A", + .driver_data = &quirk_spurious_8042, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MECHREVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "Yilong15Pro Series GM5HG7A"), + } + },/* https://bugzilla.kernel.org/show_bug.cgi?id=220116 */ { .ident = "PCSpecialist Lafite Pro V 14M",
@@ -242,6 +250,13 @@ static const struct dmi_system_id fwbug_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Lafite Pro V 14M"), } }, + { + .ident = "TUXEDO Stellaris Slim 15 AMD Gen6", + .driver_data = &quirk_spurious_8042, + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxHGxx"), + } + }, { .ident = "TUXEDO InfinityBook Pro 14/15 AMD Gen10", .driver_data = &quirk_spurious_8042,
drivers/staging/axis-fifo/axis-fifo.c +31 -37
134 lines not on this page · raw message
drivers/tty/serial/Kconfig +1 -1
@@ -1405,7 +1405,7 @@ config SERIAL_STM32 config SERIAL_STM32_CONSOLE bool "Support for console on STM32" - depends on SERIAL_STM32=y + depends on SERIAL_STM32 select SERIAL_CORE_CONSOLE select SERIAL_EARLYCON
drivers/usb/serial/option.c +6 -0
@@ -2114,6 +2114,12 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff), /* Simcom SIM7500/SIM7600 RNDIS mode */ .driver_info = RSVD(7) }, + { USB_DEVICE(0x1e0e, 0x9071), /* Simcom SIM8230 RMNET mode */ + .driver_info = RSVD(3) | RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9078, 0xff), /* Simcom SIM8230 ECM mode */ + .driver_info = RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x907b, 0xff), /* Simcom SIM8230 RNDIS mode */ + .driver_info = RSVD(5) }, { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
fs/btrfs/ref-verify.c +8 -1
@@ -990,11 +990,18 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)if (!btrfs_test_opt (fs_info,REF_VERIFY ))return 0 ; + extent_root =btrfs_extent_root (fs_info,0 ); +/* If the extent tree is damaged we cannot ignore it (IGNOREBADROOTS). */ +if (IS_ERR (extent_root)) { +btrfs_warn (fs_info,"ref-verify: extent tree not available, disabling" ); +btrfs_clear_opt (fs_info->mount_opt,REF_VERIFY ); +return 0 ; + } + path =btrfs_alloc_path ();if (!path)return -ENOMEM ; - extent_root =btrfs_extent_root (fs_info,0 ); eb =btrfs_read_lock_root_node (extent_root); level =btrfs_header_level (eb); path->nodes[level] = eb;
include/linux/device.h +3 -0
@@ -968,6 +968,9 @@ static inline bool device_pm_not_required(struct device *dev)static inline void device_set_pm_not_required (struct device *dev) { dev->power.no_pm = true; +#ifdef CONFIG_PM + dev->power.no_callbacks = true; +#endif }static inline void dev_pm_syscore_device (struct device *dev,bool val)
net/9p/trans_fd.c +4 -4
@@ -719,10 +719,10 @@ static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req)p9_debug (P9_DEBUG_TRANS ,"client %p req %p\n" , client, req);spin_lock (&m->req_lock); -/* Ignore cancelled request if message has been received -* before lock. -*/ -if (req->status ==REQ_STATUS_RCVD ) { +/* Ignore cancelled request if status changed since the request was +* processed in p9_client_flush() +*/ +if (req->status !=REQ_STATUS_SENT ) {spin_unlock (&m->req_lock);return 0 ; }
sound/soc/amd/acp/amd.h +1 -1
@@ -116,7 +116,7 @@#define PDM_DMA_INTR_MASK 0x10000#define PDM_DEC_64 0x2#define PDM_CLK_FREQ_MASK 0x07 -#define PDM_MISC_CTRL_MASK 0x10 +#define PDM_MISC_CTRL_MASK 0x18#define PDM_ENABLE 0x01#define PDM_DISABLE 0x00#define DMA_EN_MASK 0x02
sound/soc/codecs/rt5682s.c +9 -8
@@ -653,14 +653,15 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int modeswitch (mode) {case SAR_PWR_SAVING :snd_soc_component_update_bits (component,RT5682S_CBJ_CTRL_3 , -RT5682S_CBJ_IN_BUF_MASK ,RT5682S_CBJ_IN_BUF_DIS ); +RT5682S_CBJ_IN_BUF_MASK ,RT5682S_CBJ_IN_BUF_EN );snd_soc_component_update_bits (component,RT5682S_CBJ_CTRL_1 , -RT5682S_MB1_PATH_MASK |RT5682S_MB2_PATH_MASK , -RT5682S_CTRL_MB1_REG |RT5682S_CTRL_MB2_REG ); +RT5682S_MB1_PATH_MASK |RT5682S_MB2_PATH_MASK | +RT5682S_VREF_POW_MASK ,RT5682S_CTRL_MB1_FSM | +RT5682S_CTRL_MB2_FSM |RT5682S_VREF_POW_FSM );snd_soc_component_update_bits (component,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_BUTDET_MASK |RT5682S_SAR_BUTDET_POW_MASK |RT5682S_SAR_SEL_MB1_2_CTL_MASK ,RT5682S_SAR_BUTDET_DIS | -RT5682S_SAR_BUTDET_POW_SAV |RT5682S_SAR_SEL_MB1_2_MANU ); +RT5682S_SAR_BUTDET_POW_NORM |RT5682S_SAR_SEL_MB1_2_MANU );usleep_range (5000 ,5500 );snd_soc_component_update_bits (component,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_BUTDET_MASK ,RT5682S_SAR_BUTDET_EN );
@@ -688,7 +689,7 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int modesnd_soc_component_update_bits (component,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_BUTDET_MASK |RT5682S_SAR_BUTDET_POW_MASK |RT5682S_SAR_SEL_MB1_2_CTL_MASK ,RT5682S_SAR_BUTDET_DIS | -RT5682S_SAR_BUTDET_POW_SAV |RT5682S_SAR_SEL_MB1_2_MANU ); +RT5682S_SAR_BUTDET_POW_NORM |RT5682S_SAR_SEL_MB1_2_MANU );break ;default :dev_err (component->dev,"Invalid SAR Power mode: %d\n" , mode);
@@ -725,7 +726,7 @@ static void rt5682s_disable_push_button_irq(struct snd_soc_component *component)snd_soc_component_update_bits (component,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_BUTDET_MASK |RT5682S_SAR_BUTDET_POW_MASK |RT5682S_SAR_SEL_MB1_2_CTL_MASK ,RT5682S_SAR_BUTDET_DIS | -RT5682S_SAR_BUTDET_POW_SAV |RT5682S_SAR_SEL_MB1_2_MANU ); +RT5682S_SAR_BUTDET_POW_NORM |RT5682S_SAR_SEL_MB1_2_MANU ); }/**
@@ -786,7 +787,7 @@ static int rt5682s_headset_detect(struct snd_soc_component *component, int jack_ jack_type =SND_JACK_HEADSET ;snd_soc_component_write (component,RT5682S_SAR_IL_CMD_3 ,0x024c );snd_soc_component_update_bits (component,RT5682S_CBJ_CTRL_1 , -RT5682S_FAST_OFF_MASK ,RT5682S_FAST_OFF_EN ); +RT5682S_FAST_OFF_MASK ,RT5682S_FAST_OFF_DIS );snd_soc_component_update_bits (component,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_SEL_MB1_2_MASK , val <<RT5682S_SAR_SEL_MB1_2_SFT );rt5682s_enable_push_button_irq (component);
@@ -966,7 +967,7 @@ static int rt5682s_set_jack_detect(struct snd_soc_component *component,RT5682S_EMB_JD_MASK |RT5682S_DET_TYPE |RT5682S_POL_FAST_OFF_MASK |RT5682S_MIC_CAP_MASK ,RT5682S_EMB_JD_EN |RT5682S_DET_TYPE | - RT5682S_POL_FAST_OFF_HIGH | RT5682S_MIC_CAP_HS); + RT5682S_POL_FAST_OFF_LOW | RT5682S_MIC_CAP_HS);regmap_update_bits (rt5682s->regmap,RT5682S_SAR_IL_CMD_1 ,RT5682S_SAR_POW_MASK ,RT5682S_SAR_POW_EN ); regmap_update_bits(rt5682s->regmap, RT5682S_GPIO_CTRL_1,
sound/usb/midi.c +5 -5
@@ -1522,12 +1522,12 @@ static void snd_usbmidi_free(struct snd_usb_midi *umidi) {int i; +if (!umidi->disconnected) +snd_usbmidi_disconnect (&umidi->list); +for (i =0 ; i <MIDI_MAX_ENDPOINTS ; ++i) {struct snd_usb_midi_endpoint *ep = &umidi->endpoints[i]; -if (ep->out) -snd_usbmidi_out_endpoint_delete (ep->out); -if (ep->in) -snd_usbmidi_in_endpoint_delete (ep->in); +kfree (ep->out); }mutex_destroy (&umidi->mutex);kfree (umidi);
@@ -1553,7 +1553,7 @@ void snd_usbmidi_disconnect(struct list_head *p)spin_unlock_irq (&umidi->disc_lock);up_write (&umidi->disc_rwsem); -del_timer_sync (&umidi->error_timer); +timer_shutdown_sync (&umidi->error_timer);for (i =0 ; i <MIDI_MAX_ENDPOINTS ; ++i) {struct snd_usb_midi_endpoint *ep = &umidi->endpoints[i];
tools/lib/subcmd/help.c +3 -0
@@ -75,6 +75,9 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)size_t ci, cj, ei;int cmp; +if (!excludes->cnt) +return ; + ci = cj = ei =0 ;while (ci < cmds->cnt && ei < excludes->cnt) { cmp =strcmp (cmds->names[ci]->name, excludes->names[ei]->name);