Linux 3.7.6
Greg KH
maintainerI'm announcing the release of the 3.7.6 kernel.
All users of the 3.7 kernel series must upgrade.
The updated 3.7.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.7.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
------------
Documentation/device-mapper/dm-raid.txt | 1 Makefile | 2 arch/arm/kernel/head.S | 5 arch/arm/kernel/hyp-stub.S | 18 +-- arch/arm/mach-at91/setup.c | 2 arch/arm/mach-omap2/board-omap4panda.c | 6 + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 arch/arm/mm/dma-mapping.c | 18 +-- arch/arm/vfp/entry.S | 6 - arch/arm/vfp/vfphw.S | 4 arch/powerpc/kernel/entry_64.S | 13 ++ arch/powerpc/kvm/emulate.c | 2 arch/s390/include/asm/pgtable.h | 12 ++ arch/x86/boot/compressed/eboot.c | 3 arch/x86/boot/compressed/head_32.S | 2 arch/x86/include/asm/efi.h | 1 arch/x86/kernel/msr.c | 3 arch/x86/kernel/reboot.c | 2 arch/x86/kernel/setup.c | 30 ++--- arch/x86/platform/efi/efi.c | 59 ++++++---- arch/x86/platform/efi/efi_64.c | 22 +++ drivers/acpi/osl.c | 2 drivers/edac/edac_pci_sysfs.c | 2 drivers/firmware/dmi_scan.c | 2 drivers/firmware/efivars.c | 4 drivers/firmware/iscsi_ibft_find.c | 2 drivers/gpu/drm/i915/i915_debugfs.c | 2 drivers/gpu/drm/i915/i915_reg.h | 1 drivers/gpu/drm/i915/intel_pm.c | 15 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 24 +++- drivers/gpu/drm/radeon/radeon_cs.c | 6 - drivers/gpu/drm/radeon/radeon_cursor.c | 3 drivers/gpu/drm/radeon/radeon_device.c | 3 drivers/gpu/drm/radeon/radeon_display.c | 2 drivers/hid/hid-ids.h | 3 drivers/hid/usbhid/hid-quirks.c | 1 drivers/iommu/amd_iommu_init.c | 34 ++++++ drivers/iommu/intel-iommu.c | 21 ++- drivers/md/dm-raid.c | 101 ++++++------------ drivers/mfd/tc3589x.c | 17 --- drivers/net/can/c_can/c_can.c | 4 drivers/net/can/pch_can.c | 2 drivers/net/can/ti_hecc.c | 4 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 25 +--- drivers/net/wireless/ath/ath9k/ath9k.h | 3 drivers/net/wireless/ath/ath9k/beacon.c | 2 drivers/net/wireless/ath/ath9k/debug.c | 1 drivers/net/wireless/ath/ath9k/debug.h | 2 drivers/net/wireless/ath/ath9k/htc_hst.c | 2 drivers/net/wireless/ath/ath9k/main.c | 22 +-- drivers/net/wireless/ath/ath9k/recv.c | 54 ++------- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 11 + drivers/net/wireless/brcm80211/brcmsmac/main.c | 14 +- drivers/net/wireless/brcm80211/brcmsmac/main.h | 2 drivers/net/wireless/brcm80211/brcmsmac/pub.h | 2 drivers/net/wireless/iwlegacy/common.c | 35 ++---- drivers/net/wireless/mwifiex/cfg80211.c | 15 -- drivers/net/wireless/mwifiex/pcie.c | 2 drivers/net/wireless/mwifiex/sta_ioctl.c | 14 ++ drivers/platform/x86/ibm_rtl.c | 2 drivers/platform/x86/samsung-laptop.c | 4 drivers/scsi/isci/init.c | 2 drivers/target/target_core_fabric_configfs.c | 11 - fs/cifs/cifs_dfs_ref.c | 2 fs/nfs/namespace.c | 20 +++ fs/nfs/nfs4client.c | 62 ++++------- fs/nfs/nfs4state.c | 22 ++- fs/nfs/super.c | 22 +-- fs/xfs/xfs_aops.c | 2 fs/xfs/xfs_buf.c | 18 +++ fs/xfs/xfs_sync.c | 2 include/linux/efi.h | 24 +++- include/net/netfilter/nf_conntrack_core.h | 2 include/net/netns/x_tables.h | 1 init/main.c | 4 kernel/smp.c | 13 ++ mm/slub.c | 1 net/bluetooth/hci_event.c | 2 net/bluetooth/hidp/core.c | 2 net/ipv4/netfilter/ipt_REJECT.c | 1 net/ipv6/netfilter/ip6t_REJECT.c | 1 net/ipv6/netfilter/nf_conntrack_reasm.c | 5 net/mac80211/cfg.c | 12 +- net/mac80211/ieee80211_i.h | 6 - net/mac80211/offchannel.c | 19 +-- net/mac80211/scan.c | 15 -- net/netfilter/Kconfig | 7 + net/netfilter/nf_conntrack_core.c | 9 - net/netfilter/nf_conntrack_netlink.c | 2 net/netfilter/nf_conntrack_standalone.c | 1 net/netfilter/nfnetlink_log.c | 16 ++ net/netfilter/x_tables.c | 28 +++- net/netfilter/xt_CT.c | 54 +++++++++ net/netfilter/xt_hashlimit.c | 54 ++++++++- net/netfilter/xt_recent.c | 43 ++++++- sound/pci/hda/hda_intel.c | 40 ++++--- sound/pci/hda/patch_realtek.c | 2 sound/soc/codecs/arizona.c | 2 sound/soc/codecs/wm2200.c | 3 sound/usb/mixer.c | 17 ++- virt/kvm/eventfd.c | 2 101 files changed, 756 insertions(+), 475 deletions(-)
Alan Cox (1):
x86/msr: Add capabilities check
Alex Williamson (1):
kvm: Fix irqfd resampler list walk
Alexander Graf (1):
KVM: PPC: Emulate dcbf
Amitkumar Karwar (1):
mwifiex: update config_bands during infra association
Anderson Lizardo (1):
Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()
Avinash Patil (1):
mwifiex: fix typo in PCIe adapter NULL check
Bob Hockney (1):
netfilter: nfnetlink_log: fix mac address for 6in4 tunnels
CAI Qian (1):
slub: assign refcount for kmalloc_caches
Chris Rattray (1):
ASoC: wm2200: correct mixer values and text
Chris Wilson (2):
drm/i915: Disable AsyncFlip performance optimisations drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits
Clemens Ladisch (1):
ALSA: usb-audio: fix invalid length check for RME and other UAC 2 devices
Cong Ding (1):
fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
Dan Carpenter (1):
EDAC: Test correct variable in ->store function
Daniel Vetter (2):
drm/i915: dump UTS_RELEASE into the error_state iommu/intel: disable DMAR for g4x integrated gfx
Dave Chinner (2):
xfs: fix _xfs_buf_find oops on blocks beyond the filesystem end
xfs: fix periodic log flushing
Dave Martin (1):
ARM: virt: Avoid bx instruction for compatibility with <=ARMv4
David Henningsson (1):
ALSA: hda - fix inverted internal mic on Acer AOA150/ZG5
David Woodhouse (2):
x86, efi: Fix display detection in EFI boot stub x86, efi: Fix 32-bit EFI handover protocol entry point
Dimitris Papastamos (1):
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
Eric Dumazet (1):
netfilter: xt_recent: avoid high order page allocations
Felix Fietkau (9):
ath9k: do not link receive buffers during flush
ath9k: fix double-free bug on beacon generate failure
ath9k: remove the WARN_ON that triggers if generating a beacon fails
ath9k: add a better fix for the rx tasklet vs rx flush race
ath9k: fix rx flush handling
ath9k: remove sc->rx.rxbuflock to fix a deadlock
ath9k: disable the tasklet before taking the PCU lock
ath9k_hw: fix chain swap setting when setting rx chainmask to 5
ath9k: allow setting arbitrary antenna masks on AR9003+
Gerald Schaefer (1):
s390/thp: implement pmdp_set_wrprotect()
Greg Kroah-Hartman (1):
Linux 3.7.6
H. Peter Anvin (1):
x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI
Haibo Xi (1):
netfilter: nf_ct_reasm: fix conntrack reassembly expire code
Ilija Hadzic (2):
drm/radeon: fix error path in kpage allocation drm/radeon: fix a rare case of double kfree
Jan Engelhardt (1):
netfilter: x_tables: print correct hook names for ARP
Jan Kara (1):
xfs: Fix possible use-after-free with AIO
Jani Nikula (1):
drm/i915: fix FORCEWAKE posting reads
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: rm9200: remake the BGA as default version
Jerome Glisse (1):
drm/radeon: fix cursor corruption on DCE6 and newer
Jesper Juhl (1):
netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect
Johannes Berg (1):
mac80211: fix FT roaming
Jonathan Brassow (1):
DM-RAID: Fix RAID10's check for sufficient redundancy
Linus Walleij (1):
mfd: tc3589x: Use simple irqdomain
Luciano Coelho (1):
ARM: OMAP2+: omap4-panda: add UART2 muxing for WiLink shared transport
Marc Zyngier (2):
ARM: virt: boot secondary CPUs through the right entry point
ARM: virt: simplify __hyp_stub_install epilog
Mark Brown (1):
ASoC: arizona: Use actual rather than desired BCLK when calculating LRCLK
Matt Fleming (3):
efi: Make 'efi_enabled' a function to query EFI facilities
samsung-laptop: Disable on EFI hardware
x86, efi: Set runtime_version to the EFI spec revision
Mukund Jampala (1):
netfilter: ip[6]t_REJECT: fix wrong transport header pointer in TCP reset
Nathan Zimmer (1):
efi, x86: Pass a proper identity mapping in efi_call_phys_prelog
Nicholas Bellinger (1):
target: fix regression with dev_link_magic in target_fabric_port_link
Nicholas Santos (1):
HID: usbhid: quirk for Formosa IR receiver
Nicolas Pitre (1):
ARM: 7628/1: head.S: map one extra section for the ATAG/DTB area
Olivier Sobrie (3):
can: c_can: fix invalid error codes
can: ti_hecc: fix invalid error codes
can: pch_can: fix invalid error codes
Pablo Neira Ayuso (6):
netfilter: nfnetlink_log: fix possible compilation issue due to missing include
netfilter: xt_CT: recover NOTRACK target support
netfilter: fix missing dependencies for the NOTRACK target
netfilter: xt_hashlimit: fix race that results in duplicated entries
netfilter: nf_conntrack: fix BUG_ON while removing nf_conntrack with netns
netfilter: xt_CT: fix unset return value if conntrack zone are disabled
Piotr Haber (2):
brcmsmac: increase timer reference count for new timers only
brcmsmac: handle packet drop during transmit correctly
Russell King (1):
ARM: DMA: Fix struct page iterator in dma_cache_maint() to work with sparsemem
Stanislaw Gruszka (2):
iwlegacy: fix IBSS cleanup
mac80211: synchronize scan off/on-channel and PS states
Stephen Boyd (1):
ARM: 7627/1: Predicate preempt logic on PREEMP_COUNT not PREEMPT alone
Sujith Manoharan (1):
ath9k_htc: Fix memory leak
Suravee Suthikulpanit (1):
IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround
Szymon Janc (1):
Bluetooth: Fix sending HCI commands after reset
Takashi Iwai (2):
ALSA: hda - Add a fixup for Packard-Bell desktop with ALC880
ALSA: hda - Fix non-snoop page handling
Tiejun Chen (1):
powerpc/book3e: Disable interrupt after preempt_schedule_irq
Trond Myklebust (6):
NFS: Fix error reporting in nfs_xdev_mount
NFS: Don't silently fail setattr() requests on mountpoints
NFSv4: Fix NFSv4 reference counting for trunked sessions
NFSv4: Fix NFSv4 trunking discovery
NFSv4.1: Ensure that nfs41_walk_client_list() does start lease recovery NFSv4.1: Handle NFS4ERR_DELAY when resetting the NFSv4.1 session
Vitaly E. Lavrov (2):
netfilter: xt_hashlimit: fix namespace destroy path
netfilter: xt_recent: fix namespace destroy path
Wang YanQing (1):
smp: Fix SMP function call empty cpu mask race
xueminsu (1):
radeon_display: Use pointer return error codes
Greg KH
maintainerDocumentation/device-mapper/dm-raid.txt +1 -0
@@ -141,3 +141,4 @@ Version History 1.2.0 Handle creation of arrays that contain failed devices. 1.3.0 Added support for RAID 10 1.3.1 Allow device replacement/rebuild for RAID 10 +1.3.2 Fix/improve redundancy checking for RAID10
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 7 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = Terrified Chipmunk
arch/arm/kernel/head.S +4 -1
@@ -246,6 +246,7 @@ __create_page_tables: /* * Then map boot params address in r2 if specified. + * We map 2 sections in case the ATAGs/DTB crosses a section boundary. */ mov r0, r2, lsr #SECTION_SHIFT movs r0, r0, lsl #SECTION_SHIFT
@@ -253,6 +254,8 @@ __create_page_tables: addne r3, r3, #PAGE_OFFSET addne r3, r4, r3, lsr #(SECTION_SHIFT - PMD_ORDER) orrne r6, r7, r0 + strne r6, [r3], #1 << PMD_ORDER + addne r6, r6, #1 << SECTION_SHIFT strne r6, [r3] #ifdef CONFIG_DEBUG_LL
@@ -331,7 +334,7 @@ ENTRY(secondary_startup) * as it has already been validated by the primary processor. */ #ifdef CONFIG_ARM_VIRT_EXT - bl __hyp_stub_install + bl __hyp_stub_install_secondary #endif safe_svcmode_maskall r9
arch/arm/kernel/hyp-stub.S +6 -12
@@ -99,7 +99,7 @@ ENTRY(__hyp_stub_install_secondary) * immediately. */ compare_cpu_mode_with_primary r4, r5, r6, r7 - bxne lr + movne pc, lr /* * Once we have given up on one CPU, we do not try to install the
@@ -111,7 +111,7 @@ ENTRY(__hyp_stub_install_secondary) */ cmp r4, #HYP_MODE - bxne lr @ give up if the CPU is not in HYP mode + movne pc, lr @ give up if the CPU is not in HYP mode /* * Configure HSCTLR to set correct exception endianness/instruction set
@@ -120,7 +120,8 @@ ENTRY(__hyp_stub_install_secondary) * Eventually, CPU-specific code might be needed -- assume not for now * * This code relies on the "eret" instruction to synchronize the - * various coprocessor accesses. + * various coprocessor accesses. This is done when we switch to SVC + * (see safe_svcmode_maskall). */ @ Now install the hypervisor stub: adr r7, __hyp_stub_vectors
@@ -155,14 +156,7 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE 1: #endif - bic r7, r4, #MODE_MASK - orr r7, r7, #SVC_MODE -THUMB( orr r7, r7, #PSR_T_BIT ) - msr spsr_cxsf, r7 @ This is SPSR_hyp. - - __MSR_ELR_HYP(14) @ msr elr_hyp, lr - __ERET @ return, switching to SVC mode - @ The boot CPU mode is left in r4. + bx lr @ The boot CPU mode is left in r4. ENDPROC(__hyp_stub_install_secondary) __hyp_stub_do_trap:
@@ -200,7 +194,7 @@ ENDPROC(__hyp_get_vectors) @ fall through ENTRY(__hyp_set_vectors) __HVC(0) - bx lr + mov pc, lr ENDPROC(__hyp_set_vectors) #ifndef ZIMAGE
arch/arm/mach-at91/setup.c +2 -0
@@ -104,6 +104,8 @@ static void __init soc_detect(u32 dbgu_base)switch (socid) {case ARCH_ID_AT91RM9200 : at91_soc_initdata.type =AT91_SOC_RM9200 ; +if (at91_soc_initdata.subtype ==AT91_SOC_SUBTYPE_NONE ) + at91_soc_initdata.subtype =AT91_SOC_RM9200_BGA ; at91_boot_soc = at91rm9200_soc;break ;
arch/arm/mach-omap2/board-omap4panda.c +6 -0
@@ -402,6 +402,12 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP_PULL_ENA),OMAP4_MUX (ABE_MCBSP1_FSX ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +/* UART2 - BT/FM/GPS shared transport */ +OMAP4_MUX (UART2_CTS ,OMAP_PIN_INPUT |OMAP_MUX_MODE0 ), +OMAP4_MUX (UART2_RTS ,OMAP_PIN_OUTPUT |OMAP_MUX_MODE0 ), +OMAP4_MUX (UART2_RX ,OMAP_PIN_INPUT |OMAP_MUX_MODE0 ), +OMAP4_MUX (UART2_TX ,OMAP_PIN_OUTPUT |OMAP_MUX_MODE0 ), + { .reg_offset = OMAP_MUX_TERMINATOR }, };
arch/arm/mach-s3c64xx/mach-crag6410-module.c +1 -1
@@ -39,7 +39,7 @@ static struct spi_board_info wm1253_devs[] = { .bus_num = 0, .chip_select = 0, .mode = SPI_MODE_0, - .irq = S3C_EINT(5), + .irq = S3C_EINT(4), .controller_data = &wm0010_spi_csinfo, }, };
arch/arm/mm/dma-mapping.c +10 -8
@@ -776,25 +776,27 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, void (*op)(const void *, size_t, int)) { + unsigned long pfn; +size_t left = size; + + pfn =page_to_pfn (page) + offset /PAGE_SIZE ; + offset %=PAGE_SIZE ; +/* * A single sg entry may refer to multiple physically contiguous * pages. But we still need to process highmem pages individually. * If highmem is not configured then the bulk of this loop gets * optimized out. */ -size_t left = size; do { size_t len = left; void *vaddr; + page = pfn_to_page(pfn); + if (PageHighMem(page)) { - if (len + offset > PAGE_SIZE) { - if (offset >= PAGE_SIZE) { - page += offset / PAGE_SIZE; - offset %= PAGE_SIZE; - } + if (len + offset > PAGE_SIZE) len = PAGE_SIZE - offset; - } vaddr = kmap_high_get(page); if (vaddr) { vaddr += offset;
@@ -811,7 +813,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,op (vaddr, len, dir); } offset =0 ; - page++; + pfn++; left -= len; }while (left); }
arch/arm/vfp/entry.S +3 -3
@@ -22,7 +22,7 @@ @ IRQs disabled. @ ENTRY(do_vfp) -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_COUNT ldr r4, [r10, #TI_PREEMPT] @ get preempt count add r11, r4, #1 @ increment it str r11, [r10, #TI_PREEMPT]
@@ -35,7 +35,7 @@ ENTRY(do_vfp) ENDPROC(do_vfp) ENTRY(vfp_null_entry) -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 ldr r4, [r10, #TI_PREEMPT] @ get preempt count sub r11, r4, #1 @ decrement it
@@ -53,7 +53,7 @@ ENDPROC(vfp_null_entry) __INIT ENTRY(vfp_testing_entry) -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 ldr r4, [r10, #TI_PREEMPT] @ get preempt count sub r11, r4, #1 @ decrement it
arch/arm/vfp/vfphw.S +2 -2
@@ -168,7 +168,7 @@ vfp_hw_state_valid: @ else it's one 32-bit instruction, so @ always subtract 4 from the following @ instruction address. -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 ldr r4, [r10, #TI_PREEMPT] @ get preempt count sub r11, r4, #1 @ decrement it
@@ -192,7 +192,7 @@ look_for_VFP_exceptions: @ not recognised by VFP DBGSTR "not VFP" -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 ldr r4, [r10, #TI_PREEMPT] @ get preempt count sub r11, r4, #1 @ decrement it
arch/powerpc/kernel/entry_64.S +13 -0
@@ -668,6 +668,19 @@ resume_kernel: ld r4,TI_FLAGS(r9) andi. r0,r4,_TIF_NEED_RESCHED bne 1b + + /* + * arch_local_irq_restore() from preempt_schedule_irq above may + * enable hard interrupt but we really should disable interrupts + * when we return from the interrupt, and so that we don't get + * interrupted after loading SRR0/1. + */ +#ifdef CONFIG_PPC_BOOK3E + wrteei 0 +#else + ld r10,PACAKMSR(r13) /* Get kernel MSR without EE */ + mtmsrd r10,1 /* Update machine state */ +#endif /* CONFIG_PPC_BOOK3E */ #endif /* CONFIG_PREEMPT */ .globl fast_exc_return_irq
arch/powerpc/kvm/emulate.c +2 -0
@@ -39,6 +39,7 @@#define OP_31_XOP_TRAP 4#define OP_31_XOP_LWZX 23#define OP_31_XOP_TRAP_64 68 +#define OP_31_XOP_DCBF 86#define OP_31_XOP_LBZX 87#define OP_31_XOP_STWX 151#define OP_31_XOP_STBX 215
@@ -353,6 +354,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)kvmppc_set_exit_type (vcpu,EMULATED_MTSPR_EXITS );break ; +case OP_31_XOP_DCBF :case OP_31_XOP_DCBI :/* Do nothing. The guest is performing dcbi because * hardware DMA is not snooped by the dcache, but
arch/s390/include/asm/pgtable.h +12 -0
@@ -1365,6 +1365,18 @@ static inline void pmdp_invalidate(struct vm_area_struct *vma,__pmd_idte (address, pmdp); } +#define __HAVE_ARCH_PMDP_SET_WRPROTECT +static inline void pmdp_set_wrprotect (struct mm_struct *mm, +unsigned long address,pmd_t *pmdp) +{ +pmd_t pmd = *pmdp; + +if (pmd_write (pmd)) { +__pmd_idte (address, pmdp); +set_pmd_at (mm, address, pmdp,pmd_wrprotect (pmd)); + } +} +static inline pmd_t mk_pmd_phys (unsigned long physpage,pgprot_t pgprot) {pmd_t __pmd;
arch/x86/boot/compressed/eboot.c +1 -2
@@ -316,10 +316,9 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,* Once we've found a GOP supporting ConOut, * don't bother looking any further. */ + first_gop = gop;if (conout_found)break ; - - first_gop = gop; } }
arch/x86/boot/compressed/head_32.S +2 -0
@@ -50,8 +50,10 @@ ENTRY(startup_32) pushl %eax pushl %esi pushl %ecx + sub $0x4, %esp .org 0x30,0x90 + add $0x4, %esp call efi_main cmpl $0, %eax movl %eax, %esi
arch/x86/include/asm/efi.h +1 -0
@@ -94,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,#endif /* CONFIG_X86_32 */ extern int add_efi_memmap; +extern unsigned long x86_efi_facility;extern void efi_set_executable (efi_memory_desc_t *md,bool executable);extern int efi_memblock_x86_reserve_range (void );extern void efi_call_phys_prelog (void );
arch/x86/kernel/msr.c +3 -0
@@ -174,6 +174,9 @@ static int msr_open(struct inode *inode, struct file *file)unsigned int cpu;struct cpuinfo_x86 *c; +if (!capable (CAP_SYS_RAWIO )) +return -EPERM ; + cpu =iminor (file->f_path.dentry->d_inode);if (cpu >= nr_cpu_ids || !cpu_online (cpu))return -ENXIO ;/* No such CPU */
arch/x86/kernel/reboot.c +1 -1
@@ -584,7 +584,7 @@ static void native_machine_emergency_restart(void)break ;case BOOT_EFI : -if (efi_enabled) +if (efi_enabled (EFI_RUNTIME_SERVICES )) efi.reset_system(reboot_mode ? EFI_RESET_WARM : EFI_RESET_COLD,
arch/x86/kernel/setup.c +16 -14
@@ -616,6 +616,7 @@ static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10;static bool __init snb_gfx_workaround_needed (void ) { +#ifdef CONFIG_PCI int i;u16 vendor, devid; static const u16 snb_ids[] = {
@@ -640,6 +641,7 @@ static bool __init snb_gfx_workaround_needed(void)for (i =0 ; i <ARRAY_SIZE (snb_ids); i++)if (devid == snb_ids[i])return true; +#endif return false; }
@@ -809,15 +811,15 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_EFI if (!strncmp ((char *)&boot_params.efi_info.efi_loader_signature,"EL32" ,4 )) { - efi_enabled =1 ; - efi_64bit = false; +set_bit (EFI_BOOT , &x86_efi_facility); }else if (!strncmp ((char *)&boot_params.efi_info.efi_loader_signature,"EL64" ,4 )) { - efi_enabled =1 ; - efi_64bit = true; +set_bit (EFI_BOOT , &x86_efi_facility); +set_bit (EFI_64BIT , &x86_efi_facility); } -if (efi_enabled &&efi_memblock_x86_reserve_range ()) - efi_enabled =0 ; + +if (efi_enabled (EFI_BOOT )) +efi_memblock_x86_reserve_range ();#endif x86_init.oem.arch_setup ();
@@ -890,7 +892,7 @@ void __init setup_arch(char **cmdline_p)finish_e820_parsing (); -if (efi_enabled) +if (efi_enabled (EFI_BOOT ))efi_init ();dmi_scan_machine ();
@@ -973,7 +975,7 @@ void __init setup_arch(char **cmdline_p)* The EFI specification says that boot service code won't be called * after ExitBootServices(). This is, in fact, a lie. */ -if (efi_enabled) +if (efi_enabled (EFI_MEMMAP ))efi_reserve_boot_services ();/* preallocate 4k for mptable mpc */
@@ -1112,7 +1114,7 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE ) -if (!efi_enabled || (efi_mem_type (0xa0000 ) !=EFI_CONVENTIONAL_MEMORY )) +if (!efi_enabled (EFI_BOOT ) || (efi_mem_type (0xa0000 ) !=EFI_CONVENTIONAL_MEMORY )) conswitchp = &vga_con;#elif defined(CONFIG_DUMMY_CONSOLE ) conswitchp = &dummy_con;
@@ -1129,14 +1131,14 @@ void __init setup_arch(char **cmdline_p)register_refined_jiffies (CLOCK_TICK_RATE );#ifdef CONFIG_EFI -/* Once setup is done above, disable efi_enabled on mismatched -* firmware/kernel archtectures since there is no support for -* runtime services. +/* Once setup is done above, unmap the EFI memory map on +* mismatched firmware/kernel archtectures since there is no +* support for runtime services. */ -if (efi_enabled &&IS_ENABLED (CONFIG_X86_64 ) != efi_64bit) { +if (efi_enabled (EFI_BOOT ) && +IS_ENABLED (CONFIG_X86_64 ) !=efi_enabled (EFI_64BIT )) {pr_info ("efi: Setup done, disabling due to 32/64-bit mismatch\n" );efi_unmap_memmap (); - efi_enabled =0 ; }#endif }
arch/x86/platform/efi/efi.c +35 -24
145 lines not on this page · raw message
arch/x86/platform/efi/efi_64.c +17 -5
@@ -38,7 +38,7 @@#include <asm/cacheflush.h> #include <asm/fixmap.h> -static pgd_t save_pgd__initdata ; +static pgd_t *save_pgd__initdata ;static unsigned long efi_flags__initdata ;static void __init early_code_mapping_set_exec (int executable)
@@ -61,12 +61,20 @@ static void __init early_code_mapping_set_exec(int executable)void __init efi_call_phys_prelog (void ) {unsigned long vaddress; +int pgd; +int n_pgds;early_code_mapping_set_exec (1 );local_irq_save (efi_flags); - vaddress = (unsigned long )__va (0x0UL ); - save_pgd = *pgd_offset_k (0x0UL ); -set_pgd (pgd_offset_k (0x0UL ), *pgd_offset_k (vaddress)); + + n_pgds =DIV_ROUND_UP ((max_pfn <<PAGE_SHIFT ),PGDIR_SIZE ); + save_pgd =kmalloc (n_pgds *sizeof (pgd_t),GFP_KERNEL ); + +for (pgd =0 ; pgd < n_pgds; pgd++) { + save_pgd[pgd] = *pgd_offset_k (pgd *PGDIR_SIZE ); + vaddress = (unsigned long )__va (pgd *PGDIR_SIZE ); +set_pgd (pgd_offset_k (pgd *PGDIR_SIZE ), *pgd_offset_k (vaddress)); + }__flush_tlb_all (); }
@@ -75,7 +83,11 @@ void __init efi_call_phys_epilog(void)/* * After the lock is released, the original page table is restored. */ -set_pgd (pgd_offset_k (0x0UL ), save_pgd); +int pgd; +int n_pgds =DIV_ROUND_UP ((max_pfn <<PAGE_SHIFT ) ,PGDIR_SIZE ); +for (pgd =0 ; pgd < n_pgds; pgd++) +set_pgd (pgd_offset_k (pgd *PGDIR_SIZE ), save_pgd[pgd]); +kfree (save_pgd);__flush_tlb_all ();local_irq_restore (efi_flags);early_code_mapping_set_exec (0 );
drivers/acpi/osl.c +1 -1
@@ -250,7 +250,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)return acpi_rsdp;#endif -if (efi_enabled) { +if (efi_enabled (EFI_CONFIG_TABLES )) {if (efi.acpi20 !=EFI_INVALID_TABLE_ADDR )return efi.acpi20;else if (efi.acpi !=EFI_INVALID_TABLE_ADDR )
drivers/edac/edac_pci_sysfs.c +1 -1
@@ -256,7 +256,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,struct edac_pci_dev_attribute *edac_pci_dev; edac_pci_dev = (struct edac_pci_dev_attribute *)attr; -if (edac_pci_dev->show) +if (edac_pci_dev->store)return edac_pci_dev->store (edac_pci_dev->value, buffer, count);return -EIO ; }
drivers/firmware/dmi_scan.c +1 -1
@@ -471,7 +471,7 @@ void __init dmi_scan_machine(void)char __iomem *p, *q;int rc; -if (efi_enabled) { +if (efi_enabled (EFI_CONFIG_TABLES )) {if (efi.smbios ==EFI_INVALID_TABLE_ADDR ) goto error;
drivers/firmware/efivars.c +2 -2
@@ -1224,7 +1224,7 @@ efivars_init(void)printk (KERN_INFO "EFI Variables Facility v%s %s\n" ,EFIVARS_VERSION ,EFIVARS_DATE ); -if (!efi_enabled) +if (!efi_enabled (EFI_RUNTIME_SERVICES ))return 0 ;/* For now we'll register the efi directory at /sys/firmware/efi */
@@ -1262,7 +1262,7 @@ err_put: static void __exitefivars_exit (void ) { -if (efi_enabled) { +if (efi_enabled (EFI_RUNTIME_SERVICES )) {unregister_efivars (&__efivars);kobject_put (efi_kobj); }
drivers/firmware/iscsi_ibft_find.c +1 -1
@@ -99,7 +99,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)/* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will * only use ACPI for this */ -if (!efi_enabled) +if (!efi_enabled (EFI_BOOT ))find_ibft_in_mem ();if (ibft_addr) {
drivers/gpu/drm/i915/i915_debugfs.c +2 -0
@@ -30,6 +30,7 @@#include <linux/debugfs.h> #include <linux/slab.h> #include <linux/export.h> +#include <generated/utsrelease.h> #include <drm/drmP.h> #include "intel_drv.h" #include "intel_ringbuffer.h"
@@ -687,6 +688,7 @@ static int i915_error_state(struct seq_file *m, void *unused)seq_printf (m,"Time: %ld s %ld us\n" , error->time.tv_sec, error->time.tv_usec); +seq_printf (m,"Kernel: " UTS_RELEASE );seq_printf (m,"PCI ID: 0x%04x\n" , dev->pci_device);seq_printf (m,"EIR: 0x%08x\n" , error->eir);seq_printf (m,"IER: 0x%08x\n" , error->ier);
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -527,6 +527,7 @@#define MI_MODE 0x0209c# define VS_TIMER_DISPATCH (1 << 6)# define MI_FLUSH_ENABLE (1 << 12) +# define ASYNC_FLIP_PERF_DISABLE (1 << 14)#define GEN6_GT_MODE 0x20d0#define GEN6_GT_MODE_HI (1 << 9)
drivers/gpu/drm/i915/intel_pm.c +10 -5
@@ -4018,7 +4018,8 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)DRM_ERROR ("Timed out waiting for forcewake old ack to clear.\n" );I915_WRITE_NOTRACE (FORCEWAKE ,1 ); -POSTING_READ (ECOBUS );/* something from same cacheline, but !FORCEWAKE */ +/* something from same cacheline, but !FORCEWAKE */ +POSTING_READ (ECOBUS );if (wait_for_atomic ((I915_READ_NOTRACE (forcewake_ack) &1 ),FORCEWAKE_ACK_TIMEOUT_MS ))
@@ -4041,7 +4042,8 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)DRM_ERROR ("Timed out waiting for forcewake old ack to clear.\n" );I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_ENABLE (1 )); -POSTING_READ (ECOBUS );/* something from same cacheline, but !FORCEWAKE */ +/* something from same cacheline, but !FORCEWAKE */ +POSTING_READ (ECOBUS );if (wait_for_atomic ((I915_READ_NOTRACE (forcewake_ack) &1 ),FORCEWAKE_ACK_TIMEOUT_MS ))
@@ -4078,14 +4080,16 @@ void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv)static void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) {I915_WRITE_NOTRACE (FORCEWAKE ,0 ); -/* gen6_gt_check_fifodbg doubles as the POSTING_READ */ +/* something from same cacheline, but !FORCEWAKE */ +POSTING_READ (ECOBUS );gen6_gt_check_fifodbg (dev_priv); }static void __gen6_gt_force_wake_mt_put (struct drm_i915_private *dev_priv) {I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_DISABLE (1 )); -/* gen6_gt_check_fifodbg doubles as the POSTING_READ */ +/* something from same cacheline, but !FORCEWAKE_MT */ +POSTING_READ (ECOBUS );gen6_gt_check_fifodbg (dev_priv); }
@@ -4140,7 +4144,8 @@ static void vlv_force_wake_get(struct drm_i915_private *dev_priv)static void vlv_force_wake_put (struct drm_i915_private *dev_priv) {I915_WRITE_NOTRACE (FORCEWAKE_VLV ,_MASKED_BIT_DISABLE (1 )); -/* The below doubles as a POSTING_READ */ +/* something from same cacheline, but !FORCEWAKE_VLV */ +POSTING_READ (FORCEWAKE_ACK_VLV );gen6_gt_check_fifodbg (dev_priv); }
drivers/gpu/drm/i915/intel_ringbuffer.c +18 -6
@@ -505,13 +505,25 @@ static int init_render_ring(struct intel_ring_buffer *ring)struct drm_i915_private *dev_priv = dev->dev_private;int ret =init_ring_common (ring); -if (INTEL_INFO (dev)->gen >3 ) { +if (INTEL_INFO (dev)->gen >3 )I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (VS_TIMER_DISPATCH )); -if (IS_GEN7 (dev)) -I915_WRITE (GFX_MODE_GEN7 , -_MASKED_BIT_DISABLE (GFX_TLB_INVALIDATE_ALWAYS ) | -_MASKED_BIT_ENABLE (GFX_REPLAY_MODE )); - } + +/* We need to disable the AsyncFlip performance optimisations in order +* to use MI_WAIT_FOR_EVENT within the CS. It should already be +* programmed to '1' on all products. +*/ +if (INTEL_INFO (dev)->gen >=6 ) +I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (ASYNC_FLIP_PERF_DISABLE )); + +/* Required for the hardware to program scanline values for waiting */ +if (INTEL_INFO (dev)->gen ==6 ) +I915_WRITE (GFX_MODE , +_MASKED_BIT_ENABLE (GFX_TLB_INVALIDATE_ALWAYS )); + +if (IS_GEN7 (dev)) +I915_WRITE (GFX_MODE_GEN7 , +_MASKED_BIT_DISABLE (GFX_TLB_INVALIDATE_ALWAYS ) | +_MASKED_BIT_ENABLE (GFX_REPLAY_MODE ));if (INTEL_INFO (dev)->gen >=5 ) { ret =init_pipe_control (ring);
drivers/gpu/drm/radeon/radeon_cs.c +4 -2
@@ -271,8 +271,10 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) p->chunks[p->chunk_ib_idx].kpage[1 ] =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (p->chunks[p->chunk_ib_idx].kpage[0 ] ==NULL || p->chunks[p->chunk_ib_idx].kpage[1 ] ==NULL ) { -kfree (p->chunks[i].kpage[0 ]); -kfree (p->chunks[i].kpage[1 ]); +kfree (p->chunks[p->chunk_ib_idx].kpage[0 ]); +kfree (p->chunks[p->chunk_ib_idx].kpage[1 ]); + p->chunks[p->chunk_ib_idx].kpage[0 ] =NULL ; + p->chunks[p->chunk_ib_idx].kpage[1 ] =NULL ;return -ENOMEM ; } }
drivers/gpu/drm/radeon/radeon_cursor.c +2 -1
@@ -240,7 +240,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, y =0 ; } -if (ASIC_IS_AVIVO (rdev)) { +/* fixed on DCE6 and newer */ +if (ASIC_IS_AVIVO (rdev) && !ASIC_IS_DCE6 (rdev)) {int i =0 ;struct drm_crtc *crtc_p;
drivers/gpu/drm/radeon/radeon_device.c +2 -1
@@ -429,7 +429,8 @@ bool radeon_card_posted(struct radeon_device *rdev) {uint32_t reg; -if (efi_enabled && rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) +if (efi_enabled (EFI_BOOT ) && + rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE )return false;/* first check CRTCs */
drivers/gpu/drm/radeon/radeon_display.c +1 -1
@@ -1118,7 +1118,7 @@ radeon_user_framebuffer_create(struct drm_device *dev,if (ret) {kfree (radeon_fb);drm_gem_object_unreference_unlocked (obj); -return NULL ; +return ERR_PTR (ret); }return &radeon_fb->base;
drivers/hid/hid-ids.h +3 -0
@@ -305,6 +305,9 @@#define USB_VENDOR_ID_EZKEY 0x0518#define USB_DEVICE_ID_BTC_8193 0x0002 +#define USB_VENDOR_ID_FORMOSA 0x147a +#define USB_DEVICE_ID_FORMOSA_IR_RECEIVER 0xe03e +#define USB_VENDOR_ID_FREESCALE 0x15A2#define USB_DEVICE_ID_FREESCALE_MX28 0x004F
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -70,6 +70,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
drivers/iommu/amd_iommu_init.c +34 -0
@@ -975,6 +975,38 @@ static void __init free_iommu_all(void) }/* +* Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) +* Workaround: +* BIOS should disable L2B micellaneous clock gating by setting +* L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b +*/ +static void __init amd_iommu_erratum_746_workaround (struct amd_iommu *iommu) +{ +u32 value; + +if ((boot_cpu_data.x86 !=0x15 ) || + (boot_cpu_data.x86_model <0x10 ) || + (boot_cpu_data.x86_model >0x1f )) +return ; + +pci_write_config_dword (iommu->dev,0xf0 ,0x90 ); +pci_read_config_dword (iommu->dev,0xf4 , &value); + +if (value &BIT (2 )) +return ; + +/* Select NB indirect register 0x90 and enable writing */ +pci_write_config_dword (iommu->dev,0xf0 ,0x90 | (1 <<8 )); + +pci_write_config_dword (iommu->dev,0xf4 , value |0x4 ); +pr_info ("AMD-Vi: Applying erratum 746 workaround for IOMMU at %s\n" , +dev_name (&iommu->dev->dev)); + +/* Clear the enable writing bit */ +pci_write_config_dword (iommu->dev,0xf0 ,0x90 ); +} + +/* * This function clues the initialization function for one IOMMU * together and also allocates the command buffer and programs the * hardware. It does NOT enable the IOMMU. This is done afterwards.
@@ -1172,6 +1204,8 @@ static int iommu_init_pci(struct amd_iommu *iommu) iommu->stored_l2[i] =iommu_read_l2 (iommu, i); } +amd_iommu_erratum_746_workaround (iommu); +return pci_enable_device (iommu->dev); }
drivers/iommu/intel-iommu.c +15 -6
@@ -4234,6 +4234,21 @@ static struct iommu_ops intel_iommu_ops = { .pgsize_bitmap = INTEL_IOMMU_PGSIZES, }; +static void __devinit quirk_iommu_g4x_gfx (struct pci_dev *dev) +{ +/* G4x/GM45 integrated gfx dmar support is totally busted. */ +printk (KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n" ); + dmar_map_gfx =0 ; +} + +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2a40 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e00 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e10 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e20 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e30 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e40 , quirk_iommu_g4x_gfx); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e90 , quirk_iommu_g4x_gfx); +static void __devinit quirk_iommu_rwbf (struct pci_dev *dev) {/*
@@ -4242,12 +4257,6 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)*/ printk (KERN_INFO "DMAR: Forcing write-buffer flush capability\n" ); rwbf_quirk =1 ; - -/* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */ -if (dev->revision ==0x07 ) { -printk (KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n" ); - dmar_map_gfx =0 ; - } }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2a40 , quirk_iommu_rwbf);
drivers/md/dm-raid.c +37 -64
176 lines not on this page · raw message
drivers/mfd/tc3589x.c +5 -12
@@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq) }static struct irq_domain_ops tc3589x_irq_ops = { - .map = tc3589x_irq_map, + .map = tc3589x_irq_map, .unmap = tc3589x_irq_unmap, - .xlate = irq_domain_xlate_twocell, + .xlate = irq_domain_xlate_twocell, };static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) {int base = tc3589x->irq_base; -if (base) { - tc3589x->domain =irq_domain_add_legacy ( -NULL , TC3589x_NR_INTERNAL_IRQS, base, -0 , &tc3589x_irq_ops, tc3589x); - } -else { - tc3589x->domain =irq_domain_add_linear ( - np, TC3589x_NR_INTERNAL_IRQS, - &tc3589x_irq_ops, tc3589x); - } + tc3589x->domain =irq_domain_add_simple ( + np, TC3589x_NR_INTERNAL_IRQS, base, + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/net/can/c_can/c_can.c +2 -2
@@ -954,7 +954,7 @@ static int c_can_handle_bus_err(struct net_device *dev,break ;case LEC_ACK_ERROR :netdev_dbg (dev,"ack error\n" ); - cf->data[2 ] |= (CAN_ERR_PROT_LOC_ACK | + cf->data[3 ] |= (CAN_ERR_PROT_LOC_ACK |CAN_ERR_PROT_LOC_ACK_DEL );break ;case LEC_BIT1_ERROR :
@@ -967,7 +967,7 @@ static int c_can_handle_bus_err(struct net_device *dev,break ;case LEC_CRC_ERROR :netdev_dbg (dev,"CRC error\n" ); - cf->data[2 ] |= (CAN_ERR_PROT_LOC_CRC_SEQ | + cf->data[3 ] |= (CAN_ERR_PROT_LOC_CRC_SEQ |CAN_ERR_PROT_LOC_CRC_DEL );break ;default :
drivers/net/can/pch_can.c +1 -1
@@ -560,7 +560,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) stats->rx_errors++;break ;case PCH_CRC_ERR : - cf->data[2 ] |=CAN_ERR_PROT_LOC_CRC_SEQ | + cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ |CAN_ERR_PROT_LOC_CRC_DEL ; priv->can.can_stats.bus_error++; stats->rx_errors++;
drivers/net/can/ti_hecc.c +2 -2
@@ -746,12 +746,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, }if (err_status &HECC_CANES_CRCE ) {hecc_set_bit (priv,HECC_CANES ,HECC_CANES_CRCE ); - cf->data[2 ] |=CAN_ERR_PROT_LOC_CRC_SEQ | + cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ |CAN_ERR_PROT_LOC_CRC_DEL ; }if (err_status &HECC_CANES_ACKE ) {hecc_set_bit (priv,HECC_CANES ,HECC_CANES_ACKE ); - cf->data[2 ] |=CAN_ERR_PROT_LOC_ACK | + cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK |CAN_ERR_PROT_LOC_ACK_DEL ; } }
drivers/net/wireless/ath/ath9k/ar9003_phy.c +6 -19
@@ -588,30 +588,17 @@ static void ar9003_hw_init_bb(struct ath_hw *ah,static void ar9003_hw_set_chain_masks (struct ath_hw *ah,u8 rx,u8 tx) { -switch (rx) { -case 0x5 : +if (ah->caps.tx_chainmask ==5 || ah->caps.rx_chainmask ==5 )REG_SET_BIT (ah,AR_PHY_ANALOG_SWAP ,AR_PHY_SWAP_ALT_CHAIN ); -case 0x3 : -case 0x1 : -case 0x2 : -case 0x7 : -REG_WRITE (ah,AR_PHY_RX_CHAINMASK , rx); -REG_WRITE (ah,AR_PHY_CAL_CHAINMASK , rx); -break ; -default : -break ; - } + +REG_WRITE (ah,AR_PHY_RX_CHAINMASK , rx); +REG_WRITE (ah,AR_PHY_CAL_CHAINMASK , rx);if ((ah->caps.hw_caps &ATH9K_HW_CAP_APM ) && (tx ==0x7 )) -REG_WRITE (ah,AR_SELFGEN_MASK ,0x3 ); -else -REG_WRITE (ah,AR_SELFGEN_MASK , tx); + tx =3 ; -if (tx ==0x5 ) { -REG_SET_BIT (ah,AR_PHY_ANALOG_SWAP , -AR_PHY_SWAP_ALT_CHAIN ); - } +REG_WRITE (ah,AR_SELFGEN_MASK , tx); }/*
drivers/net/wireless/ath/ath9k/ath9k.h +0 -3
@@ -315,7 +315,6 @@ struct ath_rx {u32 *rxlink;u32 num_pkts;unsigned int rxfilter; -spinlock_t rxbuflock;struct list_head rxbuf;struct ath_descdma rxdma;struct ath_buf *rx_bufptr;
@@ -326,7 +325,6 @@ struct ath_rx {int ath_startrecv (struct ath_softc *sc);bool ath_stoprecv (struct ath_softc *sc); -void ath_flushrecv (struct ath_softc *sc);u32 ath_calcrxfilter (struct ath_softc *sc);int ath_rx_init (struct ath_softc *sc,int nbufs);void ath_rx_cleanup (struct ath_softc *sc);
@@ -630,7 +628,6 @@ void ath_ant_comb_update(struct ath_softc *sc);enum sc_op_flags {SC_OP_INVALID ,SC_OP_BEACONS , -SC_OP_RXFLUSH ,SC_OP_ANI_RUN ,SC_OP_PRIM_STA_VIF ,SC_OP_HW_RESET ,
drivers/net/wireless/ath/ath9k/beacon.c +1 -1
@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, skb->len, DMA_TO_DEVICE);dev_kfree_skb_any (skb); bf->bf_buf_addr =0 ; + bf->bf_mpdu =NULL ; } skb =ieee80211_beacon_get (hw, vif);
@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data)return ; bf =ath9k_beacon_generate (sc->hw, vif); -WARN_ON (!bf);if (sc->beacon.bmisscnt !=0 ) { ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
drivers/net/wireless/ath/ath9k/debug.c +0 -1
@@ -973,7 +973,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,RXS_ERR ("RX-LENGTH-ERR" , rx_len_err);RXS_ERR ("RX-OOM-ERR" , rx_oom_err);RXS_ERR ("RX-RATE-ERR" , rx_rate_err); -RXS_ERR ("RX-DROP-RXFLUSH" , rx_drop_rxflush);RXS_ERR ("RX-TOO-MANY-FRAGS" , rx_too_many_frags_err);PHY_ERR ("UNDERRUN ERR" ,ATH9K_PHYERR_UNDERRUN );
drivers/net/wireless/ath/ath9k/debug.h +0 -2
@@ -200,7 +200,6 @@ struct ath_tx_stats {* @rx_oom_err: No. of frames dropped due to OOM issues. * @rx_rate_err: No. of frames dropped due to rate errors. * @rx_too_many_frags_err: Frames dropped due to too-many-frags received. -* @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH. * @rx_beacons: No. of beacons received. * @rx_frags: No. of rx-fragements received. */
@@ -219,7 +218,6 @@ struct ath_rx_stats {u32 rx_oom_err;u32 rx_rate_err;u32 rx_too_many_frags_err; -u32 rx_drop_rxflush;u32 rx_beacons;u32 rx_frags; };
drivers/net/wireless/ath/ath9k/htc_hst.c +2 -0
@@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle, endpoint->ep_callbacks.tx (endpoint->ep_callbacks.priv, skb, htc_hdr->endpoint_id, txok); + }else { +kfree_skb (skb); } }
drivers/net/wireless/ath/ath9k/main.c +9 -13
@@ -181,7 +181,7 @@ static void ath_restart_work(struct ath_softc *sc)ath_start_ani (sc); } -static bool ath_prepare_reset (struct ath_softc *sc,bool retry_tx,bool flush) +static bool ath_prepare_reset (struct ath_softc *sc,bool retry_tx) {struct ath_hw *ah = sc->sc_ah;bool ret = true;
@@ -201,14 +201,6 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)if (!ath_drain_all_txq (sc, retry_tx)) ret = false; -if (!flush) { -if (ah->caps.hw_caps &ATH9K_HW_CAP_EDMA ) -ath_rx_tasklet (sc,1 , true); -ath_rx_tasklet (sc,1 , false); - }else { -ath_flushrecv (sc); - } -return ret; }
@@ -261,11 +253,11 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,struct ath_common *common =ath9k_hw_common (ah);struct ath9k_hw_cal_data *caldata =NULL ;bool fastcc = true; -bool flush = false;int r;__ath_cancel_work (sc); +tasklet_disable (&sc->intr_tq);spin_lock_bh (&sc->sc_pcu_lock);if (!(sc->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL )) {
@@ -275,11 +267,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,if (!hchan) { fastcc = false; - flush = true; hchan = ah->curchan; } -if (!ath_prepare_reset (sc, retry_tx, flush)) +if (!ath_prepare_reset (sc, retry_tx)) fastcc = false; ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@ -297,6 +288,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, out:spin_unlock_bh (&sc->sc_pcu_lock); +tasklet_enable (&sc->intr_tq); +return r; }
@@ -816,7 +809,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)ath9k_hw_cfg_gpio_input (ah, ah->led_pin); } -ath_prepare_reset (sc, false, true); +ath_prepare_reset (sc, false);if (sc->rx.frag) {dev_kfree_skb_any (sc->rx.frag);
@@ -1837,6 +1830,9 @@ static u32 fill_chainmask(u32 cap, u32 new)static bool validate_antenna_mask (struct ath_hw *ah,u32 val) { +if (AR_SREV_9300_20_OR_LATER (ah)) +return true; +switch (val &0x7 ) {case 0x1 :case 0x3 :
drivers/net/wireless/ath/ath9k/recv.c +15 -39
143 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +6 -5
@@ -280,8 +280,8 @@ static void brcms_ops_tx(struct ieee80211_hw *hw,kfree_skb (skb); goto done; } -brcms_c_sendpkt_mac80211 (wl->wlc, skb, hw); - tx_info->rate_driver_data[0 ] = control->sta; +if (brcms_c_sendpkt_mac80211 (wl->wlc, skb, hw)) + tx_info->rate_driver_data[0 ] = control->sta; done:spin_unlock_bh (&wl->lock); }
@@ -1401,9 +1401,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)#endif t->ms = ms; t->periodic = (bool ) periodic; - t->set = true; - -atomic_inc (&t->wl->callbacks); +if (!t->set) { + t->set = true; +atomic_inc (&t->wl->callbacks); + }ieee80211_queue_delayed_work (hw, &t->dly_wrk,msecs_to_jiffies (ms)); }
drivers/net/wireless/brcm80211/brcmsmac/main.c +9 -5
@@ -6095,7 +6095,7 @@ static bool brcms_c_prec_enq(struct brcms_c_info *wlc, struct pktq *q,return brcms_c_prec_enq_head (wlc, q, pkt, prec, false); } -void brcms_c_txq_enq (struct brcms_c_info *wlc,struct scb *scb, +bool brcms_c_txq_enq (struct brcms_c_info *wlc,struct scb *scb,struct sk_buff *sdu,uint prec) {struct brcms_txq_info *qi = wlc->pkt_queue;/* Check me */
@@ -6110,7 +6110,9 @@ void brcms_c_txq_enq(struct brcms_c_info *wlc, struct scb *scb,* packet flooding from mac80211 stack */ brcmu_pkt_buf_free_skb (sdu); +return false; } +return true; }/*
@@ -7273,7 +7275,7 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,return 0 ; } -void brcms_c_sendpkt_mac80211 (struct brcms_c_info *wlc,struct sk_buff *sdu, +bool brcms_c_sendpkt_mac80211 (struct brcms_c_info *wlc,struct sk_buff *sdu,struct ieee80211_hw *hw) {u8 prio;
@@ -7288,10 +7290,12 @@ void brcms_c_sendpkt_mac80211(struct brcms_c_info *wlc, struct sk_buff *sdu, prio =ieee80211_is_data (d11_header->frame_control) ? sdu->priority :MAXPRIO ; fifo = prio2fifo[prio]; -if (brcms_c_d11hdrs_mac80211 (wlc, hw, sdu, scb,0 ,1 , fifo,0 )) -return ; -brcms_c_txq_enq (wlc, scb, sdu,BRCMS_PRIO_TO_PREC (prio)); +brcms_c_d11hdrs_mac80211 (wlc, hw, sdu, scb,0 ,1 , fifo,0 ); +if (!brcms_c_txq_enq (wlc, scb, sdu,BRCMS_PRIO_TO_PREC (prio))) +return false;brcms_c_send_q (wlc); + +return true; }void brcms_c_send_q (struct brcms_c_info *wlc)
drivers/net/wireless/brcm80211/brcmsmac/main.h +1 -1
@@ -642,7 +642,7 @@ extern void brcms_c_txfifo(struct brcms_c_info *wlc, uint fifo, bool commit, s8 txpktpend);extern void brcms_c_txfifo_complete (struct brcms_c_info *wlc,uint fifo,s8 txpktpend); -extern void brcms_c_txq_enq (struct brcms_c_info *wlc,struct scb *scb, +extern bool brcms_c_txq_enq (struct brcms_c_info *wlc,struct scb *scb,struct sk_buff *sdu,uint prec);extern void brcms_c_print_txstatus (struct tx_status *txs); extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
drivers/net/wireless/brcm80211/brcmsmac/pub.h +1 -1
@@ -321,7 +321,7 @@ extern void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask);extern bool brcms_c_intrsupd (struct brcms_c_info *wlc);extern bool brcms_c_isr (struct brcms_c_info *wlc,bool *wantdpc);extern bool brcms_c_dpc (struct brcms_c_info *wlc,bool bounded); -extern void brcms_c_sendpkt_mac80211 (struct brcms_c_info *wlc, +extern bool brcms_c_sendpkt_mac80211 (struct brcms_c_info *wlc,struct sk_buff *sdu,struct ieee80211_hw *hw);extern bool brcms_c_aggregatable (struct brcms_c_info *wlc,u8 tid);
drivers/net/wireless/iwlegacy/common.c +14 -21
@@ -3957,17 +3957,21 @@ il_connection_init_rx_config(struct il_priv *il)memset (&il->staging,0 ,sizeof (il->staging)); -if (!il->vif) { +switch (il->iw_mode) { +case NL80211_IFTYPE_UNSPECIFIED : il->staging.dev_type =RXON_DEV_TYPE_ESS ; - }else if (il->vif->type ==NL80211_IFTYPE_STATION ) { +break ; +case NL80211_IFTYPE_STATION : il->staging.dev_type =RXON_DEV_TYPE_ESS ; il->staging.filter_flags =RXON_FILTER_ACCEPT_GRP_MSK ; - }else if (il->vif->type ==NL80211_IFTYPE_ADHOC ) { +break ; +case NL80211_IFTYPE_ADHOC : il->staging.dev_type =RXON_DEV_TYPE_IBSS ; il->staging.flags =RXON_FLG_SHORT_PREAMBLE_MSK ; il->staging.filter_flags =RXON_FILTER_BCON_AWARE_MSK |RXON_FILTER_ACCEPT_GRP_MSK ; - }else { +break ; +default :IL_ERR ("Unsupported interface type %d\n" , il->vif->type);return ; }
@@ -4550,8 +4554,7 @@ out:EXPORT_SYMBOL (il_mac_add_interface);static void -il_teardown_interface (struct il_priv *il,struct ieee80211_vif *vif, -bool mode_change) +il_teardown_interface (struct il_priv *il,struct ieee80211_vif *vif) {lockdep_assert_held (&il->mutex);
@@ -4560,9 +4563,7 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,il_force_scan_end (il); } -if (!mode_change) -il_set_mode (il); - +il_set_mode (il); }void
@@ -4575,8 +4576,8 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)WARN_ON (il->vif != vif); il->vif =NULL ; - -il_teardown_interface (il, vif, false); + il->iw_mode =NL80211_IFTYPE_UNSPECIFIED ; +il_teardown_interface (il, vif);memset (il->bssid,0 ,ETH_ALEN );D_MAC80211 ("leave\n" );
@@ -4685,18 +4686,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, }/* success */ -il_teardown_interface (il, vif, true); vif->type = newtype; vif->p2p = false; - err =il_set_mode (il); -WARN_ON (err); -/* -* We've switched internally, but submitting to the -* device may have failed for some reason. Mask this -* error, because otherwise mac80211 will not switch -* (and set the interface type back) and we'll be -* out of sync with it. -*/ + il->iw_mode = newtype; +il_teardown_interface (il, vif); err =0 ; out:
drivers/net/wireless/mwifiex/cfg80211.c +1 -14
@@ -1462,7 +1462,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,struct cfg80211_ssid req_ssid;int ret, auth_type =0 ;struct cfg80211_bss *bss =NULL ; -u8 is_scanning_required =0 , config_bands =0 ; +u8 is_scanning_required =0 ;memset (&req_ssid,0 ,sizeof (struct cfg80211_ssid ));
@@ -1481,19 +1481,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,/* disconnect before try to associate */ mwifiex_deauthenticate (priv,NULL ); -if (channel) { -if (mode ==NL80211_IFTYPE_STATION ) { -if (channel->band ==IEEE80211_BAND_2GHZ ) - config_bands =BAND_B |BAND_G |BAND_GN ; -else - config_bands =BAND_A |BAND_AN ; - -if (!((config_bands | priv->adapter->fw_bands) & - ~priv->adapter->fw_bands)) - priv->adapter->config_bands = config_bands; - } - } -/* As this is new association, clear locally stored * keys and security related flags */ priv->sec_info.wpa_enabled = false;
drivers/net/wireless/mwifiex/pcie.c +1 -1
@@ -161,7 +161,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)if (pdev) { card = (struct pcie_service_card *)pci_get_drvdata (pdev); -if (!card || card->adapter) { +if (!card || !card->adapter) {pr_err ("Card or adapter structure is not valid\n" );return 0 ; }
drivers/net/wireless/mwifiex/sta_ioctl.c +14 -0
@@ -265,6 +265,20 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,if (ret) goto done; +if (bss_desc) { +u8 config_bands =0 ; + +if (mwifiex_band_to_radio_type ((u8 ) bss_desc->bss_band) + == HostCmd_SCAN_RADIO_TYPE_BG) + config_bands =BAND_B |BAND_G |BAND_GN ; +else + config_bands =BAND_A |BAND_AN ; + +if (!((config_bands | adapter->fw_bands) & + ~adapter->fw_bands)) + adapter->config_bands = config_bands; + } + ret =mwifiex_check_network_compatibility (priv, bss_desc);if (ret) goto done;
drivers/platform/x86/ibm_rtl.c +1 -1
@@ -244,7 +244,7 @@ static int __init ibm_rtl_init(void) {if (force)pr_warn ("module loaded by force\n" );/* first ensure that we are running on IBM HW */ -else if (efi_enabled || !dmi_check_system (ibm_rtl_dmi_table)) +else if (efi_enabled (EFI_BOOT ) || !dmi_check_system (ibm_rtl_dmi_table))return -ENODEV ;/* Get the address for the Extended BIOS Data Area */
drivers/platform/x86/samsung-laptop.c +4 -0
@@ -26,6 +26,7 @@#include <linux/seq_file.h> #include <linux/debugfs.h> #include <linux/ctype.h> +#include <linux/efi.h> #include <acpi/video.h> /*
@@ -1544,6 +1545,9 @@ static int __init samsung_init(void)struct samsung_laptop *samsung;int ret; +if (efi_enabled (EFI_BOOT )) +return -ENODEV ; + quirks = &samsung_unknown;if (!force && !dmi_check_system (samsung_dmi_table))return -ENODEV ;
drivers/scsi/isci/init.c +1 -1
@@ -633,7 +633,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devicreturn -ENOMEM ;pci_set_drvdata (pdev, pci_info); -if (efi_enabled) +if (efi_enabled (EFI_RUNTIME_SERVICES )) orom =isci_get_efi_var (pdev);if (!orom)
drivers/target/target_core_fabric_configfs.c +5 -6
@@ -751,12 +751,6 @@ static int target_fabric_port_link(struct target_fabric_configfs *tf;int ret; -if (dev->dev_link_magic !=SE_DEV_LINK_MAGIC ) { -pr_err ("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:" -" %p to struct se_device: %p\n" , se_dev_ci, dev); -return -EFAULT ; - } - tpg_ci = &lun_ci->ci_parent->ci_group->cg_item; se_tpg =container_of (to_config_group (tpg_ci), struct se_portal_group, tpg_group);
@@ -774,6 +768,11 @@ static int target_fabric_port_link( ret = -ENODEV ; goto out; } +if (dev->dev_link_magic !=SE_DEV_LINK_MAGIC ) { +pr_err ("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:" +" %p to struct se_device: %p\n" , se_dev_ci, dev); +return -EFAULT ; + } lun_p =core_dev_add_lun (se_tpg, dev, lun->unpacked_lun);if (IS_ERR (lun_p)) {
fs/cifs/cifs_dfs_ref.c +2 -0
@@ -226,6 +226,8 @@ compose_mount_options_out: compose_mount_options_err:kfree (mountdata); mountdata =ERR_PTR (rc); +kfree (*devname); + *devname =NULL ; goto compose_mount_options_out; }
fs/nfs/namespace.c +20 -0
@@ -177,11 +177,31 @@ out_nofree:return mnt; } +static int +nfs_namespace_getattr (struct vfsmount *mnt,struct dentry *dentry,struct kstat *stat) +{ +if (NFS_FH (dentry->d_inode)->size !=0 ) +return nfs_getattr (mnt, dentry, stat); +generic_fillattr (dentry->d_inode, stat); +return 0 ; +} + +static int +nfs_namespace_setattr (struct dentry *dentry,struct iattr *attr) +{ +if (NFS_FH (dentry->d_inode)->size !=0 ) +return nfs_setattr (dentry, attr); +return -EACCES ; +} +const struct inode_operations nfs_mountpoint_inode_operations = { .getattr = nfs_getattr, + .setattr = nfs_setattr, };const struct inode_operations nfs_referral_inode_operations = { + .getattr = nfs_namespace_getattr, + .setattr = nfs_namespace_setattr, };static void nfs_expire_automounts (struct work_struct *work)
fs/nfs/nfs4client.c +26 -36
127 lines not on this page · raw message
fs/nfs/nfs4state.c +14 -8
@@ -136,16 +136,11 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, clp->cl_confirm = clid.confirm; status =nfs40_walk_client_list (clp, result, cred); -switch (status) { -case -NFS4ERR_STALE_CLIENTID : -set_bit (NFS4CLNT_LEASE_CONFIRM , &clp->cl_state); -case 0 : +if (status ==0 ) {/* Sustain the lease, even if it's empty. If the clientid4 * goes stale it's of no use for trunking discovery. */ nfs4_schedule_state_renewal (*result); -break ; } - out:return status; }
@@ -1850,6 +1845,7 @@ again:case -ETIMEDOUT :case -EAGAIN :ssleep (1 ); +case -NFS4ERR_STALE_CLIENTID :dprintk ("NFS: %s after status %d, retrying\n" , __func__, status); goto again;
@@ -2001,8 +1997,18 @@ static int nfs4_reset_session(struct nfs_client *clp)nfs4_begin_drain_session (clp); cred =nfs4_get_exchange_id_cred (clp); status =nfs4_proc_destroy_session (clp->cl_session, cred); -if (status && status != -NFS4ERR_BADSESSION && - status != -NFS4ERR_DEADSESSION ) { +switch (status) { +case 0 : +case -NFS4ERR_BADSESSION : +case -NFS4ERR_DEADSESSION : +break ; +case -NFS4ERR_BACK_CHAN_BUSY : +case -NFS4ERR_DELAY : +set_bit (NFS4CLNT_SESSION_RESET , &clp->cl_state); + status =0 ; +ssleep (1 ); + goto out; +default : status =nfs4_recovery_handle_error (clp, status); goto out; }
fs/nfs/super.c +9 -13
@@ -2576,27 +2576,23 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,struct nfs_server *server;struct dentry *mntroot =ERR_PTR (-ENOMEM );struct nfs_subversion *nfs_mod =NFS_SB (data->sb)->nfs_client->cl_nfs_mod; -int error; -dprintk ("--> nfs_xdev_mount_common()\n" ); +dprintk ("--> nfs_xdev_mount()\n" ); mount_info.mntfh = mount_info.cloned->fh;/* create a new volume representation */ server = nfs_mod->rpc_ops->clone_server (NFS_SB (data->sb), data->fh, data->fattr, data->authflavor); -if (IS_ERR (server)) { - error =PTR_ERR (server); - goto out_err; - } - mntroot =nfs_fs_mount_common (server, flags, dev_name, &mount_info, nfs_mod); -dprintk ("<-- nfs_xdev_mount_common() = 0\n" ); -out: -return mntroot; +if (IS_ERR (server)) + mntroot =ERR_CAST (server); +else + mntroot =nfs_fs_mount_common (server, flags, + dev_name, &mount_info, nfs_mod); -out_err: -dprintk ("<-- nfs_xdev_mount_common() = %d [error]\n" , error); - goto out; +dprintk ("<-- nfs_xdev_mount() = %ld\n" , +IS_ERR (mntroot) ?PTR_ERR (mntroot) :0L ); +return mntroot; }#if IS_ENABLED (CONFIG_NFS_V4 )
fs/xfs/xfs_aops.c +1 -1
@@ -86,11 +86,11 @@ xfs_destroy_ioend( }if (ioend->io_iocb) { +inode_dio_done (ioend->io_inode);if (ioend->io_isasync) {aio_complete (ioend->io_iocb, ioend->io_error ? ioend->io_error : ioend->io_result,0 ); } -inode_dio_done (ioend->io_inode); }mempool_free (ioend, xfs_ioend_pool);
fs/xfs/xfs_buf.c +18 -0
@@ -487,6 +487,7 @@ _xfs_buf_find(struct rb_node *parent;xfs_buf_t *bp;xfs_daddr_t blkno = map[0 ].bm_bn; +xfs_daddr_t eofs;int numblks =0 ;int i;
@@ -498,6 +499,23 @@ _xfs_buf_find(ASSERT (!(numbytes < (1 << btp->bt_sshift)));ASSERT (!(BBTOB (blkno) & (xfs_off_t )btp->bt_smask)); +/* +* Corrupted block numbers can get through to here, unfortunately, so we +* have to check that the buffer falls within the filesystem bounds. +*/ + eofs =XFS_FSB_TO_BB (btp->bt_mount, btp->bt_mount->m_sb.sb_dblocks); +if (blkno >= eofs) { +/* +* XXX (dgc): we should really be returning EFSCORRUPTED here, +* but none of the higher level infrastructure supports +* returning a specific error on buffer lookup failures. +*/ +xfs_alert (btp->bt_mount, +"%s: Block out of range: block 0x%llx, EOFS 0x%llx " , + __func__, blkno, eofs); +return NULL ; + } +/* get tree root */ pag =xfs_perag_get (btp->bt_mount,xfs_daddr_to_agno (btp->bt_mount, blkno));
fs/xfs/xfs_sync.c +1 -1
@@ -400,7 +400,7 @@ xfs_sync_worker(* cancel_delayed_work_sync on this work queue before tearing down * the ail and the log in xfs_log_unmount. */ -if (!(mp->m_super->s_flags &MS_ACTIVE ) && +if ((mp->m_super->s_flags &MS_ACTIVE ) && !(mp->m_flags &XFS_MOUNT_RDONLY )) {/* dgc: errors ignored here */ if (mp->m_super->s_writers.frozen == SB_UNFROZEN &&
include/linux/efi.h +18 -6
@@ -542,18 +542,30 @@ extern int __init efi_setup_pcdp_console(char *);#endif /* -* We play games with efi_enabled so that the compiler will, if possible, remove -* EFI-related code altogether. +* We play games with efi_enabled so that the compiler will, if +* possible, remove EFI-related code altogether. */ +#define EFI_BOOT 0/* Were we booted from EFI? */ +#define EFI_SYSTEM_TABLES 1/* Can we use EFI system tables? */ +#define EFI_CONFIG_TABLES 2/* Can we use EFI config tables? */ +#define EFI_RUNTIME_SERVICES 3/* Can we use runtime services? */ +#define EFI_MEMMAP 4/* Can we use EFI memory map? */ +#define EFI_64BIT 5/* Is the firmware 64-bit? */ +#ifdef CONFIG_EFI # ifdef CONFIG_X86 -extern int efi_enabled; -extern bool efi_64bit; +extern int efi_enabled (int facility);# else -# define efi_enabled 1 +static inline int efi_enabled (int facility) +{ +return 1 ; +}# endif #else -# define efi_enabled 0 +static inline int efi_enabled (int facility) +{ +return 0 ; +}#endif /*
include/net/netfilter/nf_conntrack_core.h +2 -0
@@ -31,6 +31,8 @@ extern void nf_conntrack_cleanup(struct net *net);extern int nf_conntrack_proto_init (struct net *net);extern void nf_conntrack_proto_fini (struct net *net); +extern void nf_conntrack_cleanup_end (void ); + extern bool nf_ct_get_tuple(const struct sk_buff *skb, unsigned int nhoff,
include/net/netns/x_tables.h +1 -0
@@ -8,6 +8,7 @@ struct ebt_table;struct netns_xt {struct list_head tables[NFPROTO_NUMPROTO ]; +bool notrack_deprecated_warning;#if defined(CONFIG_BRIDGE_NF_EBTABLES ) || \ defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE )struct ebt_table *broute_table;
init/main.c +2 -2
@@ -604,7 +604,7 @@ asmlinkage void __init start_kernel(void)pidmap_init ();anon_vma_init ();#ifdef CONFIG_X86 -if (efi_enabled) +if (efi_enabled (EFI_RUNTIME_SERVICES ))efi_enter_virtual_mode ();#endif thread_info_cache_init ();
@@ -632,7 +632,7 @@ asmlinkage void __init start_kernel(void)acpi_early_init ();/* before LAPIC and SMP init */ sfi_init_late (); -if (efi_enabled) { +if (efi_enabled (EFI_RUNTIME_SERVICES )) {efi_late_init ();efi_free_boot_services (); }
kernel/smp.c +12 -1
@@ -33,6 +33,7 @@ struct call_function_data {struct call_single_data csd;atomic_t refs;cpumask_var_t cpumask; +cpumask_var_t cpumask_ipi; }; static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data);
@@ -56,6 +57,9 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)if (!zalloc_cpumask_var_node (&cfd->cpumask,GFP_KERNEL ,cpu_to_node (cpu)))return notifier_from_errno (-ENOMEM ); +if (!zalloc_cpumask_var_node (&cfd->cpumask_ipi,GFP_KERNEL , +cpu_to_node (cpu))) +return notifier_from_errno (-ENOMEM );break ;#ifdef CONFIG_HOTPLUG_CPU
@@ -65,6 +69,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)case CPU_DEAD :case CPU_DEAD_FROZEN :free_cpumask_var (cfd->cpumask); +free_cpumask_var (cfd->cpumask_ipi);break ;#endif };
@@ -526,6 +531,12 @@ void smp_call_function_many(const struct cpumask *mask,return ; } +/* +* After we put an entry into the list, data->cpumask +* may be cleared again when another CPU sends another IPI for +* a SMP function call, so data->cpumask will be zero. +*/ +cpumask_copy (data->cpumask_ipi, data->cpumask);raw_spin_lock_irqsave (&call_function.lock, flags);/* * Place entry at the _HEAD_ of the list, so that any cpu still
@@ -549,7 +560,7 @@ void smp_call_function_many(const struct cpumask *mask,smp_mb ();/* Send a message to all CPUs in the map */ -arch_send_call_function_ipi_mask (data->cpumask); +arch_send_call_function_ipi_mask (data->cpumask_ipi);/* Optionally wait for the CPUs to complete */ if (wait)
mm/slub.c +1 -0
@@ -3279,6 +3279,7 @@ static struct kmem_cache *__init create_kmalloc_cache(const char *name,if (kmem_cache_open (s, flags)) goto panic; + s->refcount =1 ;list_add (&s->list, &slab_caches);return s;
net/bluetooth/hci_event.c +1 -1
@@ -2394,7 +2394,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)if (ev->opcode !=HCI_OP_NOP )del_timer (&hdev->cmd_timer); -if (ev->ncmd) { +if (ev->ncmd && !test_bit (HCI_RESET , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );if (!skb_queue_empty (&hdev->cmd_q))queue_work (hdev->workqueue, &hdev->cmd_work);
net/bluetooth/hidp/core.c +1 -1
@@ -931,7 +931,7 @@ static int hidp_setup_hid(struct hidp_session *session, hid->version = req->version; hid->country = req->country; -strncpy (hid->name, req->name,128 ); +strncpy (hid->name, req->name,sizeof (req->name) -1 );strncpy (hid->phys,batostr (&bt_sk (session->ctrl_sock->sk)->src),64 );strncpy (hid->uniq,batostr (&bt_sk (session->ctrl_sock->sk)->dst),64 );
net/ipv4/netfilter/ipt_REJECT.c +1 -0
@@ -81,6 +81,7 @@ static void send_reset(struct sk_buff *oldskb, int hook) niph->saddr = oiph->daddr; niph->daddr = oiph->saddr; +skb_reset_transport_header (nskb); tcph = (struct tcphdr *)skb_put (nskb,sizeof (struct tcphdr ));memset (tcph,0 ,sizeof (*tcph)); tcph->source = oth->dest;
net/ipv6/netfilter/ip6t_REJECT.c +1 -0
@@ -132,6 +132,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb) ip6h->saddr = oip6h->daddr; ip6h->daddr = oip6h->saddr; +skb_reset_transport_header (nskb); tcph = (struct tcphdr *)skb_put (nskb,sizeof (struct tcphdr ));/* Truncate to length (no data) */ tcph->doff =sizeof (struct tcphdr )/4 ;
net/ipv6/netfilter/nf_conntrack_reasm.c +4 -1
@@ -311,7 +311,10 @@ found:else fq->q.fragments = skb; - skb->dev =NULL ; +if (skb->dev) { + fq->iif = skb->dev->ifindex; + skb->dev =NULL ; + } fq->q.stamp = skb->tstamp; fq->q.meat += skb->len;if (payload_len > fq->q.max_size)
net/mac80211/cfg.c +11 -1
@@ -164,7 +164,17 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, sta =sta_info_get (sdata, mac_addr); else sta =sta_info_get_bss (sdata, mac_addr); -if (!sta) { +/* +* The ASSOC test makes sure the driver is ready to +* receive the key. When wpa_supplicant has roamed +* using FT, it attempts to set the key before +* association has completed, this rejects that attempt +* so it will set the key again after assocation. +* +* TODO: accept the key if we have a station entry and +* add it to the device after the station. +*/ +if (!sta || !test_sta_flag (sta,WLAN_STA_ASSOC )) {ieee80211_key_free (sdata->local, key); err = -ENOENT ; goto out_unlock;
net/mac80211/ieee80211_i.h +2 -4
@@ -1279,10 +1279,8 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata);void ieee80211_sched_scan_stopped_work (struct work_struct *work);/* off-channel helpers */ -void ieee80211_offchannel_stop_vifs (struct ieee80211_local *local, -bool offchannel_ps_enable); -void ieee80211_offchannel_return (struct ieee80211_local *local, -bool offchannel_ps_disable); +void ieee80211_offchannel_stop_vifs (struct ieee80211_local *local); +void ieee80211_offchannel_return (struct ieee80211_local *local);void ieee80211_roc_setup (struct ieee80211_local *local);void ieee80211_start_next_roc (struct ieee80211_local *local);void ieee80211_roc_purge (struct ieee80211_sub_if_data *sdata);
net/mac80211/offchannel.c +7 -12
@@ -102,8 +102,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata)ieee80211_sta_reset_conn_monitor (sdata); } -void ieee80211_offchannel_stop_vifs (struct ieee80211_local *local, -bool offchannel_ps_enable) +void ieee80211_offchannel_stop_vifs (struct ieee80211_local *local) {struct ieee80211_sub_if_data *sdata;
@@ -131,8 +130,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,if (sdata->vif.type !=NL80211_IFTYPE_MONITOR ) {netif_tx_stop_all_queues (sdata->dev); -if (offchannel_ps_enable && - (sdata->vif.type ==NL80211_IFTYPE_STATION ) && +if (sdata->vif.type ==NL80211_IFTYPE_STATION && sdata->u.mgd.associated)ieee80211_offchannel_ps_enable (sdata); }
@@ -140,8 +138,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,mutex_unlock (&local->iflist_mtx); } -void ieee80211_offchannel_return (struct ieee80211_local *local, -bool offchannel_ps_disable) +void ieee80211_offchannel_return (struct ieee80211_local *local) {struct ieee80211_sub_if_data *sdata;
@@ -157,11 +154,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,continue ;/* Tell AP we're back */ -if (offchannel_ps_disable && - sdata->vif.type ==NL80211_IFTYPE_STATION ) { -if (sdata->u.mgd.associated) -ieee80211_offchannel_ps_disable (sdata); - } +if (sdata->vif.type ==NL80211_IFTYPE_STATION && + sdata->u.mgd.associated) +ieee80211_offchannel_ps_disable (sdata);if (sdata->vif.type !=NL80211_IFTYPE_MONITOR ) {/*
@@ -381,7 +376,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) local->tmp_channel =NULL ;ieee80211_hw_config (local,0 ); -ieee80211_offchannel_return (local, true); +ieee80211_offchannel_return (local); }ieee80211_recalc_idle (local);
net/mac80211/scan.c +5 -10
@@ -310,7 +310,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,if (!was_hw_scan) {ieee80211_configure_filter (local);drv_sw_scan_complete (local); -ieee80211_offchannel_return (local, true); +ieee80211_offchannel_return (local); }ieee80211_recalc_idle (local);
@@ -355,7 +355,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) local->next_scan_state =SCAN_DECISION ; local->scan_channel_idx =0 ; -ieee80211_offchannel_stop_vifs (local, true); +ieee80211_offchannel_stop_vifs (local);ieee80211_configure_filter (local);
@@ -680,12 +680,8 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local, local->scan_channel =NULL ;ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); -/* -* Re-enable vifs and beaconing. Leave PS -* in off-channel state..will put that back -* on-channel at the end of scanning. -*/ -ieee80211_offchannel_return (local, false); +/* disable PS */ +ieee80211_offchannel_return (local); *next_delay =HZ /5 ;/* afterwards, resume scan & go to next channel */
@@ -695,8 +691,7 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local,static void ieee80211_scan_state_resume (struct ieee80211_local *local,unsigned long *next_delay) { -/* PS already is in off-channel mode */ -ieee80211_offchannel_stop_vifs (local, false); +ieee80211_offchannel_stop_vifs (local);if (local->ops->flush) {drv_flush (local, false);
net/netfilter/Kconfig +7 -0
@@ -680,6 +680,13 @@ config NETFILTER_XT_TARGET_NFQUEUE To compile it as a module, choose M here. If unsure, say N. +config NETFILTER_XT_TARGET_NOTRACK + tristate '"NOTRACK" target support (DEPRECATED)' + depends on NF_CONNTRACK + depends on IP_NF_RAW || IP6_NF_RAW + depends on NETFILTER_ADVANCED + select NETFILTER_XT_TARGET_CT + config NETFILTER_XT_TARGET_RATEEST tristate '"RATEEST" target support' depends on NETFILTER_ADVANCED
net/netfilter/nf_conntrack_core.c +5 -4
@@ -1383,11 +1383,12 @@ void nf_conntrack_cleanup(struct net *net)synchronize_net ();nf_conntrack_proto_fini (net);nf_conntrack_cleanup_net (net); +} -if (net_eq (net, &init_net)) { -RCU_INIT_POINTER (nf_ct_destroy,NULL ); -nf_conntrack_cleanup_init_net (); - } +void nf_conntrack_cleanup_end (void ) +{ +RCU_INIT_POINTER (nf_ct_destroy,NULL ); +nf_conntrack_cleanup_init_net (); }void *nf_ct_alloc_hashtable (unsigned int *sizep,int nulls)
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -2514,7 +2514,7 @@ ctnetlink_create_expect(struct net *net, u16 zone,if (!help) {if (!cda[CTA_EXPECT_TIMEOUT ]) { err = -EINVAL ; - goto out; + goto err_out; } exp->timeout.expires = jiffies +ntohl (nla_get_be32 (cda[CTA_EXPECT_TIMEOUT ])) *HZ ;
net/netfilter/nf_conntrack_standalone.c +1 -0
@@ -571,6 +571,7 @@ static int __init nf_conntrack_standalone_init(void) static void __exit nf_conntrack_standalone_fini(void) {unregister_pernet_subsys (&nf_conntrack_net_ops); +nf_conntrack_cleanup_end (); }module_init (nf_conntrack_standalone_init);
net/netfilter/nfnetlink_log.c +13 -3
@@ -13,6 +13,7 @@*/ #include <linux/module.h> #include <linux/skbuff.h> +#include <linux/if_arp.h> #include <linux/init.h> #include <linux/ip.h> #include <linux/ipv6.h>
@@ -384,6 +385,7 @@ __build_packet_message(struct nfulnl_instance *inst,struct nfgenmsg *nfmsg;sk_buff_data_t old_tail = inst->skb->tail;struct sock *sk; +const unsigned char *hwhdrp; nlh = nlmsg_put(inst->skb, 0, 0, NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET,
@@ -485,9 +487,17 @@ __build_packet_message(struct nfulnl_instance *inst,if (indev &&skb_mac_header_was_set (skb)) {if (nla_put_be16 (inst->skb,NFULA_HWTYPE ,htons (skb->dev->type)) ||nla_put_be16 (inst->skb,NFULA_HWLEN , -htons (skb->dev->hard_header_len)) || -nla_put (inst->skb,NFULA_HWHEADER , skb->dev->hard_header_len, -skb_mac_header (skb))) +htons (skb->dev->hard_header_len))) + goto nla_put_failure; + + hwhdrp =skb_mac_header (skb); + +if (skb->dev->type ==ARPHRD_SIT ) + hwhdrp -=ETH_HLEN ; + +if (hwhdrp >= skb->head && +nla_put (inst->skb,NFULA_HWHEADER , + skb->dev->hard_header_len, hwhdrp)) goto nla_put_failure; }
net/netfilter/x_tables.c +20 -8
@@ -345,19 +345,27 @@ int xt_find_revision(u8 af, const char *name, u8 revision, int target, }EXPORT_SYMBOL_GPL (xt_find_revision); -static char *textify_hooks (char *buf,size_t size,unsigned int mask) +static char * +textify_hooks (char *buf,size_t size,unsigned int mask,uint8_t nfproto) { -static const char *const names[] = { +static const char *const inetbr_names[] = {"PREROUTING" ,"INPUT" ,"FORWARD" ,"OUTPUT" ,"POSTROUTING" ,"BROUTING" , }; -unsigned int i; +static const char *const arp_names[] = { +"INPUT" ,"FORWARD" ,"OUTPUT" , + }; +const char *const *names; +unsigned int i, max;char *p = buf;bool np = false;int res; + names = (nfproto ==NFPROTO_ARP ) ? arp_names : inetbr_names; + max = (nfproto ==NFPROTO_ARP ) ?ARRAY_SIZE (arp_names) : +ARRAY_SIZE (inetbr_names); *p ='\0' ; -for (i =0 ; i <ARRAY_SIZE (names); ++i) { +for (i =0 ; i < max; ++i) {if (!(mask & (1 << i)))continue ; res =snprintf (p, size,"%s%s" , np ?"/" :"" , names[i]);
@@ -402,8 +410,10 @@ int xt_check_match(struct xt_mtchk_param *par,pr_err ("%s_tables: %s match: used from hooks %s, but only " "valid from %s\n" , xt_prefix[par->family], par->match->name, -textify_hooks (used,sizeof (used), par->hook_mask), -textify_hooks (allow,sizeof (allow), par->match->hooks)); +textify_hooks (used,sizeof (used), par->hook_mask, + par->family), +textify_hooks (allow,sizeof (allow), par->match->hooks, + par->family));return -EINVAL ; }if (par->match->proto && (par->match->proto != proto || inv_proto)) {
@@ -575,8 +585,10 @@ int xt_check_target(struct xt_tgchk_param *par,pr_err ("%s_tables: %s target: used from hooks %s, but only " "usable from %s\n" , xt_prefix[par->family], par->target->name, -textify_hooks (used,sizeof (used), par->hook_mask), -textify_hooks (allow,sizeof (allow), par->target->hooks)); +textify_hooks (used,sizeof (used), par->hook_mask, + par->family), +textify_hooks (allow,sizeof (allow), par->target->hooks, + par->family));return -EINVAL ; }if (par->target->proto && (par->target->proto != proto || inv_proto)) {
net/netfilter/xt_CT.c +51 -3
82 lines not on this page · raw message
net/netfilter/xt_hashlimit.c +46 -8
98 lines not on this page · raw message
net/netfilter/xt_recent.c +34 -9
99 lines not on this page · raw message
sound/pci/hda/hda_intel.c +26 -14
@@ -650,29 +650,43 @@ static char *driver_short_names[] DELAYED_INITDATA_MARK = {#define get_azx_dev (substream) (substream->runtime->private_data)#ifdef CONFIG_X86 -static void __mark_pages_wc (struct azx *chip,void *addr,size_t size,bool on) +static void __mark_pages_wc (struct azx *chip,struct snd_dma_buffer *dmab,bool on) { +int pages; +if (azx_snoop (chip))return ; -if (addr && size) { -int pages = (size +PAGE_SIZE -1 ) >>PAGE_SHIFT ; +if (!dmab || !dmab->area || !dmab->bytes) +return ; + +#ifdef CONFIG_SND_DMA_SGBUF +if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_SG ) { +struct snd_sg_buf *sgbuf = dmab->private_data;if (on) -set_memory_wc ((unsigned long )addr, pages); +set_pages_array_wc (sgbuf->page_table, sgbuf->pages);else -set_memory_wb ((unsigned long )addr, pages); +set_pages_array_wb (sgbuf->page_table, sgbuf->pages); +return ; } +#endif + + pages = (dmab->bytes +PAGE_SIZE -1 ) >>PAGE_SHIFT ; +if (on) +set_memory_wc ((unsigned long )dmab->area, pages); +else +set_memory_wb ((unsigned long )dmab->area, pages); }static inline void mark_pages_wc (struct azx *chip,struct snd_dma_buffer *buf,bool on) { -__mark_pages_wc (chip, buf->area, buf->bytes, on); +__mark_pages_wc (chip, buf, on); }static inline void mark_runtime_wc (struct azx *chip,struct azx_dev *azx_dev, -struct snd_pcm_runtime *runtime,bool on) +struct snd_pcm_substream *substream,bool on) {if (azx_dev->wc_marked != on) { -__mark_pages_wc (chip, runtime->dma_area, runtime->dma_bytes, on); +__mark_pages_wc (chip,snd_pcm_get_dma_buf (substream), on); azx_dev->wc_marked = on; } }
@@ -683,7 +697,7 @@ static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf, { }static inline void mark_runtime_wc (struct azx *chip,struct azx_dev *azx_dev, -struct snd_pcm_runtime *runtime,bool on) +struct snd_pcm_substream *substream,bool on) { }#endif
@@ -1860,11 +1874,10 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, {struct azx_pcm *apcm =snd_pcm_substream_chip (substream);struct azx *chip = apcm->chip; -struct snd_pcm_runtime *runtime = substream->runtime;struct azx_dev *azx_dev =get_azx_dev (substream);int ret; -mark_runtime_wc (chip, azx_dev, runtime, false); +mark_runtime_wc (chip, azx_dev, substream, false); azx_dev->bufsize =0 ; azx_dev->period_bytes =0 ; azx_dev->format_val =0 ;
@@ -1872,7 +1885,7 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, params_buffer_bytes(hw_params));if (ret <0 )return ret; -mark_runtime_wc (chip, azx_dev, runtime, true); +mark_runtime_wc (chip, azx_dev, substream, true);return ret; }
@@ -1881,7 +1894,6 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)struct azx_pcm *apcm =snd_pcm_substream_chip (substream);struct azx_dev *azx_dev =get_azx_dev (substream);struct azx *chip = apcm->chip; -struct snd_pcm_runtime *runtime = substream->runtime;struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];/* reset BDL address */
@@ -1894,7 +1906,7 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)snd_hda_codec_cleanup (apcm->codec, hinfo, substream); -mark_runtime_wc (chip, azx_dev, runtime, false); +mark_runtime_wc (chip, azx_dev, substream, false);return snd_pcm_lib_free_pages (substream); }
sound/pci/hda/patch_realtek.c +2 -0
@@ -4688,6 +4688,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {SND_PCI_QUIRK (0x1584 ,0x9077 ,"Uniwill P53" ,ALC880_FIXUP_VOL_KNOB ),SND_PCI_QUIRK (0x161f ,0x203d ,"W810" ,ALC880_FIXUP_W810 ),SND_PCI_QUIRK (0x161f ,0x205d ,"Medion Rim 2150" ,ALC880_FIXUP_MEDION_RIM ), +SND_PCI_QUIRK (0x1631 ,0xe011 ,"PB 13201056" ,ALC880_FIXUP_6ST ),SND_PCI_QUIRK (0x1734 ,0x107c ,"FSC F1734" ,ALC880_FIXUP_F1734 ),SND_PCI_QUIRK (0x1734 ,0x1094 ,"FSC Amilo M1451G" ,ALC880_FIXUP_FUJITSU ), SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
@@ -5702,6 +5703,7 @@ static const struct alc_model_fixup alc268_fixup_models[] = { };static const struct snd_pci_quirk alc268_fixup_tbl[] = { +SND_PCI_QUIRK (0x1025 ,0x015b ,"Acer AOA 150 (ZG5)" ,ALC268_FIXUP_INV_DMIC ),/* below is codec SSID since multiple Toshiba laptops have the * same PCI SSID 1179:ff00 */
sound/soc/codecs/arizona.c +1 -1
@@ -648,7 +648,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, } sr_val = i; - lrclk =snd_soc_params_to_bclk (params) /params_rate (params); + lrclk = rates[bclk] /params_rate (params);arizona_aif_dbg (dai,"BCLK %dHz LRCLK %dHz\n" , rates[bclk], rates[bclk] / lrclk);
sound/soc/codecs/wm2200.c +0 -3
@@ -897,8 +897,6 @@ static const char *wm2200_mixer_texts[] = {"EQR" ,"LHPF1" ,"LHPF2" , -"LHPF3" , -"LHPF4" ,"DSP1.1" ,"DSP1.2" , "DSP1.3",
@@ -931,7 +929,6 @@ static int wm2200_mixer_values[] = {0x25 ,0x50 ,/* EQ */ 0x51 , -0x52 ,0x60 ,/* LHPF1 */ 0x61 ,/* LHPF2 */ 0x68, /* DSP1 */
sound/usb/mixer.c +12 -5
@@ -1259,16 +1259,23 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void } channels = (hdr->bLength -7 ) / csize -1 ; bmaControls = hdr->bmaControls; +if (hdr->bLength <7 + csize) { +snd_printk (KERN_ERR "usbaudio: unit %u: " +"invalid UAC_FEATURE_UNIT descriptor\n" , + unitid); +return -EINVAL ; + } }else {struct uac2_feature_unit_descriptor *ftr = _ftr; csize =4 ; channels = (hdr->bLength -6 ) /4 -1 ; bmaControls = ftr->bmaControls; - } - -if (hdr->bLength <7 || !csize || hdr->bLength <7 + csize) { -snd_printk (KERN_ERR "usbaudio: unit %u: invalid UAC_FEATURE_UNIT descriptor\n" , unitid); -return -EINVAL ; +if (hdr->bLength <6 + csize) { +snd_printk (KERN_ERR "usbaudio: unit %u: " +"invalid UAC_FEATURE_UNIT descriptor\n" , + unitid); +return -EINVAL ; + } }/* parse the source unit */
virt/kvm/eventfd.c +1 -1
@@ -332,7 +332,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)mutex_lock (&kvm->irqfds.resampler_lock);list_for_each_entry (resampler, - &kvm->irqfds.resampler_list, list) { + &kvm->irqfds.resampler_list, link) {if (resampler->notifier.gsi == irqfd->gsi) { irqfd->resampler = resampler;break ;