Linux 3.10.29
Greg KH
maintainerI'm announcing the release of the 3.10.29 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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/devicetree/bindings/ata/marvell.txt | 2 Makefile | 2 arch/arm/mach-at91/sam9_smc.c | 2 arch/arm/net/bpf_jit_32.c | 6 arch/parisc/include/asm/cacheflush.h | 2 arch/parisc/include/asm/page.h | 3 arch/parisc/kernel/cache.c | 14 ++ arch/powerpc/include/asm/topology.h | 10 + arch/powerpc/kernel/cacheinfo.c | 3 arch/powerpc/kvm/book3s_hv.c | 7 - arch/powerpc/kvm/e500_mmu.c | 2 arch/powerpc/mm/numa.c | 70 ++++++++++ arch/powerpc/net/bpf_jit_comp.c | 7 - arch/s390/include/uapi/asm/statfs.h | 10 - arch/s390/kvm/diag.c | 2 arch/s390/net/bpf_jit_comp.c | 29 ++-- arch/sparc/net/bpf_jit_comp.c | 17 ++ arch/x86/include/uapi/asm/msr-index.h | 1 arch/x86/kernel/cpu/amd.c | 10 + arch/x86/kvm/i8254.c | 18 ++ arch/x86/kvm/lapic.c | 5 arch/x86/kvm/x86.c | 3 arch/x86/kvm/x86.h | 2 arch/x86/net/bpf_jit_comp.c | 14 +- arch/x86/platform/efi/efi.c | 2 drivers/ata/libata-core.c | 27 ++++ drivers/ata/libata-scsi.c | 18 ++ drivers/ata/sata_mv.c | 25 +++ drivers/char/tpm/tpm_i2c_stm_st33.c | 7 - drivers/char/tpm/tpm_ppi.c | 8 - drivers/edac/e752x_edac.c | 4 drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 8 - drivers/hwmon/k10temp.c | 1 drivers/md/bcache/bset.c | 26 +++- drivers/md/raid5.c | 1 drivers/mfd/max77686.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 13 +- drivers/net/ethernet/intel/e1000e/phy.c | 10 + drivers/net/ethernet/via/via-rhine.c | 1 drivers/net/wireless/b43/b43.h | 4 drivers/net/wireless/b43/main.c | 27 ++-- drivers/net/wireless/b43/xmit.c | 4 drivers/net/wireless/b43legacy/main.c | 1 drivers/net/wireless/iwlwifi/iwl-7000.c | 6 drivers/net/wireless/iwlwifi/iwl-config.h | 3 drivers/net/wireless/iwlwifi/iwl-csr.h | 5 drivers/net/wireless/iwlwifi/iwl-prph.h | 4 drivers/net/wireless/iwlwifi/mvm/ops.c | 1 drivers/net/wireless/iwlwifi/pcie/rx.c | 4 drivers/net/wireless/iwlwifi/pcie/trans.c | 19 ++ drivers/net/wireless/mwifiex/fw.h | 2 drivers/net/wireless/mwifiex/scan.c | 4 drivers/net/wireless/rtlwifi/base.c | 3 drivers/net/wireless/rtlwifi/core.c | 11 + drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 2 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 36 +++++ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 14 ++ drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 9 + drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 3 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 ++-- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 17 ++ drivers/net/wireless/rtlwifi/stats.c | 14 ++ drivers/net/wireless/rtlwifi/usb.c | 4 drivers/net/wireless/rtlwifi/wifi.h | 33 ++--- drivers/net/xen-netfront.c | 88 ++++--------- drivers/parport/parport_pc.c | 10 - drivers/pinctrl/pinctrl-sunxi.c | 13 +- drivers/platform/x86/hp_accel.c | 1 drivers/rtc/rtc-max8907.c | 11 - drivers/scsi/bfa/bfad.c | 6 drivers/scsi/virtio_scsi.c | 15 ++ drivers/staging/rtl8712/usb_intf.c | 5 drivers/staging/vt6656/baseband.c | 3 drivers/staging/vt6656/card.c | 2 drivers/target/iscsi/iscsi_target.c | 34 +++-- drivers/tty/serial/8250/8250_core.c | 4 drivers/tty/serial/8250/8250_pci.c | 8 - drivers/tty/serial/atmel_serial.c | 20 ++- drivers/usb/core/config.c | 7 - drivers/usb/core/hub.c | 54 ++------ drivers/usb/host/ehci.h | 18 ++ drivers/usb/host/xhci.c | 3 drivers/usb/serial/cypress_m8.h | 2 drivers/usb/serial/ftdi_sio.c | 17 ++ drivers/usb/serial/option.c | 15 ++ drivers/usb/serial/pl2303.c | 33 +++-- drivers/usb/storage/unusual_devs.h | 7 + fs/btrfs/extent-tree.c | 2 fs/btrfs/ioctl.c | 6 fs/ext4/inline.c | 8 - fs/mount.h | 2 include/linux/hugetlb.h | 6 include/linux/libata.h | 2 lib/decompress_inflate.c | 2 mm/hugetlb.c | 17 ++ mm/mempolicy.c | 2 mm/swap.c | 143 ++++++++++++---------- net/compat.c | 9 - net/core/filter.c | 30 ---- net/ieee802154/nl-phy.c | 6 net/ipv4/fib_frontend.c | 2 net/ipv4/inet_diag.c | 4 net/ipv4/ip_input.c | 2 net/ipv4/ip_tunnel.c | 1 net/ipv4/ipmr.c | 7 - net/ipv4/tcp_metrics.c | 51 ++++--- net/ipv6/ip6_input.c | 2 net/ipv6/ip6_tunnel.c | 12 + net/ipv6/ip6mr.c | 7 - net/ipv6/sit.c | 10 + net/rds/ib_recv.c | 7 - sound/pci/Kconfig | 12 + sound/pci/hda/hda_generic.c | 6 sound/pci/hda/patch_hdmi.c | 100 +++++++++++---- sound/pci/hda/patch_realtek.c | 19 ++ sound/pci/rme9652/rme9652.c | 2 sound/soc/codecs/adau1701.c | 2 sound/soc/codecs/wm5110.c | 48 +++++++ tools/perf/util/session.c | 7 - 119 files changed, 1098 insertions(+), 467 deletions(-)
Adrien Vergé (1):
ALSA: hda - Fix silent output on MacBook Air 1,1
Alan Stern (1):
USB: fix race between hub_disconnect and recursively_mark_NOTATTACHED
Alexandre Courbot (1):
lib/decompressors: fix "no limit" output buffer length
Amitkumar Karwar (1):
mwifiex: add missing endian conversion for fw_tsf
Andrea Arcangeli (1):
mm: hugetlbfs: fix hugetlbfs optimization
Andreas Schwab (1):
KVM: PPC: Book3S HV: use xics_wake_cpu only when defined
Andrew Jones (1):
kvm: x86: fix apic_base enable check
Andy Grover (1):
target/iscsi: Fix network portal creation race
Annie Li (1):
xen-netfront: fix resource leak in netfront
Anssi Hannula (1):
ALSA: hda - hdmi: introduce patch_nvhdmi()
Aristeu Rozanski (1):
e752x_edac: Fix pci_dev usage count
Asias He (1):
virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
Bing Zhao (1):
mwifiex: fix wrong 11ac bits setting in fw_cap_info
Borislav Petkov (1):
x86, cpu, amd: Add workaround for family 16h, erratum 793
Charles Keepax (1):
ASoC: wm5110: Extend SYSCLK patch file for rev D
Chen-Yu Tsai (1):
pinctrl: sunxi: Honor GPIO output initial vaules
Christian Engelmayer (1):
ieee802154: Fix memory leak in ieee802154_add_iface()
Christoph Paasch (1):
tcp: metrics: Avoid duplicate entries with the same destination-IP
Colin Leitner (1):
USB: ftdi_sio: added CS5 quirk for broken smartcard readers
Dave Young (1):
x86/efi: Fix off-by-one bug in EFI Boot Services reservation
David Ertman (1):
e1000e: fix compiler warnings
David Rientjes (1):
mm/mempolicy.c: fix mempolicy printing in numa_maps
David Sterba (1):
btrfs: restrict snapshotting to own subvolumes
Dongsheng Yang (1):
perf kvm: Fix kvm report without guestmount.
Duan Jiong (1):
ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
Eliad Peller (1):
iwlwifi: mvm: fix missing cleanup in .start() error path
Emmanuel Grumbach (2):
iwlwifi: pcie: enable oscillator for L1 exit
iwlwifi: pcie: fix interrupt coalescing for 7260 / 3160
Eric Dumazet (1):
bpf: do not use reciprocal divide
Eric W. Biederman (1):
vfs: Is mounted should be testing mnt_ns for NULL or error.
Gerald Schaefer (1):
net: rds: fix per-cpu helper usage
Greg Kroah-Hartman (1):
Linux 3.10.29
Hannes Frederic Sowa (1):
net: avoid reference counter overflows on fib_rules in multicast forwarding
Heiko Carstens (3):
KVM: s390: fix diagnose code extraction
s390/uapi: fix struct statfs64 definition
s390/bpf,jit: fix 32 bit divisions, use unsigned divide instructions
Helge Deller (1):
parisc: fix cache-flushing
Holger Eitzenberger (1):
net: Fix memory leak if TPROXY used with TCP early demux
Ilia Mirkin (1):
drm/nouveau/bios: fix offset calculation for BMPv1 bioses
Jack Pham (1):
usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix()
Jean-Jacques Hiblot (1):
ARM: at91: smc: bug fix in sam9_smc_cs_read()
Johan Hovold (2):
USB: pl2303: fix data corruption on termios updates
USB: cypress_m8: fix ring-indicator detection and reporting
Jonathan Woithe (1):
serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip
Kent Overstreet (1):
bcache: Data corruption fix
Krzysztof Kozlowski (1):
mfd: max77686: Fix regmap resource leak on driver remove
Larry Finger (17):
rtlwifi: rtl8192cu: Add new device ID
rtlwifi: Update beacon statistics for USB driver
rtlwifi: rtl8192c: Prevent reconnect attempts if not connected
rtlwifi: rtl8192cu: Add new firmware
rtlwifi: Redo register save locations
rtlwifi: Set the link state
rtlwifi: rtl8192c: Add new definitions in the dm_common header
rtlwifi: Increase the RX queue length for USB drivers
rtlwifi: rtl8192c: Add routines to save/restore power index registers
rtlwifi: rtl8192cu: Update the power index registers
rtlwifi: rtl8192cu: Fix some code in RF handling
rtlwifi: Add missing code to PWDB statics routine
rtlwifi: rtl8188ee: Fix typo in code
b43: Fix lockdep splat
b43: Fix unload oops if firmware is not available
b43legacy: Fix unload oops if firmware is not available
staging: r8712u: Set device type to wlan
Lars-Peter Clausen (1):
ASoC: adau1701: Fix ADAU1701_SEROCTL_WORD_LEN_16 constant
Lior Amsalem (1):
ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs
Malcolm Priestley (2):
staging: vt6656: [BUG] BBvUpdatePreEDThreshold Always set sensitivity on bScanning
staging: vt6656: CARDqGetNextTBTT correct uLowNextTBTT
Marcelo Tosatti (1):
KVM: x86: limit PIT timer frequency
Marek Roszko (1):
tty/serial: at91: Handle shutdown more safely
Michal Schmidt (1):
bnx2x: fix DMA unmapping of TSO split BDs
Mihai Caraman (1):
KVM: PPC: e500: Fix bad address type in deliver_tlb_misss()
Mikhail Zolotaryov (1):
USB: Nokia 502 is an unusual device
Neal Cardwell (1):
inet_diag: fix inet_diag_dump_icsk() timewait socket state logic
NeilBrown (1):
md/raid5: fix long-standing problem with bitmap handling on write failure.
Nicolas Dichtel (3):
sit: fix double free of fb_tunnel_dev on exit Revert "ip6tnl: fix use after free of fb_tnl_dev"
ip6tnl: fix double free of fb_tnl_dev on exit
Oliver Hartkopp (1):
fib_frontend: fix possible NULL pointer dereference
PaX Team (1):
x86, x32: Correct invalid use of user timespec in the kernel
Paul Mackerras (1):
powerpc: Make sure "cache" directory is removed when offlining cpu
Peter Chen (1):
usb: ehci: add freescale imx28 special write register method
Peter Huewe (2):
tpm/tpm_i2c_stm_st33: Check return code of get_burstcount tpm/tpm_ppi: Do not compare strcmp(a,b) == -1
Phil Pokorny (1):
hwmon: (k10temp) Add support for Kaveri CPUs
Rahul Bedarkar (1):
USB: serial: add support for iBall 3.5G connect usb modem
Richard Weinberger (1):
net,via-rhine: Fix tx_timeout handling
Sebastian Andrzej Siewior (1):
parport: parport_pc: remove double PCI ID for NetMos
Simon Guinot (1):
ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
Srivatsa S. Bhat (1):
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
Stephen Warren (3):
serial: 8250: enable UART_BUG_NOMSR for Tegra
rtc: max8907: weekday encoding fixes
ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled
Takashi Iwai (4):
ALSA: rme9652: fix a missing comma in channel_map_9636_ds[]
ALSA: hda - Don't create duplicated ctls for loopback paths
ALSA: Enable CONFIG_ZONE_DMA for smaller PCI DMA masks
hp_accel: Add a new PnP ID HPQ6007 for new HP laptops
Tejun Heo (1):
libata: disable LPM for some WD SATA-I devices
Theodore Ts'o (1):
ext4: avoid clearing beyond i_blocks when truncating an inline data file
Thomas Pugliese (1):
usb: core: get config and string descriptors for unauthorized devices
Vijaya Mohan Guvva (1):
SCSI: bfa: Chinook quad port 16G FC HBA claim issue
Wang Shilong (1):
Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
Yegor Yefremov (1):
serial: add support for 200 v3 series Titan card
ZHAO Gang (1):
b43: fix the wrong assignment of status.freq in b43_rx()
张君 (1):
usb: option: add new zte 3g modem pids to option driver
Greg KH
maintainerDocumentation/devicetree/bindings/ata/marvell.txt +1 -1
@@ -1,7 +1,7 @@ * Marvell Orion SATA Required Properties: -- compatibility : "marvell,orion-sata" +- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata" - reg : Address range of controller - interrupts : Interrupt controller is using - nr-ports : Number of SATA ports in use.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 28 +SUBLEVEL = 29 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/mach-at91/sam9_smc.c +1 -1
@@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iomem *base,/* Pulse register */ val =__raw_readl (base +AT91_SMC_PULSE ); - config->nwe_setup = val &AT91_SMC_NWEPULSE ; + config->nwe_pulse = val &AT91_SMC_NWEPULSE ; config->ncs_write_pulse = (val &AT91_SMC_NCS_WRPULSE ) >>8 ; config->nrd_pulse = (val &AT91_SMC_NRDPULSE ) >>16 ; config->ncs_read_pulse = (val &AT91_SMC_NCS_RDPULSE ) >>24 ;
arch/arm/net/bpf_jit_32.c +3 -3
@@ -637,10 +637,10 @@ load_ind:emit (ARM_MUL (r_A, r_A, r_X), ctx);break ;case BPF_S_ALU_DIV_K : -/* current k == reciprocal_value(userspace k) */ +if (k ==1 ) +break ;emit_mov_i (r_scratch, k, ctx); -/* A = top 32 bits of the product */ -emit (ARM_UMULL (r_scratch, r_A, r_A, r_scratch), ctx); +emit_udiv (r_A, r_A, r_scratch, ctx);break ;case BPF_S_ALU_DIV_X :update_on_xread (ctx);
arch/parisc/include/asm/cacheflush.h +0 -2
@@ -132,7 +132,6 @@ void mark_rodata_ro(void);static inline void *kmap (struct page *page) {might_sleep (); -flush_dcache_page (page);return page_address (page); }
@@ -144,7 +143,6 @@ static inline void kunmap(struct page *page)static inline void *kmap_atomic (struct page *page) {pagefault_disable (); -flush_dcache_page (page);return page_address (page); }
arch/parisc/include/asm/page.h +2 -1
@@ -29,7 +29,8 @@ struct page;void clear_page_asm (void *page);void copy_page_asm (void *to,void *from);#define clear_user_page (vto, vaddr, page) clear_page_asm(vto) -#define copy_user_page (vto, vfrom, vaddr, page) copy_page_asm(vto, vfrom) +void copy_user_page (void *vto,void *vfrom,unsigned long vaddr, +struct page *pg);/* #define CONFIG_PARISC_TMPALIAS */
arch/parisc/kernel/cache.c +14 -0
@@ -388,6 +388,20 @@ void flush_kernel_dcache_page_addr(void *addr) }EXPORT_SYMBOL (flush_kernel_dcache_page_addr); +void copy_user_page (void *vto,void *vfrom,unsigned long vaddr, +struct page *pg) +{ +/* Copy using kernel mapping. No coherency is needed (all in +kunmap) for the `to' page. However, the `from' page needs to +be flushed through a mapping equivalent to the user mapping +before it can be accessed through the kernel mapping. */ +preempt_disable (); +flush_dcache_page_asm (__pa (vfrom), vaddr); +preempt_enable (); +copy_page_asm (vto, vfrom); +} +EXPORT_SYMBOL (copy_user_page); +void purge_tlb_entries (struct mm_struct *mm,unsigned long addr) {unsigned long flags;
arch/powerpc/include/asm/topology.h +9 -1
@@ -22,7 +22,15 @@ struct device_node;static inline int cpu_to_node (int cpu) { -return numa_cpu_lookup_table[cpu]; +int nid; + + nid = numa_cpu_lookup_table[cpu]; + +/* +* During early boot, the numa-cpu lookup table might not have been +* setup for all CPUs yet. In such cases, default to node 0. +*/ +return (nid <0 ) ?0 : nid; }#define parent_node (node) (node)
arch/powerpc/kernel/cacheinfo.c +3 -0
@@ -788,6 +788,9 @@ static void remove_cache_dir(struct cache_dir *cache_dir) {remove_index_dirs (cache_dir); +/* Remove cache dir from sysfs */ +kobject_del (cache_dir->kobj); +kobject_put (cache_dir->kobj);kfree (cache_dir);
arch/powerpc/kvm/book3s_hv.c +6 -1
@@ -82,10 +82,13 @@ void kvmppc_fast_vcpu_kick(struct kvm_vcpu *vcpu)/* CPU points to the first thread of the core */ if (cpu != me && cpu >=0 && cpu < nr_cpu_ids) { +#ifdef CONFIG_KVM_XICS int real_cpu = cpu + vcpu->arch.ptid;if (paca[real_cpu].kvm_hstate.xics_phys)xics_wake_cpu (real_cpu); -else if (cpu_online (cpu)) + else +#endif +if (cpu_online (cpu))smp_send_reschedule (cpu); }put_cpu ();
@@ -1090,7 +1093,9 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu)smp_wmb ();#if defined(CONFIG_PPC_ICP_NATIVE ) && defined(CONFIG_SMP )if (vcpu->arch.ptid) { +#ifdef CONFIG_KVM_XICS xics_wake_cpu (cpu); +#endif ++vc->n_woken; }#endif
arch/powerpc/kvm/e500_mmu.c +1 -1
@@ -127,7 +127,7 @@ static int kvmppc_e500_tlb_index(struct kvmppc_vcpu_e500 *vcpu_e500, }static inline void kvmppc_e500_deliver_tlb_miss (struct kvm_vcpu *vcpu, -unsigned int eaddr,int as) +gva_t eaddr,int as) {struct kvmppc_vcpu_e500 *vcpu_e500 =to_e500 (vcpu);unsigned int victim, tsized;
arch/powerpc/mm/numa.c +67 -3
111 lines not on this page · raw message
arch/powerpc/net/bpf_jit_comp.c +4 -3
@@ -209,10 +209,11 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, }PPC_DIVWU (r_A, r_A, r_X);break ; -case BPF_S_ALU_DIV_K :/* A = reciprocal_divide(A, K); */ +case BPF_S_ALU_DIV_K :/* A /= K */ +if (K ==1 ) +break ;PPC_LI32 (r_scratch1,K ); -/* Top 32 bits of 64bit result -> A */ -PPC_MULHWU (r_A, r_A, r_scratch1); +PPC_DIVWU (r_A, r_A, r_scratch1);break ;case BPF_S_ALU_AND_X : ctx->seen |=SEEN_XREG ;
arch/s390/include/uapi/asm/statfs.h +5 -5
@@ -35,11 +35,11 @@ struct statfs {struct statfs64 {unsigned int f_type;unsigned int f_bsize; -unsigned long f_blocks; -unsigned long f_bfree; -unsigned long f_bavail; -unsigned long f_files; -unsigned long f_ffree; +unsigned long long f_blocks; +unsigned long long f_bfree; +unsigned long long f_bavail; +unsigned long long f_files; +unsigned long long f_ffree;__kernel_fsid_t f_fsid;unsigned int f_namelen;unsigned int f_frsize;
arch/s390/kvm/diag.c +1 -1
@@ -130,7 +130,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu)int kvm_s390_handle_diag (struct kvm_vcpu *vcpu) { -int code = (vcpu->arch.sie_block->ipb &0xfff0000 ) >>16 ; +int code =kvm_s390_get_base_disp_rs (vcpu) &0xffff ;trace_kvm_s390_handle_diag (vcpu, code);switch (code) {
arch/s390/net/bpf_jit_comp.c +18 -11
@@ -335,14 +335,16 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,EMIT4_PCREL (0xa7840000 , (jit->ret0_ip - jit->prg));/* lhi %r4,0 */ EMIT4 (0xa7480000 ); -/* dr %r4,%r12 */ -EMIT2 (0x1d4c ); +/* dlr %r4,%r12 */ +EMIT4 (0xb997004c );break ; -case BPF_S_ALU_DIV_K :/* A = reciprocal_divide(A, K) */ -/* m %r4,<d(K)>(%r13) */ -EMIT4_DISP (0x5c40d000 ,EMIT_CONST (K )); -/* lr %r5,%r4 */ -EMIT2 (0x1854 ); +case BPF_S_ALU_DIV_K :/* A /= K */ +if (K ==1 ) +break ; +/* lhi %r4,0 */ +EMIT4 (0xa7480000 ); +/* dl %r4,<d(K)>(%r13) */ +EMIT6_DISP (0xe340d000 ,0x0097 ,EMIT_CONST (K ));break ;case BPF_S_ALU_MOD_X :/* A %= X */ jit->seen |=SEEN_XREG |SEEN_RET0 ;
@@ -352,16 +354,21 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,EMIT4_PCREL (0xa7840000 , (jit->ret0_ip - jit->prg));/* lhi %r4,0 */ EMIT4 (0xa7480000 ); -/* dr %r4,%r12 */ -EMIT2 (0x1d4c ); +/* dlr %r4,%r12 */ +EMIT4 (0xb997004c );/* lr %r5,%r4 */ EMIT2 (0x1854 );break ;case BPF_S_ALU_MOD_K :/* A %= K */ +if (K ==1 ) { +/* lhi %r5,0 */ +EMIT4 (0xa7580000 ); +break ; + }/* lhi %r4,0 */ EMIT4 (0xa7480000 ); -/* d %r4,<d(K)>(%r13) */ -EMIT4_DISP (0x5d40d000 ,EMIT_CONST (K )); +/* dl %r4,<d(K)>(%r13) */ +EMIT6_DISP (0xe340d000 ,0x0097 ,EMIT_CONST (K ));/* lr %r5,%r4 */ EMIT2 (0x1854 );break ;
arch/sparc/net/bpf_jit_comp.c +14 -3
@@ -497,9 +497,20 @@ void bpf_jit_compile(struct sk_filter *fp)case BPF_S_ALU_MUL_K :/* A *= K */ emit_alu_K (MUL ,K );break ; -case BPF_S_ALU_DIV_K :/* A /= K */ -emit_alu_K (MUL ,K ); -emit_read_y (r_A); +case BPF_S_ALU_DIV_K :/* A /= K with K != 0*/ +if (K ==1 ) +break ; +emit_write_y (G0 ); +#ifdef CONFIG_SPARC32 +/* The Sparc v8 architecture requires +* three instructions between a %y +* register write and the first use. +*/ +emit_nop (); +emit_nop (); +emit_nop (); +#endif +emit_alu_K (DIV ,K );break ;case BPF_S_ALU_DIV_X :/* A /= X; */ emit_cmpi (r_X,0 );
arch/x86/include/uapi/asm/msr-index.h +1 -0
@@ -179,6 +179,7 @@#define MSR_AMD64_PATCH_LOADER 0xc0010020#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020#define MSR_AMD64_DC_CFG 0xc0011022#define MSR_AMD64_BU_CFG2 0xc001102a#define MSR_AMD64_IBSFETCHCTL 0xc0011030
arch/x86/kernel/cpu/amd.c +10 -0
@@ -508,6 +508,16 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) set_cpu_cap(c, X86_FEATURE_EXTD_APICID); }#endif + +/* F16h erratum 793, CVE-2013-6885 */ +if (c->x86 ==0x16 && c->x86_model <=0xf ) { +u64 val; + +rdmsrl (MSR_AMD64_LS_CFG , val); +if (!(val &BIT (15 ))) +wrmsrl (MSR_AMD64_LS_CFG , val |BIT (15 )); + } + }static const int amd_erratum_383[];
arch/x86/kvm/i8254.c +18 -0
@@ -37,6 +37,7 @@#include "irq.h" #include "i8254.h" +#include "x86.h" #ifndef CONFIG_X86_64 #define mod_64 (x, y) ((x) - (y) * div64_u64(x, y))
@@ -349,6 +350,23 @@ static void create_pit_timer(struct kvm *kvm, u32 val, int is_period)atomic_set (&ps->pending,0 ); ps->irq_ack =1 ; +/* +* Do not allow the guest to program periodic timers with small +* interval, since the hrtimers are not throttled by the host +* scheduler. +*/ +if (ps->is_periodic) { +s64 min_period = min_timer_period_us *1000LL ; + +if (ps->period < min_period) { +pr_info_ratelimited ( +"kvm: requested %lld ns " +"i8254 timer period limited to %lld ns\n" , + ps->period, min_period); + ps->period = min_period; + } + } +hrtimer_start (&ps->timer,ktime_add_ns (ktime_get (), interval),HRTIMER_MODE_ABS ); }
arch/x86/kvm/lapic.c +1 -4
@@ -71,9 +71,6 @@#define VEC_POS (v) ((v) & (32 - 1))#define REG_POS (v) (((v) >> 5) << 4) -static unsigned int min_timer_period_us =500 ; -module_param (min_timer_period_us, uint,S_IRUGO |S_IWUSR ); -static inline void apic_set_reg (struct kvm_lapic *apic,int reg_off,u32 val) { *((u32 *) (apic->regs + reg_off)) = val;
@@ -1369,7 +1366,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) vcpu->arch.apic_base = value;/* update jump label if enable bit changes */ -if ((vcpu->arch.apic_base ^ value) &MSR_IA32_APICBASE_ENABLE ) { +if ((old_value ^ value) &MSR_IA32_APICBASE_ENABLE ) {if (value &MSR_IA32_APICBASE_ENABLE )static_key_slow_dec_deferred (&apic_hw_disabled);else
arch/x86/kvm/x86.c +3 -0
@@ -94,6 +94,9 @@ EXPORT_SYMBOL_GPL(kvm_x86_ops);static bool ignore_msrs =0 ;module_param (ignore_msrs, bool,S_IRUGO |S_IWUSR ); +unsigned int min_timer_period_us =500 ; +module_param (min_timer_period_us, uint,S_IRUGO |S_IWUSR ); +bool kvm_has_tsc_control;EXPORT_SYMBOL_GPL (kvm_has_tsc_control);u32 kvm_max_guest_tsc_khz;
arch/x86/kvm/x86.h +2 -0
@@ -124,5 +124,7 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,extern u64 host_xcr0; +extern unsigned int min_timer_period_us; +extern struct static_key kvm_no_apic_vcpu;#endif
arch/x86/net/bpf_jit_comp.c +10 -4
@@ -324,15 +324,21 @@ void bpf_jit_compile(struct sk_filter *fp)EMIT2 (0x89 ,0xd0 );/* mov %edx,%eax */ break ;case BPF_S_ALU_MOD_K :/* A %= K; */ +if (K ==1 ) { +CLEAR_A (); +break ; + }EMIT2 (0x31 ,0xd2 );/* xor %edx,%edx */ EMIT1 (0xb9 );EMIT (K ,4 );/* mov imm32,%ecx */ EMIT2 (0xf7 ,0xf1 );/* div %ecx */ EMIT2 (0x89 ,0xd0 );/* mov %edx,%eax */ break ; -case BPF_S_ALU_DIV_K :/* A = reciprocal_divide(A, K); */ -EMIT3 (0x48 ,0x69 ,0xc0 );/* imul imm32,%rax,%rax */ -EMIT (K ,4 ); -EMIT4 (0x48 ,0xc1 ,0xe8 ,0x20 );/* shr $0x20,%rax */ +case BPF_S_ALU_DIV_K :/* A /= K */ +if (K ==1 ) +break ; +EMIT2 (0x31 ,0xd2 );/* xor %edx,%edx */ +EMIT1 (0xb9 );EMIT (K ,4 );/* mov imm32,%ecx */ +EMIT2 (0xf7 ,0xf1 );/* div %ecx */ break ;case BPF_S_ALU_AND_X : seen |=SEEN_XREG ;
arch/x86/platform/efi/efi.c +1 -1
@@ -438,7 +438,7 @@ void __init efi_reserve_boot_services(void)* - Not within any part of the kernel * - Not the bios reserved area */ -if ((start+size >=__pa_symbol (_text) +if ((start + size >__pa_symbol (_text) && start <=__pa_symbol (_end)) || !e820_all_mapped (start, start+size,E820_RAM ) ||memblock_is_region_reserved (start, size)) {
drivers/ata/libata-core.c +27 -0
@@ -2199,6 +2199,16 @@ int ata_dev_configure(struct ata_device *dev)if (rc)return rc; +/* some WD SATA-1 drives have issues with LPM, turn on NOLPM for them */ +if ((dev->horkage &ATA_HORKAGE_WD_BROKEN_LPM ) && + (id[ATA_ID_SATA_CAPABILITY ] &0xe ) ==0x2 ) + dev->horkage |=ATA_HORKAGE_NOLPM ; + +if (dev->horkage &ATA_HORKAGE_NOLPM ) { +ata_dev_warn (dev,"LPM support broken, forcing max_power\n" ); + dev->link->ap->target_lpm_policy =ATA_LPM_MAX_POWER ; + } +/* let ACPI work its magic */ rc =ata_acpi_on_devcfg (dev);if (rc)
@@ -4189,6 +4199,23 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "PIONEER DVD-RW DVR-212D", NULL, ATA_HORKAGE_NOSETXFER }, { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER }, +/* +* Some WD SATA-I drives spin up and down erratically when the link +* is put into the slumber mode. We don't have full list of the +* affected devices. Disable LPM if the device matches one of the +* known prefixes and is SATA-1. As a side effect LPM partial is +* lost too. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=57211 +*/ + { "WDC WD800JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD1200JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD1600JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD2000JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD2500JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD3000JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + { "WDC WD3200JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, + /* End Marker */ { } };
drivers/ata/libata-scsi.c +15 -3
@@ -112,12 +112,14 @@ static const char *ata_lpm_policy_names[] = { [ATA_LPM_MIN_POWER] = "min_power", }; -static ssize_t ata_scsi_lpm_store (struct device *dev, +static ssize_t ata_scsi_lpm_store (struct device *device,struct device_attribute *attr,const char *buf,size_t count) { -struct Scsi_Host *shost =class_to_shost (dev); +struct Scsi_Host *shost =class_to_shost (device);struct ata_port *ap =ata_shost_to_port (shost); +struct ata_link *link; +struct ata_device *dev;enum ata_lpm_policy policy;unsigned long flags;
@@ -133,10 +135,20 @@ static ssize_t ata_scsi_lpm_store(struct device *dev,return -EINVAL ;spin_lock_irqsave (ap->lock, flags); + +ata_for_each_link (link, ap,EDGE ) { +ata_for_each_dev (dev, &ap->link,ENABLED ) { +if (dev->horkage &ATA_HORKAGE_NOLPM ) { + count = -EOPNOTSUPP ; + goto out_unlock; + } + } + } + ap->target_lpm_policy = policy;ata_port_schedule_eh (ap); +out_unlock:spin_unlock_irqrestore (ap->lock, flags); -return count; }
drivers/ata/sata_mv.c +25 -0
@@ -304,6 +304,7 @@ enum {MV5_LTMODE =0x30 ,MV5_PHY_CTL =0x0C ,SATA_IFCFG =0x050 , +LP_PHY_CTL =0x058 , MV_M2_PREAMP_MASK = 0x7e0,
@@ -431,6 +432,7 @@ enum {MV_HP_CUT_THROUGH = (1 <<10 ),/* can use EDMA cut-through */ MV_HP_FLAG_SOC = (1 <<11 ),/* SystemOnChip, no PCI */ MV_HP_QUIRK_LED_BLINK_EN = (1 <<12 ),/* is led blinking enabled? */ +MV_HP_FIX_LP_PHY_CTL = (1 <<13 ),/* fix speed in LP_PHY_CTL ? */ /* Port private flags (pp_flags) */ MV_PP_FLAG_EDMA_EN = (1 << 0), /* is EDMA engine enabled? */
@@ -1353,6 +1355,7 @@ static int mv_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val)if (ofs !=0xffffffffU ) {void __iomem *addr =mv_ap_base (link->ap) + ofs; +struct mv_host_priv *hpriv = link->ap->host->private_data;if (sc_reg_in ==SCR_CONTROL ) {/* * Workaround for 88SX60x1 FEr SATA#26:
@@ -1369,6 +1372,18 @@ static int mv_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val)*/ if ((val &0xf ) ==1 || (readl (addr) &0xf ) ==1 ) val |=0xf000 ; + +if (hpriv->hp_flags &MV_HP_FIX_LP_PHY_CTL ) { +void __iomem *lp_phy_addr = +mv_ap_base (link->ap) +LP_PHY_CTL ; +/* +* Set PHY speed according to SControl speed. +*/ +if ((val &0xf0 ) ==0x10 ) +writelfl (0x7 , lp_phy_addr); +else +writelfl (0x227 , lp_phy_addr); + } }writelfl (val, addr);return 0 ;
@@ -4111,6 +4126,15 @@ static int mv_platform_probe(struct platform_device *pdev)if (rc) goto err; +/* +* To allow disk hotplug on Armada 370/XP SoCs, the PHY speed must be +* updated in the LP_PHY_CTL register. +*/ +if (pdev->dev.of_node && +of_device_is_compatible (pdev->dev.of_node, +"marvell,armada-370-sata" )) + hpriv->hp_flags |=MV_HP_FIX_LP_PHY_CTL ; +/* initialize adapter */ rc =mv_init_host (host);if (rc)
@@ -4216,6 +4240,7 @@ static int mv_platform_resume(struct platform_device *pdev)#ifdef CONFIG_OF static struct of_device_id mv_sata_dt_ids[] = { + { .compatible ="marvell,armada-370-sata" , }, { .compatible ="marvell,orion-sata" , }, {}, };
drivers/char/tpm/tpm_i2c_stm_st33.c +6 -1
@@ -410,6 +410,8 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) &chip->vendor.read_queue) == 0) { burstcnt =get_burstcount (chip); +if (burstcnt <0 ) +return burstcnt; len =min_t (int, burstcnt, count - size);I2C_READ_DATA (client,TPM_DATA_FIFO , buf + size, len); size += len;
@@ -451,7 +453,8 @@ static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id)static int tpm_stm_i2c_send (struct tpm_chip *chip,unsigned char *buf,size_t len) { -u32 status, burstcnt =0 , i, size; +u32 status, i, size; +int burstcnt =0 ;int ret;u8 data;struct i2c_client *client;
@@ -482,6 +485,8 @@ static int tpm_stm_i2c_send(struct tpm_chip *chip, unsigned char *buf,for (i =0 ; i < len -1 ;) { burstcnt =get_burstcount (chip); +if (burstcnt <0 ) +return burstcnt; size =min_t (int, len - i -1 , burstcnt); ret =I2C_WRITE_DATA (client,TPM_DATA_FIFO , buf, size);if (ret <0 )
drivers/char/tpm/tpm_ppi.c +4 -4
@@ -172,7 +172,7 @@ static ssize_t tpm_store_ppi_request(struct device *dev,* is updated with function index from SUBREQ to SUBREQ2 since PPI * version 1.1 */ -if (strcmp (version,"1.1" ) ==-1 ) +if (strcmp (version,"1.1" ) <0 ) params[2 ].integer.value =TPM_PPI_FN_SUBREQ ;else params[2 ].integer.value =TPM_PPI_FN_SUBREQ2 ;
@@ -182,7 +182,7 @@ static ssize_t tpm_store_ppi_request(struct device *dev,* string/package type. For PPI version 1.0 and 1.1, use buffer type * for compatibility, and use package type since 1.2 according to spec. */ -if (strcmp (version,"1.2" ) ==-1 ) { +if (strcmp (version,"1.2" ) <0 ) { params[3 ].type =ACPI_TYPE_BUFFER ; params[3 ].buffer.length =sizeof (req);sscanf (buf,"%d" , &req);
@@ -248,7 +248,7 @@ static ssize_t tpm_show_ppi_transition_action(struct device *dev,* (e.g. Capella with PPI 1.0) need integer/string/buffer type, so for * compatibility, define params[3].type as buffer, if PPI version < 1.2 */ -if (strcmp (version,"1.2" ) ==-1 ) { +if (strcmp (version,"1.2" ) <0 ) { params[3 ].type =ACPI_TYPE_BUFFER ; params[3 ].buffer.length =0 ; params[3 ].buffer.pointer =NULL ;
@@ -390,7 +390,7 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)kfree (output.pointer); output.length =ACPI_ALLOCATE_BUFFER ; output.pointer =NULL ; -if (strcmp (version,"1.2" ) ==-1 ) +if (strcmp (version,"1.2" ) <0 )return -EPERM ; params[2 ].integer.value =TPM_PPI_FN_GETOPR ;
drivers/edac/e752x_edac.c +3 -1
@@ -1182,9 +1182,11 @@ static int e752x_get_devs(struct pci_dev *pdev, int dev_idx, pvt->bridge_ck =pci_get_device (PCI_VENDOR_ID_INTEL , pvt->dev_info->err_dev, pvt->bridge_ck); -if (pvt->bridge_ck ==NULL ) +if (pvt->bridge_ck ==NULL ) { pvt->bridge_ck =pci_scan_single_device (pdev->bus,PCI_DEVFN (0 ,1 )); +pci_dev_get (pvt->bridge_ck); + }if (pvt->bridge_ck ==NULL ) { e752x_printk(KERN_ERR, "error reporting device not found:"
drivers/gpu/drm/nouveau/core/subdev/bios/init.c +4 -4
@@ -366,13 +366,13 @@ static u16 init_script(struct nouveau_bios *bios, int index) {struct nvbios_init init = { .bios = bios }; -u16 data; +u16 bmp_ver =bmp_version (bios), data; -if (bmp_version (bios) &&bmp_version (bios) <0x0510 ) { -if (index >1 ) +if (bmp_ver && bmp_ver <0x0510 ) { +if (index >1 || bmp_ver <0x0100 )return 0x0000 ; - data = bios->bmp_offset + (bios->version.major <2 ?14 :18 ); + data = bios->bmp_offset + (bmp_ver <0x0200 ?14 :18 );return nv_ro16 (bios, data + (index *2 )); }
drivers/hwmon/k10temp.c +1 -0
@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, {} };
drivers/md/bcache/bset.c +22 -4
@@ -927,7 +927,7 @@ static void sort_key_next(struct btree_iter *iter, *i = iter->data[--iter->used]; } -static void btree_sort_fixup (struct btree_iter *iter) +static struct bkey *btree_sort_fixup (struct btree_iter *iter,struct bkey *tmp) {while (iter->used >1 ) {struct btree_iter_set *top = iter->data, *i = top +1 ;
@@ -955,9 +955,22 @@ static void btree_sort_fixup(struct btree_iter *iter) }else {/* can't happen because of comparison func */ BUG_ON (!bkey_cmp (&START_KEY (top->k), &START_KEY (i->k))); -bch_cut_back (&START_KEY (i->k), top->k); + +if (bkey_cmp (i->k, top->k) <0 ) { +bkey_copy (tmp, top->k); + +bch_cut_back (&START_KEY (i->k), tmp); +bch_cut_front (i->k, top->k); +heap_sift (iter,0 , btree_iter_cmp); + +return tmp; + }else { +bch_cut_back (&START_KEY (i->k), top->k); + } } } + +return NULL ; } static void btree_mergesort(struct btree *b, struct bset *out,
@@ -965,15 +978,20 @@ static void btree_mergesort(struct btree *b, struct bset *out, bool fixup, bool remove_stale) {struct bkey *k, *last =NULL ; +BKEY_PADDED (k) tmp;bool (*bad)(struct btree *,const struct bkey *) = remove_stale ? bch_ptr_bad : bch_ptr_invalid;while (!btree_iter_end (iter)) {if (fixup && !b->level) -btree_sort_fixup (iter); + k =btree_sort_fixup (iter, &tmp.k); +else + k =NULL ; + +if (!k) + k =bch_btree_iter_next (iter); - k =bch_btree_iter_next (iter);if (bad (b, k))continue ;
drivers/md/raid5.c +1 -0
@@ -1893,6 +1893,7 @@ static void raid5_end_write_request(struct bio *bi, int error)set_bit (R5_MadeGoodRepl, &sh->dev[i].flags); }else {if (!uptodate) { +set_bit (STRIPE_DEGRADED , &sh->state);set_bit (WriteErrorSeen, &rdev->flags);set_bit (R5_WriteError, &sh->dev[i].flags);if (!test_and_set_bit (WantReplacement, &rdev->flags))
drivers/mfd/max77686.c +1 -1
@@ -102,7 +102,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, max77686->irq_gpio = pdata->irq_gpio; max77686->irq = i2c->irq; - max77686->regmap =regmap_init_i2c (i2c, &max77686_regmap_config); + max77686->regmap =devm_regmap_init_i2c (i2c, &max77686_regmap_config);if (IS_ERR (max77686->regmap)) { ret =PTR_ERR (max77686->regmap); dev_err(max77686->dev, "Failed to allocate register map: %d\n",
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +9 -4
@@ -153,6 +153,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,struct sk_buff *skb = tx_buf->skb;u16 bd_idx =TX_BD (tx_buf->first_bd), new_cons;int nbd; +u16 split_bd_len =0 ;/* prefetch skb end pointer to speedup dev_kfree_skb() */ prefetch (&skb->end);
@@ -160,10 +161,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,DP (NETIF_MSG_TX_DONE ,"fp[%d]: pkt_idx %d buff @(%p)->skb %p\n" , txdata->txq_index, idx, tx_buf, skb); -/* unmap first bd */ tx_start_bd = &txdata->tx_desc_ring[bd_idx].start_bd; -dma_unmap_single (&bp->pdev->dev,BD_UNMAP_ADDR (tx_start_bd), -BD_UNMAP_LEN (tx_start_bd),DMA_TO_DEVICE ); nbd =le16_to_cpu (tx_start_bd->nbd) -1 ;
@@ -182,12 +180,19 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata, --nbd; bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); -/* ...and the TSO split header bd since they have no mapping */ +/* TSO headers+data bds share a common mapping. See bnx2x_tx_split() */ if (tx_buf->flags &BNX2X_TSO_SPLIT_BD ) { + tx_data_bd = &txdata->tx_desc_ring[bd_idx].reg_bd; + split_bd_len =BD_UNMAP_LEN (tx_data_bd); --nbd; bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); } +/* unmap first bd */ +dma_unmap_single (&bp->pdev->dev,BD_UNMAP_ADDR (tx_start_bd), +BD_UNMAP_LEN (tx_start_bd) + split_bd_len, +DMA_TO_DEVICE ); +/* now free frags */ while (nbd >0 ) {
drivers/net/ethernet/intel/e1000e/phy.c +7 -3
@@ -1757,19 +1757,23 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,* it across the board. */ ret_val =e1e_rphy (hw,MII_BMSR , &phy_status); -if (ret_val) +if (ret_val) {/* If the first read fails, another entity may have * ownership of the resources, wait and try again to * see if they have relinquished the resources yet. */ -udelay (usec_interval); +if (usec_interval >=1000 ) +msleep (usec_interval /1000 ); +else +udelay (usec_interval); + } ret_val =e1e_rphy (hw,MII_BMSR , &phy_status);if (ret_val)break ;if (phy_status &BMSR_LSTATUS )break ;if (usec_interval >=1000 ) -mdelay (usec_interval /1000 ); +msleep (usec_interval /1000 );else udelay (usec_interval); }
drivers/net/ethernet/via/via-rhine.c +1 -0
@@ -1611,6 +1611,7 @@ static void rhine_reset_task(struct work_struct *work) goto out_unlock;napi_disable (&rp->napi); +netif_tx_disable (dev);spin_lock_bh (&rp->lock);/* clear all descriptors */
drivers/net/wireless/b43/b43.h +2 -2
@@ -731,8 +731,6 @@ enum b43_firmware_file_type {struct b43_request_fw_context {/* The device we are requesting the fw for. */ struct b43_wldev *dev; -/* a completion event structure needed if this call is asynchronous */ -struct completion fw_load_complete;/* a pointer to the firmware object */ const struct firmware *blob;/* The type of firmware to request. */
@@ -809,6 +807,8 @@ enum {struct b43_wldev {struct b43_bus_dev *dev;struct b43_wl *wl; +/* a completion event structure needed if this call is asynchronous */ +struct completion fw_load_complete;/* The device initialization status. * Use b43_status() to query. */
drivers/net/wireless/b43/main.c +16 -11
@@ -2068,6 +2068,7 @@ void b43_do_release_fw(struct b43_firmware_file *fw)static void b43_release_firmware (struct b43_wldev *dev) { +complete (&dev->fw_load_complete);b43_do_release_fw (&dev->fw.ucode);b43_do_release_fw (&dev->fw.pcm);b43_do_release_fw (&dev->fw.initvals);
@@ -2093,7 +2094,7 @@ static void b43_fw_cb(const struct firmware *firmware, void *context)struct b43_request_fw_context *ctx = context; ctx->blob = firmware; -complete (&ctx->fw_load_complete); +complete (&ctx->dev->fw_load_complete); } int b43_do_request_fw(struct b43_request_fw_context *ctx,
@@ -2140,7 +2141,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx, }if (async) {/* do this part asynchronously */ -init_completion (&ctx->fw_load_complete); +init_completion (&ctx->dev->fw_load_complete); err =request_firmware_nowait (THIS_MODULE ,1 , ctx->fwname, ctx->dev->dev->dev,GFP_KERNEL , ctx, b43_fw_cb);
@@ -2148,12 +2149,11 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,pr_err ("Unable to load firmware\n" );return err; } -/* stall here until fw ready */ -wait_for_completion (&ctx->fw_load_complete); +wait_for_completion (&ctx->dev->fw_load_complete);if (ctx->blob) goto fw_ready;/* On some ARM systems, the async request will fail, but the next sync -* request works. For this reason, we dall through here +* request works. For this reason, we fall through here */ } err = request_firmware(&ctx->blob, ctx->fwname,
@@ -2422,6 +2422,7 @@ error:static int b43_one_core_attach (struct b43_bus_dev *dev,struct b43_wl *wl);static void b43_one_core_detach (struct b43_bus_dev *dev); +static int b43_rng_init (struct b43_wl *wl);static void b43_request_firmware (struct work_struct *work) {
@@ -2473,6 +2474,10 @@ start_ieee80211: goto err_one_core_detach; wl->hw_registred = true;b43_leds_register (wl->current_dev); + +/* Register HW RNG driver */ +b43_rng_init (wl); + goto out; err_one_core_detach:
@@ -4634,9 +4639,6 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)if (!dev ||b43_status (dev) !=B43_STAT_INITIALIZED )return ; -/* Unregister HW RNG driver */ -b43_rng_exit (dev->wl); -b43_set_status (dev,B43_STAT_UNINIT );/* Stop the microcode PSM. */
@@ -4779,9 +4781,6 @@ static int b43_wireless_core_init(struct b43_wldev *dev)b43_set_status (dev,B43_STAT_INITIALIZED ); -/* Register HW RNG driver */ -b43_rng_init (dev->wl); - out:return err;
@@ -5442,6 +5441,9 @@ static void b43_bcma_remove(struct bcma_device *core)b43_one_core_detach (wldev->dev); +/* Unregister HW RNG driver */ +b43_rng_exit (wl); +b43_leds_unregister (wl);ieee80211_free_hw (wl->hw);
@@ -5519,6 +5521,9 @@ static void b43_ssb_remove(struct ssb_device *sdev)b43_one_core_detach (dev); +/* Unregister HW RNG driver */ +b43_rng_exit (wl); +if (list_empty (&wl->devlist)) {b43_leds_unregister (wl);/* Last core on the chip unregistered.
drivers/net/wireless/b43/xmit.c +2 -2
@@ -821,10 +821,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)* channel number in b43. */ if (chanstat &B43_RX_CHAN_5GHZ ) { status.band =IEEE80211_BAND_5GHZ ; - status.freq =b43_freq_to_channel_5ghz (chanid); + status.freq =b43_channel_to_freq_5ghz (chanid); }else { status.band =IEEE80211_BAND_2GHZ ; - status.freq =b43_freq_to_channel_2ghz (chanid); + status.freq =b43_channel_to_freq_2ghz (chanid); }break ;default :
drivers/net/wireless/b43legacy/main.c +1 -0
@@ -3919,6 +3919,7 @@ static void b43legacy_remove(struct ssb_device *dev)* as the ieee80211 unreg will destroy the workqueue. */ cancel_work_sync (&wldev->restart_work);cancel_work_sync (&wl->firmware_load); +complete (&wldev->fw_load_complete);B43legacy_WARN_ON (!wl);if (!wldev->fw.ucode)
drivers/net/wireless/iwlwifi/iwl-7000.c +6 -0
@@ -131,6 +131,7 @@ const struct iwl_cfg iwl7260_2ac_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL7260_NVM_VERSION, .nvm_calib_ver = IWL7260_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl7260_2n_cfg = {
@@ -140,6 +141,7 @@ const struct iwl_cfg iwl7260_2n_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL7260_NVM_VERSION, .nvm_calib_ver = IWL7260_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl7260_n_cfg = {
@@ -149,6 +151,7 @@ const struct iwl_cfg iwl7260_n_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL7260_NVM_VERSION, .nvm_calib_ver = IWL7260_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl3160_2ac_cfg = {
@@ -158,6 +161,7 @@ const struct iwl_cfg iwl3160_2ac_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL3160_NVM_VERSION, .nvm_calib_ver = IWL3160_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl3160_2n_cfg = {
@@ -167,6 +171,7 @@ const struct iwl_cfg iwl3160_2n_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL3160_NVM_VERSION, .nvm_calib_ver = IWL3160_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl3160_n_cfg = {
@@ -176,6 +181,7 @@ const struct iwl_cfg iwl3160_n_cfg = { .ht_params = &iwl7000_ht_params, .nvm_ver = IWL3160_NVM_VERSION, .nvm_calib_ver = IWL3160_TX_POWER_VERSION, + .host_interrupt_operation_mode = true, };MODULE_FIRMWARE (IWL7260_MODULE_FIRMWARE (IWL7260_UCODE_API_OK ));
drivers/net/wireless/iwlwifi/iwl-config.h +3 -0
@@ -241,6 +241,8 @@ struct iwl_eeprom_params {* @rx_with_siso_diversity: 1x1 device with rx antenna diversity * @internal_wimax_coex: internal wifi/wimax combo device * @temp_offset_v2: support v2 of temperature offset calibration +* @host_interrupt_operation_mode: device needs host interrupt operation +* mode set * * We enable the driver to be backward compatible wrt. hardware features. * API differences in uCode shouldn't be handled here but through TLVs
@@ -273,6 +275,7 @@ struct iwl_cfg {const bool rx_with_siso_diversity;const bool internal_wimax_coex;const bool temp_offset_v2; +const bool host_interrupt_operation_mode; };/*
drivers/net/wireless/iwlwifi/iwl-csr.h +1 -4
@@ -463,13 +463,10 @@* the CSR_INT_COALESCING is an 8 bit register in 32-usec unit * * default interrupt coalescing timer is 64 x 32 = 2048 usecs -* default interrupt coalescing calibration timer is 16 x 32 = 512 usecs */ #define IWL_HOST_INT_TIMEOUT_MAX (0xFF)#define IWL_HOST_INT_TIMEOUT_DEF (0x40)#define IWL_HOST_INT_TIMEOUT_MIN (0x0) -#define IWL_HOST_INT_CALIB_TIMEOUT_MAX (0xFF) -#define IWL_HOST_INT_CALIB_TIMEOUT_DEF (0x10) -#define IWL_HOST_INT_CALIB_TIMEOUT_MIN (0x0) +#define IWL_HOST_INT_OPER_MODE BIT(31)#endif /* !__iwl_csr_h__ */
drivers/net/wireless/iwlwifi/iwl-prph.h +4 -0
@@ -260,4 +260,8 @@ static inline unsigned int SCD_QUEUE_STATUS_BITS(unsigned int chnl)/*********************** END TX SCHEDULER *************************************/ +/* Oscillator clock */ +#define OSC_CLK (0xa04068) +#define OSC_CLK_FORCE_CONTROL (0x8) +#endif /* __iwl_prph_h__ */
drivers/net/wireless/iwlwifi/mvm/ops.c +1 -0
@@ -424,6 +424,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, out_unregister:ieee80211_unregister_hw (mvm->hw); +iwl_mvm_leds_exit (mvm); out_free:iwl_phy_db_free (mvm->phy_db);kfree (mvm->scan_cmd);
drivers/net/wireless/iwlwifi/pcie/rx.c +4 -0
@@ -489,6 +489,10 @@ static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)/* Set interrupt coalescing timer to default (2048 usecs) */ iwl_write8 (trans,CSR_INT_COALESCING ,IWL_HOST_INT_TIMEOUT_DEF ); + +/* W/A for interrupt coalescing bug in 7260 and 3160 */ +if (trans->cfg->host_interrupt_operation_mode) +iwl_set_bit (trans,CSR_INT_COALESCING ,IWL_HOST_INT_OPER_MODE ); }int iwl_pcie_rx_init (struct iwl_trans *trans)
drivers/net/wireless/iwlwifi/pcie/trans.c +16 -3
@@ -207,6 +207,22 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans) }/* +* Enable the oscillator to count wake up time for L1 exit. This +* consumes slightly more power (100uA) - but allows to be sure +* that we wake up from L1 on time. +* +* This looks weird: read twice the same register, discard the +* value, set a bit, and yet again, read that same register +* just to discard the value. But that's the way the hardware +* seems to like it. +*/ +iwl_read_prph (trans,OSC_CLK ); +iwl_read_prph (trans,OSC_CLK ); +iwl_set_bits_prph (trans,OSC_CLK ,OSC_CLK_FORCE_CONTROL ); +iwl_read_prph (trans,OSC_CLK ); +iwl_read_prph (trans,OSC_CLK ); + +/* * Enable DMA clock and wait for it to stabilize. * * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
@@ -276,9 +292,6 @@ static int iwl_pcie_nic_init(struct iwl_trans *trans)spin_lock_irqsave (&trans_pcie->irq_lock, flags);iwl_pcie_apm_init (trans); -/* Set interrupt coalescing calibration timer to default (512 usecs) */ -iwl_write8 (trans,CSR_INT_COALESCING ,IWL_HOST_INT_CALIB_TIMEOUT_DEF ); -spin_unlock_irqrestore (&trans_pcie->irq_lock, flags);iwl_pcie_set_pwr (trans, false);
drivers/net/wireless/mwifiex/fw.h +1 -1
@@ -228,7 +228,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {/* HW_SPEC fw_cap_info */ -#define ISSUPP_11ACENABLED (fw_cap_info) (fw_cap_info & (BIT(13)|BIT(14))) +#define ISSUPP_11ACENABLED (fw_cap_info) (fw_cap_info & (BIT(12)|BIT(13)))#define GET_VHTCAP_CHWDSET (vht_cap_info) ((vht_cap_info >> 2) & 0x3)#define GET_VHTNSSMCS (mcs_mapset, nss) ((mcs_mapset >> (2 * (nss - 1))) & 0x3)
drivers/net/wireless/mwifiex/scan.c +2 -2
@@ -1622,7 +1622,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,const u8 *ie_buf;size_t ie_len;u16 channel =0 ; -u64 fw_tsf =0 ; +__le64 fw_tsf =0 ;u16 beacon_size =0 ;u32 curr_bcn_bytes;u32 freq;
@@ -1749,7 +1749,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, ie_buf, ie_len, rssi, GFP_KERNEL); bss_priv = (struct mwifiex_bss_priv *)bss->priv; bss_priv->band = band; - bss_priv->fw_tsf = fw_tsf; + bss_priv->fw_tsf =le64_to_cpu (fw_tsf);if (priv->media_connected && !memcmp(bssid, priv->curr_bss_params.bss_descriptor
drivers/net/wireless/rtlwifi/base.c +2 -1
@@ -1427,7 +1427,8 @@ void rtl_watchdog_wq_callback(void *data)/* if we can't recv beacon for 6s, we should * reconnect this AP */ -if (rtlpriv->link_info.roam_times >=3 ) { +if ((rtlpriv->link_info.roam_times >=3 ) && + !is_zero_ether_addr (rtlpriv->mac80211.bssid)) {RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG ,"AP off, try to reconnect now\n" ); rtlpriv->link_info.roam_times =0 ;
drivers/net/wireless/rtlwifi/core.c +11 -0
@@ -46,10 +46,20 @@ void rtl_fw_cb(const struct firmware *firmware, void *context) "Firmware callback routine entered!\n");complete (&rtlpriv->firmware_loading_complete);if (!firmware) { +if (rtlpriv->cfg->alt_fw_name) { + err =request_firmware (&firmware, + rtlpriv->cfg->alt_fw_name, + rtlpriv->io.dev); +pr_info ("Loading alternative firmware %s\n" , + rtlpriv->cfg->alt_fw_name); +if (!err) + goto found_alt; + }pr_err ("Firmware %s not available\n" , rtlpriv->cfg->fw_name); rtlpriv->max_fw_size =0 ;return ; } +found_alt:if (firmware->size > rtlpriv->max_fw_size) {RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG ,"Firmware is too big!\n" );
@@ -184,6 +194,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, rtlpriv->cfg->maps [RTL_IBSS_INT_MASKS]); } + mac->link_state =MAC80211_LINKED ;break ;case NL80211_IFTYPE_ADHOC : RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
drivers/net/wireless/rtlwifi/rtl8188ee/dm.c +1 -1
@@ -1078,7 +1078,7 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw rtldm->swing_flag_ofdm = true; } -if (rtldm->swing_idx_cck != rtldm->swing_idx_cck) { +if (rtldm->swing_idx_cck_cur != rtldm->swing_idx_cck) { rtldm->swing_idx_cck_cur = rtldm->swing_idx_cck; rtldm->swing_flag_cck = true; }
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +36 -0
@@ -158,6 +158,42 @@ static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = { {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} }; +static u32 power_index_reg[6 ] = {0xc90 ,0xc91 ,0xc92 ,0xc98 ,0xc99 ,0xc9a }; + +void dm_restorepowerindex (struct ieee80211_hw *hw) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); +u8 index; + +for (index =0 ; index <6 ; index++) +rtl_write_byte (rtlpriv, power_index_reg[index], + rtlpriv->dm.powerindex_backup[index]); +} +EXPORT_SYMBOL_GPL (dm_restorepowerindex); + +void dm_writepowerindex (struct ieee80211_hw *hw,u8 value) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); +u8 index; + +for (index =0 ; index <6 ; index++) +rtl_write_byte (rtlpriv, power_index_reg[index], value); +} +EXPORT_SYMBOL_GPL (dm_writepowerindex); + +void dm_savepowerindex (struct ieee80211_hw *hw) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); +u8 index; +u8 tmp; + +for (index =0 ; index <6 ; index++) { + tmp =rtl_read_byte (rtlpriv, power_index_reg[index]); + rtlpriv->dm.powerindex_backup[index] = tmp; + } +} +EXPORT_SYMBOL_GPL (dm_savepowerindex); +static void rtl92c_dm_diginit (struct ieee80211_hw *hw) {struct rtl_priv *rtlpriv =rtl_priv (hw);
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h +14 -0
@@ -91,6 +91,17 @@#define TX_POWER_NEAR_FIELD_THRESH_LVL2 74#define TX_POWER_NEAR_FIELD_THRESH_LVL1 67 +#define DYNAMIC_FUNC_DISABLE 0x0 +#define DYNAMIC_FUNC_DIG BIT(0) +#define DYNAMIC_FUNC_HP BIT(1) +#define DYNAMIC_FUNC_SS BIT(2)/*Tx Power Tracking*/ +#define DYNAMIC_FUNC_BT BIT(3) +#define DYNAMIC_FUNC_ANT_DIV BIT(4) + +#define RSSI_CCK 0 +#define RSSI_OFDM 1 +#define RSSI_DEFAULT 2 +struct swat_t {u8 failure_cnt;u8 try_flag;
@@ -167,5 +178,8 @@ void rtl92c_phy_lc_calibrate(struct ieee80211_hw *hw);void rtl92c_phy_iq_calibrate (struct ieee80211_hw *hw,bool recovery);void rtl92c_dm_dynamic_txpower (struct ieee80211_hw *hw);void rtl92c_dm_bt_coexist (struct ieee80211_hw *hw); +void dm_savepowerindex (struct ieee80211_hw *hw); +void dm_writepowerindex (struct ieee80211_hw *hw,u8 value); +void dm_restorepowerindex (struct ieee80211_hw *hw);#endif
drivers/net/wireless/rtlwifi/rtl8192cu/dm.c +9 -0
@@ -101,6 +101,15 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)"PHY_SetTxPowerLevel8192S() Channel = %d\n" , rtlphy->current_channel);rtl92c_phy_set_txpower_level (hw, rtlphy->current_channel); +if (rtlpriv->dm.dynamic_txhighpower_lvl == +TXHIGHPWRLEVEL_NORMAL ) +dm_restorepowerindex (hw); +else if (rtlpriv->dm.dynamic_txhighpower_lvl == +TXHIGHPWRLEVEL_LEVEL1 ) +dm_writepowerindex (hw,0x14 ); +else if (rtlpriv->dm.dynamic_txhighpower_lvl == +TXHIGHPWRLEVEL_LEVEL2 ) +dm_writepowerindex (hw,0x10 ); } rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl;
drivers/net/wireless/rtlwifi/rtl8192cu/dm.h +3 -0
@@ -30,3 +30,6 @@#include "../rtl8192ce/dm.h" void rtl92cu_dm_dynamic_txpower (struct ieee80211_hw *hw); +void dm_savepowerindex (struct ieee80211_hw *hw); +void dm_writepowerindex (struct ieee80211_hw *hw,u8 value); +void dm_restorepowerindex (struct ieee80211_hw *hw);
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c +16 -13
@@ -85,17 +85,15 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,if (mac->act_scanning) { tx_agc[RF90_PATH_A ] =0x3f3f3f3f ; tx_agc[RF90_PATH_B ] =0x3f3f3f3f ; -if (turbo_scanoff) { -for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { - tx_agc[idx1] = ppowerlevel[idx1] | - (ppowerlevel[idx1] <<8 ) | - (ppowerlevel[idx1] <<16 ) | - (ppowerlevel[idx1] <<24 ); -if (rtlhal->interface ==INTF_USB ) { -if (tx_agc[idx1] >0x20 && - rtlefuse->external_pa) - tx_agc[idx1] =0x20 ; - } +for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { + tx_agc[idx1] = ppowerlevel[idx1] | + (ppowerlevel[idx1] <<8 ) | + (ppowerlevel[idx1] <<16 ) | + (ppowerlevel[idx1] <<24 ); +if (rtlhal->interface ==INTF_USB ) { +if (tx_agc[idx1] >0x20 && + rtlefuse->external_pa) + tx_agc[idx1] =0x20 ; } } }else {
@@ -107,7 +105,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, TXHIGHPWRLEVEL_LEVEL2) { tx_agc[RF90_PATH_A ] =0x00000000 ; tx_agc[RF90_PATH_B ] =0x00000000 ; - } else{ + } else {for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { tx_agc[idx1] = ppowerlevel[idx1] | (ppowerlevel[idx1] << 8) |
@@ -373,7 +371,12 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, regoffset == RTXAGC_B_MCS07_MCS04) regoffset =0xc98 ;for (i =0 ; i <3 ; i++) { - writeVal = (writeVal >6 ) ? (writeVal -6 ) :0 ; +if (i !=2 ) + writeVal = (writeVal >8 ) ? + (writeVal -8 ) :0 ; +else + writeVal = (writeVal >6 ) ? + (writeVal -6 ) :0 ;rtl_write_byte (rtlpriv, (u32)(regoffset + i), (u8 )writeVal); }
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +14 -3
@@ -49,6 +49,9 @@ MODULE_AUTHOR("Larry Finger <[email protected]>");MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Realtek 8192C/8188C 802.11n USB wireless" );MODULE_FIRMWARE ("rtlwifi/rtl8192cufw.bin" ); +MODULE_FIRMWARE ("rtlwifi/rtl8192cufw_A.bin" ); +MODULE_FIRMWARE ("rtlwifi/rtl8192cufw_B.bin" ); +MODULE_FIRMWARE ("rtlwifi/rtl8192cufw_TMSC.bin" );static int rtl92cu_init_sw_vars (struct ieee80211_hw *hw) {
@@ -68,14 +71,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw) "Can't alloc buffer for fw\n");return 1 ; } - +if (IS_VENDOR_UMC_A_CUT (rtlpriv->rtlhal.version) && + !IS_92C_SERIAL (rtlpriv->rtlhal.version)) { + rtlpriv->cfg->fw_name ="rtlwifi/rtl8192cufw_A.bin" ; + }else if (IS_81xxC_VENDOR_UMC_B_CUT (rtlpriv->rtlhal.version)) { + rtlpriv->cfg->fw_name ="rtlwifi/rtl8192cufw_B.bin" ; + }else { + rtlpriv->cfg->fw_name ="rtlwifi/rtl8192cufw_TMSC.bin" ; + } +/* provide name of alternative file */ + rtlpriv->cfg->alt_fw_name ="rtlwifi/rtl8192cufw.bin" ;pr_info ("Loading firmware %s\n" , rtlpriv->cfg->fw_name); rtlpriv->max_fw_size =0x4000 ; err =request_firmware_nowait (THIS_MODULE ,1 , rtlpriv->cfg->fw_name, rtlpriv->io.dev,GFP_KERNEL , hw, rtl_fw_cb); - -return err; }
@@ -306,6 +316,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/ {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/ {RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/ + {RTL_USB_DEVICE(0x0df6, 0x0077, rtl92cu_hal_cfg)}, /*Sitecom-WLA2100V2*/ {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/ {RTL_USB_DEVICE(0x4856, 0x0091, rtl92cu_hal_cfg)}, /*NetweeN - Feixun*//* HP - Lite-On ,8188CUS Slim Combo */
drivers/net/wireless/rtlwifi/stats.c +14 -0
@@ -176,6 +176,7 @@ static void rtl_process_pwdb(struct ieee80211_hw *hw, struct rtl_stats *pstatus)struct rtl_sta_info *drv_priv =NULL ;struct ieee80211_sta *sta =NULL ;long undec_sm_pwdb; +long undec_sm_cck;rcu_read_lock ();if (rtlpriv->mac80211.opmode !=NL80211_IFTYPE_STATION )
@@ -185,12 +186,16 @@ static void rtl_process_pwdb(struct ieee80211_hw *hw, struct rtl_stats *pstatus)if (sta) { drv_priv = (struct rtl_sta_info *) sta->drv_priv; undec_sm_pwdb = drv_priv->rssi_stat.undec_sm_pwdb; + undec_sm_cck = drv_priv->rssi_stat.undec_sm_cck; }else { undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb; + undec_sm_cck = rtlpriv->dm.undec_sm_cck; }if (undec_sm_pwdb <0 ) undec_sm_pwdb = pstatus->rx_pwdb_all; +if (undec_sm_cck <0 ) + undec_sm_cck = pstatus->rx_pwdb_all;if (pstatus->rx_pwdb_all > (u32 ) undec_sm_pwdb) { undec_sm_pwdb = (((undec_sm_pwdb) * (RX_SMOOTH_FACTOR - 1)) +
@@ -200,6 +205,15 @@ static void rtl_process_pwdb(struct ieee80211_hw *hw, struct rtl_stats *pstatus) undec_sm_pwdb = (((undec_sm_pwdb) * (RX_SMOOTH_FACTOR -1 )) + (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR ); } +if (pstatus->rx_pwdb_all > (u32 ) undec_sm_cck) { + undec_sm_cck = (((undec_sm_pwdb) * + (RX_SMOOTH_FACTOR -1 )) + + (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR ); + undec_sm_cck = undec_sm_cck +1 ; + }else { + undec_sm_pwdb = (((undec_sm_cck) * (RX_SMOOTH_FACTOR -1 )) + + (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR ); + }if (sta) { drv_priv->rssi_stat.undec_sm_pwdb = undec_sm_pwdb;
drivers/net/wireless/rtlwifi/usb.c +3 -1
@@ -477,6 +477,8 @@ static void _rtl_usb_rx_process_agg(struct ieee80211_hw *hw,if (unicast) rtlpriv->link_info.num_rx_inperiod++; } +/* static bcn for roaming */ +rtl_beacon_statistic (hw, skb); } }
@@ -548,7 +550,7 @@ static void _rtl_rx_pre_process(struct ieee80211_hw *hw, struct sk_buff *skb) } } -#define __RX_SKB_MAX_QUEUED 32 +#define __RX_SKB_MAX_QUEUED 64static void _rtl_rx_work (unsigned long param) {
drivers/net/wireless/rtlwifi/wifi.h +17 -16
@@ -1035,6 +1035,7 @@ struct rtl_ht_agg {struct rssi_sta {long undec_sm_pwdb; +long undec_sm_cck; };struct rtl_tid_data {
@@ -1325,8 +1326,10 @@ struct fast_ant_training {struct rtl_dm {/*PHY status for Dynamic Management */ long entry_min_undec_sm_pwdb; +long undec_sm_cck;long undec_sm_pwdb;/*out dm */ long entry_max_undec_sm_pwdb; +s32 ofdm_pkt_cnt;bool dm_initialgain_enable;bool dynamic_txpower_enable;bool current_turbo_edca;
@@ -1341,6 +1344,7 @@ struct rtl_dm {bool inform_fw_driverctrldm;bool current_mrc_switch;u8 txpowercount; +u8 powerindex_backup[6 ];u8 thermalvalue_rxgain;u8 thermalvalue_iqk;
@@ -1352,7 +1356,9 @@ struct rtl_dm {bool done_txpower;u8 dynamic_txhighpower_lvl;/*Tx high power level */ u8 dm_flag;/*Indicate each dynamic mechanism's status. */ +u8 dm_flag_tmp;u8 dm_type; +u8 dm_rssi_sel;u8 txpower_track_control;bool interrupt_migration;bool disable_tx_int;
@@ -1806,6 +1812,7 @@ struct rtl_hal_cfg {bool write_readback;char *name;char *fw_name; +char *alt_fw_name;struct rtl_hal_ops *ops;struct rtl_mod_params *mod_params;struct rtl_hal_usbint_cfg *usb_interface_cfg;
@@ -1950,6 +1957,7 @@ struct dig_t {u8 pre_ccastate;u8 cur_ccasate;u8 large_fa_hit; +u8 dig_dynamic_min;u8 forbidden_igi;u8 dig_state;u8 dig_highpwrstate;
@@ -2030,22 +2038,15 @@ struct rtl_priv {struct dig_t dm_digtable;struct ps_t dm_pstable; -/* section shared by individual drivers */ -union { -struct {/* data buffer pointer for USB reads */ -__le32 *usb_data; -int usb_data_index; -bool initialized; - }; -struct {/* section for 8723ae */ -bool reg_init;/* true if regs saved */ -u32 reg_874; -u32 reg_c70; -u32 reg_85c; -u32 reg_a74; -bool bt_operation_on; - }; - }; +u32 reg_874; +u32 reg_c70; +u32 reg_85c; +u32 reg_a74; +bool reg_init;/* true if regs saved */ +bool bt_operation_on; +__le32 *usb_data; +int usb_data_index; +bool initialized;bool enter_ps;/* true when entering PS */ u8 rate_mask[5 ];
drivers/net/xen-netfront.c +26 -62
150 lines not on this page · raw message
drivers/parport/parport_pc.c +2 -8
@@ -2596,8 +2596,6 @@ enum parport_pc_pci_cards { syba_2p_epp, syba_1p_ecp, titan_010l, - titan_1284p1, - titan_1284p2, avlab_1p, avlab_2p, oxsemi_952,
@@ -2656,8 +2654,6 @@ static struct parport_pc_pci { /* syba_2p_epp AP138B */ { 2, { { 0, 0x078 }, { 0, 0x178 }, } }, /* syba_1p_ecp W83787 */ { 1, { { 0, 0x078 }, } }, /* titan_010l */ { 1, { { 3, -1 }, } }, - /* titan_1284p1 */ { 1, { { 0, 1 }, } }, - /* titan_1284p2 */ { 2, { { 0, 1 }, { 2, 3 }, } }, /* avlab_1p */ { 1, { { 0, 1}, } }, /* avlab_2p */ { 2, { { 0, 1}, { 2, 3 },} }, /* The Oxford Semi cards are unusual: 954 doesn't support ECP,
@@ -2673,8 +2669,8 @@ static struct parport_pc_pci { /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* netmos_9715 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, - /* netmos_9805 */ { 1, { { 0, -1 }, } }, - /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, + /* netmos_9805 */ { 1, { { 0, 1 }, } }, + /* netmos_9815 */ { 2, { { 0, 1 }, { 2, 3 }, } }, /* netmos_9901 */ { 1, { { 0, -1 }, } }, /* netmos_9865 */ { 1, { { 0, -1 }, } }, /* quatech_sppxp100 */ { 1, { { 0, 1 }, } },
@@ -2718,8 +2714,6 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l }, - { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 }, - { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ /* AFAVLAB_TK9902 */ { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p},
drivers/pinctrl/pinctrl-sunxi.c +7 -6
@@ -1754,12 +1754,6 @@ static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset)return val; } -static int sunxi_pinctrl_gpio_direction_output (struct gpio_chip *chip, -unsigned offset,int value) -{ -return pinctrl_gpio_direction_output (chip->base + offset); -} -static void sunxi_pinctrl_gpio_set (struct gpio_chip *chip,unsigned offset,int value) {
@@ -1770,6 +1764,13 @@ static void sunxi_pinctrl_gpio_set(struct gpio_chip *chip,writel ((value &DATA_PINS_MASK ) << index, pctl->membase + reg); } +static int sunxi_pinctrl_gpio_direction_output (struct gpio_chip *chip, +unsigned offset,int value) +{ +sunxi_pinctrl_gpio_set (chip, offset, value); +return pinctrl_gpio_direction_output (chip->base + offset); +} +static int sunxi_pinctrl_gpio_of_xlate (struct gpio_chip *gc,const struct of_phandle_args *gpiospec,u32 *flags)
drivers/platform/x86/hp_accel.c +1 -0
@@ -77,6 +77,7 @@ static inline void delayed_sysfs_set(struct led_classdev *led_cdev,static struct acpi_device_id lis3lv02d_device_ids[] = { {"HPQ0004" ,0 },/* HP Mobile Data Protection System PNP */ {"HPQ6000" ,0 },/* HP Mobile Data Protection System PNP */ + {"HPQ6007" ,0 },/* HP Mobile Data Protection System PNP */ {"" ,0 }, };MODULE_DEVICE_TABLE (acpi, lis3lv02d_device_ids);
drivers/rtc/rtc-max8907.c +5 -6
@@ -51,7 +51,7 @@ static irqreturn_t max8907_irq_handler(int irq, void *data) {struct max8907_rtc *rtc = data; -regmap_update_bits (rtc->regmap,MAX8907_REG_ALARM0_CNTL ,0x7f ,0 ); +regmap_write (rtc->regmap,MAX8907_REG_ALARM0_CNTL ,0 );rtc_update_irq (rtc->rtc_dev,1 ,RTC_IRQF |RTC_AF );
@@ -64,7 +64,7 @@ static void regs_to_tm(u8 *regs, struct rtc_time *tm)bcd2bin (regs[RTC_YEAR1 ]) -1900 ; tm->tm_mon =bcd2bin (regs[RTC_MONTH ] &0x1f ) -1 ; tm->tm_mday =bcd2bin (regs[RTC_DATE ] &0x3f ); - tm->tm_wday = (regs[RTC_WEEKDAY ] &0x07 ) -1 ; + tm->tm_wday = (regs[RTC_WEEKDAY ] &0x07 );if (regs[RTC_HOUR ] &HOUR_12 ) { tm->tm_hour =bcd2bin (regs[RTC_HOUR ] &0x01f );if (tm->tm_hour ==12 )
@@ -88,7 +88,7 @@ static void tm_to_regs(struct rtc_time *tm, u8 *regs) regs[RTC_YEAR1 ] =bin2bcd (low); regs[RTC_MONTH ] =bin2bcd (tm->tm_mon +1 ); regs[RTC_DATE ] =bin2bcd (tm->tm_mday); - regs[RTC_WEEKDAY ] = tm->tm_wday +1 ; + regs[RTC_WEEKDAY ] = tm->tm_wday; regs[RTC_HOUR ] =bin2bcd (tm->tm_hour); regs[RTC_MIN ] =bin2bcd (tm->tm_min); regs[RTC_SEC ] =bin2bcd (tm->tm_sec);
@@ -153,7 +153,7 @@ static int max8907_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)tm_to_regs (&alrm->time, regs);/* Disable alarm while we update the target time */ - ret =regmap_update_bits (rtc->regmap,MAX8907_REG_ALARM0_CNTL ,0x7f ,0 ); + ret =regmap_write (rtc->regmap,MAX8907_REG_ALARM0_CNTL ,0 );if (ret <0 )return ret;
@@ -163,8 +163,7 @@ static int max8907_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)return ret;if (alrm->enabled) - ret =regmap_update_bits (rtc->regmap,MAX8907_REG_ALARM0_CNTL , -0x7f ,0x7f ); + ret =regmap_write (rtc->regmap,MAX8907_REG_ALARM0_CNTL ,0x77 );return ret; }
drivers/scsi/bfa/bfad.c +4 -2
@@ -1824,7 +1824,7 @@ out:static u32 *bfad_load_fwimg (struct pci_dev *pdev) { -if (pdev->device ==BFA_PCI_DEVICE_ID_CT2 ) { +if (bfa_asic_id_ct2 (pdev->device)) {if (bfi_image_ct2_size ==0 )bfad_read_firmware (pdev, &bfi_image_ct2, &bfi_image_ct2_size,BFAD_FW_FILE_CT2 );
@@ -1834,12 +1834,14 @@ bfad_load_fwimg(struct pci_dev *pdev)bfad_read_firmware (pdev, &bfi_image_ct, &bfi_image_ct_size,BFAD_FW_FILE_CT );return bfi_image_ct; - }else { + }else if (bfa_asic_id_cb (pdev->device)) {if (bfi_image_cb_size ==0 )bfad_read_firmware (pdev, &bfi_image_cb, &bfi_image_cb_size,BFAD_FW_FILE_CB );return bfi_image_cb; } + +return NULL ; } static void
drivers/scsi/virtio_scsi.c +14 -1
@@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)#ifdef CONFIG_PM static int virtscsi_freeze (struct virtio_device *vdev) { +struct Scsi_Host *sh =virtio_scsi_host (vdev); +struct virtio_scsi *vscsi =shost_priv (sh); + +unregister_hotcpu_notifier (&vscsi->nb);virtscsi_remove_vqs (vdev);return 0 ; }
@@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev) {struct Scsi_Host *sh =virtio_scsi_host (vdev);struct virtio_scsi *vscsi =shost_priv (sh); +int err; + + err =virtscsi_init (vdev, vscsi); +if (err) +return err; + + err =register_hotcpu_notifier (&vscsi->nb); +if (err) + vdev->config->del_vqs (vdev); -return virtscsi_init (vdev, vscsi); +return err; }#endif
drivers/staging/rtl8712/usb_intf.c +5 -0
@@ -358,6 +358,10 @@ static u8 key_2char2num(u8 hch, u8 lch)return (hex_to_bin (hch) <<4 ) |hex_to_bin (lch); } +static const struct device_type wlan_type = { + .name ="wlan" , +}; +/* * drv_init() - a device potentially for us *
@@ -393,6 +397,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, padapter->pusb_intf = pusb_intf;usb_set_intfdata (pusb_intf, pnetdev);SET_NETDEV_DEV (pnetdev, &pusb_intf->dev); + pnetdev->dev.type = &wlan_type;/* step 2. */ padapter->dvobj_init = &r8712_usb_dvobj_init; padapter->dvobj_deinit = &r8712_usb_dvobj_deinit;
drivers/staging/vt6656/baseband.c +0 -3
@@ -1466,7 +1466,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70,.... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE)
@@ -1609,7 +1608,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70, ... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE)
@@ -1761,7 +1759,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)case RF_VT3342A0 ://RobertYu:20060627, testing table if ( bScanning ) {// need Max sensitivity //RSSI -67, -68, ... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE)
drivers/staging/vt6656/card.c +1 -1
@@ -761,7 +761,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, u16 wBeaconInterval) uBeaconInterval = wBeaconInterval *1024 ;// Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval - uLowNextTBTT = ((qwTSF &0xffffffffU ) >>10 ) <<10 ; + uLowNextTBTT = ((qwTSF &0xffffffffULL ) >>10 ) <<10 ; uLowRemain = (uLowNextTBTT) % uBeaconInterval; uHighRemain = ((0x80000000 % uBeaconInterval) *2 * (u32)(qwTSF >>32 )) % uBeaconInterval;
drivers/target/iscsi/iscsi_target.c +21 -13
@@ -54,7 +54,7 @@static LIST_HEAD (g_tiqn_list);static LIST_HEAD (g_np_list);static DEFINE_SPINLOCK (tiqn_lock); -static DEFINE_SPINLOCK (np_lock); +static DEFINE_MUTEX (np_lock);static struct idr tiqn_idr;struct idr sess_idr;
@@ -303,6 +303,9 @@ bool iscsit_check_np_match(return false; } +/* +* Called with mutex np_lock held +*/ static struct iscsi_np *iscsit_get_np (struct __kernel_sockaddr_storage *sockaddr,int network_transport)
@@ -310,11 +313,10 @@ static struct iscsi_np *iscsit_get_np(struct iscsi_np *np;bool match; -spin_lock_bh (&np_lock);list_for_each_entry (np, &g_np_list, np_list) { -spin_lock (&np->np_thread_lock); +spin_lock_bh (&np->np_thread_lock);if (np->np_thread_state !=ISCSI_NP_THREAD_ACTIVE ) { -spin_unlock (&np->np_thread_lock); +spin_unlock_bh (&np->np_thread_lock);continue ; }
@@ -326,13 +328,11 @@ static struct iscsi_np *iscsit_get_np(* while iscsi_tpg_add_network_portal() is called. */ np->np_exports++; -spin_unlock (&np->np_thread_lock); -spin_unlock_bh (&np_lock); +spin_unlock_bh (&np->np_thread_lock);return np; } -spin_unlock (&np->np_thread_lock); +spin_unlock_bh (&np->np_thread_lock); } -spin_unlock_bh (&np_lock);return NULL ; }
@@ -346,16 +346,22 @@ struct iscsi_np *iscsit_add_np(struct sockaddr_in6 *sock_in6;struct iscsi_np *np;int ret; + +mutex_lock (&np_lock); +/* * Locate the existing struct iscsi_np if already active.. */ np =iscsit_get_np (sockaddr, network_transport); -if (np) +if (np) { +mutex_unlock (&np_lock);return np; + } np =kzalloc (sizeof (struct iscsi_np ),GFP_KERNEL );if (!np) {pr_err ("Unable to allocate memory for struct iscsi_np\n" ); +mutex_unlock (&np_lock);return ERR_PTR (-ENOMEM ); }
@@ -378,6 +384,7 @@ struct iscsi_np *iscsit_add_np( ret =iscsi_target_setup_login_socket (np, sockaddr);if (ret !=0 ) {kfree (np); +mutex_unlock (&np_lock);return ERR_PTR (ret); }
@@ -386,6 +393,7 @@ struct iscsi_np *iscsit_add_np(pr_err ("Unable to create kthread: iscsi_np\n" ); ret =PTR_ERR (np->np_thread);kfree (np); +mutex_unlock (&np_lock);return ERR_PTR (ret); }/*
@@ -396,10 +404,10 @@ struct iscsi_np *iscsit_add_np(* point because iscsi_np has not been added to g_np_list yet. */ np->np_exports =1 ; + np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ; -spin_lock_bh (&np_lock);list_add_tail (&np->np_list, &g_np_list); -spin_unlock_bh (&np_lock); +mutex_unlock (&np_lock);pr_debug ("CORE[0] - Added Network Portal: %s:%hu on %s\n" , np->np_ip, np->np_port, np->np_transport->name);
@@ -469,9 +477,9 @@ int iscsit_del_np(struct iscsi_np *np) np->np_transport->iscsit_free_np (np); -spin_lock_bh (&np_lock); +mutex_lock (&np_lock);list_del (&np->np_list); -spin_unlock_bh (&np_lock); +mutex_unlock (&np_lock);pr_debug ("CORE[0] - Removed Network Portal: %s:%hu on %s\n" , np->np_ip, np->np_port, np->np_transport->name);
drivers/tty/serial/8250/8250_core.c +4 -0
@@ -2670,6 +2670,10 @@ static void serial8250_config_port(struct uart_port *port, int flags)if (port->type ==PORT_16550A && port->iotype ==UPIO_AU ) up->bugs |=UART_BUG_NOMSR ; +/* HW bugs may trigger IRQ while IIR == NO_INT */ +if (port->type ==PORT_TEGRA ) + up->bugs |=UART_BUG_NOMSR ; +if (port->type !=PORT_UNKNOWN && flags &UART_CONFIG_IRQ )autoconfig_irq (up);
drivers/tty/serial/8250/8250_pci.c +6 -2
@@ -1260,10 +1260,10 @@ static int pci_quatech_init(struct pci_dev *dev)unsigned long base =pci_resource_start (dev,0 );if (base) {u32 tmp; -outl (inl (base +0x38 ), base +0x38 ); +outl (inl (base +0x38 ) |0x00002000 , base +0x38 ); tmp =inl (base +0x3c );outl (tmp |0x01000000 , base +0x3c ); -outl (tmp, base +0x3c ); +outl (tmp &= ~0x01000000 , base +0x3c ); } }return 0 ;
@@ -1545,6 +1545,7 @@ pci_wch_ch353_setup(struct serial_private *priv,#define PCI_DEVICE_ID_TITAN_800E 0xA014#define PCI_DEVICE_ID_TITAN_200EI 0xA016#define PCI_DEVICE_ID_TITAN_200EISI 0xA017 +#define PCI_DEVICE_ID_TITAN_200V3 0xA306#define PCI_DEVICE_ID_TITAN_400V3 0xA310#define PCI_DEVICE_ID_TITAN_410V3 0xA312#define PCI_DEVICE_ID_TITAN_800V3 0xA314
@@ -4139,6 +4140,9 @@ static struct pci_device_id serial_pci_tbl[] = { {PCI_VENDOR_ID_TITAN ,PCI_DEVICE_ID_TITAN_200EISI ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_oxsemi_2_4000000 }, + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200V3, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + pbn_b0_bt_2_921600 }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400V3,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b0_4_921600 },
drivers/tty/serial/atmel_serial.c +13 -7
@@ -1022,12 +1022,24 @@ static int atmel_startup(struct uart_port *port)static void atmel_shutdown (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); +/* -* Ensure everything is stopped. +* Clear out any scheduled tasklets before +* we destroy the buffers +*/ +tasklet_kill (&atmel_port->tasklet); + +/* +* Ensure everything is stopped and +* disable all interrupts, port and break condition. */ atmel_stop_rx (port);atmel_stop_tx (port); +UART_PUT_CR (port,ATMEL_US_RSTSTA ); +UART_PUT_IDR (port,-1 ); + +/* * Shut-down the DMA. */
@@ -1054,12 +1066,6 @@ static void atmel_shutdown(struct uart_port *port) }/* -* Disable all interrupts, port and break condition. -*/ -UART_PUT_CR (port,ATMEL_US_RSTSTA ); -UART_PUT_IDR (port,-1 ); - -/* * Free the interrupt */ free_irq (port->irq, port);
drivers/usb/core/config.c +0 -7
@@ -651,10 +651,6 @@ void usb_destroy_configuration(struct usb_device *dev)* * hub-only!! ... and only in reset path, or usb_new_device() * (used by real hubs and virtual root hubs) -* -* NOTE: if this is a WUSB device and is not authorized, we skip the -* whole thing. A non-authorized USB device has no -* configurations. */ int usb_get_configuration (struct usb_device *dev) {
@@ -666,8 +662,6 @@ int usb_get_configuration(struct usb_device *dev)struct usb_config_descriptor *desc; cfgno =0 ; -if (dev->authorized ==0 )/* Not really an error */ - goto out_not_authorized; result = -ENOMEM ;if (ncfg >USB_MAXCONFIG ) { dev_warn(ddev, "too many configurations: %d, "
@@ -751,7 +745,6 @@ int usb_get_configuration(struct usb_device *dev) err:kfree (desc); -out_not_authorized: dev->descriptor.bNumConfigurations = cfgno; err2:if (result == -ENOMEM )
drivers/usb/core/hub.c +16 -38
92 lines not on this page · raw message
drivers/usb/host/ehci.h +17 -1
@@ -200,6 +200,7 @@ struct ehci_hcd { /* one per controller */ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ unsigned need_oc_pp_cycle:1; /* MPC834X port power */ + unsigned imx28_write_fix:1; /* For Freescale i.MX28 *//* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6)
@@ -675,6 +676,18 @@ static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,#endif } +#ifdef CONFIG_SOC_IMX28 +static inline void imx28_ehci_writel (const unsigned int val, +volatile __u32 __iomem *addr) +{ + __asm__ ("swp %0, %0, [%1]" : :"r" (val),"r" (addr)); +} +#else +static inline void imx28_ehci_writel (const unsigned int val, +volatile __u32 __iomem *addr) +{ +} +#endif static inline void ehci_writel (const struct ehci_hcd *ehci,const unsigned int val,__u32 __iomem *regs) {
@@ -683,7 +696,10 @@ static inline void ehci_writel(const struct ehci_hcd *ehci, writel_be(val, regs) :writel (val, regs);#else -writel (val, regs); +if (ehci->imx28_write_fix) +imx28_ehci_writel (val, regs); +else +writel (val, regs);#endif }
drivers/usb/host/xhci.c +3 -0
@@ -315,6 +315,9 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)struct usb_hcd *hcd =xhci_to_hcd (xhci);struct pci_dev *pdev =to_pci_dev (hcd->self.controller); +if (xhci->quirks &XHCI_PLAT ) +return ; +xhci_free_irq (xhci);if (xhci->msix_entries) {
drivers/usb/serial/cypress_m8.h +1 -1
@@ -63,7 +63,7 @@#define UART_DSR 0x20/* data set ready - flow control - device to host */ #define CONTROL_RTS 0x10/* request to send - flow control - host to device */ #define UART_CTS 0x10/* clear to send - flow control - device to host */ -#define UART_RI 0x10/* ring indicator - modem - device to host */ +#define UART_RI 0x80/* ring indicator - modem - device to host */ #define UART_CD 0x40/* carrier detect - modem - device to host */ #define CYP_ERROR 0x08/* received from input report - device to host */ /* Note - the below has nothing to do with the "feature report" reset */
drivers/usb/serial/ftdi_sio.c +15 -2
@@ -2132,10 +2132,20 @@ static void ftdi_set_termios(struct tty_struct *tty, }/* -* All FTDI UART chips are limited to CS7/8. We won't pretend to +* All FTDI UART chips are limited to CS7/8. We shouldn't pretend to * support CS5/6 and revert the CSIZE setting instead. +* +* CS5 however is used to control some smartcard readers which abuse +* this limitation to switch modes. Original FTDI chips fall back to +* eight data bits. +* +* TODO: Implement a quirk to only allow this with mentioned +* readers. One I know of (Argolis Smartreader V1) +* returns "USB smartcard server" as iInterface string. +* The vendor didn't bother with a custom VID/PID of +* course. */ -if ((C_CSIZE (tty) !=CS8 ) && (C_CSIZE (tty) !=CS7 )) { +if (C_CSIZE (tty) ==CS6 ) {dev_warn (ddev,"requested CSIZE setting not supported\n" ); termios->c_cflag &= ~CSIZE ;
@@ -2182,6 +2192,9 @@ no_skip: urb_value |=FTDI_SIO_SET_DATA_PARITY_NONE ; }switch (cflag &CSIZE ) { +case CS5 : +dev_dbg (ddev,"Setting CS5 quirk\n" ); +break ;case CS7 : urb_value |=7 ;dev_dbg (ddev,"Setting CS7\n" );
drivers/usb/serial/option.c +15 -0
@@ -320,6 +320,9 @@ static void option_instat_callback(struct urb *urb);* It seems to contain a Qualcomm QSC6240/6290 chipset */ #define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 +/* iBall 3.5G connect wireless modem */ +#define IBALL_3_5G_CONNECT 0x9605 +/* Zoom */ #define ZOOM_PRODUCT_4597 0x9607
@@ -1447,6 +1450,17 @@ static const struct usb_device_id option_ids[] = { .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0178, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xffe9, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8b, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8c, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8d, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8e, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8f, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff90, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff91, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff92, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) },/* NOTE: most ZTE CDMA devices should be driven by zte_ev, not option */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
@@ -1489,6 +1503,7 @@ static const struct usb_device_id option_ids[] = { .driver_info = (kernel_ulong_t)&four_g_w14_blacklist }, { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) }, { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },/* Pirelli */ { USB_DEVICE_INTERFACE_CLASS(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1, 0xff) },
drivers/usb/serial/pl2303.c +25 -8
@@ -141,6 +141,8 @@ struct pl2303_private {spinlock_t lock;u8 line_control;u8 line_status; + +u8 line_settings[7 ]; }; static int pl2303_vendor_read(__u16 value, __u16 index,
@@ -280,10 +282,6 @@ static void pl2303_set_termios(struct tty_struct *tty,int baud_floor, baud_ceil;int k; -/* The PL2303 is reported to lose bytes if you change -serial settings even to the same values as before. Thus -we actually need to filter in this specific case */ -if (old_termios && !tty_termios_hw_change (&tty->termios, old_termios))return ;
@@ -422,10 +420,29 @@ static void pl2303_set_termios(struct tty_struct *tty,dev_dbg (&port->dev,"parity = none\n" ); } - i =usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), -SET_LINE_REQUEST ,SET_LINE_REQUEST_TYPE , -0 ,0 , buf,7 ,100 ); -dev_dbg (&port->dev,"0x21:0x20:0:0 %d\n" , i); +/* +* Some PL2303 are known to lose bytes if you change serial settings +* even to the same values as before. Thus we actually need to filter +* in this specific case. +* +* Note that the tty_termios_hw_change check above is not sufficient +* as a previously requested baud rate may differ from the one +* actually used (and stored in old_termios). +* +* NOTE: No additional locking needed for line_settings as it is +* only used in set_termios, which is serialised against itself. +*/ +if (!old_termios ||memcmp (buf, priv->line_settings,7 )) { + i =usb_control_msg (serial->dev, +usb_sndctrlpipe (serial->dev,0 ), +SET_LINE_REQUEST ,SET_LINE_REQUEST_TYPE , +0 ,0 , buf,7 ,100 ); + +dev_dbg (&port->dev,"0x21:0x20:0:0 %d\n" , i); + +if (i ==7 ) +memcpy (priv->line_settings, buf,7 ); + }/* change control lines if we are switching to or from B0 */ spin_lock_irqsave (&priv->lock, flags);
drivers/usb/storage/unusual_devs.h +7 -0
@@ -234,6 +234,13 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x0370, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_MAX_SECTORS_64 ), +/* Patch submitted by Mikhail Zolotaryov <[email protected]> */ +UNUSUAL_DEV( 0x0421, 0x06aa, 0x1110, 0x1110, + "Nokia", + "502", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), +#ifdef NO_SDDR09 UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, "Microtech",
fs/btrfs/extent-tree.c +1 -1
@@ -7491,7 +7491,7 @@ out:*/ if (root_dropped == false)btrfs_add_dead_root (root); -if (err) +if (err && err != -EAGAIN )btrfs_std_error (root->fs_info, err);return err; }
fs/btrfs/ioctl.c +6 -0
@@ -1528,6 +1528,12 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,printk (KERN_INFO "btrfs: Snapshot src from " "another FS\n" ); ret = -EINVAL ; + }else if (!inode_owner_or_capable (src_inode)) { +/* +* Subvolume creation is not restricted, but snapshots +* are limited to own subvolumes only +*/ + ret = -EPERM ; }else { ret = btrfs_mksubvol(&file->f_path, name, namelen, BTRFS_I(src_inode)->root,
fs/ext4/inline.c +5 -3
@@ -1957,9 +1957,11 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline) }/* Clear the content within i_blocks. */ -if (i_size <EXT4_MIN_INLINE_DATA_SIZE ) -memset (ext4_raw_inode (&is.iloc)->i_block + i_size,0 , -EXT4_MIN_INLINE_DATA_SIZE - i_size); +if (i_size <EXT4_MIN_INLINE_DATA_SIZE ) { +void *p = (void *)ext4_raw_inode (&is.iloc)->i_block; +memset (p + i_size,0 , +EXT4_MIN_INLINE_DATA_SIZE - i_size); + }EXT4_I (inode)->i_inline_size = i_size < EXT4_MIN_INLINE_DATA_SIZE ?
fs/mount.h +1 -1
@@ -73,7 +73,7 @@ static inline int mnt_has_parent(struct mount *mnt)static inline int is_mounted (struct vfsmount *mnt) {/* neither detached nor internal? */ -return !IS_ERR_OR_NULL (real_mount (mnt)); +return !IS_ERR_OR_NULL (real_mount (mnt)->mnt_ns); }extern struct mount *__lookup_mnt (struct vfsmount *,struct dentry *,int );
include/linux/hugetlb.h +6 -0
@@ -31,6 +31,7 @@ struct hugepage_subpool *hugepage_new_subpool(long nr_blocks);void hugepage_put_subpool (struct hugepage_subpool *spool);int PageHuge (struct page *page); +int PageHeadHuge (struct page *page_head);void reset_vma_resv_huge_pages (struct vm_area_struct *vma);int hugetlb_sysctl_handler (struct ctl_table *,int ,void __user *,size_t *,loff_t *);
@@ -98,6 +99,11 @@ static inline int PageHuge(struct page *page)return 0 ; } +static inline int PageHeadHuge (struct page *page_head) +{ +return 0 ; +} +static inline void reset_vma_resv_huge_pages (struct vm_area_struct *vma) { }
include/linux/libata.h +2 -0
@@ -400,6 +400,8 @@ enum {ATA_HORKAGE_DUMP_ID = (1 <<16 ),/* dump IDENTIFY data */ ATA_HORKAGE_MAX_SEC_LBA48 = (1 <<17 ),/* Set max sects to 65535 */ ATA_HORKAGE_ATAPI_DMADIR = (1 <<18 ),/* device requires dmadir */ +ATA_HORKAGE_NOLPM = (1 <<20 ),/* don't use LPM */ +ATA_HORKAGE_WD_BROKEN_LPM = (1 <<21 ),/* some WDs have broken LPM */ /* DMA mask for user DMA control: User visible values; DO NOT renumber */
lib/decompress_inflate.c +1 -1
@@ -48,7 +48,7 @@ STATIC int INIT gunzip(unsigned char *buf, int len, out_len =0x8000 ;/* 32 K */ out_buf =malloc (out_len); }else { - out_len =0x7fffffff ;/* no limit */ + out_len = ((size_t )~0 ) - (size_t )out_buf;/* no limit */ }if (!out_buf) {error ("Out of memory while allocating output buffer" );
mm/hugetlb.c +17 -0
@@ -690,6 +690,23 @@ int PageHuge(struct page *page) }EXPORT_SYMBOL_GPL (PageHuge); +/* +* PageHeadHuge() only returns true for hugetlbfs head page, but not for +* normal or transparent huge pages. +*/ +int PageHeadHuge (struct page *page_head) +{ +compound_page_dtor *dtor; + +if (!PageHead (page_head)) +return 0 ; + + dtor =get_compound_page_dtor (page_head); + +return dtor == free_huge_page; +} +EXPORT_SYMBOL_GPL (PageHeadHuge); +pgoff_t __basepage_index (struct page *page) {struct page *page_head =compound_head (page);
mm/mempolicy.c +1 -1
@@ -2801,7 +2801,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)*/ VM_BUG_ON (maxlen <strlen ("interleave" ) +strlen ("relative" ) +16 ); -if (!pol || pol == &default_policy) +if (!pol || pol == &default_policy || (pol->flags &MPOL_F_MORON )) mode =MPOL_DEFAULT ;else mode = pol->mode;
mm/swap.c +83 -60
182 lines not on this page · raw message
net/compat.c +2 -7
@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,if (flags &MSG_CMSG_COMPAT )return -EINVAL ; -if (COMPAT_USE_64BIT_TIME ) -return __sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, - flags |MSG_CMSG_COMPAT , - (struct timespec *) timeout); -if (timeout ==NULL )return __sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, flags |MSG_CMSG_COMPAT ,NULL ); -if (get_compat_timespec (&ktspec, timeout)) +if (compat_get_timespec (&ktspec, timeout))return -EFAULT ; datagrams =__sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, flags |MSG_CMSG_COMPAT , &ktspec); -if (datagrams >0 &&put_compat_timespec (&ktspec, timeout)) +if (datagrams >0 &&compat_put_timespec (&ktspec, timeout)) datagrams = -EFAULT ;return datagrams;
net/core/filter.c +2 -28
@@ -36,7 +36,6 @@#include <asm/uaccess.h> #include <asm/unaligned.h> #include <linux/filter.h> -#include <linux/reciprocal_div.h> #include <linux/ratelimit.h> #include <linux/seccomp.h> #include <linux/if_vlan.h>
@@ -166,7 +165,7 @@ unsigned int sk_run_filter(const struct sk_buff *skb,A /=X ;continue ;case BPF_S_ALU_DIV_K : -A =reciprocal_divide (A ,K ); +A /=K ;continue ;case BPF_S_ALU_MOD_X :if (X ==0 )
@@ -553,11 +552,6 @@ int sk_chk_filter(struct sock_filter *filter, unsigned int flen)/* Some instructions need special checks */ switch (code) {case BPF_S_ALU_DIV_K : -/* check for division by zero */ -if (ftest->k ==0 ) -return -EINVAL ; - ftest->k =reciprocal_value (ftest->k); -break ;case BPF_S_ALU_MOD_K :/* check for division by zero */ if (ftest->k ==0 )
@@ -853,27 +847,7 @@ void sk_decode_filter(struct sock_filter *filt, struct sock_filter *to) to->code = decodes[code]; to->jt = filt->jt; to->jf = filt->jf; - -if (code ==BPF_S_ALU_DIV_K ) { -/* -* When loaded this rule user gave us X, which was -* translated into R = r(X). Now we calculate the -* RR = r(R) and report it back. If next time this -* value is loaded and RRR = r(RR) is calculated -* then the R == RRR will be true. -* -* One exception. X == 1 translates into R == 0 and -* we can't calculate RR out of it with r(). -*/ - -if (filt->k ==0 ) - to->k =1 ; -else - to->k =reciprocal_value (filt->k); - -BUG_ON (reciprocal_value (to->k) != filt->k); - }else - to->k = filt->k; + to->k = filt->k; }int sk_get_filter (struct sock *sk,struct sock_filter __user *ubuf,unsigned int len)
net/ieee802154/nl-phy.c +4 -2
@@ -224,8 +224,10 @@ static int ieee802154_add_iface(struct sk_buff *skb,if (info->attrs[IEEE802154_ATTR_DEV_TYPE ]) { type =nla_get_u8 (info->attrs[IEEE802154_ATTR_DEV_TYPE ]); -if (type >= __IEEE802154_DEV_MAX) -return -EINVAL ; +if (type >= __IEEE802154_DEV_MAX) { + rc = -EINVAL ; + goto nla_put_failure; + } } dev = phy->add_iface (phy, devname, type);
net/ipv4/fib_frontend.c +2 -0
@@ -1049,6 +1049,8 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo } in_dev =__in_dev_get_rtnl (dev); +if (!in_dev) +return NOTIFY_DONE ;switch (event) {case NETDEV_UP :
net/ipv4/inet_diag.c +3 -1
@@ -961,7 +961,7 @@ next_normal: ++num; } -if (r->idiag_states &TCPF_TIME_WAIT ) { +if (r->idiag_states & (TCPF_TIME_WAIT |TCPF_FIN_WAIT2 )) {struct inet_timewait_sock *tw; inet_twsk_for_each(tw, node,
@@ -971,6 +971,8 @@ next_normal:if (num < s_num) goto next_dying; +if (!(r->idiag_states & (1 << tw->tw_substate))) + goto next_dying;if (r->sdiag_family !=AF_UNSPEC && tw->tw_family != r->sdiag_family) goto next_dying;
net/ipv4/ip_input.c +1 -1
@@ -313,7 +313,7 @@ static int ip_rcv_finish(struct sk_buff *skb)const struct iphdr *iph =ip_hdr (skb);struct rtable *rt; -if (sysctl_ip_early_demux && !skb_dst (skb)) { +if (sysctl_ip_early_demux && !skb_dst (skb) && skb->sk ==NULL ) {const struct net_protocol *ipprot;int protocol = iph->protocol;
net/ipv4/ip_tunnel.c +1 -0
@@ -636,6 +636,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, tunnel->err_time + IPTUNNEL_ERR_TIMEO)) { tunnel->err_count--; +memset (IPCB (skb),0 ,sizeof (*IPCB (skb)));dst_link_failure (skb); } else tunnel->err_count = 0;
net/ipv4/ipmr.c +5 -2
@@ -157,9 +157,12 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id)static int ipmr_fib_lookup (struct net *net,struct flowi4 *flp4,struct mr_table **mrt) { -struct ipmr_result res; -struct fib_lookup_arg arg = { .result = &res, };int err; +struct ipmr_result res; +struct fib_lookup_arg arg = { + .result = &res, + .flags =FIB_LOOKUP_NOREF , + }; err =fib_rules_lookup (net->ipv4.mr_rules_ops,flowi4_to_flowi (flp4),0 , &arg);
net/ipv4/tcp_metrics.c +32 -19
91 lines not on this page · raw message
net/ipv6/ip6_input.c +1 -1
@@ -49,7 +49,7 @@int ip6_rcv_finish (struct sk_buff *skb) { -if (sysctl_ip_early_demux && !skb_dst (skb)) { +if (sysctl_ip_early_demux && !skb_dst (skb) && skb->sk ==NULL ) {const struct inet6_protocol *ipprot; ipprot =rcu_dereference (inet6_protos[ipv6_hdr (skb)->nexthdr]);
net/ipv6/ip6_tunnel.c +12 -0
@@ -1617,6 +1617,15 @@ static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[],return ip6_tnl_update (t, &p); } +static void ip6_tnl_dellink (struct net_device *dev,struct list_head *head) +{ +struct net *net =dev_net (dev); +struct ip6_tnl_net *ip6n =net_generic (net, ip6_tnl_net_id); + +if (dev != ip6n->fb_tnl_dev) +unregister_netdevice_queue (dev, head); +} +static size_t ip6_tnl_get_size (const struct net_device *dev) {return
@@ -1681,6 +1690,7 @@ static struct rtnl_link_ops ip6_link_ops __read_mostly = { .validate = ip6_tnl_validate, .newlink = ip6_tnl_newlink, .changelink = ip6_tnl_changelink, + .dellink = ip6_tnl_dellink, .get_size = ip6_tnl_get_size, .fill_info = ip6_tnl_fill_info, };
@@ -1711,6 +1721,8 @@ static void __net_exit ip6_tnl_destroy_tunnels(struct ip6_tnl_net *ip6n) } } + t =rtnl_dereference (ip6n->tnls_wc[0 ]); +unregister_netdevice_queue (t->dev, &list);unregister_netdevice_many (&list); }
net/ipv6/ip6mr.c +5 -2
@@ -141,9 +141,12 @@ static struct mr6_table *ip6mr_get_table(struct net *net, u32 id)static int ip6mr_fib_lookup (struct net *net,struct flowi6 *flp6,struct mr6_table **mrt) { -struct ip6mr_result res; -struct fib_lookup_arg arg = { .result = &res, };int err; +struct ip6mr_result res; +struct fib_lookup_arg arg = { + .result = &res, + .flags =FIB_LOOKUP_NOREF , + }; err =fib_rules_lookup (net->ipv6.mr6_rules_ops,flowi6_to_flowi (flp6),0 , &arg);
net/ipv6/sit.c +10 -0
@@ -1507,6 +1507,15 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = {#endif }; +static void ipip6_dellink (struct net_device *dev,struct list_head *head) +{ +struct net *net =dev_net (dev); +struct sit_net *sitn =net_generic (net, sit_net_id); + +if (dev != sitn->fb_tunnel_dev) +unregister_netdevice_queue (dev, head); +} +static struct rtnl_link_ops sit_link_ops__read_mostly = { .kind ="sit" , .maxtype =IFLA_IPTUN_MAX ,
@@ -1517,6 +1526,7 @@ static struct rtnl_link_ops sit_link_ops __read_mostly = { .changelink = ipip6_changelink, .get_size = ipip6_get_size, .fill_info = ipip6_fill_info, + .dellink = ipip6_dellink, };static struct xfrm_tunnel sit_handler__read_mostly = {
net/rds/ib_recv.c +3 -4
@@ -421,8 +421,7 @@ static void rds_ib_recv_cache_put(struct list_head *new_item, struct rds_ib_refill_cache *cache) {unsigned long flags; -struct list_head *old; -struct list_head __percpu *chpfirst; +struct list_head *old, *chpfirst;local_irq_save (flags);
@@ -432,7 +431,7 @@ static void rds_ib_recv_cache_put(struct list_head *new_item,else /* put on front */ list_add_tail (new_item, chpfirst); -__this_cpu_write (chpfirst, new_item); +__this_cpu_write (cache->percpu->first, new_item);__this_cpu_inc (cache->percpu->count);if (__this_cpu_read (cache->percpu->count) <RDS_IB_RECYCLE_BATCH_COUNT )
@@ -452,7 +451,7 @@ static void rds_ib_recv_cache_put(struct list_head *new_item, }while (old); -__this_cpu_write (chpfirst,NULL ); +__this_cpu_write (cache->percpu->first,NULL );__this_cpu_write (cache->percpu->count,0 ); end:local_irq_restore (flags);
sound/pci/Kconfig +12 -0
@@ -30,6 +30,7 @@ config SND_ALS300 select SND_PCM select SND_AC97_CODEC select SND_OPL3_LIB + select ZONE_DMA help Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
@@ -54,6 +55,7 @@ config SND_ALI5451 tristate "ALi M5451 PCI Audio Controller" select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for the integrated AC97 sound device on motherboards using the ALi M5451 Audio Controller
@@ -158,6 +160,7 @@ config SND_AZT3328 select SND_PCM select SND_RAWMIDI select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for Aztech AZF3328 (PCI168) soundcards.
@@ -463,6 +466,7 @@ config SND_EMU10K1 select SND_HWDEP select SND_RAWMIDI select SND_AC97_CODEC + select ZONE_DMA help Say Y to include support for Sound Blaster PCI 512, Live!, Audigy and E-mu APS (partially supported) soundcards.
@@ -478,6 +482,7 @@ config SND_EMU10K1X tristate "Emu10k1X (Dell OEM Version)" select SND_AC97_CODEC select SND_RAWMIDI + select ZONE_DMA help Say Y here to include support for the Dell OEM version of the Sound Blaster Live!.
@@ -511,6 +516,7 @@ config SND_ES1938 select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Solo-1 (ES1938, ES1946, ES1969) chips.
@@ -522,6 +528,7 @@ config SND_ES1968 tristate "ESS ES1968/1978 (Maestro-1/2/2E)" select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Maestro 1/2/2E chips.
@@ -603,6 +610,7 @@ config SND_ICE1712 select SND_MPU401_UART select SND_AC97_CODEC select BITREVERSE + select ZONE_DMA help Say Y here to include support for soundcards based on the ICE1712 (Envy24) chip.
@@ -690,6 +698,7 @@ config SND_LX6464ES config SND_MAESTRO3 tristate "ESS Allegro/Maestro3" select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Maestro 3 (Allegro) chips.
@@ -786,6 +795,7 @@ config SND_SIS7019 tristate "SiS 7019 Audio Accelerator" depends on X86 && !X86_64 select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for the SiS 7019 Audio Accelerator.
@@ -797,6 +807,7 @@ config SND_SONICVIBES select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on the S3 SonicVibes chip.
@@ -808,6 +819,7 @@ config SND_TRIDENT tristate "Trident 4D-Wave DX/NX; SiS 7018"
Lines of this file are not shown. View the raw message.
sound/pci/hda/patch_hdmi.c +73 -27
100 lines not on this page · raw message
sound/soc/codecs/wm5110.c +48 -0
48 lines not on this page · 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.