Linux 5.2.2
Greg KH
maintainerI'm announcing the release of the 5.2.2 kernel.
All users of the 5.2 kernel series must upgrade.
The updated 5.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.2.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/arc/kernel/unwind.c | 9 +- arch/s390/include/asm/facility.h | 21 ++++-- arch/s390/include/asm/sclp.h | 1 arch/s390/kernel/ipl.c | 7 -- arch/x86/entry/entry_32.S | 24 +++++++ arch/x86/entry/entry_64.S | 30 +++++++- arch/x86/include/asm/hw_irq.h | 5 + arch/x86/kernel/apic/apic.c | 33 ++++++--- arch/x86/kernel/apic/io_apic.c | 46 +++++++++++++ arch/x86/kernel/apic/vector.c | 4 - arch/x86/kernel/idt.c | 3 arch/x86/kernel/irq.c | 2 drivers/base/cacheinfo.c | 3 drivers/base/firmware_loader/fallback.c | 2 drivers/crypto/nx/nx-842-powernv.c | 8 +- drivers/crypto/talitos.c | 99 ++++++++++++----------------- drivers/crypto/talitos.h | 30 ++++++++ drivers/input/mouse/synaptics.c | 1 drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++--- drivers/s390/char/sclp_early.c | 1 drivers/s390/cio/qdio_setup.c | 2 drivers/s390/cio/qdio_thinint.c | 5 - include/linux/cpuhotplug.h | 1 include/uapi/linux/nilfs2_ondisk.h | 24 +++---- kernel/irq/autoprobe.c | 6 - kernel/irq/chip.c | 6 + kernel/irq/cpuhotplug.c | 2 kernel/irq/internals.h | 5 + kernel/irq/manage.c | 90 ++++++++++++++++++++------ 30 files changed, 341 insertions(+), 152 deletions(-)
Arnd Bergmann (1):
ARC: hide unused function unw_hdr_alloc
Christophe Leroy (2):
crypto: talitos - move struct talitos_edesc into talitos.h
crypto: talitos - fix hash on SEC1.
Cole Rogers (1):
Input: synaptics - enable SMBUS on T480 thinkpad trackpad
Greg Kroah-Hartman (1):
Linux 5.2.2
Haren Myneni (1):
crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
Heiko Carstens (1):
s390: fix stfle zero padding
James Morse (1):
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
Jiri Slaby (1):
x86/entry/32: Fix ENDPROC of common_spurious
Julian Wiedmann (2):
s390/qdio: (re-)initialize tiqdio list entries s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
Konstantin Khlebnikov (2):
Revert "e1000e: fix cyclic resets at link up with active tx"
e1000e: start network tx queue only when link is up
Masahiro Yamada (1):
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
Philipp Rudo (1):
s390/ipl: Fix detection of has_secure attribute
Sven Van Asbroeck (1):
firmware: improve LSM/IMA security behaviour
Thomas Gleixner (6):
genirq: Delay deactivation in free_irq()
genirq: Fix misleading synchronize_irq() documentation
genirq: Add optional hardware synchronization for shutdown x86/ioapic: Implement irq_get_irqchip_state() callback x86/irq: Handle spurious interrupt after shutdown gracefully x86/irq: Seperate unused system vectors from spurious entry again
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Bobtail Squid
arch/arc/kernel/unwind.c +4 -5
@@ -181,11 +181,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz)return memblock_alloc_from (sz,sizeof (unsigned int ),MAX_DMA_ADDRESS ); } -static void *unw_hdr_alloc (unsigned long sz) -{ -return kmalloc (sz,GFP_KERNEL ); -} - static void init_unwind_table(struct unwind_table *table, const char *name, const void *core_start, unsigned long core_size, const void *init_start, unsigned long init_size,
@@ -366,6 +361,10 @@ static void init_unwind_hdr(struct unwind_table *table, }#ifdef CONFIG_MODULES +static void *unw_hdr_alloc (unsigned long sz) +{ +return kmalloc (sz,GFP_KERNEL ); +}static struct unwind_table *last_table;
arch/s390/include/asm/facility.h +14 -7
@@ -59,6 +59,18 @@ static inline int test_facility(unsigned long nr)return __test_facility (nr, &S390_lowcore.stfle_fac_list); } +static inline unsigned long __stfle_asm (u64 *stfle_fac_list,int size) +{ + register unsigned long reg0 asm("0") = size - 1; + + asmvolatile ( +".insn s,0xb2b00000,0(%1)" /* stfle */ + :"+d" (reg0) + :"a" (stfle_fac_list) + :"memory" ,"cc" ); +return reg0; +} +/** * stfle - Store facility list extended * @stfle_fac_list: array where facility list can be stored
@@ -75,13 +87,8 @@ static inline void __stfle(u64 *stfle_fac_list, int size)memcpy (stfle_fac_list, &S390_lowcore.stfl_fac_list,4 );if (S390_lowcore.stfl_fac_list &0x01000000 ) {/* More facility bits available with stfle */ - register unsigned long reg0 asm("0") = size - 1; - - asmvolatile (".insn s,0xb2b00000,0(%1)" /* stfle */ - :"+d" (reg0) - :"a" (stfle_fac_list) - :"memory" ,"cc" ); - nr = (reg0 +1 ) *8 ;/* # bytes stored by stfle */ + nr =__stfle_asm (stfle_fac_list, size); + nr = min_t(unsigned long, (nr + 1) * 8, size * 8); }memset ((char *) stfle_fac_list + nr,0 , size *8 - nr); }
arch/s390/include/asm/sclp.h +0 -1
@@ -80,7 +80,6 @@ struct sclp_info { unsigned char has_gisaf : 1; unsigned char has_diag318 : 1; unsigned char has_sipl : 1; - unsigned char has_sipl_g2 : 1; unsigned char has_dirq : 1;unsigned int ibc;unsigned int mtid;
arch/s390/kernel/ipl.c +1 -6
@@ -286,12 +286,7 @@ static struct kobj_attribute sys_ipl_secure_attr =static ssize_t ipl_has_secure_show (struct kobject *kobj,struct kobj_attribute *attr,char *page) { -if (MACHINE_IS_LPAR ) -return sprintf (page,"%i\n" , !!sclp.has_sipl); -else if (MACHINE_IS_VM ) -return sprintf (page,"%i\n" , !!sclp.has_sipl_g2); -else -return sprintf (page,"%i\n" ,0 ); +return sprintf (page,"%i\n" , !!sclp.has_sipl); } static struct kobj_attribute sys_ipl_has_secure_attr =
arch/x86/entry/entry_32.S +24 -0
@@ -1104,6 +1104,30 @@ ENTRY(irq_entries_start) .endr END(irq_entries_start) +#ifdef CONFIG_X86_LOCAL_APIC + .align 8 +ENTRY(spurious_entries_start) + vector=FIRST_SYSTEM_VECTOR + .rept (NR_VECTORS - FIRST_SYSTEM_VECTOR) + pushl $(~vector+0x80) /* Note: always in signed byte range */ + vector=vector+1 + jmp common_spurious + .align 8 + .endr +END(spurious_entries_start) + +common_spurious: + ASM_CLAC + addl $-0x80, (%esp) /* Adjust vector into the [-256, -1] range */ + SAVE_ALL switch_stacks=1 + ENCODE_FRAME_POINTER + TRACE_IRQS_OFF + movl %esp, %eax + call smp_spurious_interrupt + jmp ret_from_intr +ENDPROC(common_spurious) +#endif + /* * the CPU automatically disables interrupts when executing an IRQ vector, * so IRQ-flags tracing has to follow that:
arch/x86/entry/entry_64.S +26 -4
@@ -375,6 +375,18 @@ ENTRY(irq_entries_start) .endr END(irq_entries_start) + .align 8 +ENTRY(spurious_entries_start) + vector=FIRST_SYSTEM_VECTOR + .rept (NR_VECTORS - FIRST_SYSTEM_VECTOR) + UNWIND_HINT_IRET_REGS + pushq $(~vector+0x80) /* Note: always in signed byte range */ + jmp common_spurious + .align 8 + vector=vector+1 + .endr +END(spurious_entries_start) + .macro DEBUG_ENTRY_ASSERT_IRQS_OFF #ifdef CONFIG_DEBUG_ENTRY pushq %rax
@@ -571,10 +583,20 @@ _ASM_NOKPROBE(interrupt_entry) /* Interrupt entry/exit. */ - /* - * The interrupt stubs push (~vector+0x80) onto the stack and - * then jump to common_interrupt. - */ +/* + * The interrupt stubs push (~vector+0x80) onto the stack and + * then jump to common_spurious/interrupt. + */ +common_spurious: + addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */ + call interrupt_entry + UNWIND_HINT_REGS indirect=1 + call smp_spurious_interrupt /* rdi points to pt_regs */ + jmp ret_from_intr +END(common_spurious) +_ASM_NOKPROBE(common_spurious) + +/* common_interrupt is a hotpath. Align it */ .p2align CONFIG_X86_L1_CACHE_SHIFT common_interrupt: addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */
arch/x86/include/asm/hw_irq.h +4 -1
@@ -150,8 +150,11 @@ extern char irq_entries_start[];#define trace_irq_entries_start irq_entries_start#endif +extern char spurious_entries_start[]; +#define VECTOR_UNUSED NULL -#define VECTOR_RETRIGGERED ((void *)~0UL) +#define VECTOR_SHUTDOWN ((void *)~0UL) +#define VECTOR_RETRIGGERED ((void *)~1UL)typedef struct irq_desc *vector_irq_t [NR_VECTORS ];DECLARE_PER_CPU (vector_irq_t, vector_irq);
arch/x86/kernel/apic/apic.c +22 -11
@@ -2041,21 +2041,32 @@ __visible void __irq_entry smp_spurious_interrupt(struct pt_regs *regs)entering_irq ();trace_spurious_apic_entry (vector); +inc_irq_stat (irq_spurious_count); + +/* +* If this is a spurious interrupt then do not acknowledge +*/ +if (vector ==SPURIOUS_APIC_VECTOR ) { +/* See SDM vol 3 */ +pr_info ("Spurious APIC interrupt (vector 0xFF) on CPU#%d, should never happen.\n" , +smp_processor_id ()); + goto out; + } +/* -* Check if this really is a spurious interrupt and ACK it -* if it is a vectored one. Just in case... -* Spurious interrupts should not be ACKed. +* If it is a vectored one, verify it's set in the ISR. If set, +* acknowledge it. */ v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); -if (v & (1 << (vector &0x1f ))) +if (v & (1 << (vector &0x1f ))) { +pr_info ("Spurious interrupt (vector 0x%02x) on CPU#%d. Acked\n" , + vector,smp_processor_id ());ack_APIC_irq (); - -inc_irq_stat (irq_spurious_count); - -/* see sw-dev-man vol 3, chapter 7.4.13.5 */ -pr_info ("spurious APIC interrupt through vector %02x on CPU#%d, " -"should never happen.\n" , vector,smp_processor_id ()); - + }else { +pr_info ("Spurious interrupt (vector 0x%02x) on CPU#%d. Not pending!\n" , + vector,smp_processor_id ()); + } +out:trace_spurious_apic_exit (vector);exiting_irq (); }
arch/x86/kernel/apic/io_apic.c +46 -0
64 lines not on this page · raw message
arch/x86/kernel/apic/vector.c +2 -2
@@ -340,7 +340,7 @@ static void clear_irq_vector(struct irq_data *irqd)trace_vector_clear (irqd->irq, vector, apicd->cpu, apicd->prev_vector, apicd->prev_cpu); -per_cpu (vector_irq, apicd->cpu)[vector] =VECTOR_UNUSED ; +per_cpu (vector_irq, apicd->cpu)[vector] =VECTOR_SHUTDOWN ;irq_matrix_free (vector_matrix, apicd->cpu, vector, managed); apicd->vector =0 ;
@@ -349,7 +349,7 @@ static void clear_irq_vector(struct irq_data *irqd)if (!vector)return ; -per_cpu (vector_irq, apicd->prev_cpu)[vector] =VECTOR_UNUSED ; +per_cpu (vector_irq, apicd->prev_cpu)[vector] =VECTOR_SHUTDOWN ;irq_matrix_free (vector_matrix, apicd->prev_cpu, vector, managed); apicd->prev_vector =0 ; apicd->move_in_progress =0 ;
arch/x86/kernel/idt.c +2 -1
@@ -319,7 +319,8 @@ void __init idt_setup_apic_and_irq_gates(void)#ifdef CONFIG_X86_LOCAL_APIC for_each_clear_bit_from (i, system_vectors,NR_VECTORS ) {set_bit (i, system_vectors); -set_intr_gate (i, spurious_interrupt); + entry = spurious_entries_start +8 * (i -FIRST_SYSTEM_VECTOR ); +set_intr_gate (i, entry); }#endif }
arch/x86/kernel/irq.c +1 -1
@@ -247,7 +247,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)if (!handle_irq (desc, regs)) {ack_APIC_irq (); -if (desc !=VECTOR_RETRIGGERED ) { +if (desc !=VECTOR_RETRIGGERED && desc !=VECTOR_SHUTDOWN ) {pr_emerg_ratelimited ("%s: %d.%d No irq handler for vector\n" , __func__,smp_processor_id (), vector);
drivers/base/cacheinfo.c +2 -1
@@ -655,7 +655,8 @@ static int cacheinfo_cpu_pre_down(unsigned int cpu)static int __init cacheinfo_sysfs_init (void ) { -return cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"base/cacheinfo:online" , +return cpuhp_setup_state (CPUHP_AP_BASE_CACHEINFO_ONLINE , +"base/cacheinfo:online" , cacheinfo_cpu_online, cacheinfo_cpu_pre_down); }device_initcall (cacheinfo_sysfs_init);
drivers/base/firmware_loader/fallback.c +1 -1
@@ -659,7 +659,7 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags)/* Also permit LSMs and IMA to fail firmware sysfs fallback */ ret =security_kernel_load_data (LOADING_FIRMWARE );if (ret <0 ) -return ret; +return false;return fw_force_sysfs_fallback (opt_flags); }
drivers/crypto/nx/nx-842-powernv.c +5 -3
@@ -27,8 +27,6 @@ MODULE_ALIAS_CRYPTO("842-nx");#define WORKMEM_ALIGN (CRB_ALIGN)#define CSB_WAIT_MAX (5000)/* ms */ #define VAS_RETRIES (10) -/* # of requests allowed per RxFIFO at a time. 0 for unlimited */ -#define MAX_CREDITS_PER_RXFIFO (1024)struct nx842_workmem {/* Below fields must be properly aligned */
@@ -812,7 +810,11 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id, rxattr.lnotify_lpid = lpid; rxattr.lnotify_pid = pid; rxattr.lnotify_tid = tid; - rxattr.wcreds_max =MAX_CREDITS_PER_RXFIFO ; +/* +* Maximum RX window credits can not be more than #CRBs in +* RxFIFO. Otherwise, can get checkstop if RxFIFO overruns. +*/ + rxattr.wcreds_max = fifo_size /CRB_SIZE ;/* * Open a VAS receice window which is used to configure RxFIFO
drivers/crypto/talitos.c +41 -58
197 lines not on this page · raw message
drivers/crypto/talitos.h +30 -0
@@ -65,6 +65,36 @@ struct talitos_desc {#define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) +/* +* talitos_edesc - s/w-extended descriptor +* @src_nents: number of segments in input scatterlist +* @dst_nents: number of segments in output scatterlist +* @icv_ool: whether ICV is out-of-line +* @iv_dma: dma address of iv for checking continuity and link table +* @dma_len: length of dma mapped link_tbl space +* @dma_link_tbl: bus physical address of link_tbl/buf +* @desc: h/w descriptor +* @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) +* @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) +* +* if decrypting (with authcheck), or either one of src_nents or dst_nents +* is greater than 1, an integrity check value is concatenated to the end +* of link_tbl data +*/ +struct talitos_edesc { +int src_nents; +int dst_nents; +bool icv_ool; +dma_addr_t iv_dma; +int dma_len; +dma_addr_t dma_link_tbl; +struct talitos_desc desc; +union { +struct talitos_ptr link_tbl[0 ]; +u8 buf[0 ]; + }; +}; +/** * talitos_request - descriptor submission request * @desc: descriptor pointer (kernel virtual)
drivers/input/mouse/synaptics.c +1 -0
@@ -173,6 +173,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073" ,/* X1 Carbon G5 (Elantech) */ "LEN0092" ,/* X1 Carbon 6 */ +"LEN0093" ,/* T480 */ "LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f", /* T450s */
drivers/net/ethernet/intel/e1000e/netdev.c +13 -8
@@ -4208,7 +4208,7 @@ void e1000e_up(struct e1000_adapter *adapter)e1000_configure_msix (adapter);e1000_irq_enable (adapter); -netif_start_queue (adapter->netdev); +/* Tx queue started by watchdog timer when link is up */ e1000e_trigger_lsc (adapter); }
@@ -4606,6 +4606,7 @@ int e1000e_open(struct net_device *netdev)pm_runtime_get_sync (&pdev->dev);netif_carrier_off (netdev); +netif_stop_queue (netdev);/* allocate transmit descriptors */ err =e1000e_setup_tx_resources (adapter->tx_ring);
@@ -4666,7 +4667,6 @@ int e1000e_open(struct net_device *netdev)e1000_irq_enable (adapter); adapter->tx_hang_recheck = false; -netif_start_queue (netdev); hw->mac.get_link_status = true;pm_runtime_put (&pdev->dev);
@@ -5288,6 +5288,7 @@ static void e1000_watchdog_task(struct work_struct *work)if (phy->ops.cfg_on_link_up) phy->ops.cfg_on_link_up (hw); +netif_wake_queue (netdev);netif_carrier_on (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))
@@ -5301,6 +5302,7 @@ static void e1000_watchdog_task(struct work_struct *work)/* Link status message must follow this format */ pr_info ("%s NIC Link is Down\n" , adapter->netdev->name);netif_carrier_off (netdev); +netif_stop_queue (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))mod_timer (&adapter->phy_info_timer,round_jiffies (jiffies +2 *HZ ));
@@ -5308,13 +5310,8 @@ static void e1000_watchdog_task(struct work_struct *work)/* 8000ES2LAN requires a Rx packet buffer work-around * on link down event; reset the controller to flush * the Rx packet buffer. -* -* If the link is lost the controller stops DMA, but -* if there is queued Tx work it cannot be done. So -* reset the controller to flush the Tx packet buffers. */ -if ((adapter->flags &FLAG_RX_NEEDS_RESTART ) || -e1000_desc_unused (tx_ring) +1 < tx_ring->count) +if (adapter->flags &FLAG_RX_NEEDS_RESTART ) adapter->flags |=FLAG_RESTART_NOW ;else pm_schedule_suspend(netdev->dev.parent,
@@ -5337,6 +5334,14 @@ static void e1000_watchdog_task(struct work_struct *work) adapter->gotc_old = adapter->stats.gotc;spin_unlock (&adapter->stats64_lock); +/* If the link is lost the controller stops DMA, but +* if there is queued Tx work it cannot be done. So +* reset the controller to flush the Tx packet buffers. +*/ +if (!netif_carrier_ok (netdev) && + (e1000_desc_unused (tx_ring) +1 < tx_ring->count)) + adapter->flags |=FLAG_RESTART_NOW ; +/* If reset is necessary, do it outside of interrupt context. */ if (adapter->flags &FLAG_RESTART_NOW ) {schedule_work (&adapter->reset_task);
drivers/s390/char/sclp_early.c +0 -1
@@ -41,7 +41,6 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb) sclp.has_hvs = !!(sccb->fac119 &0x80 ); sclp.has_kss = !!(sccb->fac98 &0x01 ); sclp.has_sipl = !!(sccb->cbl &0x02 ); - sclp.has_sipl_g2 = !!(sccb->cbl &0x04 );if (sccb->fac85 &0x02 ) S390_lowcore.machine_flags |=MACHINE_FLAG_ESOP ;if (sccb->fac91 &0x40 )
drivers/s390/cio/qdio_setup.c +2 -0
@@ -150,6 +150,7 @@ static int __qdio_allocate_qs(struct qdio_q **irq_ptr_qs, int nr_queues)return -ENOMEM ; } irq_ptr_qs[i] = q; +INIT_LIST_HEAD (&q->entry); }return 0 ; }
@@ -178,6 +179,7 @@ static void setup_queues_misc(struct qdio_q *q, struct qdio_irq *irq_ptr, q->mask =1 << (31 - i); q->nr = i; q->handler = handler; +INIT_LIST_HEAD (&q->entry); } static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
drivers/s390/cio/qdio_thinint.c +2 -3
@@ -79,7 +79,6 @@ void tiqdio_add_input_queues(struct qdio_irq *irq_ptr)mutex_lock (&tiq_list_lock);list_add_rcu (&irq_ptr->input_qs[0 ]->entry, &tiq_list);mutex_unlock (&tiq_list_lock); -xchg (irq_ptr->dsci,1 <<7 ); }void tiqdio_remove_input_queues (struct qdio_irq *irq_ptr)
@@ -87,14 +86,14 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)struct qdio_q *q; q = irq_ptr->input_qs[0 ]; -/* if establish triggered an error */ -if (!q || !q->entry.prev || !q->entry.next) +if (!q)return ;mutex_lock (&tiq_list_lock);list_del_rcu (&q->entry);mutex_unlock (&tiq_list_lock);synchronize_rcu (); +INIT_LIST_HEAD (&q->entry); }static inline int has_multiple_inq_on_dsci (struct qdio_irq *irq_ptr)
include/linux/cpuhotplug.h +1 -0
@@ -176,6 +176,7 @@ enum cpuhp_state {CPUHP_AP_WATCHDOG_ONLINE ,CPUHP_AP_WORKQUEUE_ONLINE ,CPUHP_AP_RCUTREE_ONLINE , +CPUHP_AP_BASE_CACHEINFO_ONLINE ,CPUHP_AP_ONLINE_DYN ,CPUHP_AP_ONLINE_DYN_END =CPUHP_AP_ONLINE_DYN +30 , CPUHP_AP_X86_HPET_ONLINE,
include/uapi/linux/nilfs2_ondisk.h +12 -12
@@ -29,7 +29,7 @@#include <linux/types.h> #include <linux/magic.h> - +#include <asm/byteorder.h> #define NILFS_INODE_BMAP_SIZE 7
@@ -533,19 +533,19 @@ enum { static inline void \ nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \ - (1UL << NILFS_CHECKPOINT_##flag)); \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) | \ + (1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline void \ nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) & \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) & \ ~(1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline int \ nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \ { \ - return !!(le32_to_cpu(cp->cp_flags) & \ + return !!(__le32_to_cpu(cp->cp_flags) & \ (1UL << NILFS_CHECKPOINT_##flag)); \ }
@@ -595,20 +595,20 @@ enum { static inline void \ nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \ { \ - su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) | \ + su->su_flags = __cpu_to_le32(__le32_to_cpu(su->su_flags) | \ (1UL << NILFS_SEGMENT_USAGE_##flag));\ } \ static inline void \ nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \ { \ su->su_flags = \ - cpu_to_le32(le32_to_cpu(su->su_flags) & \ + __cpu_to_le32(__le32_to_cpu(su->su_flags) & \ ~(1UL << NILFS_SEGMENT_USAGE_##flag)); \ } \ static inline int \ nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \ { \ - return !!(le32_to_cpu(su->su_flags) & \ + return !!(__le32_to_cpu(su->su_flags) & \ (1UL << NILFS_SEGMENT_USAGE_##flag)); \ }
@@ -619,15 +619,15 @@ NILFS_SEGMENT_USAGE_FNS(ERROR, error)static inline void nilfs_segment_usage_set_clean (struct nilfs_segment_usage *su) { - su->su_lastmod =cpu_to_le64 (0 ); - su->su_nblocks =cpu_to_le32 (0 ); - su->su_flags =cpu_to_le32 (0 ); + su->su_lastmod =__cpu_to_le64 (0 ); + su->su_nblocks =__cpu_to_le32 (0 ); + su->su_flags =__cpu_to_le32 (0 ); }static inline int nilfs_segment_usage_clean (const struct nilfs_segment_usage *su) { -return !le32_to_cpu (su->su_flags); +return !__le32_to_cpu (su->su_flags); }/**
kernel/irq/autoprobe.c +3 -3
@@ -90,7 +90,7 @@ unsigned long probe_irq_on(void)/* It triggered already - consider it spurious. */ if (!(desc->istate &IRQS_WAITING )) { desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }else if (i <32 ) mask |=1 << i;
@@ -127,7 +127,7 @@ unsigned int probe_irq_mask(unsigned long val) mask |=1 << i; desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }raw_spin_unlock_irq (&desc->lock); }
@@ -169,7 +169,7 @@ int probe_irq_off(unsigned long val) nr_of_irqs++; } desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }raw_spin_unlock_irq (&desc->lock); }
kernel/irq/chip.c +6 -0
@@ -314,6 +314,12 @@ void irq_shutdown(struct irq_desc *desc) }irq_state_clr_started (desc); } +} + + +void irq_shutdown_and_deactivate (struct irq_desc *desc) +{ +irq_shutdown (desc);/* * This must be called even if the interrupt was never started up, * because the activation can happen before the interrupt is
kernel/irq/cpuhotplug.c +1 -1
@@ -116,7 +116,7 @@ static bool migrate_one_irq(struct irq_desc *desc)*/ if (irqd_affinity_is_managed (d)) {irqd_set_managed_shutdown (d); -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc);return false; } affinity = cpu_online_mask;
kernel/irq/internals.h +5 -0
@@ -82,6 +82,7 @@ extern int irq_activate_and_startup(struct irq_desc *desc, bool resend);extern int irq_startup (struct irq_desc *desc,bool resend,bool force);extern void irq_shutdown (struct irq_desc *desc); +extern void irq_shutdown_and_deactivate (struct irq_desc *desc);extern void irq_enable (struct irq_desc *desc);extern void irq_disable (struct irq_desc *desc);extern void irq_percpu_enable (struct irq_desc *desc,unsigned int cpu);
@@ -96,6 +97,10 @@ static inline void irq_mark_irq(unsigned int irq) { }extern void irq_mark_irq (unsigned int irq);#endif +extern int __irq_get_irqchip_state (struct irq_data *data, +enum irqchip_irq_state which, +bool *state); +extern void init_kstat_irqs (struct irq_desc *desc,int node,int nr);irqreturn_t __handle_irq_event_percpu (struct irq_desc *desc,unsigned int *flags);
kernel/irq/manage.c +69 -21
175 lines not on this page · raw message
Thanks, a bunch Greg!
Quoted 97 lines · Greg KH
I'm announcing the release of the 5.2.2 kernel.
All users of the 5.2 kernel series must upgrade.
The updated 5.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.2.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=summarythanks,
greg k-h
------------
Makefile | 2 arch/arc/kernel/unwind.c | 9 +- arch/s390/include/asm/facility.h | 21 ++++-- arch/s390/include/asm/sclp.h | 1 arch/s390/kernel/ipl.c | 7 -- arch/x86/entry/entry_32.S | 24 +++++++ arch/x86/entry/entry_64.S | 30 +++++++- arch/x86/include/asm/hw_irq.h | 5 + arch/x86/kernel/apic/apic.c | 33 ++++++--- arch/x86/kernel/apic/io_apic.c | 46 +++++++++++++ arch/x86/kernel/apic/vector.c | 4 - arch/x86/kernel/idt.c | 3 arch/x86/kernel/irq.c | 2 drivers/base/cacheinfo.c | 3 drivers/base/firmware_loader/fallback.c | 2 drivers/crypto/nx/nx-842-powernv.c | 8 +- drivers/crypto/talitos.c | 99 ++++++++++++----------------- drivers/crypto/talitos.h | 30 ++++++++ drivers/input/mouse/synaptics.c | 1 drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++--- drivers/s390/char/sclp_early.c | 1 drivers/s390/cio/qdio_setup.c | 2 drivers/s390/cio/qdio_thinint.c | 5 - include/linux/cpuhotplug.h | 1 include/uapi/linux/nilfs2_ondisk.h | 24 +++---- kernel/irq/autoprobe.c | 6 - kernel/irq/chip.c | 6 + kernel/irq/cpuhotplug.c | 2 kernel/irq/internals.h | 5 + kernel/irq/manage.c | 90 ++++++++++++++++++++------ 30 files changed, 341 insertions(+), 152 deletions(-)Arnd Bergmann (1):
ARC: hide unused functionunw_hdr_allocChristophe Leroy (2):
crypto: talitos - move structtalitos_edescintotalitos.h
crypto: talitos - fix hash on SEC1.Cole Rogers (1):
Input: synaptics - enable SMBUS on T480 thinkpad trackpadGreg Kroah-Hartman (1):
Linux 5.2.2Haren Myneni (1):
crypto/NX: Set receive window credits to max number of CRBs in RxFIFOHeiko Carstens (1):
s390: fix stfle zero paddingJames Morse (1):
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDTJiri Slaby (1):
x86/entry/32: Fix ENDPROC ofcommon_spuriousJulian Wiedmann (2):
s390/qdio: (re-)initialize tiqdio list entries s390/qdio: don't touch the dsci intiqdio_add_input_queues()Konstantin Khlebnikov (2):
Revert "e1000e: fix cyclic resets at link up with active tx"
e1000e: start network tx queue only when link is upMasahiro Yamada (1):
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi headerPhilipp Rudo (1):
s390/ipl: Fix detection ofhas_secureattributeSven Van Asbroeck (1):
firmware: improve LSM/IMA security behaviourThomas Gleixner (6):
genirq: Delay deactivation infree_irq()
genirq: Fix misleadingsynchronize_irq()documentation
genirq: Add optional hardware synchronization for shutdown x86/ioapic: Implementirq_get_irqchip_state()callback x86/irq: Handle spurious interrupt after shutdown gracefully x86/irq: Seperate unused system vectors from spurious entry again