Linux 4.9.28
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 27 +SUBLEVEL = 28 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/boot/dts/bcm958522er.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm958525er.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm958525xmc.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 31 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm958622hr.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm958623hr.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm958625hr.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/bcm988312hr.dts +1 -0
@@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; };
arch/arm/boot/dts/qcom-ipq8064.dtsi +2 -2
@@ -65,13 +65,13 @@ cxo_board { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <19200000>; + clock-frequency = <25000000>; }; pxo_board { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <27000000>; + clock-frequency = <25000000>; }; sleep_clk: sleep_clk {
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +1 -1
@@ -167,7 +167,7 @@ reg = <8>; label = "cpu"; ethernet = <&gmac>; - phy-mode = "rgmii"; + phy-mode = "rgmii-txid"; fixed-link { speed = <1000>; full-duplex;
arch/arm/mach-omap2/omap-headsmp.S +2 -1
@@ -17,6 +17,7 @@ #include <linux/linkage.h> #include <linux/init.h> +#include <asm/assembler.h> #include "omap44xx.h"
@@ -66,7 +67,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0 cmp r0, r4 bne wait_2 ldr r12, =API_HYP_ENTRY - adr r0, hyp_boot + badr r0, hyp_boot smc #0 hyp_boot: b omap_secondary_startup
arch/arm64/boot/dts/renesas/r8a7795.dtsi +1 -0
@@ -553,6 +553,7 @@ phy-mode = "rgmii-id"; #address-cells = <1>; #size-cells = <0>; + status = "disabled"; }; can0: can@e6c30000 {
arch/arm64/include/asm/pgtable.h +9 -6
@@ -71,9 +71,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];#define pte_young (pte) (!!(pte_val(pte) & PTE_AF))#define pte_special (pte) (!!(pte_val(pte) & PTE_SPECIAL))#define pte_write (pte) (!!(pte_val(pte) & PTE_WRITE)) -#define pte_exec (pte) (!(pte_val(pte) & PTE_UXN)) +#define pte_user_exec (pte) (!(pte_val(pte) & PTE_UXN))#define pte_cont (pte) (!!(pte_val(pte) & PTE_CONT)) -#define pte_ng (pte) (!!(pte_val(pte) & PTE_NG))#ifdef CONFIG_ARM64_HW_AFDBM #define pte_hw_dirty (pte) (pte_write(pte) && !(pte_val(pte) & PTE_RDONLY))
@@ -84,8 +83,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];#define pte_dirty (pte) (pte_sw_dirty(pte) || pte_hw_dirty(pte))#define pte_valid (pte) (!!(pte_val(pte) & PTE_VALID)) -#define pte_valid_global (pte) \ - ((pte_val(pte) & (PTE_VALID | PTE_NG)) == PTE_VALID) +/* +* Execute-only user mappings do not have the PTE_USER bit set. All valid +* kernel mappings have the PTE_UXN bit set. +*/ +#define pte_valid_not_user (pte) \ + ((pte_val(pte) & (PTE_VALID | PTE_USER | PTE_UXN)) == (PTE_VALID | PTE_UXN))#define pte_valid_young (pte) \ ((pte_val(pte) & (PTE_VALID | PTE_AF)) == (PTE_VALID | PTE_AF))
@@ -178,7 +181,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)* Only if the new pte is valid and kernel, otherwise TLB maintenance * or update_mmu_cache() have the necessary barriers. */ -if (pte_valid_global (pte)) { +if (pte_valid_not_user (pte)) {dsb (ishst);isb (); }
@@ -212,7 +215,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,pte_val (pte) &= ~PTE_RDONLY ; else pte_val(pte) |= PTE_RDONLY; - if (pte_ng(pte) && pte_exec(pte) && !pte_special(pte)) + if (pte_user_exec(pte) && !pte_special(pte)) __sync_icache_dcache(pte, addr); }
arch/arm64/net/bpf_jit_comp.c +4 -4
@@ -779,14 +779,14 @@ static int build_body(struct jit_ctx *ctx)int ret; ret =build_insn (insn, ctx); - -if (ctx->image ==NULL ) - ctx->offset[i] = ctx->idx; -if (ret >0 ) { i++; +if (ctx->image ==NULL ) + ctx->offset[i] = ctx->idx;continue ; } +if (ctx->image ==NULL ) + ctx->offset[i] = ctx->idx;if (ret)return ret; }
arch/mips/kernel/mips-r2-to-r6-emul.c +6 -6
@@ -433,8 +433,8 @@ static int multu_func(struct pt_regs *regs, u32 ir) rs = regs->regs[MIPSInst_RS (ir)]; res = (u64 )rt * (u64 )rs; rt = res; - regs->lo = (s64 )rt; - regs->hi = (s64)(res >>32 ); + regs->lo = (s64 )(s32 )rt; + regs->hi = (s64)(s32)(res >>32 );MIPS_R2_STATS (muls);
@@ -670,9 +670,9 @@ static int maddu_func(struct pt_regs *regs, u32 ir) res += ((((s64 )rt) <<32 ) | (u32 )rs); rt = res; - regs->lo = (s64 )rt; + regs->lo = (s64 )(s32 )rt; rs = res >>32 ; - regs->hi = (s64 )rs; + regs->hi = (s64 )(s32 )rs;MIPS_R2_STATS (dsps);
@@ -728,9 +728,9 @@ static int msubu_func(struct pt_regs *regs, u32 ir) res = ((((s64 )rt) <<32 ) | (u32 )rs) - res; rt = res; - regs->lo = (s64 )rt; + regs->lo = (s64 )(s32 )rt; rs = res >>32 ; - regs->hi = (s64 )rs; + regs->hi = (s64 )(s32 )rs;MIPS_R2_STATS (dsps);
arch/powerpc/Kconfig +2 -2
@@ -388,8 +388,8 @@ config DISABLE_MPROFILE_KERNEL be disabled also. If you have a toolchain which supports mprofile-kernel, then you can - enable this. Otherwise leave it disabled. If you're not sure, say - "N". + disable this. Otherwise leave it enabled. If you're not sure, say + "Y". config MPROFILE_KERNEL depends on PPC64 && CPU_LITTLE_ENDIAN
arch/powerpc/include/asm/reg.h +1 -1
@@ -337,7 +337,7 @@#define LPCR_DPFD_SH 52#define LPCR_DPFD (ASM_CONST(7) << LPCR_DPFD_SH)#define LPCR_VRMASD_SH 47 -#define LPCR_VRMASD (ASM_CONST(1) << LPCR_VRMASD_SH) +#define LPCR_VRMASD (ASM_CONST(0x1f) << LPCR_VRMASD_SH)#define LPCR_VRMA_L ASM_CONST(0x0008000000000000)#define LPCR_VRMA_LP0 ASM_CONST(0x0001000000000000)#define LPCR_VRMA_LP1 ASM_CONST(0x0000800000000000)
arch/powerpc/kernel/Makefile +1 -1
@@ -15,7 +15,7 @@ CFLAGS_btext.o += -fPIC endif CFLAGS_cputable.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) -CFLAGS_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) +CFLAGS_prom_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
arch/powerpc/platforms/powernv/opal-wrappers.S +1 -1
@@ -146,7 +146,7 @@ opal_tracepoint_entry: opal_tracepoint_return: std r3,STK_REG(R31)(r1) mr r4,r3 - ld r0,STK_REG(R23)(r1) + ld r3,STK_REG(R23)(r1) bl __trace_opal_exit ld r3,STK_REG(R31)(r1) addi r1,r1,STACKFRAMESIZE
arch/sparc/kernel/head_64.S +6 -0
@@ -935,3 +935,9 @@ ENTRY(__retl_o1) retl mov %o1, %o0 ENDPROC(__retl_o1) + +ENTRY(__retl_o1_asi) + wr %o5, 0x0, %asi + retl + mov %o1, %o0 +ENDPROC(__retl_o1_asi)
arch/sparc/lib/GENbzero.S +1 -1
@@ -8,7 +8,7 @@ 98: x,y; \ .section __ex_table,"a";\ .align 4; \ - .word 98b, __retl_o1; \ + .word 98b, __retl_o1_asi;\ .text; \ .align 4;
arch/sparc/lib/NGbzero.S +1 -1
@@ -8,7 +8,7 @@ 98: x,y; \ .section __ex_table,"a";\ .align 4; \ - .word 98b, __retl_o1; \ + .word 98b, __retl_o1_asi;\ .text; \ .align 4;
arch/x86/events/intel/pt.c +6 -0
@@ -106,18 +106,24 @@ static struct attribute_group pt_cap_group = { };PMU_FORMAT_ATTR (cyc,"config:1" ); +PMU_FORMAT_ATTR (pwr_evt,"config:4" ); +PMU_FORMAT_ATTR (fup_on_ptw,"config:5" );PMU_FORMAT_ATTR (mtc,"config:9" );PMU_FORMAT_ATTR (tsc,"config:10" );PMU_FORMAT_ATTR (noretcomp,"config:11" ); +PMU_FORMAT_ATTR (ptw,"config:12" );PMU_FORMAT_ATTR (mtc_period,"config:14-17" );PMU_FORMAT_ATTR (cyc_thresh,"config:19-22" );PMU_FORMAT_ATTR (psb_period,"config:24-27" );static struct attribute *pt_formats_attr[] = { &format_attr_cyc.attr, + &format_attr_pwr_evt.attr, + &format_attr_fup_on_ptw.attr, &format_attr_mtc.attr, &format_attr_tsc.attr, &format_attr_noretcomp.attr, + &format_attr_ptw.attr, &format_attr_mtc_period.attr, &format_attr_cyc_thresh.attr, &format_attr_psb_period.attr,
arch/x86/include/asm/xen/events.h +11 -0
@@ -20,4 +20,15 @@ static inline int xen_irqs_disabled(struct pt_regs *regs)/* No need for a barrier -- XCHG is a barrier on x86. */ #define xchg_xen_ulong (ptr, val) xchg((ptr), (val)) +extern int xen_have_vector_callback; + +/* +* Events delivered via platform PCI interrupts are always +* routed to vcpu 0 and hence cannot be rebound. +*/ +static inline bool xen_support_evtchn_rebind (void ) +{ +return (!xen_hvm_domain () || xen_have_vector_callback); +} +#endif /* _ASM_X86_XEN_EVENTS_H */
arch/x86/kernel/apic/io_apic.c +2 -0
@@ -1876,6 +1876,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, + .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
@@ -1887,6 +1888,7 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, + .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
arch/x86/kernel/kprobes/common.h +1 -1
@@ -67,7 +67,7 @@#endif /* Ensure if the instruction can be boostable */ -extern int can_boost (kprobe_opcode_t *instruction); +extern int can_boost (kprobe_opcode_t *instruction,void *addr);/* Recover instruction if given address is probed */ extern unsigned long recover_probed_instruction (kprobe_opcode_t *buf,unsigned long addr);
arch/x86/kernel/kprobes/core.c +3 -3
@@ -166,12 +166,12 @@ NOKPROBE_SYMBOL(skip_prefixes);* Returns non-zero if opcode is boostable. * RIP relative instructions are adjusted at copying time in 64 bits mode */ -int can_boost (kprobe_opcode_t *opcodes) +int can_boost (kprobe_opcode_t *opcodes,void *addr) {kprobe_opcode_t opcode;kprobe_opcode_t *orig_opcodes = opcodes; -if (search_exception_tables ((unsigned long )opcodes)) +if (search_exception_tables ((unsigned long )addr))return 0 ;/* Page fault may occur on this address. */ retry:
@@ -416,7 +416,7 @@ static int arch_copy_kprobe(struct kprobe *p)* __copy_instruction can modify the displacement of the instruction, * but it doesn't affect boostable check. */ -if (can_boost (p->ainsn.insn)) +if (can_boost (p->ainsn.insn, p->addr)) p->ainsn.boostable =0 ;else p->ainsn.boostable =-1 ;
arch/x86/kernel/kprobes/opt.c +1 -1
@@ -178,7 +178,7 @@ static int copy_optimized_instructions(u8 *dest, u8 *src)while (len <RELATIVEJUMP_SIZE ) { ret =__copy_instruction (dest + len, src + len); -if (!ret || !can_boost (dest + len)) +if (!ret || !can_boost (dest + len, src + len))return -EINVAL ; len += ret; }
arch/x86/kernel/pci-calgary_64.c +1 -1
@@ -296,7 +296,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,/* were we called with bad_dma_address? */ badend =DMA_ERROR_CODE + (EMERGENCY_PAGES *PAGE_SIZE ); -if (unlikely ((dma_addr >=DMA_ERROR_CODE ) && (dma_addr < badend))) { +if (unlikely (dma_addr < badend)) {WARN (1 ,KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n" , dma_addr);return ;
arch/x86/kvm/cpuid.c +0 -6
@@ -846,12 +846,6 @@ void kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)if (!best) best =check_cpuid_limit (vcpu, function, index); -/* -* Perfmon not yet supported for L2 guest. -*/ -if (is_guest_mode (vcpu) && function ==0xa ) - best =NULL ; -if (best) { *eax = best->eax; *ebx = best->ebx;
arch/x86/kvm/vmx.c +15 -2
@@ -8051,8 +8051,6 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)case EXIT_REASON_TASK_SWITCH :return true;case EXIT_REASON_CPUID : -if (kvm_register_read (vcpu,VCPU_REGS_RAX ) ==0xa ) -return false;return true;case EXIT_REASON_HLT :return nested_cpu_has (vmcs12,CPU_BASED_HLT_EXITING );
@@ -8137,6 +8135,9 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)return nested_cpu_has2 (vmcs12,SECONDARY_EXEC_XSAVES );case EXIT_REASON_PREEMPTION_TIMER :return false; +case EXIT_REASON_PML_FULL : +/* We don't expose PML support to L1. */ +return false;default :return true; }
@@ -10073,6 +10074,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) } +if (enable_pml) { +/* +* Conceptually we want to copy the PML address and index from +* vmcs01 here, and then back to vmcs01 on nested vmexit. But, +* since we always flush the log on each vmexit, this happens +* to be equivalent to simply resetting the fields in vmcs02. +*/ +ASSERT (vmx->pml_pg); +vmcs_write64 (PML_ADDRESS ,page_to_phys (vmx->pml_pg)); +vmcs_write16 (GUEST_PML_INDEX ,PML_ENTITY_NUM -1 ); + } +if (nested_cpu_has_ept (vmcs12)) {kvm_mmu_unload (vcpu);nested_ept_init_mmu_context (vcpu);
arch/x86/pci/xen.c +1 -1
@@ -447,7 +447,7 @@ void __init xen_msi_init(void)int __init pci_xen_hvm_init (void ) { -if (!xen_feature (XENFEAT_hvm_pirqs)) +if (!xen_have_vector_callback || !xen_feature (XENFEAT_hvm_pirqs))return 0 ;#ifdef CONFIG_ACPI
arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c +1 -1
@@ -19,7 +19,7 @@#include <asm/intel_scu_ipc.h> #include <asm/io_apic.h> -#define TANGIER_EXT_TIMER0_MSI 15 +#define TANGIER_EXT_TIMER0_MSI 12static struct platform_device wdt_dev = { .name ="intel_mid_wdt" ,
arch/x86/xen/enlighten.c +15 -6
@@ -137,6 +137,8 @@ struct shared_info xen_dummy_shared_info;void *xen_initial_gdt;RESERVE_BRK (shared_info_page_brk,PAGE_SIZE ); +__read_mostly int xen_have_vector_callback; +EXPORT_SYMBOL_GPL (xen_have_vector_callback);static int xen_cpu_up_prepare (unsigned int cpu);static int xen_cpu_up_online (unsigned int cpu);
@@ -1521,7 +1523,10 @@ static void __init xen_pvh_early_guest_init(void)if (!xen_feature (XENFEAT_auto_translated_physmap))return ; -BUG_ON (!xen_feature (XENFEAT_hvm_callback_vector)); +if (!xen_feature (XENFEAT_hvm_callback_vector)) +return ; + + xen_have_vector_callback =1 ;xen_pvh_early_cpu_init (0 , false);xen_pvh_set_cr_flags (0 );
@@ -1860,7 +1865,9 @@ static int xen_cpu_up_prepare(unsigned int cpu)xen_vcpu_setup (cpu); } -if (xen_pv_domain () ||xen_feature (XENFEAT_hvm_safe_pvclock)) +if (xen_pv_domain () || + (xen_have_vector_callback && +xen_feature (XENFEAT_hvm_safe_pvclock)))xen_setup_timer (cpu); rc =xen_smp_intr_init (cpu);
@@ -1876,7 +1883,9 @@ static int xen_cpu_dead(unsigned int cpu) {xen_smp_intr_free (cpu); -if (xen_pv_domain () ||xen_feature (XENFEAT_hvm_safe_pvclock)) +if (xen_pv_domain () || + (xen_have_vector_callback && +xen_feature (XENFEAT_hvm_safe_pvclock)))xen_teardown_timer (cpu);return 0 ;
@@ -1915,8 +1924,8 @@ static void __init xen_hvm_guest_init(void)xen_panic_handler_init (); -BUG_ON (!xen_feature (XENFEAT_hvm_callback_vector)); - +if (xen_feature (XENFEAT_hvm_callback_vector)) + xen_have_vector_callback =1 ;xen_hvm_smp_init ();WARN_ON (xen_cpuhp_setup ());xen_unplug_emulated_devices ();
@@ -1954,7 +1963,7 @@ bool xen_hvm_need_lapic(void)return false;if (!xen_hvm_domain ())return false; -if (xen_feature (XENFEAT_hvm_pirqs)) +if (xen_feature (XENFEAT_hvm_pirqs) && xen_have_vector_callback)return false;return true; }
arch/x86/xen/smp.c +2 -0
@@ -765,6 +765,8 @@ static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus)void __init xen_hvm_smp_init (void ) { +if (!xen_have_vector_callback) +return ; smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus; smp_ops.smp_send_reschedule = xen_smp_send_reschedule; smp_ops.cpu_die = xen_cpu_die;
arch/x86/xen/time.c +5 -0
@@ -432,6 +432,11 @@ static void xen_hvm_setup_cpu_clockevents(void)void __init xen_hvm_init_time_ops (void ) { +/* vector callback is needed otherwise we cannot receive interrupts +* on cpu > 0 and at this point we don't know how many cpus are +* available */ +if (!xen_have_vector_callback) +return ;if (!xen_feature (XENFEAT_hvm_safe_pvclock)) {printk (KERN_INFO "Xen doesn't support pvclock on HVM," "disable pv timer\n" );
block/blk-integrity.c +2 -17
@@ -417,7 +417,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template bi->tuple_size = template->tuple_size; bi->tag_size = template->tag_size; -blk_integrity_revalidate (disk); + disk->queue->backing_dev_info.capabilities |=BDI_CAP_STABLE_WRITES ; }EXPORT_SYMBOL (blk_integrity_register);
@@ -430,26 +430,11 @@ EXPORT_SYMBOL(blk_integrity_register);*/ void blk_integrity_unregister (struct gendisk *disk) { -blk_integrity_revalidate (disk); + disk->queue->backing_dev_info.capabilities &= ~BDI_CAP_STABLE_WRITES ;memset (&disk->queue->integrity,0 ,sizeof (struct blk_integrity )); }EXPORT_SYMBOL (blk_integrity_unregister); -void blk_integrity_revalidate (struct gendisk *disk) -{ -struct blk_integrity *bi = &disk->queue->integrity; - -if (!(disk->flags &GENHD_FL_UP )) -return ; - -if (bi->profile) - disk->queue->backing_dev_info.capabilities |= -BDI_CAP_STABLE_WRITES ; -else - disk->queue->backing_dev_info.capabilities &= - ~BDI_CAP_STABLE_WRITES ; -} -void blk_integrity_add (struct gendisk *disk) { if (kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
block/partition-generic.c +0 -1
@@ -447,7 +447,6 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)if (disk->fops->revalidate_disk) disk->fops->revalidate_disk (disk); -blk_integrity_revalidate (disk);check_disk_size_change (disk, bdev); bdev->bd_invalidated =0 ;if (!get_capacity (disk) || !(state =check_partition (disk, bdev)))
drivers/char/tpm/tpm-chip.c +4 -4
@@ -140,7 +140,7 @@ static void tpm_dev_release(struct device *dev)* Allocates a new struct tpm_chip instance and assigns a free * device number for it. Must be paired with put_device(&chip->dev). */ -struct tpm_chip *tpm_chip_alloc (struct device *dev, +struct tpm_chip *tpm_chip_alloc (struct device *pdev,const struct tpm_class_ops *ops) {struct tpm_chip *chip;
@@ -159,7 +159,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, rc =idr_alloc (&dev_nums_idr,NULL ,0 ,TPM_NUM_DEVICES ,GFP_KERNEL );mutex_unlock (&idr_lock);if (rc <0 ) { -dev_err (dev,"No available tpm device numbers\n" ); +dev_err (pdev,"No available tpm device numbers\n" );kfree (chip);return ERR_PTR (rc); }
@@ -169,7 +169,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, chip->dev.class = tpm_class; chip->dev.release = tpm_dev_release; - chip->dev.parent = dev; + chip->dev.parent = pdev; chip->dev.groups = chip->groups;if (chip->dev_num ==0 )
@@ -181,7 +181,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev,if (rc) goto out; -if (!dev) +if (!pdev) chip->flags |=TPM_CHIP_FLAG_VIRTUAL ;cdev_init (&chip->cdev, &tpm_fops);
drivers/char/tpm/tpm.h +5 -0
@@ -518,6 +518,11 @@ static inline void tpm_add_ppi(struct tpm_chip *chip) }#endif +static inline inline u32 tpm2_rc_value (u32 rc) +{ +return (rc &BIT (7 )) ? rc &0xff : rc; +} +int tpm2_pcr_read (struct tpm_chip *chip,int pcr_idx,u8 *res_buf);int tpm2_pcr_extend (struct tpm_chip *chip,int pcr_idx,const u8 *hash);int tpm2_get_random (struct tpm_chip *chip,u8 *out,size_t max);
drivers/char/tpm/tpm2-cmd.c +1 -1
@@ -529,7 +529,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip,tpm_buf_destroy (&buf);if (rc >0 ) { -if ((rc &TPM2_RC_HASH ) ==TPM2_RC_HASH ) +if (tpm2_rc_value (rc) ==TPM2_RC_HASH ) rc = -EINVAL ;else rc = -EPERM ;
drivers/clk/Makefile +2 -0
@@ -87,6 +87,8 @@ obj-y += ti/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ +ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_X86) += x86/ +endif obj-$(CONFIG_ARCH_ZX) += zte/ obj-$(CONFIG_ARCH_ZYNQ) += zynq/
drivers/clk/rockchip/clk-rk3036.c +1 -1
@@ -127,7 +127,7 @@ PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" };PNAME (mux_pll_src_3plls_p) = {"apll" ,"dpll" ,"gpll" };PNAME (mux_timer_p) = {"xin24m" ,"pclk_peri_src" }; -PNAME (mux_pll_src_apll_dpll_gpll_usb480m_p) = {"apll" ,"dpll" ,"gpll" "usb480m" }; +PNAME (mux_pll_src_apll_dpll_gpll_usb480m_p) = {"apll" ,"dpll" ,"gpll" ,"usb480m" };PNAME (mux_mmc_src_p) = {"apll" ,"dpll" ,"gpll" ,"xin24m" };PNAME (mux_i2s_pre_p) = {"i2s_src" ,"i2s_frac" ,"ext_i2s" ,"xin12m" };
drivers/crypto/caam/caamhash.c +6 -1
@@ -154,6 +154,7 @@ static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev, ctx_len, DMA_FROM_DEVICE);if (dma_mapping_error (jrdev, state->ctx_dma)) {dev_err (jrdev,"unable to map ctx\n" ); + state->ctx_dma =0 ;return -ENOMEM ; }
@@ -214,6 +215,7 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev, state->ctx_dma =dma_map_single (jrdev, state->caam_ctx, ctx_len, flag);if (dma_mapping_error (jrdev, state->ctx_dma)) {dev_err (jrdev,"unable to map ctx\n" ); + state->ctx_dma =0 ;return -ENOMEM ; }
@@ -620,8 +622,10 @@ static inline void ahash_unmap_ctx(struct device *dev,struct caam_hash_ctx *ctx =crypto_ahash_ctx (ahash);struct caam_hash_state *state =ahash_request_ctx (req); -if (state->ctx_dma) +if (state->ctx_dma) {dma_unmap_single (dev, state->ctx_dma, ctx->ctx_len, flag); + state->ctx_dma =0 ; + }ahash_unmap (dev, edesc, req, dst_len); }
@@ -1605,6 +1609,7 @@ static int ahash_init(struct ahash_request *req) state->finup = ahash_finup_first; state->final = ahash_final_no_ctx; + state->ctx_dma =0 ; state->current_buf =0 ; state->buf_dma =0 ; state->buflen_0 =0 ;
drivers/gpu/drm/sti/sti_gdp.c +7 -5
@@ -66,7 +66,9 @@ static struct gdp_format_to_str {#define GAM_GDP_ALPHARANGE_255 BIT(5)#define GAM_GDP_AGC_FULL_RANGE 0x00808080#define GAM_GDP_PPT_IGNORE (BIT(1) | BIT(0)) -#define GAM_GDP_SIZE_MAX 0x7FF + +#define GAM_GDP_SIZE_MAX_WIDTH 3840 +#define GAM_GDP_SIZE_MAX_HEIGHT 2160#define GDP_NODE_NB_BANK 2#define GDP_NODE_PER_FIELD 2
@@ -633,8 +635,8 @@ static int sti_gdp_atomic_check(struct drm_plane *drm_plane,/* src_x are in 16.16 format */ src_x = state->src_x >>16 ; src_y = state->src_y >>16 ; - src_w =clamp_val (state->src_w >>16 ,0 ,GAM_GDP_SIZE_MAX ); - src_h =clamp_val (state->src_h >>16 ,0 ,GAM_GDP_SIZE_MAX ); + src_w =clamp_val (state->src_w >>16 ,0 ,GAM_GDP_SIZE_MAX_WIDTH ); + src_h =clamp_val (state->src_h >>16 ,0 ,GAM_GDP_SIZE_MAX_HEIGHT ); format =sti_gdp_fourcc2format (fb->pixel_format);if (format ==-1 ) {
@@ -732,8 +734,8 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane,/* src_x are in 16.16 format */ src_x = state->src_x >>16 ; src_y = state->src_y >>16 ; - src_w =clamp_val (state->src_w >>16 ,0 ,GAM_GDP_SIZE_MAX ); - src_h =clamp_val (state->src_h >>16 ,0 ,GAM_GDP_SIZE_MAX ); + src_w =clamp_val (state->src_w >>16 ,0 ,GAM_GDP_SIZE_MAX_WIDTH ); + src_h =clamp_val (state->src_h >>16 ,0 ,GAM_GDP_SIZE_MAX_HEIGHT ); list =sti_gdp_get_free_nodes (gdp); top_field = list->top_field;
drivers/gpu/drm/ttm/ttm_bo_vm.c +12 -0
@@ -66,8 +66,11 @@ static int ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,if (vmf->flags &FAULT_FLAG_RETRY_NOWAIT ) goto out_unlock; +ttm_bo_reference (bo);up_read (&vma->vm_mm->mmap_sem); (void )fence_wait (bo->moving, true); +ttm_bo_unreserve (bo); +ttm_bo_unref (&bo); goto out_unlock; }
@@ -120,8 +123,10 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)if (vmf->flags &FAULT_FLAG_ALLOW_RETRY ) {if (!(vmf->flags &FAULT_FLAG_RETRY_NOWAIT )) { +ttm_bo_reference (bo);up_read (&vma->vm_mm->mmap_sem); (void )ttm_bo_wait_unreserved (bo); +ttm_bo_unref (&bo); }return VM_FAULT_RETRY ;
@@ -166,6 +171,13 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ret =ttm_bo_vm_fault_idle (bo, vma, vmf);if (unlikely (ret !=0 )) { retval = ret; + +if (retval ==VM_FAULT_RETRY && + !(vmf->flags &FAULT_FLAG_RETRY_NOWAIT )) { +/* The BO has already been unreserved. */ +return retval; + } + goto out_unlock; }
drivers/hwmon/it87.c +1 -1
@@ -2600,7 +2600,7 @@ static int __init it87_find(int sioaddr, unsigned short *address,/* Check for pwm4 */ reg =superio_inb (sioaddr,IT87_SIO_GPIO4_REG ); -if (!(reg &BIT (2 ))) +if (reg &BIT (2 )) sio_data->skip_pwm |=BIT (3 );/* Check for pwm2, fan2 */
drivers/leds/leds-ktd2692.c +4 -4
@@ -270,15 +270,15 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,return -ENXIO ; led->ctrl_gpio =devm_gpiod_get (dev,"ctrl" ,GPIOD_ASIS ); -if (IS_ERR (led->ctrl_gpio)) { - ret =PTR_ERR (led->ctrl_gpio); + ret =PTR_ERR_OR_ZERO (led->ctrl_gpio); +if (ret) {dev_err (dev,"cannot get ctrl-gpios %d\n" , ret);return ret; } led->aux_gpio =devm_gpiod_get (dev,"aux" ,GPIOD_ASIS ); -if (IS_ERR (led->aux_gpio)) { - ret =PTR_ERR (led->aux_gpio); + ret =PTR_ERR_OR_ZERO (led->aux_gpio); +if (ret) {dev_err (dev,"cannot get aux-gpios %d\n" , ret);return ret; }
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -1
@@ -2867,7 +2867,8 @@ static int bnxt_alloc_ntp_fltrs(struct bnxt *bp)INIT_HLIST_HEAD (&bp->ntp_fltr_hash_tbl[i]); bp->ntp_fltr_count =0 ; - bp->ntp_fltr_bmap =kzalloc (BITS_TO_LONGS (BNXT_NTP_FLTR_MAX_FLTR ), + bp->ntp_fltr_bmap =kcalloc (BITS_TO_LONGS (BNXT_NTP_FLTR_MAX_FLTR ), +sizeof (long ),GFP_KERNEL );if (!bp->ntp_fltr_bmap)
drivers/net/macsec.c +22 -7
@@ -617,7 +617,8 @@ static void macsec_encrypt_done(struct crypto_async_request *base, int err)static struct aead_request *macsec_alloc_req (struct crypto_aead *tfm,unsigned char **iv, -struct scatterlist **sg) +struct scatterlist **sg, +int num_frags) {size_t size, iv_offset, sg_offset;struct aead_request *req;
@@ -629,7 +630,7 @@ static struct aead_request *macsec_alloc_req(struct crypto_aead *tfm, size =ALIGN (size, __alignof__(struct scatterlist )); sg_offset = size; - size +=sizeof (struct scatterlist ) * (MAX_SKB_FRAGS +1 ); + size +=sizeof (struct scatterlist ) * num_frags; tmp =kmalloc (size,GFP_ATOMIC );if (!tmp)
@@ -649,6 +650,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, {int ret;struct scatterlist *sg; +struct sk_buff *trailer;unsigned char *iv;struct ethhdr *eth;struct macsec_eth_header *hh;
@@ -723,7 +725,14 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,return ERR_PTR (-EINVAL ); } - req =macsec_alloc_req (tx_sa->key.tfm, &iv, &sg); + ret =skb_cow_data (skb,0 , &trailer); +if (unlikely (ret <0 )) { +macsec_txsa_put (tx_sa); +kfree_skb (skb); +return ERR_PTR (ret); + } + + req =macsec_alloc_req (tx_sa->key.tfm, &iv, &sg, ret);if (!req) {macsec_txsa_put (tx_sa);kfree_skb (skb);
@@ -732,7 +741,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,macsec_fill_iv (iv, secy->sci, pn); -sg_init_table (sg,MAX_SKB_FRAGS +1 ); +sg_init_table (sg, ret);skb_to_sgvec (skb, sg,0 , skb->len);if (tx_sc->encrypt) {
@@ -914,6 +923,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, {int ret;struct scatterlist *sg; +struct sk_buff *trailer;unsigned char *iv;struct aead_request *req;struct macsec_eth_header *hdr;
@@ -924,7 +934,12 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,if (!skb)return ERR_PTR (-ENOMEM ); - req =macsec_alloc_req (rx_sa->key.tfm, &iv, &sg); + ret =skb_cow_data (skb,0 , &trailer); +if (unlikely (ret <0 )) { +kfree_skb (skb); +return ERR_PTR (ret); + } + req =macsec_alloc_req (rx_sa->key.tfm, &iv, &sg, ret);if (!req) {kfree_skb (skb);return ERR_PTR (-ENOMEM );
@@ -933,7 +948,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, hdr = (struct macsec_eth_header *)skb->data;macsec_fill_iv (iv, sci,ntohl (hdr->packet_number)); -sg_init_table (sg,MAX_SKB_FRAGS +1 ); +sg_init_table (sg, ret);skb_to_sgvec (skb, sg,0 , skb->len);if (hdr->tci_an &MACSEC_TCI_E ) {
@@ -2709,7 +2724,7 @@ static netdev_tx_t macsec_start_xmit(struct sk_buff *skb, }#define MACSEC_FEATURES \ - (NETIF_F_SG | NETIF_F_HIGHDMA) + (NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST)static struct lock_class_key macsec_netdev_addr_lock_key;static int macsec_dev_init (struct net_device *dev)
drivers/net/phy/mdio-mux-bcm-iproc.c +4 -1
@@ -203,11 +203,14 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) &md->mux_handle, md, md->mii_bus);if (rc) {dev_info (md->dev,"mdiomux initialization failed\n" ); - goto out; + goto out_register; }dev_info (md->dev,"iProc mdiomux registered\n" );return 0 ; + +out_register: +mdiobus_unregister (bus); out:mdiobus_free (bus);return rc;
drivers/net/usb/qmi_wwan.c +1 -0
@@ -902,6 +902,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */ + {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)}, /* Telit ME910 */ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +8 -15
@@ -198,7 +198,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,int ret;struct brcmf_if *ifp =netdev_priv (ndev);struct brcmf_pub *drvr = ifp->drvr; -struct ethhdr *eh = (struct ethhdr *)(skb->data); +struct ethhdr *eh;brcmf_dbg (DATA ,"Enter, bsscfgidx=%d\n" , ifp->bsscfgidx);
@@ -211,22 +211,13 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, goto done; } -/* Make sure there's enough room for any header */ -if (skb_headroom (skb) < drvr->hdrlen) { -struct sk_buff *skb2; - -brcmf_dbg (INFO ,"%s: insufficient headroom\n" , +/* Make sure there's enough writable headroom*/ + ret =skb_cow_head (skb, drvr->hdrlen); +if (ret <0 ) { +brcmf_err ("%s: skb_cow_head failed\n" ,brcmf_ifname (ifp)); - drvr->bus_if->tx_realloc++; - skb2 =skb_realloc_headroom (skb, drvr->hdrlen);dev_kfree_skb (skb); - skb = skb2; -if (skb ==NULL ) { -brcmf_err ("%s: skb_realloc_headroom failed\n" , -brcmf_ifname (ifp)); - ret = -ENOMEM ; - goto done; - } + goto done; }/* validate length for ether packet */
@@ -236,6 +227,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, goto done; } + eh = (struct ethhdr *)(skb->data); +if (eh->h_proto ==htons (ETH_P_PAE ))atomic_inc (&ifp->pend_8021x_cnt);
drivers/net/wireless/intel/iwlwifi/iwl-6000.c +1 -1
@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = {MODULE_FIRMWARE (IWL6000_MODULE_FIRMWARE (IWL6000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL6050_MODULE_FIRMWARE (IWL6050_UCODE_API_MAX ));MODULE_FIRMWARE (IWL6005_MODULE_FIRMWARE (IWL6000G2_UCODE_API_MAX )); -MODULE_FIRMWARE (IWL6030_MODULE_FIRMWARE (IWL6000G2B_UCODE_API_MAX )); +MODULE_FIRMWARE (IWL6030_MODULE_FIRMWARE (IWL6000G2_UCODE_API_MAX ));
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +8 -5
@@ -1262,12 +1262,15 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,iwl_trans_d3_suspend (mvm->trans, test, !unified_image); out:if (ret <0 ) { -iwl_mvm_ref (mvm,IWL_MVM_REF_UCODE_DOWN ); -if (mvm->restart_fw >0 ) { - mvm->restart_fw--; -ieee80211_restart_hw (mvm->hw); - }iwl_mvm_free_nd (mvm); + +if (!unified_image) { +iwl_mvm_ref (mvm,IWL_MVM_REF_UCODE_DOWN ); +if (mvm->restart_fw >0 ) { + mvm->restart_fw--; +ieee80211_restart_hw (mvm->hw); + } + } } out_noreset:mutex_unlock (&mvm->mutex);
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +2 -0
@@ -1056,6 +1056,8 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,if (ret)return ret; +if (count ==0 ) +return 0 ;iwl_mvm_fw_dbg_collect (mvm,FW_DBG_TRIGGER_USER , buf, (count -1 ),NULL );
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +4 -0
@@ -784,12 +784,16 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)struct iwl_fw_error_dump_paging *paging;struct page *pages = mvm->fw_paging_db[i].fw_paging_block; +dma_addr_t addr = mvm->fw_paging_db[i].fw_paging_phys; dump_data->type =cpu_to_le32 (IWL_FW_ERROR_DUMP_PAGING ); dump_data->len =cpu_to_le32 (sizeof (*paging) +PAGING_BLOCK_SIZE ); paging = (void *)dump_data->data; paging->index =cpu_to_le32 (i); +dma_sync_single_for_cpu (mvm->trans->dev, addr, +PAGING_BLOCK_SIZE , +DMA_BIDIRECTIONAL );memcpy (paging->data,page_address (pages),PAGING_BLOCK_SIZE ); dump_data =iwl_fw_error_next_data (dump_data);
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +20 -3
@@ -214,6 +214,10 @@ static int iwl_fill_paging_mem(struct iwl_mvm *mvm, const struct fw_img *image)memcpy (page_address (mvm->fw_paging_db[0 ].fw_paging_block), image->sec[sec_idx].data, mvm->fw_paging_db[0 ].fw_paging_size); +dma_sync_single_for_device (mvm->trans->dev, + mvm->fw_paging_db[0 ].fw_paging_phys, + mvm->fw_paging_db[0 ].fw_paging_size, +DMA_BIDIRECTIONAL ); IWL_DEBUG_FW(mvm, "Paging: copied %d CSS bytes to first block\n",
@@ -228,9 +232,16 @@ static int iwl_fill_paging_mem(struct iwl_mvm *mvm, const struct fw_img *image)* loop stop at num_of_paging_blk since that last block is not full. */ for (idx =1 ; idx < mvm->num_of_paging_blk; idx++) { -memcpy (page_address (mvm->fw_paging_db[idx].fw_paging_block), +struct iwl_fw_paging *block = &mvm->fw_paging_db[idx]; + +memcpy (page_address (block->fw_paging_block), image->sec[sec_idx].data + offset, - mvm->fw_paging_db[idx].fw_paging_size); + block->fw_paging_size); +dma_sync_single_for_device (mvm->trans->dev, + block->fw_paging_phys, + block->fw_paging_size, +DMA_BIDIRECTIONAL ); + IWL_DEBUG_FW(mvm, "Paging: copied %d paging bytes to block %d\n",
@@ -242,9 +253,15 @@ static int iwl_fill_paging_mem(struct iwl_mvm *mvm, const struct fw_img *image)/* copy the last paging block */ if (mvm->num_of_pages_in_last_blk >0 ) { -memcpy (page_address (mvm->fw_paging_db[idx].fw_paging_block), +struct iwl_fw_paging *block = &mvm->fw_paging_db[idx]; + +memcpy (page_address (block->fw_paging_block), image->sec[sec_idx].data + offset,FW_PAGING_SIZE * mvm->num_of_pages_in_last_blk); +dma_sync_single_for_device (mvm->trans->dev, + block->fw_paging_phys, + block->fw_paging_size, +DMA_BIDIRECTIONAL ); IWL_DEBUG_FW(mvm, "Paging: copied %d pages in the last block %d\n",
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +2 -1
@@ -409,7 +409,7 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm,/* ignore nssn smaller than head sn - this can happen due to timeout */ if (iwl_mvm_is_sn_less (nssn, ssn, reorder_buf->buf_size)) -return ; + goto set_timer;while (iwl_mvm_is_sn_less (ssn, nssn, reorder_buf->buf_size)) {int index = ssn % reorder_buf->buf_size;
@@ -432,6 +432,7 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm, } reorder_buf->head_sn = nssn; +set_timer:if (reorder_buf->num_stored && !reorder_buf->removed) {u16 index = reorder_buf->head_sn % reorder_buf->buf_size;
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +20 -11
@@ -1466,6 +1466,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif);struct iwl_mvm_sta *mvm_sta =iwl_mvm_sta_from_mac80211 (sta); +u8 sta_id = mvm_sta->sta_id;int ret;lockdep_assert_held (&mvm->mutex);
@@ -1474,7 +1475,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,kfree (mvm_sta->dup_data);if ((vif->type ==NL80211_IFTYPE_STATION && - mvmvif->ap_sta_id == mvm_sta->sta_id) || + mvmvif->ap_sta_id == sta_id) ||iwl_mvm_is_dqa_supported (mvm)){ ret =iwl_mvm_drain_sta (mvm, mvm_sta, true);if (ret)
@@ -1497,6 +1498,15 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,iwl_mvm_disable_sta_queues (mvm, vif, mvm_sta);/* +* If pending_frames is set at this point - it must be +* driver internal logic error, since queues are empty +* and removed successuly. +* warn on it but set it to 0 anyway to avoid station +* not being removed later in the function +*/ +WARN_ON (atomic_xchg (&mvm->pending_frames[sta_id],0 )); + +/* * If no traffic has gone through the reserved TXQ - it * is still marked as IWL_MVM_QUEUE_RESERVED, and * should be manually marked as free again
@@ -1506,7 +1516,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,if (WARN ((*status !=IWL_MVM_QUEUE_RESERVED ) && (*status !=IWL_MVM_QUEUE_FREE ),"sta_id %d reserved txq %d status %d" , - mvm_sta->sta_id, reserved_txq, *status)) { + sta_id, reserved_txq, *status)) {spin_unlock_bh (&mvm->queue_info_lock);return -EINVAL ; }
@@ -1516,7 +1526,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, }if (vif->type ==NL80211_IFTYPE_STATION && - mvmvif->ap_sta_id == mvm_sta->sta_id) { + mvmvif->ap_sta_id == sta_id) {/* if associated - we can't remove the AP STA now */ if (vif->bss_conf.assoc)return ret;
@@ -1525,7 +1535,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, mvmvif->ap_sta_id =IWL_MVM_STATION_COUNT ;/* clear d0i3_ap_sta_id if no longer relevant */ -if (mvm->d0i3_ap_sta_id == mvm_sta->sta_id) +if (mvm->d0i3_ap_sta_id == sta_id) mvm->d0i3_ap_sta_id =IWL_MVM_STATION_COUNT ; } }
@@ -1534,7 +1544,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,* This shouldn't happen - the TDLS channel switch should be canceled * before the STA is removed. */ -if (WARN_ON_ONCE (mvm->tdls_cs.peer.sta_id == mvm_sta->sta_id)) { +if (WARN_ON_ONCE (mvm->tdls_cs.peer.sta_id == sta_id)) { mvm->tdls_cs.peer.sta_id =IWL_MVM_STATION_COUNT ;cancel_delayed_work (&mvm->tdls_cs.dwork); }
@@ -1544,21 +1554,20 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,* calls the drain worker. */ spin_lock_bh (&mvm_sta->lock); +/* * There are frames pending on the AC queues for this station. * We need to wait until all the frames are drained... */ -if (atomic_read (&mvm->pending_frames[mvm_sta->sta_id])) { -rcu_assign_pointer (mvm->fw_id_to_mac_id[mvm_sta->sta_id], +if (atomic_read (&mvm->pending_frames[sta_id])) { +rcu_assign_pointer (mvm->fw_id_to_mac_id[sta_id],ERR_PTR (-EBUSY ));spin_unlock_bh (&mvm_sta->lock);/* disable TDLS sta queues on drain complete */ if (sta->tdls) { - mvm->tfd_drained[mvm_sta->sta_id] = - mvm_sta->tfd_queue_msk; -IWL_DEBUG_TDLS (mvm,"Draining TDLS sta %d\n" , - mvm_sta->sta_id); + mvm->tfd_drained[sta_id] = mvm_sta->tfd_queue_msk; +IWL_DEBUG_TDLS (mvm,"Draining TDLS sta %d\n" , sta_id); } ret =iwl_mvm_drain_sta (mvm, mvm_sta, true);
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +31 -49
200 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +1 -1
@@ -279,7 +279,7 @@ struct iwl_txq {bool frozen;u8 active;bool ampdu; -bool block; +int block;unsigned long wd_timeout;struct sk_buff_head overflow_q;
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +4 -12
@@ -868,17 +868,13 @@ static int iwl_pcie_load_cpu_sections(struct iwl_trans *trans,int cpu, int *first_ucode_section) { - int shift_param; int i, ret = 0;u32 last_read_idx =0 ; -if (cpu ==1 ) { - shift_param =0 ; +if (cpu ==1 ) *first_ucode_section =0 ; - }else { - shift_param =16 ; +else (*first_ucode_section)++; - }for (i = *first_ucode_section; i <IWL_UCODE_SECTION_MAX ; i++) { last_read_idx = i;
@@ -2933,16 +2929,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, PCIE_LINK_STATE_CLKPM); } -if (cfg->mq_rx_supported) - addr_size =64 ; -else - addr_size =36 ; -if (cfg->use_tfh) { + addr_size =64 ; trans_pcie->max_tbs =IWL_TFH_NUM_TBS ; trans_pcie->tfd_size =sizeof (struct iwl_tfh_tfd ); - }else { + addr_size =36 ; trans_pcie->max_tbs =IWL_NUM_OF_TBS ; trans_pcie->tfd_size =sizeof (struct iwl_tfd ); }
drivers/net/wireless/intel/iwlwifi/pcie/tx.c +19 -4
@@ -2096,6 +2096,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,struct iwl_cmd_meta *out_meta, struct iwl_device_cmd *dev_cmd, u16 tb1_len) { + struct iwl_tx_cmd *tx_cmd = (void *)dev_cmd->payload;struct iwl_trans_pcie *trans_pcie = txq->trans_pcie;struct ieee80211_hdr *hdr = (void *)skb->data;unsigned int snap_ip_tcp_hdrlen, ip_hdrlen, total_len, hdr_room;
@@ -2145,6 +2146,13 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,*/ skb_pull (skb, hdr_len + iv_len); +/* +* Remove the length of all the headers that we don't actually +* have in the MPDU by themselves, but that we duplicate into +* all the different MSDUs inside the A-MSDU. +*/ +le16_add_cpu (&tx_cmd->len, -snap_ip_tcp_hdrlen); +tso_start (skb, &tso);while (total_len) {
@@ -2155,7 +2163,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,unsigned int hdr_tb_len;dma_addr_t hdr_tb_phys;struct tcphdr *tcph; -u8 *iph; +u8 *iph, *subf_hdrs_start = hdr_page->pos; total_len -= data_left;
@@ -2216,6 +2224,8 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb, hdr_tb_len, false);trace_iwlwifi_dev_tx_tso_chunk (trans->dev, start_hdr, hdr_tb_len); +/* add this subframe's headers' length to the tx_cmd */ +le16_add_cpu (&tx_cmd->len, hdr_page->pos - subf_hdrs_start);/* prepare the start_hdr for the next subframe */ start_hdr = hdr_page->pos;
@@ -2408,9 +2418,10 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, tb1_len = len; } -/* The first TB points to bi-directional DMA data */ -memcpy (&txq->first_tb_bufs[txq->write_ptr], &dev_cmd->hdr, -IWL_FIRST_TB_SIZE ); +/* +* The first TB points to bi-directional DMA data, we'll +* memcpy the data into it later. +*/ iwl_pcie_txq_build_tfd (trans, txq, tb0_phys,IWL_FIRST_TB_SIZE , true);
@@ -2434,6 +2445,10 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, goto out_err; } +/* building the A-MSDU might have changed this data, so memcpy it now */ +memcpy (&txq->first_tb_bufs[txq->write_ptr], &dev_cmd->hdr, +IWL_FIRST_TB_SIZE ); + tfd =iwl_pcie_get_tfd (trans_pcie, txq, txq->write_ptr);/* Set up entry for this TFD in Tx byte-count array */ iwl_pcie_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len),
drivers/net/wireless/marvell/mwifiex/11n_aggr.c +7 -12
@@ -101,13 +101,6 @@ mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv, {struct txpd *local_tx_pd;struct mwifiex_txinfo *tx_info =MWIFIEX_SKB_TXCB (skb); -unsigned int pad; -int headroom = (priv->adapter->iface_type == -MWIFIEX_USB ) ?0 :INTF_HEADER_LEN ; - - pad = ((void *)skb->data -sizeof (*local_tx_pd) - - headroom -NULL ) & (MWIFIEX_DMA_ALIGN_SZ -1 ); -skb_push (skb, pad);skb_push (skb,sizeof (*local_tx_pd));
@@ -121,12 +114,10 @@ mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv, local_tx_pd->bss_num = priv->bss_num; local_tx_pd->bss_type = priv->bss_type;/* Always zero as the data is followed by struct txpd */ - local_tx_pd->tx_pkt_offset =cpu_to_le16 (sizeof (struct txpd ) + - pad); + local_tx_pd->tx_pkt_offset =cpu_to_le16 (sizeof (struct txpd )); local_tx_pd->tx_pkt_type =cpu_to_le16 (PKT_TYPE_AMSDU ); local_tx_pd->tx_pkt_length =cpu_to_le16 (skb->len - -sizeof (*local_tx_pd) - - pad); +sizeof (*local_tx_pd));if (tx_info->flags &MWIFIEX_BUF_FLAG_TDLS_PKT ) local_tx_pd->flags |=MWIFIEX_TXPD_FLAGS_TDLS_PACKET ;
@@ -190,7 +181,11 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, ra_list_flags);return -1 ; } -skb_reserve (skb_aggr,MWIFIEX_MIN_DATA_HEADER_LEN ); + +/* skb_aggr->data already 64 byte align, just reserve bus interface +* header and txpd. +*/ +skb_reserve (skb_aggr, headroom +sizeof (struct txpd )); tx_info_aggr =MWIFIEX_SKB_TXCB (skb_aggr);memset (tx_info_aggr,0 ,sizeof (*tx_info_aggr));
drivers/net/wireless/marvell/mwifiex/debugfs.c +2 -1
@@ -114,7 +114,8 @@ mwifiex_info_read(struct file *file, char __user *ubuf,if (GET_BSS_ROLE (priv) ==MWIFIEX_BSS_ROLE_STA ) { p +=sprintf (p,"multicast_count=\"%d\"\n" ,netdev_mc_count (netdev)); - p +=sprintf (p,"essid=\"%s\"\n" , info.ssid.ssid); + p +=sprintf (p,"essid=\"%.*s\"\n" , info.ssid.ssid_len, + info.ssid.ssid); p +=sprintf (p,"bssid=\"%pM\"\n" , info.bssid); p +=sprintf (p,"channel=\"%d\"\n" , (int ) info.bss_chan); p +=sprintf (p,"country_code = \"%s\"\n" , info.country_code);
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +0 -2
@@ -1159,8 +1159,6 @@ int mwifiex_set_encode(struct mwifiex_private *priv, struct key_params *kp, encrypt_key.is_rx_seq_valid = true; } }else { -if (GET_BSS_ROLE (priv) ==MWIFIEX_BSS_ROLE_UAP ) -return 0 ; encrypt_key.key_disable = true;if (mac_addr)memcpy (encrypt_key.mac_addr, mac_addr,ETH_ALEN );
drivers/net/wireless/ti/wl18xx/event.c +28 -0
@@ -218,5 +218,33 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl)if (vector &FW_LOGGER_INDICATION )wlcore_event_fw_logger (wl); +if (vector &RX_BA_WIN_SIZE_CHANGE_EVENT_ID ) { +struct wl12xx_vif *wlvif; +struct ieee80211_vif *vif; +struct ieee80211_sta *sta; +u8 link_id = mbox->rx_ba_link_id; +u8 win_size = mbox->rx_ba_win_size; +const u8 *addr; + + wlvif = wl->links[link_id].wlvif; + vif =wl12xx_wlvif_to_vif (wlvif); + +/* Update RX aggregation window size and call +* MAC routine to stop active RX aggregations for this link +*/ +if (wlvif->bss_type !=BSS_TYPE_AP_BSS ) + addr = vif->bss_conf.bssid; +else + addr = wl->links[link_id].addr; + + sta =ieee80211_find_sta (vif, addr); +if (sta) { + sta->max_rx_aggregation_subframes = win_size; +ieee80211_stop_rx_ba_session (vif, + wl->links[link_id].ba_bitmap, + addr); + } + } +return 0 ; }
drivers/net/wireless/ti/wl18xx/event.h +1 -0
@@ -38,6 +38,7 @@ enum {REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID =BIT (18 ),DFS_CHANNELS_CONFIG_COMPLETE_EVENT =BIT (19 ),PERIODIC_SCAN_REPORT_EVENT_ID =BIT (20 ), +RX_BA_WIN_SIZE_CHANGE_EVENT_ID =BIT (21 ),SMART_CONFIG_SYNC_EVENT_ID =BIT (22 ),SMART_CONFIG_DECODE_EVENT_ID =BIT (23 ), TIME_SYNC_EVENT_ID = BIT(24),
drivers/net/wireless/ti/wl18xx/main.c +2 -1
@@ -1041,7 +1041,8 @@ static int wl18xx_boot(struct wl1271 *wl)SMART_CONFIG_SYNC_EVENT_ID |SMART_CONFIG_DECODE_EVENT_ID |TIME_SYNC_EVENT_ID | -FW_LOGGER_INDICATION ; +FW_LOGGER_INDICATION | +RX_BA_WIN_SIZE_CHANGE_EVENT_ID ; wl->ap_event_mask =MAX_TX_FAILURE_EVENT_ID ;
drivers/net/wireless/ti/wlcore/acx.c +3 -2
@@ -1419,7 +1419,8 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,/* setup BA session receiver setting in the FW. */ int wl12xx_acx_set_ba_receiver_session (struct wl1271 *wl,u8 tid_index, -u16 ssn,bool enable,u8 peer_hlid) +u16 ssn,bool enable,u8 peer_hlid, +u8 win_size) {struct wl1271_acx_ba_receiver_setup *acx;int ret;
@@ -1435,7 +1436,7 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, acx->hlid = peer_hlid; acx->tid = tid_index; acx->enable = enable; - acx->win_size = wl->conf.ht.rx_ba_win_size; + acx->win_size = win_size; acx->ssn = ssn; ret = wlcore_cmd_configure_failsafe(wl, ACX_BA_SESSION_RX_SETUP, acx,
drivers/net/wireless/ti/wlcore/acx.h +2 -1
@@ -1113,7 +1113,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,int wl12xx_acx_set_ba_initiator_policy (struct wl1271 *wl,struct wl12xx_vif *wlvif);int wl12xx_acx_set_ba_receiver_session (struct wl1271 *wl,u8 tid_index, -u16 ssn,bool enable,u8 peer_hlid); +u16 ssn,bool enable,u8 peer_hlid, +u8 win_size);int wl12xx_acx_tsf_info (struct wl1271 *wl,struct wl12xx_vif *wlvif,u64 *mactime); int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
drivers/net/wireless/ti/wlcore/main.c +4 -2
@@ -5285,7 +5285,9 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, } ret =wl12xx_acx_set_ba_receiver_session (wl, tid, *ssn, true, - hlid); + hlid, + params->buf_size); +if (!ret) { *ba_bitmap |=BIT (tid); wl->ba_rx_session_count++;
@@ -5306,7 +5308,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, } ret =wl12xx_acx_set_ba_receiver_session (wl, tid,0 , false, - hlid); + hlid,0 );if (!ret) { *ba_bitmap &= ~BIT (tid); wl->ba_rx_session_count--;
drivers/phy/Kconfig +1 -0
@@ -456,6 +456,7 @@ config PHY_QCOM_UFS config PHY_TUSB1210 tristate "TI TUSB1210 ULPI PHY module" depends on USB_ULPI_BUS + depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in select GENERIC_PHY help Support for TI TUSB1210 USB ULPI PHY.
drivers/power/supply/bq24190_charger.c +74 -108
297 lines not on this page · raw message
drivers/power/supply/lp8788-charger.c +1 -1
@@ -654,7 +654,7 @@ static ssize_t lp8788_show_eoc_time(struct device *dev, {struct lp8788_charger *pchg =dev_get_drvdata (dev);char *stime[] = {"400ms" ,"5min" ,"10min" ,"15min" , -"20min" ,"25min" ,"30min" "No timeout" }; +"20min" ,"25min" ,"30min" ,"No timeout" };u8 val;lp8788_read_byte (pchg->lp,LP8788_CHG_EOC , &val);
drivers/scsi/Kconfig +1 -1
@@ -1497,7 +1497,7 @@ config ATARI_SCSI config MAC_SCSI tristate "Macintosh NCR5380 SCSI" - depends on MAC && SCSI=y + depends on MAC && SCSI select SCSI_SPI_ATTRS help This is the NCR 5380 SCSI controller included on most of the 68030
drivers/scsi/qla2xxx/qla_os.c +2 -1
@@ -1464,7 +1464,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)/* Don't abort commands in adapter during EEH * recovery as it's not accessible/responding. */ -if (GET_CMD_SP (sp) && !ha->flags.eeh_busy) { +if (GET_CMD_SP (sp) && !ha->flags.eeh_busy && + (sp->type ==SRB_SCSI_CMD )) {/* Get a reference to the sp and drop the lock. * The reference ensures this sp->done() call * - and not the call in qla2xxx_eh_abort() -
drivers/scsi/smartpqi/smartpqi_init.c +3 -5
@@ -533,8 +533,7 @@ static int pqi_write_current_time_to_host_wellness(size_t buffer_length;time64_t local_time;unsigned int year; -struct timeval time; -struct rtc_time tm; +struct tm tm; buffer_length =sizeof (*buffer);
@@ -551,9 +550,8 @@ static int pqi_write_current_time_to_host_wellness(put_unaligned_le16 (sizeof (buffer->time), &buffer->time_length); -do_gettimeofday (&time); - local_time = time.tv_sec - (sys_tz.tz_minuteswest *60 ); -rtc_time64_to_tm (local_time, &tm); + local_time =ktime_get_real_seconds (); +time64_to_tm (local_time, -sys_tz.tz_minuteswest *60 , &tm); year = tm.tm_year +1900 ; buffer->time[0 ] =bin2bcd (tm.tm_hour);
drivers/staging/emxx_udc/emxx_udc.c +2 -2
@@ -3160,7 +3160,7 @@ static const struct { };/*-------------------------------------------------------------------------*/ -static void __init nbu2ss_drv_ep_init (struct nbu2ss_udc *udc) +static void nbu2ss_drv_ep_init (struct nbu2ss_udc *udc) {int i;
@@ -3191,7 +3191,7 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc)/*-------------------------------------------------------------------------*/ /* platform_driver */ -static int __init nbu2ss_drv_contest_init ( +static int nbu2ss_drv_contest_init (struct platform_device *pdev,struct nbu2ss_udc *udc) {
drivers/staging/lustre/lustre/llite/lproc_llite.c +15 -12
@@ -924,27 +924,29 @@ static ssize_t ll_unstable_stats_seq_write(struct file *file, }LPROC_SEQ_FOPS (ll_unstable_stats); -static ssize_t root_squash_show (struct kobject *kobj,struct attribute *attr, -char *buf) +static int ll_root_squash_seq_show (struct seq_file *m,void *v) { - struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info, - ll_kobj); +struct super_block *sb = m->private; +struct ll_sb_info *sbi =ll_s2sbi (sb);struct root_squash_info *squash = &sbi->ll_squash; -return sprintf (buf,"%u:%u\n" , squash->rsi_uid, squash->rsi_gid); +seq_printf (m,"%u:%u\n" , squash->rsi_uid, squash->rsi_gid); +return 0 ; } -static ssize_t root_squash_store (struct kobject *kobj,struct attribute *attr, -const char *buffer,size_t count) +static ssize_t ll_root_squash_seq_write (struct file *file, +const char __user *buffer, +size_t count,loff_t *off) { - struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info, - ll_kobj); +struct seq_file *m = file->private_data; +struct super_block *sb = m->private; +struct ll_sb_info *sbi =ll_s2sbi (sb);struct root_squash_info *squash = &sbi->ll_squash;return lprocfs_wr_root_squash (buffer, count, squash, -ll_get_fsname (sbi->ll_sb,NULL ,0 )); +ll_get_fsname (sb,NULL ,0 )); } -LUSTRE_RW_ATTR (root_squash); +LPROC_SEQ_FOPS (ll_root_squash);static int ll_nosquash_nids_seq_show (struct seq_file *m,void *v) {
@@ -997,6 +999,8 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = { { "statahead_stats", &ll_statahead_stats_fops, NULL, 0 }, { "unstable_stats", &ll_unstable_stats_fops, NULL }, { "sbi_flags", &ll_sbi_flags_fops, NULL, 0 }, + { .name = "root_squash", + .fops = &ll_root_squash_fops }, { .name = "nosquash_nids", .fops = &ll_nosquash_nids_fops }, { NULL }
@@ -1027,7 +1031,6 @@ static struct attribute *llite_attrs[] = { &lustre_attr_max_easize.attr, &lustre_attr_default_easize.attr, &lustre_attr_xattr_cache.attr, - &lustre_attr_root_squash.attr, NULL, };
drivers/staging/wlan-ng/p80211netdev.c +1 -1
@@ -232,7 +232,7 @@ static int p80211_convert_to_ether(struct wlandevice *wlandev, struct sk_buff *sstruct p80211_hdr_a3 *hdr; hdr = (struct p80211_hdr_a3 *)skb->data; -if (p80211_rx_typedrop (wlandev, hdr->fc)) +if (p80211_rx_typedrop (wlandev,le16_to_cpu (hdr->fc)))return CONV_TO_ETHER_SKIPPED ;/* perform mcast filtering: allow my local address through but reject
drivers/tty/serial/8250/8250_omap.c +7 -1
@@ -1237,7 +1237,8 @@ static int omap8250_probe(struct platform_device *pdev)pm_runtime_put_autosuspend (&pdev->dev);return 0 ; err: -pm_runtime_put (&pdev->dev); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);return ret; }
@@ -1246,6 +1247,7 @@ static int omap8250_remove(struct platform_device *pdev) {struct omap8250_priv *priv =platform_get_drvdata (pdev); +pm_runtime_dont_use_autosuspend (&pdev->dev);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);serial8250_unregister_port (priv->line);
@@ -1345,6 +1347,10 @@ static int omap8250_runtime_suspend(struct device *dev)struct omap8250_priv *priv =dev_get_drvdata (dev);struct uart_8250_port *up; +/* In case runtime-pm tries this before we are setup */ +if (!priv) +return 0 ; + up =serial8250_get_port (priv->line);/* * When using 'no_console_suspend', the console UART must not be
drivers/usb/chipidea/ci.h +0 -3
@@ -428,9 +428,6 @@ int hw_port_test_set(struct ci_hdrc *ci, u8 mode);u8 hw_port_test_get (struct ci_hdrc *ci); -int hw_wait_reg (struct ci_hdrc *ci,enum ci_hw_regs reg,u32 mask, -u32 value,unsigned int timeout_ms); -void ci_platform_configure (struct ci_hdrc *ci);int dbg_create_files (struct ci_hdrc *ci);
drivers/usb/chipidea/core.c +0 -32
@@ -516,38 +516,6 @@ int hw_device_reset(struct ci_hdrc *ci)return 0 ; } -/** -* hw_wait_reg: wait the register value -* -* Sometimes, it needs to wait register value before going on. -* Eg, when switch to device mode, the vbus value should be lower -* than OTGSC_BSV before connects to host. -* -* @ci: the controller -* @reg: register index -* @mask: mast bit -* @value: the bit value to wait -* @timeout_ms: timeout in millisecond -* -* This function returns an error code if timeout -*/ -int hw_wait_reg (struct ci_hdrc *ci,enum ci_hw_regs reg,u32 mask, -u32 value,unsigned int timeout_ms) -{ -unsigned long elapse = jiffies +msecs_to_jiffies (timeout_ms); - -while (hw_read (ci, reg, mask) != value) { -if (time_after (jiffies, elapse)) { -dev_err (ci->dev,"timeout waiting for %08x in %d\n" , - mask, reg); -return -ETIMEDOUT ; - } -msleep (20 ); - } - -return 0 ; -} -static irqreturn_t ci_irq (int irq,void *data) {struct ci_hdrc *ci = data;
drivers/usb/chipidea/otg.c +71 -9
120 lines not on this page · raw message
drivers/usb/dwc2/core.c +1 -1
@@ -455,7 +455,7 @@ static void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg)dwc2_writel (gusbcfg, hsotg->regs +GUSBCFG );if (dwc2_iddig_filter_enabled (hsotg)) -usleep_range (100000 ,110000 ); +msleep (100 ); }/*
drivers/usb/host/ehci-exynos.c +2 -0
@@ -77,10 +77,12 @@ static int exynos_ehci_get_phy(struct device *dev,if (IS_ERR (phy)) { ret =PTR_ERR (phy);if (ret == -EPROBE_DEFER ) { +of_node_put (child);return ret; }else if (ret != -ENOSYS && ret != -ENODEV ) {dev_err (dev,"Error retrieving usb2 phy: %d\n" , ret); +of_node_put (child);return ret; } }
drivers/usb/host/ohci-exynos.c +2 -0
@@ -66,10 +66,12 @@ static int exynos_ohci_get_phy(struct device *dev,if (IS_ERR (phy)) { ret =PTR_ERR (phy);if (ret == -EPROBE_DEFER ) { +of_node_put (child);return ret; }else if (ret != -ENOSYS && ret != -ENODEV ) {dev_err (dev,"Error retrieving usb2 phy: %d\n" , ret); +of_node_put (child);return ret; } }
drivers/usb/serial/ark3116.c +19 -6
@@ -373,23 +373,29 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)dev_dbg (&port->dev,"%s - usb_serial_generic_open failed: %d\n" , __func__, result); - goto err_out; + goto err_free; }/* remove any data still left: also clears error state */ ark3116_read_reg (serial,UART_RX , buf);/* read modem status */ - priv->msr =ark3116_read_reg (serial,UART_MSR , buf); + result =ark3116_read_reg (serial,UART_MSR , buf); +if (result <0 ) + goto err_close; + priv->msr = *buf; +/* read line status */ - priv->lsr =ark3116_read_reg (serial,UART_LSR , buf); + result =ark3116_read_reg (serial,UART_LSR , buf); +if (result <0 ) + goto err_close; + priv->lsr = *buf; result =usb_submit_urb (port->interrupt_in_urb,GFP_KERNEL );if (result) {dev_err (&port->dev,"submit irq_in urb failed %d\n" , result); -ark3116_close (port); - goto err_out; + goto err_close; }/* activate interrupts */
@@ -402,8 +408,15 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)if (tty)ark3116_set_termios (tty, port,NULL ); -err_out:kfree (buf); + +return 0 ; + +err_close: +usb_serial_generic_close (port); +err_free: +kfree (buf); +return result; }
drivers/usb/serial/digi_acceleport.c +23 -15
@@ -1398,25 +1398,30 @@ static int digi_read_inb_callback(struct urb *urb) {struct usb_serial_port *port = urb->context;struct digi_port *priv =usb_get_serial_port_data (port); -int opcode = ((unsigned char *)urb->transfer_buffer)[0 ]; -int len = ((unsigned char *)urb->transfer_buffer)[1 ]; -int port_status = ((unsigned char *)urb->transfer_buffer)[2 ]; -unsigned char *data = ((unsigned char *)urb->transfer_buffer) +3 ; +unsigned char *buf = urb->transfer_buffer; +int opcode; +int len; +int port_status; +unsigned char *data;int flag, throttled; -int status = urb->status; - -/* do not process callbacks on closed ports */ -/* but do continue the read chain */ -if (urb->status == -ENOENT ) -return 0 ;/* short/multiple packet check */ +if (urb->actual_length <2 ) { +dev_warn (&port->dev,"short packet received\n" ); +return -1 ; + } + + opcode = buf[0 ]; + len = buf[1 ]; +if (urb->actual_length != len +2 ) { -dev_err (&port->dev,"%s: INCOMPLETE OR MULTIPLE PACKET, " -"status=%d, port=%d, opcode=%d, len=%d, " -"actual_length=%d, status=%d\n" , __func__, status, - priv->dp_port_num, opcode, len, urb->actual_length, - port_status); +dev_err (&port->dev,"malformed packet received: port=%d, opcode=%d, len=%d, actual_length=%u\n" , + priv->dp_port_num, opcode, len, urb->actual_length); +return -1 ; + } + +if (opcode ==DIGI_CMD_RECEIVE_DATA && len <1 ) { +dev_err (&port->dev,"malformed data packet received\n" );return -1 ; }
@@ -1430,6 +1435,9 @@ static int digi_read_inb_callback(struct urb *urb)/* receive data */ if (opcode ==DIGI_CMD_RECEIVE_DATA ) { + port_status = buf[2 ]; + data = &buf[3 ]; +/* get flag from port_status */ flag =0 ;
drivers/usb/serial/ftdi_sio.c +5 -2
@@ -1439,10 +1439,13 @@ static int read_latency_timer(struct usb_serial_port *port)FTDI_SIO_GET_LATENCY_TIMER_REQUEST_TYPE ,0 , priv->interface, buf, 1, WDR_TIMEOUT); -if (rv <0 ) +if (rv <1 ) {dev_err (&port->dev,"Unable to read latency timer: %i\n" , rv); -else +if (rv >=0 ) + rv = -EIO ; + }else { priv->latency = buf[0 ]; + }kfree (buf);
drivers/usb/serial/io_edgeport.c +33 -15
106 lines not on this page · raw message
drivers/usb/serial/keyspan_pda.c +14 -5
@@ -139,6 +139,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb) {struct usb_serial_port *port = urb->context;unsigned char *data = urb->transfer_buffer; +unsigned int len = urb->actual_length;int retval;int status = urb->status;struct keyspan_pda_private *priv;
@@ -159,18 +160,26 @@ static void keyspan_pda_rx_interrupt(struct urb *urb) goto exit; } +if (len <1 ) { +dev_warn (&port->dev,"short message received\n" ); + goto exit; + } +/* see if the message is data or a status interrupt */ switch (data[0 ]) {case 0 :/* rest of message is rx data */ -if (urb->actual_length) { -tty_insert_flip_string (&port->port, data +1 , - urb->actual_length -1 ); -tty_flip_buffer_push (&port->port); - } +if (len <2 ) +break ; +tty_insert_flip_string (&port->port, data +1 , len -1 ); +tty_flip_buffer_push (&port->port);break ;case 1 :/* status interrupt */ +if (len <3 ) { +dev_warn (&port->dev,"short interrupt message received\n" ); +break ; + }dev_dbg (&port->dev,"rx int, d1=%d, d2=%d\n" , data[1 ], data[2 ]);switch (data[1 ]) {case 1 :/* modemline change */
drivers/usb/serial/mct_u232.c +5 -1
@@ -322,8 +322,12 @@ static int mct_u232_get_modem_stat(struct usb_serial_port *port,MCT_U232_GET_REQUEST_TYPE ,0 ,0 , buf,MCT_U232_GET_MODEM_STAT_SIZE , WDR_TIMEOUT); -if (rc <0 ) { +if (rc <MCT_U232_GET_MODEM_STAT_SIZE ) {dev_err (&port->dev,"Get MODEM STATus failed (error = %d)\n" , rc); + +if (rc >=0 ) + rc = -EIO ; + *msr =0 ; }else { *msr = buf[0 ];
drivers/usb/serial/quatech2.c +13 -11
@@ -188,22 +188,22 @@ static inline int qt2_setdevice(struct usb_device *dev, u8 *data) } -static inline int qt2_getdevice (struct usb_device *dev,u8 *data) -{ -return usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -QT_SET_GET_DEVICE ,0xc0 ,0 ,0 , - data,3 ,QT2_USB_TIMEOUT ); -} -static inline int qt2_getregister (struct usb_device *dev,u8 uart,u8 reg,u8 *data) { -return usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -QT_SET_GET_REGISTER ,0xc0 , reg, - uart, data,sizeof (*data),QT2_USB_TIMEOUT ); +int ret; + + ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), +QT_SET_GET_REGISTER ,0xc0 , reg, + uart, data,sizeof (*data),QT2_USB_TIMEOUT ); +if (ret <sizeof (*data)) { +if (ret >=0 ) + ret = -EIO ; + } +return ret; } static inline int qt2_setregister(struct usb_device *dev,
@@ -372,9 +372,11 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)0xc0 ,0 , device_port, data, 2, QT2_USB_TIMEOUT); -if (status <0 ) { +if (status <2 ) {dev_err (&port->dev,"%s - open port failed %i\n" , __func__, status); +if (status >=0 ) + status = -EIO ;kfree (data);return status; }
drivers/usb/serial/ssu100.c +24 -7
@@ -80,9 +80,17 @@ static inline int ssu100_setdevice(struct usb_device *dev, u8 *data)static inline int ssu100_getdevice (struct usb_device *dev,u8 *data) { -return usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -QT_SET_GET_DEVICE ,0xc0 ,0 ,0 , - data,3 ,300 ); +int ret; + + ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), +QT_SET_GET_DEVICE ,0xc0 ,0 ,0 , + data,3 ,300 ); +if (ret <3 ) { +if (ret >=0 ) + ret = -EIO ; + } + +return ret; } static inline int ssu100_getregister(struct usb_device *dev,
@@ -90,10 +98,17 @@ static inline int ssu100_getregister(struct usb_device *dev,unsigned short reg, u8 *data) { - return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - QT_SET_GET_REGISTER, 0xc0, reg, - uart, data, sizeof(*data), 300); + int ret; + + ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), +QT_SET_GET_REGISTER ,0xc0 , reg, + uart, data,sizeof (*data),300 ); +if (ret <sizeof (*data)) { +if (ret >=0 ) + ret = -EIO ; + } +return ret; }
@@ -289,8 +304,10 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)QT_OPEN_CLOSE_CHANNEL ,QT_TRANSFER_IN ,0x01 , 0, data, 2, 300); -if (result <0 ) { +if (result <2 ) {dev_dbg (&port->dev,"%s - open failed %i\n" , __func__, result); +if (result >=0 ) + result = -EIO ;kfree (data);return result; }
drivers/usb/serial/ti_usb_3410_5052.c +4 -8
@@ -1556,13 +1556,10 @@ static int ti_command_out_sync(struct ti_device *tdev, __u8 command, (USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ), value, moduleid, data, size, 1000); -if (status == size) - status =0 ; - -if (status >0 ) - status = -ECOMM ; +if (status <0 ) +return status; -return status; +return 0 ; }
@@ -1578,8 +1575,7 @@ static int ti_command_in_sync(struct ti_device *tdev, __u8 command,if (status == size) status =0 ; - -if (status >0 ) +else if (status >=0 ) status = -ECOMM ;return status;
drivers/xen/events/events_base.c +17 -9
@@ -1314,6 +1314,9 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)if (!VALID_EVTCHN (evtchn))return -1 ; +if (!xen_support_evtchn_rebind ()) +return -1 ; +/* Send future instances of this interrupt to other vcpu. */ bind_vcpu.port = evtchn; bind_vcpu.vcpu =xen_vcpu_nr (tcpu);
@@ -1647,15 +1650,20 @@ void xen_callback_vector(void) {int rc;uint64_t callback_via; - - callback_via =HVM_CALLBACK_VECTOR (HYPERVISOR_CALLBACK_VECTOR ); - rc =xen_set_callback_via (callback_via); -BUG_ON (rc); -pr_info ("Xen HVM callback vector for event delivery is enabled\n" ); -/* in the restore case the vector has already been allocated */ -if (!test_bit (HYPERVISOR_CALLBACK_VECTOR , used_vectors)) -alloc_intr_gate (HYPERVISOR_CALLBACK_VECTOR , - xen_hvm_callback_vector); +if (xen_have_vector_callback) { + callback_via =HVM_CALLBACK_VECTOR (HYPERVISOR_CALLBACK_VECTOR ); + rc =xen_set_callback_via (callback_via); +if (rc) { +pr_err ("Request for Xen HVM callback vector failed\n" ); + xen_have_vector_callback =0 ; +return ; + } +pr_info ("Xen HVM callback vector for event delivery is enabled\n" ); +/* in the restore case the vector has already been allocated */ +if (!test_bit (HYPERVISOR_CALLBACK_VECTOR , used_vectors)) +alloc_intr_gate (HYPERVISOR_CALLBACK_VECTOR , + xen_hvm_callback_vector); + } }#else void xen_callback_vector (void ) {}
drivers/xen/platform-pci.c +64 -0
88 lines not on this page · raw message
fs/9p/acl.c +2 -0
@@ -277,6 +277,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,case ACL_TYPE_ACCESS :if (acl) {struct iattr iattr; +struct posix_acl *old_acl = acl; retval =posix_acl_update_mode (inode, &iattr.ia_mode, &acl);if (retval)
@@ -287,6 +288,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,* by the mode bits. So don't * update ACL. */ +posix_acl_release (old_acl); value =NULL ; size =0 ; }
fs/block_dev.c +0 -1
@@ -1165,7 +1165,6 @@ int revalidate_disk(struct gendisk *disk)if (disk->fops->revalidate_disk) ret = disk->fops->revalidate_disk (disk); -blk_integrity_revalidate (disk); bdev =bdget_disk (disk,0 );if (!bdev)return ret;
fs/f2fs/super.c +7 -0
@@ -1405,6 +1405,13 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,return 1 ; } +if (le32_to_cpu (raw_super->segment_count) >F2FS_MAX_SEGMENT ) { +f2fs_msg (sb,KERN_INFO , +"Invalid segment count (%u)" , +le32_to_cpu (raw_super->segment_count)); +return 1 ; + } +/* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */ if (sanity_check_area_boundary (sbi, bh))return 1 ;
include/linux/f2fs_fs.h +6 -0
@@ -286,6 +286,12 @@ struct f2fs_nat_block {#define SIT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_sit_entry))/* +* F2FS uses 4 bytes to represent block address. As a result, supported size of +* disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. +*/ +#define F2FS_MAX_SEGMENT ((16 * 1024 * 1024) / 2) + +/* * Note that f2fs_sit_entry->vblocks has the following bit-field information. * [15:10] : allocation type such as CURSEG_XXXX_TYPE * [9:0] : valid block count
include/linux/genhd.h +0 -2
@@ -731,11 +731,9 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)#if defined(CONFIG_BLK_DEV_INTEGRITY )extern void blk_integrity_add (struct gendisk *);extern void blk_integrity_del (struct gendisk *); -extern void blk_integrity_revalidate (struct gendisk *);#else /* CONFIG_BLK_DEV_INTEGRITY */ static inline void blk_integrity_add (struct gendisk *disk) { }static inline void blk_integrity_del (struct gendisk *disk) { } -static inline void blk_integrity_revalidate (struct gendisk *disk) { }#endif /* CONFIG_BLK_DEV_INTEGRITY */ #else /* CONFIG_BLOCK */
include/linux/usb/chipidea.h +2 -0
@@ -14,6 +14,7 @@ struct ci_hdrc;* struct ci_hdrc_cable - structure for external connector cable state tracking * @state: current state of the line * @changed: set to true when extcon event happen +* @enabled: set to true if we've enabled the vbus or id interrupt * @edev: device which generate events * @ci: driver state of the chipidea device * @nb: hold event notification callback
@@ -22,6 +23,7 @@ struct ci_hdrc;struct ci_hdrc_cable {bool state;bool changed; +bool enabled;struct extcon_dev *edev;struct ci_hdrc *ci;struct notifier_block nb;
include/net/addrconf.h +2 -0
@@ -20,6 +20,8 @@#define ADDRCONF_TIMER_FUZZ (HZ / 4)#define ADDRCONF_TIMER_FUZZ_MAX (HZ) +#define ADDRCONF_NOTIFY_PRIORITY 0 +#include <linux/in.h> #include <linux/in6.h>
include/net/ip6_route.h +1 -0
@@ -84,6 +84,7 @@ struct dst_entry *ip6_route_lookup(struct net *net, struct flowi6 *fl6,struct rt6_info *ip6_pol_route (struct net *net,struct fib6_table *table,int ifindex,struct flowi6 *fl6,int flags); +void ip6_route_init_special_entries (void );int ip6_route_init (void );void ip6_route_cleanup (void );
include/xen/xen.h +2 -1
@@ -38,7 +38,8 @@ extern enum xen_domain_type xen_domain_type;*/ #include <xen/features.h> #define xen_pvh_domain () (xen_pv_domain() && \ - xen_feature(XENFEAT_auto_translated_physmap)) + xen_feature(XENFEAT_auto_translated_physmap) && \ + xen_have_vector_callback)#else #define xen_pvh_domain () (0)#endif
kernel/bpf/verifier.c +27 -5
@@ -279,7 +279,8 @@ static const char *const bpf_jmp_string[16] = { [BPF_EXIT >> 4] = "exit", }; -static void print_bpf_insn (struct bpf_insn *insn) +static void print_bpf_insn (const struct bpf_verifier_env *env, +const struct bpf_insn *insn) {u8 class =BPF_CLASS (insn->code);
@@ -343,9 +344,19 @@ static void print_bpf_insn(struct bpf_insn *insn) insn->code, bpf_ldst_string[BPF_SIZE (insn->code) >>3 ], insn->src_reg, insn->imm); - }else if (BPF_MODE (insn->code) ==BPF_IMM ) { -verbose ("(%02x) r%d = 0x%x\n" , - insn->code, insn->dst_reg, insn->imm); + }else if (BPF_MODE (insn->code) ==BPF_IMM && +BPF_SIZE (insn->code) ==BPF_DW ) { +/* At this point, we already made sure that the second +* part of the ldimm64 insn is accessible. +*/ +u64 imm = ((u64)(insn +1 )->imm <<32 ) | (u32 )insn->imm; +bool map_ptr = insn->src_reg ==BPF_PSEUDO_MAP_FD ; + +if (map_ptr && !env->allow_ptr_leaks) + imm =0 ; + +verbose ("(%02x) r%d = 0x%llx\n" , insn->code, + insn->dst_reg, (unsigned long long )imm); }else {verbose ("BUG_ld_%02x\n" , insn->code);return ;
@@ -1749,6 +1760,17 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn)return 0 ; }else if (opcode ==BPF_ADD &&BPF_CLASS (insn->code) ==BPF_ALU64 && + dst_reg->type ==PTR_TO_STACK && + ((BPF_SRC (insn->code) ==BPF_X && + regs[insn->src_reg].type ==CONST_IMM ) || +BPF_SRC (insn->code) ==BPF_K )) { +if (BPF_SRC (insn->code) ==BPF_X ) + dst_reg->imm += regs[insn->src_reg].imm; +else + dst_reg->imm += insn->imm; +return 0 ; + }else if (opcode ==BPF_ADD && +BPF_CLASS (insn->code) ==BPF_ALU64 && (dst_reg->type ==PTR_TO_PACKET || (BPF_SRC (insn->code) ==BPF_X && regs[insn->src_reg].type ==PTR_TO_PACKET ))) {
@@ -2663,7 +2685,7 @@ static int do_check(struct bpf_verifier_env *env)if (log_level) {verbose ("%d: " , insn_idx); -print_bpf_insn (insn); +print_bpf_insn (env, insn); } err =ext_analyzer_insn_hook (env, insn_idx, prev_insn_idx);
lib/test_bpf.c +45 -0
51 lines not on this page · raw message
net/core/rtnetlink.c +1 -1
@@ -1059,7 +1059,7 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev)return err; } -if (nla_put (skb,IFLA_PHYS_PORT_NAME ,strlen (name), name)) +if (nla_put_string (skb,IFLA_PHYS_PORT_NAME , name))return -EMSGSIZE ;return 0 ;
net/ipv4/raw.c +3 -0
@@ -356,6 +356,9 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, rt->dst.dev->mtu);return -EMSGSIZE ; } +if (length <sizeof (struct iphdr )) +return -EINVAL ; +if (flags&MSG_PROBE ) goto out;
net/ipv4/tcp_lp.c +4 -2
@@ -264,13 +264,15 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample) {struct tcp_sock *tp =tcp_sk (sk);struct lp *lp =inet_csk_ca (sk); +u32 delta;if (sample->rtt_us >0 )tcp_lp_rtt_sample (sk, sample->rtt_us);/* calc inference */ -if (tcp_time_stamp > tp->rx_opt.rcv_tsecr) - lp->inference =3 * (tcp_time_stamp - tp->rx_opt.rcv_tsecr); + delta = tcp_time_stamp - tp->rx_opt.rcv_tsecr; +if ((s32 )delta >0 ) + lp->inference =3 * delta;/* test if within inference */ if (lp->last_drop && (tcp_time_stamp - lp->last_drop < lp->inference))
net/ipv4/tcp_minisocks.c +1 -0
@@ -543,6 +543,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, newicsk->icsk_ack.last_seg_size = skb->len - newtp->tcp_header_len; newtp->rx_opt.mss_clamp = req->mss;tcp_ecn_openreq_child (newtp, req); + newtp->fastopen_req =NULL ; newtp->fastopen_rsk =NULL ; newtp->syn_data_acked =0 ; newtp->rack.mstamp.v64 =0 ;
net/ipv4/tcp_output.c +12 -7
@@ -1246,7 +1246,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,* eventually). The difference is that pulled data not copied, but * immediately discarded. */ -static void __pskb_trim_head (struct sk_buff *skb,int len) +static int __pskb_trim_head (struct sk_buff *skb,int len) {struct skb_shared_info *shinfo;int i, k, eat;
@@ -1256,7 +1256,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)__skb_pull (skb, eat); len -= eat;if (!len) -return ; +return 0 ; } eat = len; k =0 ;
@@ -1282,23 +1282,28 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)skb_reset_tail_pointer (skb); skb->data_len -= len; skb->len = skb->data_len; +return len; }/* Remove acked data from a packet in the transmit queue. */ int tcp_trim_head (struct sock *sk,struct sk_buff *skb,u32 len) { +u32 delta_truesize; +if (skb_unclone (skb,GFP_ATOMIC ))return -ENOMEM ; -__pskb_trim_head (skb, len); + delta_truesize =__pskb_trim_head (skb, len);TCP_SKB_CB (skb)->seq += len; skb->ip_summed =CHECKSUM_PARTIAL ; - skb->truesize -= len; - sk->sk_wmem_queued -= len; -sk_mem_uncharge (sk, len); -sock_set_flag (sk,SOCK_QUEUE_SHRUNK ); +if (delta_truesize) { + skb->truesize -= delta_truesize; + sk->sk_wmem_queued -= delta_truesize; +sk_mem_uncharge (sk, delta_truesize); +sock_set_flag (sk,SOCK_QUEUE_SHRUNK ); + }/* Any change of skb->len requires recalculation of tso factor. */ if (tcp_skb_pcount (skb) >1 )
net/ipv6/addrconf.c +6 -2
@@ -3278,7 +3278,8 @@ static int fixup_permanent_addr(struct inet6_dev *idev, idev->dev, 0, 0); } -addrconf_dad_start (ifp); +if (ifp->state ==INET6_IFADDR_STATE_PREDAD ) +addrconf_dad_start (ifp);
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/helpers/cpuid.c +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Greg KH
maintainerI'm announcing the release of the 4.9.28 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/bcm958522er.dts | 1 arch/arm/boot/dts/bcm958525er.dts | 1 arch/arm/boot/dts/bcm958525xmc.dts | 1 arch/arm/boot/dts/bcm958622hr.dts | 1 arch/arm/boot/dts/bcm958623hr.dts | 1 arch/arm/boot/dts/bcm958625hr.dts | 1 arch/arm/boot/dts/bcm988312hr.dts | 1 arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 arch/arm/mach-omap2/omap-headsmp.S | 3 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 arch/arm64/include/asm/pgtable.h | 15 arch/arm64/net/bpf_jit_comp.c | 8 arch/mips/kernel/mips-r2-to-r6-emul.c | 12 arch/powerpc/Kconfig | 4 arch/powerpc/include/asm/reg.h | 2 arch/powerpc/kernel/Makefile | 2 arch/powerpc/platforms/powernv/opal-wrappers.S | 2 arch/sparc/kernel/head_64.S | 6 arch/sparc/lib/GENbzero.S | 2 arch/sparc/lib/NGbzero.S | 2 arch/x86/events/intel/pt.c | 6 arch/x86/include/asm/xen/events.h | 11 arch/x86/kernel/apic/io_apic.c | 2 arch/x86/kernel/kprobes/common.h | 2 arch/x86/kernel/kprobes/core.c | 6 arch/x86/kernel/kprobes/opt.c | 2 arch/x86/kernel/pci-calgary_64.c | 2 arch/x86/kvm/cpuid.c | 6 arch/x86/kvm/vmx.c | 17 - arch/x86/pci/xen.c | 2 arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c | 2 arch/x86/xen/enlighten.c | 21 - arch/x86/xen/smp.c | 2 arch/x86/xen/time.c | 5 block/blk-integrity.c | 19 - block/partition-generic.c | 1 drivers/char/tpm/tpm-chip.c | 8 drivers/char/tpm/tpm.h | 5 drivers/char/tpm/tpm2-cmd.c | 2 drivers/clk/Makefile | 2 drivers/clk/rockchip/clk-rk3036.c | 2 drivers/crypto/caam/caamhash.c | 7 drivers/gpu/drm/sti/sti_gdp.c | 12 drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 drivers/hwmon/it87.c | 2 drivers/leds/leds-ktd2692.c | 8 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 drivers/net/macsec.c | 29 + drivers/net/phy/mdio-mux-bcm-iproc.c | 5 drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 23 - drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 13 drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 4 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 23 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 31 + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 80 +--- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 23 + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 19 - drivers/net/wireless/marvell/mwifiex/debugfs.c | 3 drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 2 drivers/net/wireless/ti/wl18xx/event.c | 28 + drivers/net/wireless/ti/wl18xx/event.h | 1 drivers/net/wireless/ti/wl18xx/main.c | 3 drivers/net/wireless/ti/wlcore/acx.c | 5 drivers/net/wireless/ti/wlcore/acx.h | 3 drivers/net/wireless/ti/wlcore/main.c | 6 drivers/phy/Kconfig | 1 drivers/power/supply/bq24190_charger.c | 182 ++++------- drivers/power/supply/lp8788-charger.c | 2 drivers/scsi/Kconfig | 2 drivers/scsi/qla2xxx/qla_os.c | 3 drivers/scsi/smartpqi/smartpqi_init.c | 8 drivers/staging/emxx_udc/emxx_udc.c | 4 drivers/staging/lustre/lustre/llite/lproc_llite.c | 27 - drivers/staging/wlan-ng/p80211netdev.c | 2 drivers/tty/serial/8250/8250_omap.c | 8 drivers/usb/chipidea/ci.h | 3 drivers/usb/chipidea/core.c | 32 - drivers/usb/chipidea/otg.c | 80 ++++ drivers/usb/dwc2/core.c | 2 drivers/usb/host/ehci-exynos.c | 2 drivers/usb/host/ohci-exynos.c | 2 drivers/usb/serial/ark3116.c | 25 + drivers/usb/serial/digi_acceleport.c | 38 +- drivers/usb/serial/ftdi_sio.c | 7 drivers/usb/serial/io_edgeport.c | 48 +- drivers/usb/serial/keyspan_pda.c | 19 - drivers/usb/serial/mct_u232.c | 6 drivers/usb/serial/quatech2.c | 24 - drivers/usb/serial/ssu100.c | 31 + drivers/usb/serial/ti_usb_3410_5052.c | 12 drivers/xen/events/events_base.c | 26 + drivers/xen/platform-pci.c | 64 +++ fs/9p/acl.c | 2 fs/block_dev.c | 1 fs/f2fs/super.c | 7 include/linux/f2fs_fs.h | 6 include/linux/genhd.h | 2 include/linux/usb/chipidea.h | 2 include/net/addrconf.h | 2 include/net/ip6_route.h | 1 include/xen/xen.h | 3 kernel/bpf/verifier.c | 32 + lib/test_bpf.c | 45 ++ net/core/rtnetlink.c | 2 net/ipv4/raw.c | 3 net/ipv4/tcp_lp.c | 6 net/ipv4/tcp_minisocks.c | 1 net/ipv4/tcp_output.c | 19 - net/ipv6/addrconf.c | 8 net/ipv6/raw.c | 2 net/ipv6/route.c | 39 +- samples/bpf/test_verifier.c | 18 - sound/pci/hda/hda_intel.c | 13 tools/power/cpupower/utils/helpers/cpuid.c | 1 tools/testing/selftests/x86/Makefile | 2 123 files changed, 933 insertions(+), 514 deletions(-)
Alexander Potapenko (1):
ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
Alexander Shishkin (1):
perf/x86/intel/pt: Add format strings for PTWRITE and power event tracing
Andrew Donnellan (1):
powerpc: Correctly disable latent entropy GCC plugin on prom_init.o
Andy Shevchenko (1):
x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
Aneesh Kumar K.V (1):
powerpc/mm: Fixup wrong LPCR_VRMASD value
Anton Blanchard (1):
powerpc/ftrace: Fix confusing help text for DISABLE_MPROFILE_KERNEL
Arnd Bergmann (3):
leds: ktd2692: avoid harmless maybe-uninitialized warning
scsi: smartpqi: fix time handling
staging: emxx_udc: remove incorrect __init annotations
Ben Hutchings (1):
cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
Beni Lev (1):
iwlwifi: mvm: Use aux queue for offchannel frames in dqa
Bill Kuzeja (1):
scsi: qla2xxx: Fix crash in qla2xxx_eh_abort on bad ptr
Boris Ostrovsky (1):
xen: Revert commits da72ff5bfcb0 and 72a9b186292d
Brian Norris (1):
mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
Catalin Marinas (1):
arm64: Improve detection of user/non-user mappings in set_pte(_at)
Cong Wang (1):
9p: fix a potential acl leak
Dan Carpenter (2):
iwlwifi: mvm: writing zero bytes to debugfs causes a crash
bnxt_en: allocate enough space for ->ntp_fltr_bmap
Daniel Borkmann (2):
bpf, arm64: fix jit branch offset related to ldimm64
bpf: don't let ldimm64 leak map addresses on unprivileged
Daniele Palmas (1):
net: usb: qmi_wwan: add Telit ME910 support
Dave Aldridge (1):
sparc64: fix fault handling in NGbzero.S and GENbzero.S
Dave Hansen (1):
x86/mpx: Re-add MPX to selftests Makefile
David Ahern (1):
net: ipv6: Do not duplicate DAD on link up
Emmanuel Grumbach (1):
iwlwifi: pcie: don't increment / decrement a bool
Eric Dumazet (3):
tcp: do not underestimate skb->truesize in tcp_trim_head()
tcp: fix wraparound issue in tcp_lp
tcp: do not inherit fastopen_req from parent
Finn Thain (1):
scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
Florian Fainelli (1):
ARM: dts: sun7i: lamobo-r1: Fix CPU port RGMII settings
Ganapathi Bhat (1):
mwifiex: Avoid skipping WEP key deletion for AP
Geert Uytterhoeven (1):
arm64: dts: r8a7795: Mark EthernetAVB device node disabled
Giedrius Statkevičius (1):
power: supply: lp8788: prevent out of bounds array access
Greg Kroah-Hartman (1):
Linux 4.9.28
Guenter Roeck (1):
hwmon: (it87) Fix pwm4 detection for IT8620 and IT8628
Heiko Stuebner (1):
clk: rockchip: add "," to mux_pll_src_apll_dpll_gpll_usb480m_p on rk3036
Horia Geantă (1):
crypto: caam - fix error path for ctx_dma mapping failure
Igor Pylypiv (1):
staging: wlan-ng: add missing byte order conversion
Ilya Dryomov (1):
block: get rid of blk_integrity_revalidate()
James Hughes (2):
brcmfmac: Ensure pointer correctly set if skb data location changes
brcmfmac: Make skb header writable before use
Jarkko Sakkinen (1):
tpm: fix RC value check in tpm2_seal_trusted
Jason A. Donenfeld (1):
macsec: dynamically allocate space for sglist
Jim Mattson (1):
Revert "KVM: nested VMX: disable perf cpuid reporting"
Jin Qian (1):
f2fs: sanity check segment count
Johan Hovold (10):
USB: serial: keyspan_pda: fix receive sanity checks
USB: serial: digi_acceleport: fix incomplete rx sanity check
USB: serial: ssu100: fix control-message error handling
USB: serial: io_edgeport: fix epic-descriptor handling
USB: serial: ti_usb_3410_5052: fix control-message error handling
USB: serial: ark3116: fix open error handling
USB: serial: ftdi_sio: fix latency-timer error handling
USB: serial: quatech2: fix control-message error handling
USB: serial: mct_u232: fix modem-status error handling
USB: serial: io_edgeport: fix descriptor error handling
Johannes Berg (2):
iwlwifi: mvm: overwrite skb info later
iwlwifi: mvm/pcie: adjust A-MSDU tx_cmd length in PCIe
Jon Mason (2):
ARM: dts: NSP: GPIO reboot open-source
net: mdio-mux: bcm-iproc: call mdiobus_free() in error path
Jürg Billeter (1):
iwlwifi: fix MODULE_FIRMWARE for 6030
Kirtika Ruchandani (1):
iwlwifi: pcie: trans: Remove unused 'shift_param'
Krzysztof Kozlowski (2):
usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
Ladi Prosek (2):
KVM: nVMX: initialize PML fields in vmcs02
KVM: nVMX: do not leak PML full vmexit to L1
Leonid Yegoshin (1):
MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix
Liam Breck (6):
power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING
power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()
power: supply: bq24190_charger: Call power_supply_changed() for relevant component
power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread()
power: supply: bq24190_charger: Handle fault before status on interrupt
Luca Coelho (1):
iwlwifi: mvm: don't restart HW if suspend fails with unified image
Masami Hiramatsu (1):
kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
Matthijs van Duin (1):
ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
Maxim Altshul (2):
wlcore: Pass win_size taken from ieee80211_sta to FW
wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event
Michael Ellerman (1):
powerpc/powernv: Fix opal_exit tracepoint opcode
Michal Schmidt (1):
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
Nicholas Mc Guire (1):
usb: dwc2: host: use msleep() for long delay
Nicolai Hähnle (1):
drm/ttm: fix use-after-free races in vm fault handling
Nikola Pajkovsky (1):
x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
Oleg Drokin (1):
staging/lustre/llite: move root_squash from sysfs to debugfs
Pierre-Louis Bossart (1):
clk: Make x86/ conditional on CONFIG_COMMON_CLK
Ruslan Ruslichenko (1):
x86/ioapic: Restore IO-APIC irq_chip retrigger callback
Sara Sharon (5):
iwlwifi: pcie: fix the set of DMA memory mask
iwlwifi: mvm: fix reorder timer re-arming
iwlwifi: mvm: fix pending frame counter calculation
iwlwifi: mvm: fix references to first_agg_queue in DQA mode
iwlwifi: mvm: synchronize firmware DMA paging memory
Stephen Boyd (4):
arm: dts: qcom: Fix ipq board clock rates
usb: chipidea: Only read/write OTGSC from one place
usb: chipidea: Handle extcon events properly
phy: qcom-usb-hs: Add depends on EXTCON
Takashi Iwai (1):
ALSA: hda - Fix deadlock of controller device lock at unbinding
Tony Lindgren (1):
serial: 8250_omap: Fix probe and remove for PM runtime
Vincent Abriou (1):
drm/sti: fix GDP size to support up to UHD resolution
WANG Cong (2):
ipv6: initialize route null entry in addrconf_init()
ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf
Winkler, Tomas (1):
tmp: use pdev for parent device in tpm_chip_alloc
Xinming Hu (1):
mwifiex: remove redundant dma padding in AMSDU
Yonghong Song (1):
bpf: enhance verifier to understand stack pointer arithmetic