Linux 5.10.16
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.16 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/powerpc/kernel/vdso.c | 2 arch/powerpc/kernel/vdso64/sigtramp.S | 11 arch/powerpc/kernel/vdso64/vdso64.lds.S | 1 block/blk-cgroup.c | 18 drivers/gpio/gpiolib-cdev.c | 2 drivers/gpu/drm/i915/display/intel_ddi.c | 13 drivers/gpu/drm/nouveau/include/nvif/push.h | 216 +++---- drivers/i2c/busses/i2c-mt65xx.c | 19 drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c | 7 drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 25 drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 7 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 6 drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 11 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 drivers/net/wireless/intel/iwlwifi/queue/tx.c | 6 drivers/regulator/core.c | 44 + fs/io-wq.c | 10 fs/io-wq.h | 1 fs/io_uring.c | 360 ++++-------- fs/nfs/pnfs.c | 30 - fs/nilfs2/file.c | 1 fs/squashfs/block.c | 8 fs/squashfs/export.c | 41 + fs/squashfs/id.c | 40 + fs/squashfs/squashfs_fs_sb.h | 1 fs/squashfs/super.c | 6 fs/squashfs/xattr.h | 10 fs/squashfs/xattr_id.c | 66 +- include/linux/sunrpc/xdr.h | 3 kernel/bpf/verifier.c | 38 - mm/memcontrol.c | 5 net/key/af_key.c | 6 net/mac80211/spectmgmt.c | 10 net/sunrpc/auth_gss/auth_gss.c | 30 - net/sunrpc/auth_gss/auth_gss_internal.h | 45 + net/sunrpc/auth_gss/gss_krb5_mech.c | 31 - sound/hda/intel-dsp-config.c | 4 sound/soc/codecs/ak4458.c | 22 sound/soc/codecs/wm_adsp.c | 3 sound/soc/intel/boards/sof_sdw.c | 10 sound/soc/intel/skylake/skl-topology.c | 2 46 files changed, 682 insertions(+), 515 deletions(-)
Baolin Wang (1):
blk-cgroup: Use cond_resched() when destroy blkgs
Bard Liao (1):
ALSA: hda: intel-dsp-config: add PCI id for TGL-H
Ben Skeggs (1):
drm/nouveau/nvif: fix method count when pushing an array
Cong Wang (1):
af_key: relax availability checks for skb size calculation
Daniel Borkmann (3):
bpf: Fix verifier jmp32 pruning decision logic
bpf: Fix 32 bit src register truncation on div/mod
bpf: Fix verifier jsgt branch analysis on max bound
Dave Wysochanski (2):
SUNRPC: Move simple_get_bytes and simple_get_netobj into private header
SUNRPC: Handle 0 length opaque XDR object data properly
David Collins (1):
regulator: core: avoid regulator_resolve_supply() race condition
Eliot Blennerhassett (1):
ASoC: ak4458: correct reset polarity
Emmanuel Grumbach (1):
iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap
Greg Kroah-Hartman (1):
Linux 5.10.16
Gregory Greenman (1):
iwlwifi: mvm: invalidate IDs of internal stations at mvm start
Hao Xu (1):
io_uring: fix flush cqring overflow list while TASK_INTERRUPTIBLE
James Schulman (1):
ASoC: wm_adsp: Fix control name parsing for multi-fw
Jens Axboe (2):
io_uring: account io_uring internal files as REQ_F_INFLIGHT
io_uring: if we see flush on exit, cancel related tasks
Joachim Henke (1):
nilfs2: make splice write available again
Johannes Berg (4):
iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time()
iwlwifi: pcie: fix context info memory leak
iwlwifi: mvm: guard against device removal in reprobe
iwlwifi: queue: bail out on invalid freeing
Johannes Weiner (1):
Revert "mm: memcontrol: avoid workload stalls when lowering memory.high"
Kent Gibson (1):
gpiolib: cdev: clear debounce period if line set to output
Libin Yang (1):
ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
Luca Coelho (1):
iwlwifi: pcie: add rules to match Qu with Hr2
Mark Brown (1):
regulator: Fix lockdep warning resolving supplies
Pan Bian (1):
chtls: Fix potential resource leak
Pavel Begunkov (13):
io_uring: simplify io_task_match()
io_uring: add a {task,files} pair matching helper
io_uring: don't iterate io_uring_cancel_files()
io_uring: pass files into kill timeouts/poll
io_uring: always batch cancel in *cancel_files()
io_uring: fix files cancellation
io_uring: fix __io_uring_files_cancel() with TASK_UNINTERRUPTIBLE
io_uring: replace inflight_wait with tctx->wait
io_uring: fix cancellation taking mutex while TASK_UNINTERRUPTIBLE
io_uring: fix list corruption for splice file_get
io_uring: fix sqo ownership false positive warning
io_uring: reinforce cancel on flush during exit
io_uring: drop mm/files between task_work_submit
Phillip Lougher (4):
squashfs: avoid out of bounds writes in decompressors
squashfs: add more sanity checks in id lookup
squashfs: add more sanity checks in inode lookup
squashfs: add more sanity checks in xattr id lookup
Qii Wang (1):
i2c: mediatek: Move suspend and resume handling to NOIRQ phase
Raoni Fassina Firmino (1):
powerpc/64/signal: Fix regression in __kernel_sigtramp_rt64() semantics
Ricardo Ribalda (1):
ASoC: Intel: Skylake: Zero snd_ctl_elem_value
Sara Sharon (1):
iwlwifi: mvm: skip power command when unbinding vif during CSA
Shay Bar (1):
mac80211: 160MHz with extended NSS BW in CSA
Trond Myklebust (2):
pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process() pNFS/NFSv4: Improve rejection of out-of-order layouts
Ville Syrjälä (2):
drm/i915: Fix ICL MG PHY vswing handling
drm/i915: Skip vswing programming for TBT
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 15 +SUBLEVEL = 16 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/powerpc/kernel/vdso.c +1 -1
@@ -475,7 +475,7 @@ static __init void vdso_setup_trampolines(struct lib32_elfinfo *v32,*/ #ifdef CONFIG_PPC64 - vdso64_rt_sigtramp =find_function64 (v64,"__kernel_sigtramp_rt64" ); + vdso64_rt_sigtramp =find_function64 (v64,"__kernel_start_sigtramp_rt64" );#endif vdso32_sigtramp =find_function32 (v32,"__kernel_sigtramp32" ); vdso32_rt_sigtramp =find_function32 (v32,"__kernel_sigtramp_rt32" );
arch/powerpc/kernel/vdso64/sigtramp.S +10 -1
@@ -15,11 +15,20 @@ .text +/* + * __kernel_start_sigtramp_rt64 and __kernel_sigtramp_rt64 together + * are one function split in two parts. The kernel jumps to the former + * and the signal handler indirectly (by blr) returns to the latter. + * __kernel_sigtramp_rt64 needs to point to the return address so + * glibc can correctly identify the trampoline stack frame. + */ .balign 8 .balign IFETCH_ALIGN_BYTES -V_FUNCTION_BEGIN(__kernel_sigtramp_rt64) +V_FUNCTION_BEGIN(__kernel_start_sigtramp_rt64) .Lsigrt_start: bctrl /* call the handler */ +V_FUNCTION_END(__kernel_start_sigtramp_rt64) +V_FUNCTION_BEGIN(__kernel_sigtramp_rt64) addi r1, r1, __SIGNAL_FRAMESIZE li r0,__NR_rt_sigreturn sc
arch/powerpc/kernel/vdso64/vdso64.lds.S +1 -0
@@ -150,6 +150,7 @@ VERSION __kernel_get_tbfreq; __kernel_sync_dicache; __kernel_sync_dicache_p5; + __kernel_start_sigtramp_rt64; __kernel_sigtramp_rt64; __kernel_getcpu; __kernel_time;
block/blk-cgroup.c +13 -5
@@ -1017,6 +1017,8 @@ static void blkcg_css_offline(struct cgroup_subsys_state *css)*/ void blkcg_destroy_blkgs (struct blkcg *blkcg) { +might_sleep (); +spin_lock_irq (&blkcg->lock);while (!hlist_empty (&blkcg->blkg_list)) {
@@ -1024,14 +1026,20 @@ void blkcg_destroy_blkgs(struct blkcg *blkcg) struct blkcg_gq, blkcg_node);struct request_queue *q = blkg->q; -if (spin_trylock (&q->queue_lock)) { -blkg_destroy (blkg); -spin_unlock (&q->queue_lock); - }else { +if (need_resched () || !spin_trylock (&q->queue_lock)) { +/* +* Given that the system can accumulate a huge number +* of blkgs in pathological cases, check to see if we +* need to rescheduling to avoid softlockup. +*/ spin_unlock_irq (&blkcg->lock); -cpu_relax (); +cond_resched ();spin_lock_irq (&blkcg->lock); +continue ; } + +blkg_destroy (blkg); +spin_unlock (&q->queue_lock); }spin_unlock_irq (&blkcg->lock);
drivers/gpio/gpiolib-cdev.c +2 -0
@@ -756,6 +756,8 @@ static void edge_detector_stop(struct line *line)cancel_delayed_work_sync (&line->work);WRITE_ONCE (line->sw_debounced,0 ); line->eflags =0 ; +if (line->desc) +WRITE_ONCE (line->desc->debounce_period_us,0 );/* do not change line->level - see comment in debounced_value() */ }
drivers/gpu/drm/i915/display/intel_ddi.c +9 -4
@@ -2597,6 +2597,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,u32 n_entries, val;int ln, rate =0 ; +if (enc_to_dig_port (encoder)->tc_mode ==TC_PORT_TBT_ALT ) +return ; +if (type !=INTEL_OUTPUT_HDMI ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
@@ -2605,12 +2608,11 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, ddi_translations =icl_get_mg_buf_trans (encoder, type, rate, &n_entries); -/* The table does not have values for level 3 and level 9. */ -if (level >= n_entries || level ==3 || level ==9 ) { +if (level >= n_entries) {drm_dbg_kms (&dev_priv->drm,"DDI translation not found for level %d. Using %d instead." , - level, n_entries -2 ); - level = n_entries -2 ; + level, n_entries -1 ); + level = n_entries -1 ; }/* Set MG_TX_LINK_PARAMS cri_use_fs32 to 0. */
@@ -2742,6 +2744,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;int rate =0 ; +if (enc_to_dig_port (encoder)->tc_mode ==TC_PORT_TBT_ALT ) +return ; +if (type !=INTEL_OUTPUT_HDMI ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
drivers/gpu/drm/nouveau/include/nvif/push.h +108 -108
239 lines not on this page · raw message
drivers/i2c/busses/i2c-mt65xx.c +16 -3
@@ -1275,7 +1275,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)mtk_i2c_clock_disable (i2c); ret =devm_request_irq (&pdev->dev, irq, mtk_i2c_irq, -IRQF_TRIGGER_NONE ,I2C_DRV_NAME , i2c); +IRQF_NO_SUSPEND |IRQF_TRIGGER_NONE , +I2C_DRV_NAME , i2c);if (ret <0 ) {dev_err (&pdev->dev,"Request I2C IRQ %d fail\n" , irq);
@@ -1302,7 +1303,16 @@ static int mtk_i2c_remove(struct platform_device *pdev) }#ifdef CONFIG_PM_SLEEP -static int mtk_i2c_resume (struct device *dev) +static int mtk_i2c_suspend_noirq (struct device *dev) +{ +struct mtk_i2c *i2c =dev_get_drvdata (dev); + +i2c_mark_adapter_suspended (&i2c->adap); + +return 0 ; +} + +static int mtk_i2c_resume_noirq (struct device *dev) {int ret;struct mtk_i2c *i2c =dev_get_drvdata (dev);
@@ -1317,12 +1327,15 @@ static int mtk_i2c_resume(struct device *dev)mtk_i2c_clock_disable (i2c); +i2c_mark_adapter_resumed (&i2c->adap); +return 0 ; }#endif static const struct dev_pm_ops mtk_i2c_pm = { -SET_SYSTEM_SLEEP_PM_OPS (NULL , mtk_i2c_resume) +SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (mtk_i2c_suspend_noirq, + mtk_i2c_resume_noirq) };static struct platform_driver mtk_i2c_driver = {
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +3 -4
@@ -1158,11 +1158,9 @@ static struct sock *chtls_recv_sock(struct sock *lsk,#endif }if (!n || !n->dev) - goto free_sk; + goto free_dst; ndev = n->dev; -if (!ndev) - goto free_dst;if (is_vlan_dev (ndev)) ndev =vlan_dev_real_dev (ndev);
@@ -1249,7 +1247,8 @@ static struct sock *chtls_recv_sock(struct sock *lsk, free_csk:chtls_sock_release (&csk->kref); free_dst: -neigh_release (n); +if (n) +neigh_release (n);dst_release (dst); free_sk:inet_csk_prepare_forced_close (newsk);
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +25 -0
@@ -358,6 +358,7 @@ const struct iwl_cfg_trans_params iwl_ma_trans_cfg = {const char iwl_ax101_name[] ="Intel(R) Wi-Fi 6 AX101" ;const char iwl_ax200_name[] ="Intel(R) Wi-Fi 6 AX200 160MHz" ;const char iwl_ax201_name[] ="Intel(R) Wi-Fi 6 AX201 160MHz" ; +const char iwl_ax203_name[] ="Intel(R) Wi-Fi 6 AX203" ;const char iwl_ax211_name[] ="Intel(R) Wi-Fi 6 AX211 160MHz" ;const char iwl_ax411_name[] ="Intel(R) Wi-Fi 6 AX411 160MHz" ;const char iwl_ma_name[] ="Intel(R) Wi-Fi 6" ;
@@ -384,6 +385,18 @@ const struct iwl_cfg iwl_qu_b0_hr1_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; +const struct iwl_cfg iwl_qu_b0_hr_b0 = { + .fw_name_pre =IWL_QU_B_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .num_rbds =IWL_NUM_RBDS_22000_HE , +}; +const struct iwl_cfg iwl_ax201_cfg_qu_hr = { .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , .fw_name_pre =IWL_QU_B_HR_B_FW_PRE ,
@@ -410,6 +423,18 @@ const struct iwl_cfg iwl_qu_c0_hr1_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; +const struct iwl_cfg iwl_qu_c0_hr_b0 = { + .fw_name_pre =IWL_QU_C_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .num_rbds =IWL_NUM_RBDS_22000_HE , +}; +const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = { .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , .fw_name_pre =IWL_QU_C_HR_B_FW_PRE ,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +3 -0
@@ -544,6 +544,7 @@ extern const char iwl9260_killer_1550_name[];extern const char iwl9560_killer_1550i_name[];extern const char iwl9560_killer_1550s_name[];extern const char iwl_ax200_name[]; +extern const char iwl_ax203_name[];extern const char iwl_ax201_name[];extern const char iwl_ax101_name[];extern const char iwl_ax200_killer_1650w_name[];
@@ -627,6 +628,8 @@ extern const struct iwl_cfg iwl9560_2ac_cfg_soc;extern const struct iwl_cfg iwl_qu_b0_hr1_b0;extern const struct iwl_cfg iwl_qu_c0_hr1_b0;extern const struct iwl_cfg iwl_quz_a0_hr1_b0; +extern const struct iwl_cfg iwl_qu_b0_hr_b0; +extern const struct iwl_cfg iwl_qu_c0_hr_b0;extern const struct iwl_cfg iwl_ax200_cfg_cc;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +3 -0
@@ -514,7 +514,10 @@ static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file,const size_t bufsz =sizeof (buf);int pos =0 ; +mutex_lock (&mvm->mutex);iwl_mvm_get_sync_time (mvm, &curr_gp2, &curr_os); +mutex_unlock (&mvm->mutex); +do_div (curr_os,NSEC_PER_USEC ); diff = curr_os - curr_gp2; pos +=scnprintf (buf + pos, bufsz - pos,"diff=%lld\n" , diff);
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +3 -0
@@ -4249,6 +4249,9 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,iwl_mvm_binding_remove_vif (mvm, vif); out: +if (fw_has_capa (&mvm->fw->ucode_capa,IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD ) && + switching_chanctx) +return ; mvmvif->phy_ctxt =NULL ;iwl_mvm_power_update_mac (mvm); }
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +6 -1
@@ -845,6 +845,10 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,if (!mvm->scan_cmd) goto out_free; +/* invalidate ids to prevent accidental removal of sta_id 0 */ + mvm->aux_sta.sta_id =IWL_MVM_INVALID_STA ; + mvm->snif_sta.sta_id =IWL_MVM_INVALID_STA ; +/* Set EBS as successful as long as not stated otherwise by the FW. */ mvm->last_ebs_successful = true;
@@ -1245,6 +1249,7 @@ static void iwl_mvm_reprobe_wk(struct work_struct *wk) reprobe = container_of(wk, struct iwl_mvm_reprobe, work);if (device_reprobe (reprobe->dev))dev_err (reprobe->dev,"reprobe failed!\n" ); +put_device (reprobe->dev);kfree (reprobe);module_put (THIS_MODULE ); }
@@ -1295,7 +1300,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)module_put (THIS_MODULE );return ; } - reprobe->dev = mvm->trans->dev; + reprobe->dev =get_device (mvm->trans->dev);INIT_WORK (&reprobe->work, iwl_mvm_reprobe_wk);schedule_work (&reprobe->work); } else if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +6 -0
@@ -2103,6 +2103,9 @@ int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)lockdep_assert_held (&mvm->mutex); +if (WARN_ON_ONCE (mvm->snif_sta.sta_id ==IWL_MVM_INVALID_STA )) +return -EINVAL ; +iwl_mvm_disable_txq (mvm,NULL , mvm->snif_queue,IWL_MAX_TID_COUNT ,0 ); ret =iwl_mvm_rm_sta_common (mvm, mvm->snif_sta.sta_id);if (ret)
@@ -2117,6 +2120,9 @@ int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm)lockdep_assert_held (&mvm->mutex); +if (WARN_ON_ONCE (mvm->aux_sta.sta_id ==IWL_MVM_INVALID_STA )) +return -EINVAL ; +iwl_mvm_disable_txq (mvm,NULL , mvm->aux_queue,IWL_MAX_TID_COUNT ,0 ); ret =iwl_mvm_rm_sta_common (mvm, mvm->aux_sta.sta_id);if (ret)
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +9 -2
@@ -245,8 +245,10 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,/* Allocate IML */ iml_img =dma_alloc_coherent (trans->dev, trans->iml_len, &trans_pcie->iml_dma_addr,GFP_KERNEL ); -if (!iml_img) -return -ENOMEM ; +if (!iml_img) { + ret = -ENOMEM ; + goto err_free_ctxt_info; + }memcpy (iml_img, trans->iml, trans->iml_len);
@@ -284,6 +286,11 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,return 0 ; +err_free_ctxt_info: +dma_free_coherent (trans->dev,sizeof (*trans_pcie->ctxt_info_gen3), + trans_pcie->ctxt_info_gen3, + trans_pcie->ctxt_info_dma_addr); + trans_pcie->ctxt_info_gen3 =NULL ; err_free_prph_info: dma_free_coherent(trans->dev, sizeof(*prph_info),
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +10 -0
@@ -966,6 +966,11 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, iwl_qu_b0_hr1_b0, iwl_ax101_name), +_IWL_DEV_INFO (IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_MAC_TYPE_QU ,SILICON_C_STEP , +IWL_CFG_RF_TYPE_HR2 ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY , + iwl_qu_b0_hr_b0, iwl_ax203_name),/* Qu C step */ _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
@@ -973,6 +978,11 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, iwl_qu_c0_hr1_b0, iwl_ax101_name), +_IWL_DEV_INFO (IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_MAC_TYPE_QU ,SILICON_C_STEP , +IWL_CFG_RF_TYPE_HR2 ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY , + iwl_qu_c0_hr_b0, iwl_ax203_name),/* QuZ */ _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
drivers/net/wireless/intel/iwlwifi/pcie/tx.c +5 -0
@@ -299,6 +299,11 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans);struct iwl_txq *txq = trans->txqs.txq[txq_id]; +if (!txq) { +IWL_ERR (trans,"Trying to free a queue that wasn't allocated?\n" ); +return ; + } +spin_lock_bh (&txq->lock);while (txq->write_ptr != txq->read_ptr) { IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",
drivers/net/wireless/intel/iwlwifi/queue/tx.c +2 -4
@@ -887,10 +887,8 @@ void iwl_txq_gen2_unmap(struct iwl_trans *trans, int txq_id)int idx =iwl_txq_get_cmd_index (txq, txq->read_ptr);struct sk_buff *skb = txq->entries[idx].skb; -if (WARN_ON_ONCE (!skb)) -continue ; - -iwl_txq_free_tso_page (trans, skb); +if (!WARN_ON_ONCE (!skb)) +iwl_txq_free_tso_page (trans, skb); }iwl_txq_gen2_free_tfd (trans, txq); txq->read_ptr =iwl_txq_inc_wrap (trans, txq->read_ptr);
drivers/regulator/core.c +33 -11
101 lines not on this page · raw message
fs/io-wq.c +0 -10
@@ -1078,16 +1078,6 @@ enum io_wq_cancel io_wq_cancel_cb(struct io_wq *wq, work_cancel_fn *cancel,return IO_WQ_CANCEL_NOTFOUND ; } -static bool io_wq_io_cb_cancel_data (struct io_wq_work *work,void *data) -{ -return work == data; -} - -enum io_wq_cancel io_wq_cancel_work (struct io_wq *wq,struct io_wq_work *cwork) -{ -return io_wq_cancel_cb (wq, io_wq_io_cb_cancel_data, (void *)cwork, false); -} -struct io_wq *io_wq_create (unsigned bounded,struct io_wq_data *data) {int ret = -ENOMEM , node;
fs/io-wq.h +0 -1
@@ -130,7 +130,6 @@ static inline bool io_wq_is_hashed(struct io_wq_work *work) }void io_wq_cancel_all (struct io_wq *wq); -enum io_wq_cancel io_wq_cancel_work (struct io_wq *wq,struct io_wq_work *cwork);typedef bool (work_cancel_fn )(struct io_wq_work *,void *);
fs/io_uring.c +141 -219
551 lines not on this page · raw message
fs/nfs/pnfs.c +23 -7
@@ -1000,7 +1000,7 @@ pnfs_layout_stateid_blocked(const struct pnfs_layout_hdr *lo, {u32 seqid =be32_to_cpu (stateid->seqid); -return !pnfs_seqid_is_newer (seqid, lo->plh_barrier); +return !pnfs_seqid_is_newer (seqid, lo->plh_barrier) && lo->plh_barrier; }/* lget is set to 1 if called from inside send_layoutget call chain */
@@ -1913,6 +1913,11 @@ static void nfs_layoutget_end(struct pnfs_layout_hdr *lo)wake_up_var (&lo->plh_outstanding); } +static bool pnfs_is_first_layoutget (struct pnfs_layout_hdr *lo) +{ +return test_bit (NFS_LAYOUT_FIRST_LAYOUTGET , &lo->plh_flags); +} +static void pnfs_clear_first_layoutget (struct pnfs_layout_hdr *lo) {unsigned long *bitlock = &lo->plh_flags;
@@ -2387,23 +2392,34 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) goto out_forget; } -if (!pnfs_layout_is_valid (lo)) { -/* We have a completely new layout */ -pnfs_set_layout_stateid (lo, &res->stateid, lgp->cred, true); - }else if (nfs4_stateid_match_other (&lo->plh_stateid, &res->stateid)) { +if (nfs4_stateid_match_other (&lo->plh_stateid, &res->stateid)) {/* existing state ID, make sure the sequence number matches. */ if (pnfs_layout_stateid_blocked (lo, &res->stateid)) { +if (!pnfs_layout_is_valid (lo) && +pnfs_is_first_layoutget (lo)) + lo->plh_barrier =0 ;dprintk ("%s forget reply due to sequence\n" , __func__); goto out_forget; }pnfs_set_layout_stateid (lo, &res->stateid, lgp->cred, false); - }else { + }else if (pnfs_layout_is_valid (lo)) {/* * We got an entirely new state ID. Mark all segments for the * inode invalid, and retry the layoutget */ -pnfs_mark_layout_stateid_invalid (lo, &free_me); +struct pnfs_layout_range range = { + .iomode =IOMODE_ANY , + .length =NFS4_MAX_UINT64 , + }; +pnfs_set_plh_return_info (lo,IOMODE_ANY ,0 ); +pnfs_mark_matching_lsegs_return (lo, &lo->plh_return_segs, + &range,0 ); goto out_forget; + }else { +/* We have a completely new layout */ +if (!pnfs_is_first_layoutget (lo)) + goto out_forget; +pnfs_set_layout_stateid (lo, &res->stateid, lgp->cred, true); }pnfs_get_lseg (lseg);
fs/nilfs2/file.c +1 -0
@@ -141,6 +141,7 @@ const struct file_operations nilfs_file_operations = {/* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, .splice_read = generic_file_splice_read, + .splice_write = iter_file_splice_write, };const struct inode_operations nilfs_file_inode_operations = {
fs/squashfs/block.c +7 -1
@@ -196,9 +196,15 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, length =SQUASHFS_COMPRESSED_SIZE (length); index +=2 ; -TRACE ("Block @ 0x%llx, %scompressed size %d\n" , index, +TRACE ("Block @ 0x%llx, %scompressed size %d\n" , index -2 , compressed ?"" :"un" , length); } +if (length <0 || length > output->length || + (index + length) > msblk->bytes_used) { + res = -EIO ; + goto out; + } +if (next_index) *next_index = index + length;
fs/squashfs/export.c +33 -8
72 lines not on this page · raw message
fs/squashfs/id.c +32 -8
@@ -35,10 +35,15 @@ int squashfs_get_id(struct super_block *sb, unsigned int index,struct squashfs_sb_info *msblk = sb->s_fs_info;int block =SQUASHFS_ID_BLOCK (index);int offset =SQUASHFS_ID_BLOCK_OFFSET (index); -u64 start_block =le64_to_cpu (msblk->id_table[block]); +u64 start_block;__le32 disk_id;int err; +if (index >= msblk->ids) +return -EINVAL ; + + start_block =le64_to_cpu (msblk->id_table[block]); + err =squashfs_read_metadata (sb, &disk_id, &start_block, &offset,sizeof (disk_id));if (err <0 )
@@ -56,7 +61,10 @@ __le64 *squashfs_read_id_index_table(struct super_block *sb, u64 id_table_start, u64 next_table, unsigned short no_ids) { unsigned int length = SQUASHFS_ID_BLOCK_BYTES(no_ids); +unsigned int indexes =SQUASHFS_ID_BLOCKS (no_ids); +int n;__le64 *table; +u64 start, end;TRACE ("In read_id_index_table, length %d\n" , length);
@@ -67,20 +75,36 @@ __le64 *squashfs_read_id_index_table(struct super_block *sb,return ERR_PTR (-EINVAL );/* -* length bytes should not extend into the next table - this check -* also traps instances where id_table_start is incorrectly larger -* than the next table start +* The computed size of the index table (length bytes) should exactly +* match the table start and end points */ -if (id_table_start + length > next_table) +if (length != (next_table - id_table_start))return ERR_PTR (-EINVAL ); table =squashfs_read_table (sb, id_table_start, length); +if (IS_ERR (table)) +return table;/* -* table[0] points to the first id lookup table metadata block, this -* should be less than id_table_start +* table[0], table[1], ... table[indexes - 1] store the locations +* of the compressed id blocks. Each entry should be less than +* the next (i.e. table[0] < table[1]), and the difference between them +* should be SQUASHFS_METADATA_SIZE or less. table[indexes - 1] +* should be less than id_table_start, and again the difference +* should be SQUASHFS_METADATA_SIZE or less */ -if (!IS_ERR (table) &&le64_to_cpu (table[0 ]) >= id_table_start) { +for (n =0 ; n < (indexes -1 ); n++) { + start =le64_to_cpu (table[n]); + end =le64_to_cpu (table[n +1 ]); + +if (start >= end || (end - start) >SQUASHFS_METADATA_SIZE ) { +kfree (table); +return ERR_PTR (-EINVAL ); + } + } + + start =le64_to_cpu (table[indexes -1 ]); +if (start >= id_table_start || (id_table_start - start) >SQUASHFS_METADATA_SIZE ) {kfree (table);return ERR_PTR (-EINVAL ); }
fs/squashfs/squashfs_fs_sb.h +1 -0
@@ -64,5 +64,6 @@ struct squashfs_sb_info {unsigned int inodes;unsigned int fragments;int xattr_ids; + unsigned int ids; };#endif
fs/squashfs/super.c +3 -3
@@ -166,6 +166,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) msblk->directory_table =le64_to_cpu (sblk->directory_table_start); msblk->inodes =le32_to_cpu (sblk->inodes); msblk->fragments =le32_to_cpu (sblk->fragments); + msblk->ids =le16_to_cpu (sblk->no_ids); flags =le16_to_cpu (sblk->flags);TRACE ("Found valid superblock on %pg\n" , sb->s_bdev);
@@ -177,7 +178,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)TRACE ("Block size %d\n" , msblk->block_size);TRACE ("Number of inodes %d\n" , msblk->inodes);TRACE ("Number of fragments %d\n" , msblk->fragments); -TRACE ("Number of ids %d\n" ,le16_to_cpu (sblk->no_ids)); +TRACE ("Number of ids %d\n" , msblk->ids);TRACE ("sblk->inode_table_start %llx\n" , msblk->inode_table);TRACE ("sblk->directory_table_start %llx\n" , msblk->directory_table); TRACE("sblk->fragment_table_start %llx\n",
@@ -236,8 +237,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) allocate_id_index_table:/* Allocate and read id index table */ msblk->id_table =squashfs_read_id_index_table (sb, -le64_to_cpu (sblk->id_table_start), next_table, -le16_to_cpu (sblk->no_ids)); +le64_to_cpu (sblk->id_table_start), next_table, msblk->ids);if (IS_ERR (msblk->id_table)) {errorf (fc,"unable to read id index table" ); err =PTR_ERR (msblk->id_table);
fs/squashfs/xattr.h +9 -1
@@ -17,8 +17,16 @@ extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *,static inline __le64 *squashfs_read_xattr_id_table (struct super_block *sb,u64 start,u64 *xattr_table_start,int *xattr_ids) { +struct squashfs_xattr_id_table *id_table; + + id_table =squashfs_read_table (sb, start,sizeof (*id_table)); +if (IS_ERR (id_table)) +return (__le64 *) id_table; + + *xattr_table_start =le64_to_cpu (id_table->xattr_table_start); +kfree (id_table); +ERROR ("Xattrs in filesystem, these will be ignored\n" ); - *xattr_table_start = start;return ERR_PTR (-ENOTSUPP ); }
fs/squashfs/xattr_id.c +57 -9
93 lines not on this page · raw message
include/linux/sunrpc/xdr.h +1 -2
@@ -25,8 +25,7 @@ struct rpc_rqst;#define XDR_QUADLEN (l) (((l) + 3) >> 2)/* -* Generic opaque `network object.' At the kernel level, this type -* is used only by lockd. +* Generic opaque `network object.' */ #define XDR_MAX_NETOBJ 1024struct xdr_netobj {
kernel/bpf/verifier.c +20 -18
@@ -6822,7 +6822,7 @@ static int is_branch32_taken(struct bpf_reg_state *reg, u32 val, u8 opcode)case BPF_JSGT :if (reg->s32_min_value > sval)return 1 ; -else if (reg->s32_max_value < sval) +else if (reg->s32_max_value <= sval)return 0 ;break ;case BPF_JLT :
@@ -6895,7 +6895,7 @@ static int is_branch64_taken(struct bpf_reg_state *reg, u64 val, u8 opcode)case BPF_JSGT :if (reg->smin_value > sval)return 1 ; -else if (reg->smax_value < sval) +else if (reg->smax_value <= sval)return 0 ;break ;case BPF_JLT :
@@ -8465,7 +8465,11 @@ static bool range_within(struct bpf_reg_state *old,return old->umin_value <= cur->umin_value && old->umax_value >= cur->umax_value && old->smin_value <= cur->smin_value && - old->smax_value >= cur->smax_value; + old->smax_value >= cur->smax_value && + old->u32_min_value <= cur->u32_min_value && + old->u32_max_value >= cur->u32_max_value && + old->s32_min_value <= cur->s32_min_value && + old->s32_max_value >= cur->s32_max_value; }/* Maximum number of register states that can exist at once */
@@ -10862,30 +10866,28 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env) insn->code == (BPF_ALU | BPF_MOD | BPF_X) || insn->code == (BPF_ALU | BPF_DIV | BPF_X)) {bool is64 =BPF_CLASS (insn->code) ==BPF_ALU64 ; -struct bpf_insn mask_and_div[] = { -BPF_MOV32_REG (insn->src_reg, insn->src_reg), +bool isdiv =BPF_OP (insn->code) ==BPF_DIV ; +struct bpf_insn *patchlet; +struct bpf_insn chk_and_div[] = {/* Rx div 0 -> 0 */ -BPF_JMP_IMM (BPF_JNE , insn->src_reg,0 ,2 ), +BPF_RAW_INSN ((is64 ?BPF_JMP :BPF_JMP32 ) | +BPF_JNE |BPF_K , insn->src_reg, +0 ,2 ,0 ),BPF_ALU32_REG (BPF_XOR , insn->dst_reg, insn->dst_reg),BPF_JMP_IMM (BPF_JA ,0 ,0 ,1 ), *insn, }; -struct bpf_insn mask_and_mod[] = { -BPF_MOV32_REG (insn->src_reg, insn->src_reg), +struct bpf_insn chk_and_mod[] = {/* Rx mod 0 -> Rx */ -BPF_JMP_IMM (BPF_JEQ , insn->src_reg,0 ,1 ), +BPF_RAW_INSN ((is64 ?BPF_JMP :BPF_JMP32 ) | +BPF_JEQ |BPF_K , insn->src_reg, +0 ,1 ,0 ), *insn, }; -struct bpf_insn *patchlet; -if (insn->code == (BPF_ALU64 |BPF_DIV |BPF_X ) || - insn->code == (BPF_ALU |BPF_DIV |BPF_X )) { - patchlet = mask_and_div + (is64 ?1 :0 ); - cnt =ARRAY_SIZE (mask_and_div) - (is64 ?1 :0 ); - }else { - patchlet = mask_and_mod + (is64 ?1 :0 ); - cnt =ARRAY_SIZE (mask_and_mod) - (is64 ?1 :0 ); - } + patchlet = isdiv ? chk_and_div : chk_and_mod; + cnt = isdiv ?ARRAY_SIZE (chk_and_div) : +ARRAY_SIZE (chk_and_mod); new_prog =bpf_patch_insn_data (env, i + delta, patchlet, cnt);if (!new_prog)
mm/memcontrol.c +2 -3
@@ -6320,6 +6320,8 @@ static ssize_t memory_high_write(struct kernfs_open_file *of,if (err)return err; +page_counter_set_high (&memcg->memory, high); +for (;;) {unsigned long nr_pages =page_counter_read (&memcg->memory);unsigned long reclaimed;
@@ -6343,10 +6345,7 @@ static ssize_t memory_high_write(struct kernfs_open_file *of,break ; } -page_counter_set_high (&memcg->memory, high); -memcg_wb_domain_size_changed (memcg); -return nbytes; }
net/key/af_key.c +3 -3
@@ -2902,7 +2902,7 @@ static int count_ah_combs(const struct xfrm_tmpl *t)break ;if (!aalg->pfkey_supported)continue ; -if (aalg_tmpl_set (t, aalg) && aalg->available) +if (aalg_tmpl_set (t, aalg)) sz +=sizeof (struct sadb_comb ); }return sz +sizeof (struct sadb_prop );
@@ -2920,7 +2920,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t)if (!ealg->pfkey_supported)continue ; -if (!(ealg_tmpl_set (t, ealg) && ealg->available)) +if (!(ealg_tmpl_set (t, ealg)))continue ;for (k =1 ; ; k++) {
@@ -2931,7 +2931,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t)if (!aalg->pfkey_supported)continue ; -if (aalg_tmpl_set (t, aalg) && aalg->available) +if (aalg_tmpl_set (t, aalg)) sz +=sizeof (struct sadb_comb ); } }
net/mac80211/spectmgmt.c +7 -3
@@ -133,16 +133,20 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, }if (wide_bw_chansw_ie) { +u8 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1;struct ieee80211_vht_operation vht_oper = { .chan_width = wide_bw_chansw_ie->new_channel_width, .center_freq_seg0_idx = wide_bw_chansw_ie->new_center_freq_seg0, - .center_freq_seg1_idx = - wide_bw_chansw_ie->new_center_freq_seg1, + .center_freq_seg1_idx = new_seg1,/* .basic_mcs_set doesn't matter */ }; -struct ieee80211_ht_operation ht_oper = {}; +struct ieee80211_ht_operation ht_oper = { + .operation_mode = +cpu_to_le16 (new_seg1 << +IEEE80211_HT_OP_MODE_CCFS2_SHIFT ), + };/* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT, * to the previously parsed chandef
net/sunrpc/auth_gss/auth_gss.c +1 -29
@@ -29,6 +29,7 @@#include <linux/uaccess.h> #include <linux/hashtable.h> +#include "auth_gss_internal.h" #include "../netns.h" #include <trace/events/rpcgss.h>
@@ -125,35 +126,6 @@ gss_cred_set_ctx(struct rpc_cred *cred, struct gss_cl_ctx *ctx)clear_bit (RPCAUTH_CRED_NEW , &cred->cr_flags); } -static const void * -simple_get_bytes (const void *p,const void *end,void *res,size_t len) -{ -const void *q = (const void *)((const char *)p + len); -if (unlikely (q > end || q < p)) -return ERR_PTR (-EFAULT ); -memcpy (res, p, len); -return q; -} - -static inline const void * -simple_get_netobj (const void *p,const void *end,struct xdr_netobj *dest) -{ -const void *q; -unsigned int len; - - p =simple_get_bytes (p, end, &len,sizeof (len)); -if (IS_ERR (p)) -return p; - q = (const void *)((const char *)p + len); -if (unlikely (q > end || q < p)) -return ERR_PTR (-EFAULT ); - dest->data =kmemdup (p, len,GFP_NOFS ); -if (unlikely (dest->data ==NULL )) -return ERR_PTR (-ENOMEM ); - dest->len = len; -return q; -} -static struct gss_cl_ctx *gss_cred_get_ctx (struct rpc_cred *cred) {
net/sunrpc/auth_gss/auth_gss_internal.h new file +45 -0
45 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_mech.c +2 -29
@@ -21,6 +21,8 @@#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/gss_krb5_enctypes.h> +#include "auth_gss_internal.h" +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
@@ -143,35 +145,6 @@ get_gss_krb5_enctype(int etype)return NULL ; } -static const void * -simple_get_bytes (const void *p,const void *end,void *res,int len) -{ -const void *q = (const void *)((const char *)p + len); -if (unlikely (q > end || q < p)) -return ERR_PTR (-EFAULT ); -memcpy (res, p, len); -return q; -} - -static const void * -simple_get_netobj (const void *p,const void *end,struct xdr_netobj *res) -{ -const void *q; -unsigned int len; - - p =simple_get_bytes (p, end, &len,sizeof (len)); -if (IS_ERR (p)) -return p; - q = (const void *)((const char *)p + len); -if (unlikely (q > end || q < p)) -return ERR_PTR (-EFAULT ); - res->data =kmemdup (p, len,GFP_NOFS ); -if (unlikely (res->data ==NULL )) -return ERR_PTR (-ENOMEM ); - res->len = len; -return q; -} -static inline const void *get_key (const void *p,const void *end,struct krb5_ctx *ctx,struct crypto_sync_skcipher **res)
sound/hda/intel-dsp-config.c +4 -0
@@ -306,6 +306,10 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0xa0c8, }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x43c8, + },#endif /* Elkhart Lake */
sound/soc/codecs/ak4458.c +7 -15
@@ -595,18 +595,10 @@ static struct snd_soc_dai_driver ak4497_dai = { .ops = &ak4458_dai_ops, }; -static void ak4458_power_off (struct ak4458_priv *ak4458) +static void ak4458_reset (struct ak4458_priv *ak4458,bool active) {if (ak4458->reset_gpiod) { -gpiod_set_value_cansleep (ak4458->reset_gpiod,0 ); -usleep_range (1000 ,2000 ); - } -} - -static void ak4458_power_on (struct ak4458_priv *ak4458) -{ -if (ak4458->reset_gpiod) { -gpiod_set_value_cansleep (ak4458->reset_gpiod,1 ); +gpiod_set_value_cansleep (ak4458->reset_gpiod, active);usleep_range (1000 ,2000 ); } }
@@ -620,7 +612,7 @@ static int ak4458_init(struct snd_soc_component *component)if (ak4458->mute_gpiod)gpiod_set_value_cansleep (ak4458->mute_gpiod,1 ); -ak4458_power_on (ak4458); +ak4458_reset (ak4458, false); ret =snd_soc_component_update_bits (component,AK4458_00_CONTROL1 ,0x80 ,0x80 );/* ACKS bit = 1; 10000000 */
@@ -650,7 +642,7 @@ static void ak4458_remove(struct snd_soc_component *component) {struct ak4458_priv *ak4458 =snd_soc_component_get_drvdata (component); -ak4458_power_off (ak4458); +ak4458_reset (ak4458, true); }#ifdef CONFIG_PM
@@ -660,7 +652,7 @@ static int __maybe_unused ak4458_runtime_suspend(struct device *dev)regcache_cache_only (ak4458->regmap, true); -ak4458_power_off (ak4458); +ak4458_reset (ak4458, true);if (ak4458->mute_gpiod)gpiod_set_value_cansleep (ak4458->mute_gpiod,0 );
@@ -685,8 +677,8 @@ static int __maybe_unused ak4458_runtime_resume(struct device *dev)if (ak4458->mute_gpiod)gpiod_set_value_cansleep (ak4458->mute_gpiod,1 ); -ak4458_power_off (ak4458); -ak4458_power_on (ak4458); +ak4458_reset (ak4458, true); +ak4458_reset (ak4458, false);regcache_cache_only (ak4458->regmap, false);regcache_mark_dirty (ak4458->regmap);
sound/soc/codecs/wm_adsp.c +3 -0
@@ -2031,11 +2031,14 @@ static struct wm_coeff_ctl *wm_adsp_get_ctl(struct wm_adsp *dsp, unsigned int alg) {struct wm_coeff_ctl *pos, *rslt =NULL ; +const char *fw_txt = wm_adsp_fw_text[dsp->fw];list_for_each_entry (pos, &dsp->ctl_list, list) {if (!pos->subname)continue ;if (strncmp (pos->subname, name, pos->subname_len) ==0 && +strncmp (pos->fw_name, fw_txt, +SNDRV_CTL_ELEM_ID_NAME_MAXLEN ) ==0 && pos->alg_region.alg == alg && pos->alg_region.type == type) { rslt = pos;
sound/soc/intel/boards/sof_sdw.c +10 -0
@@ -57,6 +57,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 | SOF_RT715_DAI_ID_FIX), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc" ), +DMI_EXACT_MATCH (DMI_PRODUCT_SKU ,"0A5E" ) + }, + .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 | +SOF_RT715_DAI_ID_FIX | + SOF_SDW_FOUR_SPK), + }, { .callback = sof_sdw_quirk_cb, .matches = {
sound/soc/intel/skylake/skl-topology.c +1 -1
@@ -3632,7 +3632,7 @@ static void skl_tplg_complete(struct snd_soc_component *component)sprintf (chan_text,"c%d" , mach->mach_params.dmic_num);for (i =0 ; i < se->items; i++) { -struct snd_ctl_elem_value val; +struct snd_ctl_elem_value val = {};if (strstr (texts[i], chan_text)) { val.value.enumerated.item[0 ] = i;