Linux 5.4.96
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 95 +SUBLEVEL = 96 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm64/include/asm/memory.h +5 -5
@@ -247,11 +247,11 @@ static inline const void *__tag_set(const void *addr, u8 tag)/* -* The linear kernel range starts at the bottom of the virtual address -* space. Testing the top bit for the start of the region is a -* sufficient check and avoids having to worry about the tag. +* Check whether an arbitrary address is within the linear map, which +* lives in the [PAGE_OFFSET, PAGE_END) interval at the bottom of the +* kernel's TTBR1 address range. */ -#define __is_lm_address (addr) (!(((u64)addr) & BIT(vabits_actual - 1))) +#define __is_lm_address (addr) (((u64)(addr) ^ PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))#define __lm_to_phys (addr) (((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)#define __kimg_to_phys (addr) ((addr) - kimage_voffset)
@@ -332,7 +332,7 @@ static inline void *phys_to_virt(phys_addr_t x)#endif /* !CONFIG_SPARSEMEM_VMEMMAP || CONFIG_DEBUG_VIRTUAL */ #define virt_addr_valid (addr) ({ \ - __typeof__(addr) __addr = addr; \ + __typeof__(addr) __addr = __tag_reset(addr); \ __is_lm_address(__addr) && pfn_valid(virt_to_pfn(__addr)); \ })
arch/arm64/mm/physaddr.c +1 -1
@@ -9,7 +9,7 @@phys_addr_t __virt_to_phys (unsigned long x) { -WARN (!__is_lm_address (x), +WARN (!__is_lm_address (__tag_reset (x)),"virt_to_phys used for non-linear address: %pK (%pS)\n" , (void *)x, (void *)x);
arch/x86/include/asm/msr.h +2 -2
@@ -88,7 +88,7 @@ static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {}* think of extending them - you will be slapped with a stinking trout or a frozen * shark will reach you, wherever you are! You've been warned. */ -static inline unsigned long long notrace __rdmsr (unsigned int msr) +static __always_inline unsigned long long __rdmsr (unsigned int msr) {DECLARE_ARGS (val, low, high);
@@ -100,7 +100,7 @@ static inline unsigned long long notrace __rdmsr(unsigned int msr)return EAX_EDX_VAL (val, low, high); } -static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high) +static __always_inline void __wrmsr(unsigned int msr, u32 low, u32 high) { asmvolatile ("1: wrmsr\n" "2:\n"
block/blk-core.c +7 -4
@@ -886,11 +886,14 @@ generic_make_request_checks(struct bio *bio) }/* -* For a REQ_NOWAIT based request, return -EOPNOTSUPP -* if queue is not a request based queue. +* Non-mq queues do not honor REQ_NOWAIT, so complete a bio +* with BLK_STS_AGAIN status in order to catch -EAGAIN and +* to give a chance to the caller to repeat request gracefully. */ -if ((bio->bi_opf &REQ_NOWAIT ) && !queue_is_mq (q)) - goto not_supported; +if ((bio->bi_opf &REQ_NOWAIT ) && !queue_is_mq (q)) { + status =BLK_STS_AGAIN ; + goto end_io; + }if (should_fail_bio (bio)) goto end_io;
drivers/acpi/thermal.c +38 -17
117 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -0
@@ -1914,6 +1914,9 @@ static bool decide_dp_link_settings(struct dc_link *link, struct dc_link_setting initial_link_setting;uint32_t link_bw; +if (req_bw >dc_link_bandwidth_kbps (link, &link->verified_link_cap)) +return false; +/* search for the minimum link setting that: * 1. is supported according to the link training result * 2. could support the b/w requested by the timing
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1 -1
@@ -257,7 +257,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn2_1_soc = { .num_banks = 8, .num_chans = 4, .vmm_page_size_bytes = 4096, - .dram_clock_change_latency_us = 23.84, + .dram_clock_change_latency_us = 11.72, .return_bus_width_bytes = 64, .dispclk_dppclk_vco_speed_mhz = 3600, .xfc_bus_transport_time_us = 4,
drivers/net/dsa/bcm_sf2.c +6 -2
@@ -421,15 +421,19 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)/* Find our integrated MDIO bus node */ dn =of_find_compatible_node (NULL ,NULL ,"brcm,unimac-mdio" ); priv->master_mii_bus =of_mdio_find_bus (dn); -if (!priv->master_mii_bus) +if (!priv->master_mii_bus) { +of_node_put (dn);return -EPROBE_DEFER ; + }get_device (&priv->master_mii_bus->dev); priv->master_mii_dn = dn; priv->slave_mii_bus =devm_mdiobus_alloc (ds->dev); -if (!priv->slave_mii_bus) +if (!priv->slave_mii_bus) { +of_node_put (dn);return -ENOMEM ; + } priv->slave_mii_bus->priv = priv; priv->slave_mii_bus->name ="sf2 slave mii" ;
drivers/net/ethernet/ibm/ibmvnic.c +6 -0
@@ -4752,6 +4752,12 @@ static void ibmvnic_tasklet(void *data)while (!done) {/* Pull all the valid messages off the CRQ */ while ((crq =ibmvnic_next_crq (adapter)) !=NULL ) { +/* This barrier makes sure ibmvnic_next_crq()'s +* crq->generic.first & IBMVNIC_CRQ_CMD_RSP is loaded +* before ibmvnic_handle_crq()'s +* switch(gen_crq->first) and switch(gen_crq->cmd). +*/ +dma_rmb ();ibmvnic_handle_crq (crq, adapter); crq->generic.first =0 ; }
drivers/nvme/host/core.c +15 -2
@@ -1295,8 +1295,21 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) } length = (io.nblocks +1 ) << ns->lba_shift; - meta_len = (io.nblocks +1 ) * ns->ms; - metadata =nvme_to_user_ptr (io.metadata); + +if ((io.control &NVME_RW_PRINFO_PRACT ) && + ns->ms ==sizeof (struct t10_pi_tuple )) { +/* +* Protection information is stripped/inserted by the +* controller. +*/ +if (nvme_to_user_ptr (io.metadata)) +return -EINVAL ; + meta_len =0 ; + metadata =NULL ; + }else { + meta_len = (io.nblocks +1 ) * ns->ms; + metadata =nvme_to_user_ptr (io.metadata); + }if (ns->ext) { length += meta_len;
drivers/phy/motorola/phy-cpcap-usb.c +13 -6
@@ -625,35 +625,42 @@ static int cpcap_usb_phy_probe(struct platform_device *pdev) generic_phy =devm_phy_create (ddata->dev,NULL , &ops);if (IS_ERR (generic_phy)) { error =PTR_ERR (generic_phy); -return PTR_ERR (generic_phy); + goto out_reg_disable; }phy_set_drvdata (generic_phy, ddata); phy_provider =devm_of_phy_provider_register (ddata->dev, of_phy_simple_xlate); -if (IS_ERR (phy_provider)) -return PTR_ERR (phy_provider); +if (IS_ERR (phy_provider)) { + error =PTR_ERR (phy_provider); + goto out_reg_disable; + } error =cpcap_usb_init_optional_pins (ddata);if (error) -return error; + goto out_reg_disable;cpcap_usb_init_optional_gpios (ddata); error =cpcap_usb_init_iio (ddata);if (error) -return error; + goto out_reg_disable; error =cpcap_usb_init_interrupts (pdev, ddata);if (error) -return error; + goto out_reg_disable;usb_add_phy_dev (&ddata->phy);atomic_set (&ddata->active,1 );schedule_delayed_work (&ddata->detect_work,msecs_to_jiffies (1 ));return 0 ; + +out_reg_disable: +regulator_disable (ddata->vusb); + +return error; }static int cpcap_usb_phy_remove (struct platform_device *pdev)
drivers/platform/x86/intel-vbtn.c +6 -0
@@ -203,6 +203,12 @@ static const struct dmi_system_id dmi_switches_allow_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Switch SA5-271"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7352"), + }, + }, {}/* Array terminator */ };
drivers/platform/x86/touchscreen_dmi.c +18 -0
@@ -231,6 +231,16 @@ static const struct ts_dmi_data digma_citi_e200_data = { .properties = digma_citi_e200_props, }; +static const struct property_entry estar_beauty_hd_props[] = { +PROPERTY_ENTRY_BOOL ("touchscreen-swapped-x-y" ), + { } +}; + +static const struct ts_dmi_data estar_beauty_hd_data = { + .acpi_name ="GDIX1001:00" , + .properties = estar_beauty_hd_props, +}; +static const struct property_entry gp_electronic_t701_props[] = {PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,960 ),PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,640 ),
@@ -747,6 +757,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), }, }, + { +/* Estar Beauty HD (MID 7316R) */ + .driver_data = (void *)&estar_beauty_hd_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Estar" ), + DMI_MATCH(DMI_PRODUCT_NAME, "eSTAR BEAUTY HD Intel Quad core"), + }, + }, {/* GP-electronic T701 */ .driver_data = (void *)&gp_electronic_t701_data,
drivers/scsi/fnic/vnic_dev.c +5 -3
@@ -444,7 +444,8 @@ int vnic_dev_init_devcmd2(struct vnic_dev *vdev) fetch_index =ioread32 (&vdev->devcmd2->wq.ctrl->fetch_index);if (fetch_index ==0xFFFFFFFF ) {/* check for hardware gone */ pr_err ("error in devcmd2 init" ); -return -ENODEV ; + err = -ENODEV ; + goto err_free_wq; }/*
@@ -460,7 +461,7 @@ int vnic_dev_init_devcmd2(struct vnic_dev *vdev) err =vnic_dev_alloc_desc_ring (vdev, &vdev->devcmd2->results_ring,DEVCMD2_RING_SIZE ,DEVCMD2_DESC_SIZE );if (err) - goto err_free_wq; + goto err_disable_wq; vdev->devcmd2->result = (struct devcmd2_result *) vdev->devcmd2->results_ring.descs;
@@ -481,8 +482,9 @@ int vnic_dev_init_devcmd2(struct vnic_dev *vdev) err_free_desc_ring:vnic_dev_free_desc_ring (vdev, &vdev->devcmd2->results_ring); -err_free_wq: +err_disable_wq:vnic_wq_disable (&vdev->devcmd2->wq); +err_free_wq:vnic_wq_free (&vdev->devcmd2->wq); err_free_devcmd2:kfree (vdev->devcmd2);
drivers/scsi/ibmvscsi/ibmvfc.c +3 -1
@@ -2881,8 +2881,10 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)unsigned long flags =0 ;spin_lock_irqsave (shost->host_lock, flags); -if (sdev->type ==TYPE_DISK ) +if (sdev->type ==TYPE_DISK ) { sdev->allow_restart =1 ; +blk_queue_rq_timeout (sdev->request_queue,120 *HZ ); + }spin_unlock_irqrestore (shost->host_lock, flags);return 0 ; }
drivers/scsi/libfc/fc_exch.c +14 -2
@@ -1619,8 +1619,13 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) rc =fc_exch_done_locked (ep);WARN_ON (fc_seq_exch (sp) != ep);spin_unlock_bh (&ep->ex_lock); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + } }/*
@@ -1639,6 +1644,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)if (!fc_invoke_resp (ep, sp, fp))fc_frame_free (fp); +skip_resp:fc_exch_release (ep);return ; rel:
@@ -1895,10 +1901,16 @@ static void fc_exch_reset(struct fc_exch *ep)fc_exch_hold (ep); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + }fc_invoke_resp (ep, sp,ERR_PTR (-FC_EX_CLOSED )); +skip_resp:fc_seq_set_resp (sp,NULL , ep->arg);fc_exch_release (ep); }
drivers/scsi/scsi_transport_srp.c +8 -1
@@ -541,7 +541,14 @@ int srp_reconnect_rport(struct srp_rport *rport) res =mutex_lock_interruptible (&rport->mutex);if (res) goto out; -scsi_target_block (&shost->shost_gendev); +if (rport->state !=SRP_RPORT_FAIL_FAST ) +/* +* sdev state must be SDEV_TRANSPORT_OFFLINE, transition +* to SDEV_BLOCK is illegal. Calling scsi_target_unblock() +* later is ok though, scsi_internal_device_unblock_nowait() +* treats SDEV_TRANSPORT_OFFLINE like SDEV_BLOCK. +*/ +scsi_target_block (&shost->shost_gendev); res = rport->state !=SRP_RPORT_LOST ? i->f->reconnect (rport) : -ENODEV ;pr_debug ("%s (state %d): transport.reconnect() returned %d\n" ,dev_name (&shost->shost_gendev), rport->state, res);
fs/btrfs/backref.c +101 -56
292 lines not on this page · raw message
fs/udf/super.c +4 -3
@@ -705,6 +705,7 @@ static int udf_check_vsd(struct super_block *sb)struct buffer_head *bh =NULL ;int nsr =0 ;struct udf_sb_info *sbi; +loff_t session_offset; sbi =UDF_SB (sb);if (sb->s_blocksize <sizeof (struct volStructDesc ))
@@ -712,7 +713,8 @@ static int udf_check_vsd(struct super_block *sb)else sectorsize = sb->s_blocksize; - sector += (((loff_t )sbi->s_session) << sb->s_blocksize_bits); + session_offset = (loff_t )sbi->s_session << sb->s_blocksize_bits; + sector += session_offset; udf_debug("Starting at sector %u (%lu byte sectors)\n", (unsigned int)(sector >> sb->s_blocksize_bits),
@@ -757,8 +759,7 @@ static int udf_check_vsd(struct super_block *sb)if (nsr >0 )return 1 ; -else if (!bh && sector - (sbi->s_session << sb->s_blocksize_bits) == -VSD_FIRST_SECTOR_OFFSET ) +else if (!bh && sector - session_offset ==VSD_FIRST_SECTOR_OFFSET )return -1 ;else return 0 ;
include/linux/kthread.h +3 -0
@@ -31,6 +31,9 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),unsigned int cpu, const char *namefmt); +void kthread_set_per_cpu (struct task_struct *k,int cpu); +bool kthread_is_per_cpu (struct task_struct *k); +/** * kthread_run - create and wake a thread. * @threadfn: the function to run until signal_pending(current).
include/net/tcp.h +1 -0
@@ -619,6 +619,7 @@ static inline void tcp_clear_xmit_timers(struct sock *sk)unsigned int tcp_sync_mss (struct sock *sk,u32 pmtu);unsigned int tcp_current_mss (struct sock *sk); +u32 tcp_clamp_probe0_to_user_timeout (const struct sock *sk,u32 when);/* Bound MSS / TSO packet size with the half of the window */ static inline int tcp_bound_to_half_wnd (struct tcp_sock *tp,int pktsize)
kernel/kthread.c +26 -1
@@ -469,11 +469,36 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),return p;kthread_bind (p, cpu);/* CPU hotplug need to bind once again when unparking the thread. */ -set_bit (KTHREAD_IS_PER_CPU , &to_kthread (p)->flags);to_kthread (p)->cpu = cpu;return p; } +void kthread_set_per_cpu (struct task_struct *k,int cpu) +{ +struct kthread *kthread =to_kthread (k); +if (!kthread) +return ; + +WARN_ON_ONCE (!(k->flags &PF_NO_SETAFFINITY )); + +if (cpu <0 ) { +clear_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +return ; + } + + kthread->cpu = cpu; +set_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +} + +bool kthread_is_per_cpu (struct task_struct *k) +{ +struct kthread *kthread =to_kthread (k); +if (!kthread) +return false; + +return test_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +} +/** * kthread_unpark - unpark a thread created by kthread_create(). * @k: thread created by kthread_create().
kernel/smpboot.c +1 -0
@@ -188,6 +188,7 @@ __smpboot_create_thread(struct smp_hotplug_thread *ht, unsigned int cpu)kfree (td);return PTR_ERR (tsk); } +kthread_set_per_cpu (tsk, cpu);/* * Park the thread so that it could start right on the CPU * when it is available.
kernel/workqueue.c +3 -6
@@ -1847,12 +1847,6 @@ static void worker_attach_to_pool(struct worker *worker, {mutex_lock (&wq_pool_attach_mutex); -/* -* set_cpus_allowed_ptr() will fail if the cpumask doesn't have any -* online CPUs. It'll be re-applied when any of the CPUs come up. -*/ -set_cpus_allowed_ptr (worker->task, pool->attrs->cpumask); -/* * The wq_pool_attach_mutex ensures %POOL_DISASSOCIATED remains * stable across this function. See the comments above the flag
@@ -1861,6 +1855,9 @@ static void worker_attach_to_pool(struct worker *worker,if (pool->flags &POOL_DISASSOCIATED ) worker->flags |=WORKER_UNBOUND ; +if (worker->rescue_wq) +set_cpus_allowed_ptr (worker->task, pool->attrs->cpumask); +list_add_tail (&worker->node, &pool->workers); worker->pool = pool;
net/core/gen_estimator.c +7 -4
@@ -80,11 +80,11 @@ static void est_timer(struct timer_list *t)u64 rate, brate;est_fetch_counters (est, &b); - brate = (b.bytes - est->last_bytes) << (10 - est->ewma_log - est->intvl_log); - brate -= (est->avbps >> est->ewma_log); + brate = (b.bytes - est->last_bytes) << (10 - est->intvl_log); + brate = (brate >> est->ewma_log) - (est->avbps >> est->ewma_log); - rate = (u64)(b.packets - est->last_packets) << (10 - est->ewma_log - est->intvl_log); - rate -= (est->avpps >> est->ewma_log); + rate = (u64)(b.packets - est->last_packets) << (10 - est->intvl_log); + rate = (rate >> est->ewma_log) - (est->avpps >> est->ewma_log);write_seqcount_begin (&est->seq); est->avbps += brate;
@@ -143,6 +143,9 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,if (parm->interval <-2 || parm->interval >3 )return -EINVAL ; +if (parm->ewma_log ==0 || parm->ewma_log >=31 ) +return -EINVAL ; + est =kzalloc (sizeof (*est),GFP_KERNEL );if (!est)return -ENOBUFS ;
net/ipv4/tcp_input.c +1 -0
@@ -3295,6 +3295,7 @@ static void tcp_ack_probe(struct sock *sk) }else {unsigned long when =tcp_probe0_when (sk,TCP_RTO_MAX ); + when =tcp_clamp_probe0_to_user_timeout (sk, when);tcp_reset_xmit_timer (sk,ICSK_TIME_PROBE0 , when,TCP_RTO_MAX ,NULL ); }
net/ipv4/tcp_output.c +2 -0
@@ -3850,6 +3850,8 @@ void tcp_send_probe0(struct sock *sk)*/ timeout =TCP_RESOURCE_PROBE_INTERVAL ; } + + timeout =tcp_clamp_probe0_to_user_timeout (sk, timeout);tcp_reset_xmit_timer (sk,ICSK_TIME_PROBE0 , timeout,TCP_RTO_MAX ,NULL ); }
net/ipv4/tcp_timer.c +18 -0
@@ -40,6 +40,24 @@ static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk)return min_t (u32, icsk->icsk_rto,msecs_to_jiffies (remaining)); } +u32 tcp_clamp_probe0_to_user_timeout (const struct sock *sk,u32 when) +{ +struct inet_connection_sock *icsk =inet_csk (sk); +u32 remaining; +s32 elapsed; + +if (!icsk->icsk_user_timeout || !icsk->icsk_probes_tstamp) +return when; + + elapsed = tcp_jiffies32 - icsk->icsk_probes_tstamp; +if (unlikely (elapsed <0 )) + elapsed =0 ; + remaining =msecs_to_jiffies (icsk->icsk_user_timeout) - elapsed; + remaining =max_t (u32, remaining,TCP_TIMEOUT_MIN ); + +return min_t (u32, remaining, when); +} +/** * tcp_write_err() - close socket and save error info * @sk: The socket the error has appeared on.
net/mac80211/rx.c +2 -0
@@ -4080,6 +4080,8 @@ void ieee80211_check_fast_rx(struct sta_info *sta)rcu_read_lock (); key =rcu_dereference (sta->ptk[sta->ptk_idx]); +if (!key) + key =rcu_dereference (sdata->default_unicast_key);if (key) {switch (key->conf.cipher) {case WLAN_CIPHER_SUITE_TKIP :
net/switchdev/switchdev.c +13 -10
@@ -461,10 +461,11 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev, extack =switchdev_notifier_info_to_extack (&port_obj_info->info);if (check_cb (dev)) { -/* This flag is only checked if the return value is success. */ - port_obj_info->handled = true; -return add_cb (dev, port_obj_info->obj, port_obj_info->trans, - extack); + err =add_cb (dev, port_obj_info->obj, port_obj_info->trans, + extack); +if (err != -EOPNOTSUPP ) + port_obj_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@ -513,9 +514,10 @@ static int __switchdev_handle_port_obj_del(struct net_device *dev,int err = -EOPNOTSUPP ;if (check_cb (dev)) { -/* This flag is only checked if the return value is success. */ - port_obj_info->handled = true; -return del_cb (dev, port_obj_info->obj); + err =del_cb (dev, port_obj_info->obj); +if (err != -EOPNOTSUPP ) + port_obj_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@ -563,9 +565,10 @@ static int __switchdev_handle_port_attr_set(struct net_device *dev,int err = -EOPNOTSUPP ;if (check_cb (dev)) { - port_attr_info->handled = true; -return set_cb (dev, port_attr_info->attr, - port_attr_info->trans); + err =set_cb (dev, port_attr_info->attr, port_attr_info->trans); +if (err != -EOPNOTSUPP ) + port_attr_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
sound/pci/hda/hda_intel.c +3 -0
@@ -2450,6 +2450,9 @@ static const struct pci_device_id azx_ids[] = {/* CometLake-S */ { PCI_DEVICE(0x8086, 0xa3f0), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* CometLake-R */ + { PCI_DEVICE(0x8086, 0xf0c8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
sound/soc/sof/intel/hda-codec.c +1 -2
@@ -68,8 +68,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev)* has been recorded in STATESTS */ if (codec->jacktbl.used) -schedule_delayed_work (&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); }#else void hda_codec_jack_wake_enable (struct snd_sof_dev *sdev) {}
tools/objtool/elf.c +5 -2
@@ -214,8 +214,11 @@ static int read_symbols(struct elf *elf) symtab =find_section_by_name (elf,".symtab" );if (!symtab) { -WARN ("missing symbol table" ); -return -1 ; +/* +* A missing symbol table is actually possible if it's an empty +* .o file. This can happen for thunk_64.o. +*/ +return 0 ; } symbols_nr = symtab->sh.sh_size / symtab->sh.sh_entsize;
tools/testing/selftests/powerpc/alignment/alignment_handler.c +4 -1
@@ -380,7 +380,6 @@ int test_alignment_handler_integer(void)LOAD_DFORM_TEST (ldu);LOAD_XFORM_TEST (ldx);LOAD_XFORM_TEST (ldux); -LOAD_DFORM_TEST (lmw);STORE_DFORM_TEST (stb);STORE_XFORM_TEST (stbx);STORE_DFORM_TEST (stbu);
@@ -399,7 +398,11 @@ int test_alignment_handler_integer(void)STORE_XFORM_TEST (stdx);STORE_DFORM_TEST (stdu);STORE_XFORM_TEST (stdux); + +#ifdef __BIG_ENDIAN__ +LOAD_DFORM_TEST (lmw);STORE_DFORM_TEST (stmw); +#endif return rc; }
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.4.96 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.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/include/asm/memory.h | 10 arch/arm64/mm/physaddr.c | 2 arch/x86/include/asm/msr.h | 4 block/blk-core.c | 11 drivers/acpi/thermal.c | 55 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 drivers/net/dsa/bcm_sf2.c | 8 drivers/net/ethernet/ibm/ibmvnic.c | 6 drivers/nvme/host/core.c | 17 - drivers/phy/motorola/phy-cpcap-usb.c | 19 - drivers/platform/x86/intel-vbtn.c | 6 drivers/platform/x86/touchscreen_dmi.c | 18 + drivers/scsi/fnic/vnic_dev.c | 8 drivers/scsi/ibmvscsi/ibmvfc.c | 4 drivers/scsi/libfc/fc_exch.c | 16 - drivers/scsi/scsi_transport_srp.c | 9 fs/btrfs/backref.c | 157 ++++++---- fs/udf/super.c | 7 include/linux/kthread.h | 3 include/net/tcp.h | 1 kernel/kthread.c | 27 + kernel/smpboot.c | 1 kernel/workqueue.c | 9 net/core/gen_estimator.c | 11 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 2 net/ipv4/tcp_timer.c | 18 + net/mac80211/rx.c | 2 net/switchdev/switchdev.c | 23 - sound/pci/hda/hda_intel.c | 3 sound/soc/sof/intel/hda-codec.c | 3 tools/objtool/elf.c | 7 tools/testing/selftests/powerpc/alignment/alignment_handler.c | 5 35 files changed, 347 insertions(+), 133 deletions(-)
Arnold Gozum (1):
platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
Bing Guo (1):
drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping
Brian King (1):
scsi: ibmvfc: Set default timeout to avoid crash during migration
Catalin Marinas (1):
arm64: Do not pass tagged addresses to __is_lm_address()
Dinghao Liu (1):
scsi: fnic: Fix memleak in vnic_dev_init_devcmd2
Enke Chen (1):
tcp: make TCP_USER_TIMEOUT accurate for zero window probes
Eric Dumazet (1):
net_sched: gen_estimator: support large ewma log
Felix Fietkau (1):
mac80211: fix fast-rx encryption check
Greg Kroah-Hartman (2):
Revert "Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"" Linux 5.4.96
Hans de Goede (1):
platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
Jake Wang (1):
drm/amd/display: Update dram_clock_change_latency for DCN2.1
Javed Hasan (1):
scsi: libfc: Avoid invoking response handler twice if ep is already completed
Josh Poimboeuf (1):
objtool: Don't fail on missing symbol table
Kai-Chuan Hsieh (1):
ALSA: hda: Add Cometlake-R PCI ID
Kai-Heng Feng (1):
ASoC: SOF: Intel: hda: Resume codec to do jack detection
Lijun Pan (1):
ibmvnic: Ensure that CRQ entry read are correctly ordered
Martin Wilck (1):
scsi: scsi_transport_srp: Don't block target in failfast state
Michael Ellerman (1):
selftests/powerpc: Only test lwm/stmw on big endian
Pan Bian (1):
net: dsa: bcm_sf2: put device node before return
Peter Zijlstra (3):
x86: __always_inline __{rd,wr}msr()
kthread: Extract KTHREAD_IS_PER_CPU
workqueue: Restrict affinity change to rescuer
Rafael J. Wysocki (1):
ACPI: thermal: Do not call acpi_thermal_check() directly
Rasmus Villemoes (1):
net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
Revanth Rajashekar (1):
nvme: check the PRINFO bit before deciding the host buffer length
Tony Lindgren (1):
phy: cpcap-usb: Fix warning for missing regulator_disable
Vincenzo Frascino (1):
arm64: Fix kernel address detection of __is_lm_address()
ethanwu (4):
btrfs: backref, only collect file extent items matching backref offset
btrfs: backref, don't add refs from shared block when resolving normal backref
btrfs: backref, only search backref entries from leaves of the same root
btrfs: backref, use correct count to resolve normal data refs
lianzhi chang (1):
udf: fix the problem that the disc content is not displayed