Linux 3.12.6
Greg KH
maintainerI'm announcing the release of the 3.12.6 kernel.
All users of the 3.12 kernel series must upgrade.
The updated 3.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.12.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/sun6i-a31.dtsi | 27 +-- arch/arm/kernel/process.c | 7 arch/arm/kernel/stacktrace.c | 2 arch/arm/kernel/traps.c | 3 arch/arm/mach-highbank/highbank.c | 23 ++ arch/arm/mach-omap2/omap_hwmod.c | 43 ++++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 - arch/arm/mach-pxa/reset.c | 8 arch/arm/mach-pxa/tosa.c | 102 +++++------ arch/arm64/include/asm/pgtable-hwdef.h | 2 arch/powerpc/include/asm/pgalloc-32.h | 6 arch/powerpc/include/asm/pgalloc-64.h | 6 arch/x86/Makefile | 8 arch/x86/boot/Makefile | 6 arch/x86/boot/compressed/Makefile | 1 arch/x86/kvm/lapic.c | 35 ++-- arch/x86/kvm/lapic.h | 4 arch/x86/kvm/x86.c | 40 ---- arch/x86/platform/efi/efi.c | 7 arch/x86/platform/uv/tlb_uv.c | 5 arch/x86/realmode/rm/Makefile | 3 crypto/algif_hash.c | 3 crypto/algif_skcipher.c | 3 drivers/gpu/drm/i915/intel_display.c | 64 ++++++- drivers/gpu/drm/radeon/atombios_i2c.c | 15 + drivers/gpu/drm/radeon/r600_hdmi.c | 8 drivers/gpu/drm/radeon/radeon_atombios.c | 2 drivers/gpu/drm/radeon/si.c | 11 + drivers/gpu/drm/udl/udl_gem.c | 6 drivers/hid/hid-core.c | 1 drivers/hid/hid-ids.h | 1 drivers/hid/hid-kye.c | 6 drivers/hwmon/hih6130.c | 16 + drivers/hwmon/lm78.c | 2 drivers/hwmon/sis5595.c | 2 drivers/hwmon/vt8231.c | 2 drivers/hwmon/w83l786ng.c | 13 - drivers/input/mouse/elantech.c | 1 drivers/input/touchscreen/usbtouchscreen.c | 22 ++ drivers/iommu/arm-smmu.c | 62 +++---- drivers/md/dm-bufio.c | 5 drivers/md/dm-delay.c | 23 +- drivers/md/dm-snap.c | 71 +++++++- drivers/md/dm-stats.c | 1 drivers/md/dm-table.c | 5 drivers/md/dm-thin-metadata.c | 8 drivers/md/dm-thin-metadata.h | 1 drivers/md/dm-thin.c | 66 ++++--- drivers/md/persistent-data/dm-array.c | 10 + drivers/md/persistent-data/dm-block-manager.c | 6 drivers/md/persistent-data/dm-block-manager.h | 7 drivers/md/persistent-data/dm-space-map-common.c | 32 ++- drivers/md/persistent-data/dm-space-map-metadata.c | 8 drivers/media/dvb-frontends/af9033.c | 12 - drivers/media/dvb-frontends/cxd2820r_core.c | 4 drivers/media/i2c/wm8775.c | 4 drivers/media/pci/bt8xx/bttv-driver.c | 3 drivers/media/pci/saa7164/saa7164-core.c | 4 drivers/media/radio/radio-tea5764.c | 2 drivers/media/radio/tef6862.c | 2 drivers/media/usb/dvb-usb-v2/af9035.c | 17 + drivers/mtd/nand/pxa3xx_nand.c | 4 drivers/net/ethernet/allwinner/sun4i-emac.c | 5 drivers/net/ethernet/intel/igb/e1000_phy.c | 5 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 drivers/net/wireless/iwlwifi/iwl-7000.c | 7 drivers/net/wireless/iwlwifi/iwl-config.h | 3 drivers/net/wireless/iwlwifi/iwl-csr.h | 5 drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 drivers/net/wireless/iwlwifi/pcie/rx.c | 4 drivers/net/wireless/iwlwifi/pcie/trans.c | 3 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 drivers/pci/pci-driver.c | 12 + drivers/regulator/pfuze100-regulator.c | 2 drivers/rtc/rtc-at91rm9200.c | 2 drivers/staging/comedi/drivers/amplc_pc263.c | 3 drivers/staging/comedi/drivers/amplc_pci263.c | 3 drivers/staging/comedi/drivers/ssv_dnp.c | 6 drivers/usb/core/hub.c | 5 drivers/usb/dwc3/ep0.c | 2 drivers/usb/dwc3/gadget.c | 5 drivers/usb/gadget/composite.c | 1 drivers/usb/host/xhci-ring.c | 54 ++++++ drivers/usb/musb/musb_cppi41.c | 164 ++++++++++++++++--- drivers/usb/serial/option.c | 27 +++ drivers/watchdog/sc1200wdt.c | 3 fs/btrfs/acl.c | 2 fs/btrfs/backref.c | 3 fs/btrfs/ctree.c | 8 fs/btrfs/inode.c | 47 +++-- fs/btrfs/ioctl.c | 3 fs/btrfs/ordered-data.c | 2 fs/btrfs/send.c | 179 ++++++++------------- fs/btrfs/transaction.c | 6 fs/btrfs/tree-log.c | 2 fs/btrfs/volumes.c | 2 fs/exportfs/expfs.c | 18 +- fs/nfs/blocklayout/extents.c | 2 fs/nfs/nfs4proc.c | 3 fs/nfsd/nfscache.c | 9 - fs/stat.c | 31 ++- fs/xfs/xfs_fsops.c | 6 fs/xfs/xfs_ioctl.c | 3 fs/xfs/xfs_ioctl32.c | 3 include/linux/compiler-intel.h | 2 include/linux/fs.h | 1 include/linux/kexec.h | 3 include/linux/usb.h | 2 include/sound/memalloc.h | 2 include/uapi/sound/compress_offload.h | 6 kernel/futex.c | 2 kernel/kexec.c | 4 kernel/sched/debug.c | 8 kernel/sched/fair.c | 2 mm/memcontrol.c | 41 ++++ net/ipv4/udp.c | 3 net/mac80211/cfg.c | 3 net/mac80211/main.c | 1 net/mac80211/rx.c | 3 net/mac80211/scan.c | 2 net/wireless/core.c | 3 security/selinux/hooks.c | 93 ++++++++-- sound/pci/hda/hda_generic.c | 47 +++++ sound/pci/hda/hda_generic.h | 3 sound/pci/hda/patch_analog.c | 10 + sound/pci/hda/patch_hdmi.c | 5 virt/kvm/kvm_main.c | 3 129 files changed, 1255 insertions(+), 566 deletions(-)
Alan (1):
sc1200_wdt: Fix oops
Alan Stern (1):
usb: dwc3: fix implementation of endpoint wedge
Alex Deucher (4):
drm/radeon: fix typo in fetching mpll params drm/radeon: program DCE2 audio dto just like DCE3 drm/radeon: fixup bad vram size on SI drm/radeon/atom: fix bus probes when hw_i2c is set (v2)
Andy Adamson (1):
NFSv4 wait on recovery for async session errors
Andy Honig (3):
KVM: Improve create VCPU parameter (CVE-2013-4587)
KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)
KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)Anssi Hannula (1):
ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices
Antti Palosaari (3):
media: af9035: fix broken I2C and USB I/O
media: af9033: fix broken I2C
media: af9035: add [0413:6a05] Leadtek WinFast DTV Dongle Dual
Axel Lin (1):
regulator: pfuze100: Fix address of FABID
Ben Hutchings (1):
HID: kye: Fix missing break in kye_report_fixup()
Ben Segall (1):
sched: Avoid throttle_cfs_rq() racing with period_timer stopping
Benjamin Tissoires (1):
HID: kye: Add report fixup for Genius Manticore Keyboard
Bob Copeland (1):
Revert "mac80211: allow disable power save in mesh"
Brian Carnes (1):
hwmon: (w83l786ng) Fix fan speed control mode setting and reporting
Carolyn Wyborny (1):
igb: Fix for issue where values could be too high for udelay function.
Chris Wilson (1):
drm/i915/vlv: fix up broken precision in vlv_crtc_clock_get
Christian Engelmayer (1):
Input: usbtouchscreen - separate report and transmit buffer size handling
Dan Carpenter (4):
hwmon: Prevent some divide by zeros in FAN_TO_REG()
xfs: underflow bug in xfs_attrlist_by_handle()
media: af9035: unlock on error in af9035_i2c_master_xfer()
Btrfs: fix access_ok() check in btrfs_ioctl_send()
Dave Chinner (1):
xfs: growfs overruns AGFL buffer on V4 filesystems
David Laight (1):
usb: xhci: Link TRB must not occur within a USB payload burst
David Sterba (1):
btrfs: call mnt_drop_write after interrupted subvol deletion
Dmitry Eremin-Solenikov (1):
ARM: pxa: tosa: fix keys mapping
Emmanuel Grumbach (1):
iwlwifi: pcie: fix interrupt coalescing for 7260 / 3160
Ezequiel Garcia (1):
Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"
Fangxiaozhi (Franko) (1):
USB: option: support new huawei devices
Felix Fietkau (1):
ath9k: fix duration calculation for non-aggregated packets
Filipe David Borba Manana (1):
Btrfs: fix incorrect inode acl reset
Gleb Natapov (1):
KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)
Greg Kroah-Hartman (2):
Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" Linux 3.12.6
Gustavo Zacarias (1):
USB: serial: option: blacklist interface 1 for Huawei E173s-6
H Hartley Sweeten (2):
staging: comedi: drivers: use comedi_dio_update_state() for simple cases
staging: comedi: ssv_dnp: use comedi_dio_update_state()
H. Peter Anvin (2):
x86, build: Pass in additional -mno-mmx, -mno-sse options x86, build, icc: Remove uninitialized_var() from compiler-intel.h
Hans Verkuil (4):
media: tef6862/radio-tea5764: actually assign clamp result
media: bttv: don't setup the controls if there are no video devices
media: wm8775: fix broken audio routing
cxd2820r_core: fix sparse warnings
Helge Deller (1):
nfs: fix do_div() warning by instead using sector_div()
Hong H. Pham (1):
powerpc: Fix PTE page address mismatch in pgtable ctor/dtor
J. Bruce Fields (2):
vfs: split out vfs_getattr_nosec
exportfs: fix 32-bit nfsd handling of 64-bit inode numbers
Jean Delvare (1):
hwmon: (w83l768ng) Fix fan speed control range
Jeff Layton (1):
nfsd: when reusing an existing repcache entry, unhash it first
Jesse Barnes (2):
i915/vlv: untangle integrated clock source handling v4 drm/i915/vlv: add VLV specific clock_get function v3
Joe Thornber (6):
dm array: fix a reference counting bug in shadow_ablock
dm space map: disallow decrementing a reference count below zero dm thin: switch to read only mode if a mapping insert fails dm thin: always fallback the pool mode if commit fails
dm thin: re-establish read-only state when switching to fail mode dm thin: allow pool in read-only mode to transition to read-write mode
Johannes Berg (4):
cfg80211: disable 5/10 MHz support for all drivers
mac80211: fix scheduled scan rtnl deadlock
mac80211: don't attempt to reorder multicast frames
iwlwifi: mvm: check sta_id/drain values in debugfs
Johannes Weiner (3):
mm: memcg: do not declare OOM from __GFP_NOFAIL allocations
mm: memcg: do not allow task about to OOM kill to bypass the limit
mm: memcg: fix race condition between memcg teardown and swapin
Jon Medhurst (1):
ARM: 7917/1: cacheflush: correctly limit range of memory region being flushed
Josef Bacik (5):
Btrfs: do a full search everytime in btrfs_search_old_slot
Btrfs: reset intwrite on transaction abort
Btrfs: fix hole check in log_one_extent
Btrfs: stop using vfs_read in send
Btrfs: take ordered root lock when removing ordered operations inode
José Miguel Gonçalves (1):
hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK
Julius Werner (1):
usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
Khalid Aziz (1):
PCI: Disable Bus Master only on kexec reboot
Konstantin Khlebnikov (2):
ARM: 7912/1: check stack pointer in get_wchan
ARM: 7913/1: fix framepointer check in unwind_frame
Linus Pizunski (1):
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
Linus Torvalds (1):
futex: fix handling of read-only-mapped hugepages
Liu Bo (4):
Btrfs: fix memory leak of chunks' extent map
Btrfs: do not run snapshot-aware defragment on error
Btrfs: fix a crash when running balance and defrag concurrently
Btrfs: fix lockdep error in async commit
Matt Walker (1):
Input: elantech - add support for newer (August 2013) devices
Matthew Garrett (1):
x86, efi: Don't use (U)EFI time services on 32 bit
Maxime Ripard (2):
ARM: sun6i: dt: Fix interrupt trigger types
net: allwinner: emac: Add missing free_irq
Michael Grzeschik (1):
usb: gadget: composite: reset delayed_status on reset_config
Mike Snitzer (2):
dm space map metadata: return on failure in sm_metadata_new_block dm thin: switch to read-only mode if metadata space is exhausted
Mikulas Patocka (5):
dm bufio: initialize read-only module parameters dm snapshot: avoid snapshot space leak on crash dm stats: initialize read-only module parameter dm delay: fix a possible deadlock due to shared workqueue dm table: fail dm_table_create on dm_round_up overflow
Paul Moore (2):
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()
Paulo Zanoni (1):
drm/i915: use the correct force_wake function at the PC8 code
Rob Clark (1):
udl: fix issue with imported prime buffers
Rob Herring (1):
ARM: highbank: handle soft poweroff and reset key events
Roger Quadros (2):
ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
ARM: OMAP2+: hwmod: Fix SOFTRESET logic
Sebastian Andrzej Siewior (2):
usb: musb: musb_cppi41: factor most of cppi41_dma_callback() into cppi41_trans_done()
usb: musb: musb_cppi41: handle pre-mature TX complete interrupt
Sergei Ianovich (1):
ARM: pxa: prevent PXA270 occasional reboot freezes
Stefano Panella (1):
ALSA: memalloc.h - fix wrong truncation of dma_addr_t
Steve Capper (1):
arm64: mm: Fix PMD_SECT_PROT_NONE definition
Sujith Manoharan (2):
ath9k: Fix QuickDrop usage
ath9k: Fix XLNA bias strength
Takashi Iwai (3):
ALSA: compress: Fix 64bit ABI incompatibility
ALSA: hda - Add static DAC/pin mapping for AD1986A codec
ALSA: hda - Mute all aamix inputs as default
Ujjal Roy (1):
mwifiex: fix memory leak issue for ibss join
Ville Syrjälä (1):
drm/i915: Fix pipe CSC post offset calculation
Wei Yongjun (1):
media: saa7164: fix return value check in saa7164_initdev()
Will Deacon (1):
iommu/arm-smmu: use mutex instead of spinlock for locking page tables
cpw (1):
x86/UV: Fix NULL pointer dereference in uv_flush_tlb_others() if the 'nobau' boot option is used
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 12 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = One Giant Leap for Frogkind
arch/arm/boot/dts/sun6i-a31.dtsi +15 -12
@@ -193,7 +193,10 @@ pio: pinctrl@01c20800 { compatible = "allwinner,sun6i-a31-pinctrl"; reg = <0x01c20800 0x400>; - interrupts = <0 11 1>, <0 15 1>, <0 16 1>, <0 17 1>; + interrupts = <0 11 4>, + <0 15 4>, + <0 16 4>, + <0 17 4>; clocks = <&apb1_gates 5>; gpio-controller; interrupt-controller;
@@ -212,11 +215,11 @@ timer@01c20c00 { compatible = "allwinner,sun4i-timer"; reg = <0x01c20c00 0xa0>; - interrupts = <0 18 1>, - <0 19 1>, - <0 20 1>, - <0 21 1>, - <0 22 1>; + interrupts = <0 18 4>, + <0 19 4>, + <0 20 4>, + <0 21 4>, + <0 22 4>; clocks = <&osc24M>; };
@@ -228,7 +231,7 @@ uart0: serial@01c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; - interrupts = <0 0 1>; + interrupts = <0 0 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 16>;
@@ -238,7 +241,7 @@ uart1: serial@01c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; - interrupts = <0 1 1>; + interrupts = <0 1 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 17>;
@@ -248,7 +251,7 @@ uart2: serial@01c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; - interrupts = <0 2 1>; + interrupts = <0 2 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 18>;
@@ -258,7 +261,7 @@ uart3: serial@01c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; - interrupts = <0 3 1>; + interrupts = <0 3 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 19>;
@@ -268,7 +271,7 @@ uart4: serial@01c29000 { compatible = "snps,dw-apb-uart"; reg = <0x01c29000 0x400>; - interrupts = <0 4 1>; + interrupts = <0 4 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 20>;
@@ -278,7 +281,7 @@ uart5: serial@01c29400 { compatible = "snps,dw-apb-uart"; reg = <0x01c29400 0x400>; - interrupts = <0 5 1>; + interrupts = <0 5 4>; reg-shift = <2>; reg-io-width = <4>; clocks = <&apb2_gates 21>;
arch/arm/kernel/process.c +5 -2
@@ -404,6 +404,7 @@ EXPORT_SYMBOL(dump_fpu);unsigned long get_wchan (struct task_struct *p) {struct stackframe frame; +unsigned long stack_page;int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ;
@@ -412,9 +413,11 @@ unsigned long get_wchan(struct task_struct *p) frame.sp =thread_saved_sp (p); frame.lr =0 ;/* recovered from the stack */ frame.pc =thread_saved_pc (p); + stack_page = (unsigned long )task_stack_page (p); do { - int ret = unwind_frame(&frame); - if (ret < 0) + if (frame.sp < stack_page || + frame.sp >= stack_page + THREAD_SIZE || + unwind_frame(&frame) < 0) return 0; if (!in_sched_functions(frame.pc)) return frame.pc;
arch/arm/kernel/stacktrace.c +1 -1
@@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) high =ALIGN (low,THREAD_SIZE );/* check current frame pointer is within bounds */ -if (fp < (low +12 ) || fp +4 >= high) +if (fp < low +12 || fp > high -4 )return -EINVAL ;/* restore the registers from the stack frame */
arch/arm/kernel/traps.c +2 -1
@@ -503,9 +503,10 @@ static inline int __do_cache_op(unsigned long start, unsigned long end) {int ret; -unsigned long chunk =PAGE_SIZE ; do { + unsigned long chunk = min(PAGE_SIZE, end - start); + if (signal_pending(current)) { struct thread_info *ti = current_thread_info();
arch/arm/mach-highbank/highbank.c +23 -0
@@ -17,12 +17,15 @@#include <linux/clkdev.h> #include <linux/clocksource.h> #include <linux/dma-mapping.h> +#include <linux/input.h> #include <linux/io.h> #include <linux/irqchip.h> +#include <linux/mailbox.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/of_address.h> +#include <linux/reboot.h> #include <linux/amba/bus.h> #include <linux/clk-provider.h>
@@ -153,6 +156,24 @@ static struct notifier_block highbank_platform_nb = { .notifier_call = highbank_platform_notifier, }; +static int hb_keys_notifier (struct notifier_block *nb,unsigned long event,void *data) +{ +u32 key = *(u32 *)data; + +if (event !=0x1000 ) +return 0 ; + +if (key ==KEY_POWER ) +orderly_poweroff (false); +else if (key ==0xffff ) +ctrl_alt_del (); + +return 0 ; +} +static struct notifier_block hb_keys_nb = { + .notifier_call = hb_keys_notifier, +}; +static void __init highbank_init (void ) { pm_power_off = highbank_power_off;
@@ -161,6 +182,8 @@ static void __init highbank_init(void)bus_register_notifier (&platform_bus_type, &highbank_platform_nb);bus_register_notifier (&amba_bustype, &highbank_amba_nb); +pl320_ipc_register_notifier (&hb_keys_nb); +of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); }
arch/arm/mach-omap2/omap_hwmod.c +42 -1
67 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +3 -10
@@ -1943,7 +1943,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = { .syss_offs = 0x0014, .sysc_flags = (SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_SIDLEMODE |SYSC_HAS_ENAWAKEUP | - SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE), +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE | + SYSS_HAS_RESET_STATUS), .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), .sysc_fields = &omap_hwmod_sysc_type1,
@@ -2021,15 +2022,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {* hence HWMOD_SWSUP_MSTANDBY */ -/* -* During system boot; If the hwmod framework resets the module -* the module will have smart idle settings; which can lead to deadlock -* (above Errata Id:i660); so, dont reset the module during boot; -* Use HWMOD_INIT_NO_RESET. -*/ - - .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY | - HWMOD_INIT_NO_RESET, + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, };/*
arch/arm/mach-pxa/reset.c +7 -1
@@ -13,6 +13,7 @@#include <mach/regs-ost.h> #include <mach/reset.h> +#include <mach/smemc.h> unsigned int reset_status;EXPORT_SYMBOL (reset_status);
@@ -81,6 +82,12 @@ static void do_hw_reset(void)writel_relaxed (OSSR_M3 ,OSSR );/* ... in 100 ms */ writel_relaxed (readl_relaxed (OSCR ) +368640 ,OSMR3 ); +/* +* SDRAM hangs on watchdog reset on Marvell PXA270 (erratum 71) +* we put SDRAM into self-refresh to prevent that +*/ +while (1 ) +writel_relaxed (MDREFR_SLFRSH ,MDREFR ); }void pxa_restart (enum reboot_mode mode,const char *cmd)
@@ -104,4 +111,3 @@ void pxa_restart(enum reboot_mode mode, const char *cmd)break ; } } -
arch/arm/mach-pxa/tosa.c +51 -51
108 lines not on this page · raw message
arch/arm64/include/asm/pgtable-hwdef.h +1 -1
@@ -43,7 +43,7 @@* Section */ #define PMD_SECT_VALID (_AT(pmdval_t, 1) << 0) -#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 2) +#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 58)#define PMD_SECT_USER (_AT(pmdval_t, 1) << 6)/* AP[1] */ #define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7)/* AP[2] */ #define PMD_SECT_S (_AT(pmdval_t, 3) << 8)
arch/powerpc/include/asm/pgalloc-32.h +2 -4
@@ -84,10 +84,8 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb,static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address) { -struct page *page =page_address (table); -tlb_flush_pgtable (tlb, address); -pgtable_page_dtor (page); -pgtable_free_tlb (tlb, page,0 ); +pgtable_page_dtor (table); +pgtable_free_tlb (tlb,page_address (table),0 ); }#endif /* _ASM_POWERPC_PGALLOC_32_H */
arch/powerpc/include/asm/pgalloc-64.h +2 -4
@@ -144,11 +144,9 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb,static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address) { -struct page *page =page_address (table); -tlb_flush_pgtable (tlb, address); -pgtable_page_dtor (page); -pgtable_free_tlb (tlb, page,0 ); +pgtable_page_dtor (table); +pgtable_free_tlb (tlb,page_address (table),0 ); }#else /* if CONFIG_PPC_64K_PAGES */
arch/x86/Makefile +4 -4
@@ -31,8 +31,8 @@ ifeq ($(CONFIG_X86_32),y) KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return - # Don't autogenerate SSE instructions - KBUILD_CFLAGS += -mno-sse + # Don't autogenerate MMX or SSE instructions + KBUILD_CFLAGS += -mno-mmx -mno-sse # Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
@@ -60,8 +60,8 @@ else KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 - # Don't autogenerate SSE instructions - KBUILD_CFLAGS += -mno-sse + # Don't autogenerate MMX or SSE instructions + KBUILD_CFLAGS += -mno-mmx -mno-sse # Use -mpreferred-stack-boundary=3 if supported. KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
arch/x86/boot/Makefile +3 -3
@@ -53,18 +53,18 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE # How to compile the 16-bit code. Note we always compile for -march=i386, # that way we can complain to the user if the CPU is insufficient. -KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ +KBUILD_CFLAGS := $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \ -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/code16gcc.h \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ + -mno-mmx -mno-sse \ $(call cc-option, -ffreestanding) \ $(call cc-option, -fno-toplevel-reorder,\ - $(call cc-option, -fno-unit-at-a-time)) \ + $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) -KBUILD_CFLAGS += $(call cc-option, -m32) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n
arch/x86/boot/compressed/Makefile +1 -0
@@ -13,6 +13,7 @@ KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += -mno-mmx -mno-sse KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
arch/x86/kvm/lapic.c +21 -14
@@ -143,6 +143,8 @@ static inline int kvm_apic_id(struct kvm_lapic *apic)return (kvm_apic_get_reg (apic,APIC_ID ) >>24 ) &0xff ; } +#define KVM_X2APIC_CID_BITS 0 +static void recalculate_apic_map (struct kvm *kvm) {struct kvm_apic_map *new, *old =NULL ;
@@ -180,7 +182,8 @@ static void recalculate_apic_map(struct kvm *kvm)if (apic_x2apic_mode (apic)) { new->ldr_bits =32 ; new->cid_shift =16 ; - new->cid_mask = new->lid_mask =0xffff ; + new->cid_mask = (1 <<KVM_X2APIC_CID_BITS ) -1 ; + new->lid_mask =0xffff ; }else if (kvm_apic_sw_enabled (apic) && !new->cid_mask/* flat mode */ &&kvm_apic_get_reg (apic,APIC_DFR ) ==APIC_DFR_CLUSTER ) {
@@ -841,7 +844,8 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)ASSERT (apic !=NULL );/* if initial count is 0, current count should also be 0 */ -if (kvm_apic_get_reg (apic,APIC_TMICT ) ==0 ) +if (kvm_apic_get_reg (apic,APIC_TMICT ) ==0 || + apic->lapic_timer.period ==0 )return 0 ; remaining =hrtimer_get_remaining (&apic->lapic_timer.timer);
@@ -1691,7 +1695,6 @@ static void apic_sync_pv_eoi_from_guest(struct kvm_vcpu *vcpu,void kvm_lapic_sync_from_vapic (struct kvm_vcpu *vcpu) {u32 data; -void *vapic;if (test_bit (KVM_APIC_PV_EOI_PENDING , &vcpu->arch.apic_attention))apic_sync_pv_eoi_from_guest (vcpu, vcpu->arch.apic);
@@ -1699,9 +1702,8 @@ void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu)if (!test_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention))return ; - vapic =kmap_atomic (vcpu->arch.apic->vapic_page); - data = *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)); -kunmap_atomic (vapic); +kvm_read_guest_cached (vcpu->kvm, &vcpu->arch.apic->vapic_cache, &data, +sizeof (u32));apic_set_tpr (vcpu->arch.apic, data &0xff ); }
@@ -1737,7 +1739,6 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu)u32 data, tpr;int max_irr, max_isr;struct kvm_lapic *apic = vcpu->arch.apic; -void *vapic;apic_sync_pv_eoi_to_guest (vcpu, apic);
@@ -1753,18 +1754,24 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu) max_isr =0 ; data = (tpr &0xff ) | ((max_isr &0xf0 ) <<8 ) | (max_irr <<24 ); - vapic =kmap_atomic (vcpu->arch.apic->vapic_page); - *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)) = data; -kunmap_atomic (vapic); +kvm_write_guest_cached (vcpu->kvm, &vcpu->arch.apic->vapic_cache, &data, +sizeof (u32)); } -void kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr) +int kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr) { - vcpu->arch.apic->vapic_addr = vapic_addr; -if (vapic_addr) +if (vapic_addr) { +if (kvm_gfn_to_hva_cache_init (vcpu->kvm, + &vcpu->arch.apic->vapic_cache, + vapic_addr,sizeof (u32))) +return -EINVAL ;__set_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention); -else + }else {__clear_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention); + } + + vcpu->arch.apic->vapic_addr = vapic_addr; +return 0 ; }int kvm_x2apic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data)
arch/x86/kvm/lapic.h +2 -2
@@ -34,7 +34,7 @@ struct kvm_lapic {*/ void *regs;gpa_t vapic_addr; -struct page *vapic_page; +struct gfn_to_hva_cache vapic_cache;unsigned long pending_events;unsigned int sipi_vector; };
@@ -76,7 +76,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data);void kvm_apic_write_nodecode (struct kvm_vcpu *vcpu,u32 offset);void kvm_apic_set_eoi_accelerated (struct kvm_vcpu *vcpu,int vector); -void kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr); +int kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr);void kvm_lapic_sync_from_vapic (struct kvm_vcpu *vcpu);void kvm_lapic_sync_to_vapic (struct kvm_vcpu *vcpu);
arch/x86/kvm/x86.c +1 -39
@@ -3192,8 +3192,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -EFAULT ;if (copy_from_user (&va, argp,sizeof va)) goto out; - r =0 ; -kvm_lapic_set_vapic_addr (vcpu, va.vapic_addr); + r =kvm_lapic_set_vapic_addr (vcpu, va.vapic_addr);break ; }case KVM_X86_SETUP_MCE : {
@@ -5718,36 +5717,6 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu) !kvm_event_needs_reinjection (vcpu); } -static int vapic_enter (struct kvm_vcpu *vcpu) -{ -struct kvm_lapic *apic = vcpu->arch.apic; -struct page *page; - -if (!apic || !apic->vapic_addr) -return 0 ; - - page =gfn_to_page (vcpu->kvm, apic->vapic_addr >>PAGE_SHIFT ); -if (is_error_page (page)) -return -EFAULT ; - - vcpu->arch.apic->vapic_page = page; -return 0 ; -} - -static void vapic_exit (struct kvm_vcpu *vcpu) -{ -struct kvm_lapic *apic = vcpu->arch.apic; -int idx; - -if (!apic || !apic->vapic_addr) -return ; - - idx =srcu_read_lock (&vcpu->kvm->srcu); -kvm_release_page_dirty (apic->vapic_page); -mark_page_dirty (vcpu->kvm, apic->vapic_addr >>PAGE_SHIFT ); -srcu_read_unlock (&vcpu->kvm->srcu, idx); -} -static void update_cr8_intercept (struct kvm_vcpu *vcpu) {int max_irr, tpr;
@@ -6047,11 +6016,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)struct kvm *kvm = vcpu->kvm; vcpu->srcu_idx =srcu_read_lock (&kvm->srcu); - r =vapic_enter (vcpu); -if (r) { -srcu_read_unlock (&kvm->srcu, vcpu->srcu_idx); -return r; - } r =1 ;while (r >0 ) {
@@ -6110,8 +6074,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)srcu_read_unlock (&kvm->srcu, vcpu->srcu_idx); -vapic_exit (vcpu); -return r; }
arch/x86/platform/efi/efi.c +0 -7
@@ -768,13 +768,6 @@ void __init efi_init(void)set_bit (EFI_MEMMAP , &x86_efi_facility); -#ifdef CONFIG_X86_32 -if (efi_is_native ()) { - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; - } -#endif -#if EFI_DEBUG print_efi_memmap ();#endif
arch/x86/platform/uv/tlb_uv.c +3 -2
@@ -1070,12 +1070,13 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,unsigned long status; bcp = &per_cpu (bau_control, cpu); - stat = bcp->statp; - stat->s_enters++;if (bcp->nobau)return cpumask; + stat = bcp->statp; + stat->s_enters++; +if (bcp->busy) { descriptor_status =read_lmmr (UVH_LB_BAU_SB_ACTIVATION_STATUS_0 );
arch/x86/realmode/rm/Makefile +2 -1
@@ -73,9 +73,10 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/../../boot/code16gcc.h \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ + -mno-mmx -mno-sse \ $(call cc-option, -ffreestanding) \ $(call cc-option, -fno-toplevel-reorder,\ - $(call cc-option, -fno-unit-at-a-time)) \ + $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
crypto/algif_hash.c +0 -3
@@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);sg_init_table (ctx->sgl.sg,1 );sg_set_page (ctx->sgl.sg, page, size, offset);
crypto/algif_skcipher.c +0 -3
@@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);if (!ctx->more && ctx->used) goto unlock;
drivers/gpu/drm/i915/intel_display.c +57 -7
125 lines not on this page · raw message
drivers/gpu/drm/radeon/atombios_i2c.c +9 -6
@@ -44,7 +44,7 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan,PROCESS_I2C_CHANNEL_TRANSACTION_PS_ALLOCATION args;int index =GetIndexIntoMasterTable (COMMAND , ProcessI2cChannelTransaction);unsigned char *base; -u16 out; +u16 out =cpu_to_le16 (0 );memset (&args,0 ,sizeof (args));
@@ -55,11 +55,14 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan,DRM_ERROR ("hw i2c: tried to write too many bytes (%d vs 3)\n" , num);return -EINVAL ; } - args.ucRegIndex = buf[0 ]; -if (num >1 ) { +if (buf ==NULL ) + args.ucRegIndex =0 ; +else + args.ucRegIndex = buf[0 ]; +if (num) num--; +if (num)memcpy (&out, &buf[1 ], num); - } args.lpI2CDataOut =cpu_to_le16 (out); }else {if (num >ATOM_MAX_HW_I2C_READ ) {
@@ -96,14 +99,14 @@ int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,struct radeon_i2c_chan *i2c =i2c_get_adapdata (i2c_adap);struct i2c_msg *p;int i, remaining, current_count, buffer_offset, max_bytes, ret; -u8 buf =0 , flags; +u8 flags;/* check for bus probe */ p = &msgs[0 ];if ((num ==1 ) && (p->len ==0 )) { ret =radeon_process_i2c_ch (i2c, p->addr,HW_I2C_WRITE , - &buf,1 ); +NULL ,0 );if (ret)return ret;else
drivers/gpu/drm/radeon/r600_hdmi.c +2 -6
@@ -304,9 +304,9 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)WREG32 (DCCG_AUDIO_DTO1_MODULE , dto_modulo);WREG32 (DCCG_AUDIO_DTO_SELECT ,1 );/* select DTO1 */ } - }else if (ASIC_IS_DCE3 (rdev)) { + }else {/* according to the reg specs, this should DCE3.2 only, but in -* practice it seems to cover DCE3.0/3.1 as well. +* practice it seems to cover DCE2.0/3.0/3.1 as well. */ if (dig->dig_encoder ==0 ) {WREG32 (DCCG_AUDIO_DTO0_PHASE , base_rate *100 );
@@ -317,10 +317,6 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)WREG32 (DCCG_AUDIO_DTO1_MODULE , clock *100 );WREG32 (DCCG_AUDIO_DTO_SELECT ,1 );/* select DTO1 */ } - }else { -/* according to the reg specs, this should be DCE2.0 and DCE3.0/3.1 */ -WREG32 (AUDIO_DTO ,AUDIO_DTO_PHASE (base_rate /10 ) | -AUDIO_DTO_MODULE (clock /10 )); } }
drivers/gpu/drm/radeon/radeon_atombios.c +1 -1
@@ -2918,7 +2918,7 @@ int radeon_atom_get_memory_pll_dividers(struct radeon_device *rdev, mpll_param->dll_speed = args.ucDllSpeed; mpll_param->bwcntl = args.ucBWCntl; mpll_param->vco_mode = - (args.ucPllCntlFlag &MPLL_CNTL_FLAG_VCO_MODE_MASK ) ?1 :0 ; + (args.ucPllCntlFlag &MPLL_CNTL_FLAG_VCO_MODE_MASK ); mpll_param->yclk_sel = (args.ucPllCntlFlag &MPLL_CNTL_FLAG_BYPASS_DQ_PLL ) ?1 :0 ; mpll_param->qdr =
drivers/gpu/drm/radeon/si.c +9 -2
@@ -3887,8 +3887,15 @@ static int si_mc_init(struct radeon_device *rdev) rdev->mc.aper_base =pci_resource_start (rdev->pdev,0 ); rdev->mc.aper_size =pci_resource_len (rdev->pdev,0 );/* size in MB on si */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + tmp =RREG32 (CONFIG_MEMSIZE ); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + rdev->mc.mc_vram_size = tmp *1024ULL *1024ULL ; + rdev->mc.real_vram_size = rdev->mc.mc_vram_size; rdev->mc.visible_vram_size = rdev->mc.aper_size;si_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/gpu/drm/udl/udl_gem.c +6 -0
@@ -132,6 +132,12 @@ static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask)static void udl_gem_put_pages (struct udl_gem_object *obj) { +if (obj->base.import_attach) { +drm_free_large (obj->pages); + obj->pages =NULL ; +return ; + } +drm_gem_put_pages (&obj->base, obj->pages, false, false); obj->pages =NULL ; }
drivers/hid/hid-core.c +1 -0
@@ -1725,6 +1725,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },
drivers/hid/hid-ids.h +1 -0
@@ -489,6 +489,7 @@#define USB_VENDOR_ID_KYE 0x0458#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087#define USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE 0x0138 +#define USB_DEVICE_ID_GENIUS_MANTICORE 0x0153#define USB_DEVICE_ID_GENIUS_GX_IMPERATOR 0x4018#define USB_DEVICE_ID_KYE_GPEN_560 0x5003#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010
drivers/hid/hid-kye.c +6 -0
@@ -342,6 +342,10 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc =kye_consumer_control_fixup (hdev, rdesc, rsize,83 ,"Genius Gx Imperator Keyboard" );break ; +case USB_DEVICE_ID_GENIUS_MANTICORE : + rdesc =kye_consumer_control_fixup (hdev, rdesc, rsize,104 , +"Genius Manticore Keyboard" ); +break ; }return rdesc; }
@@ -439,6 +443,8 @@ static const struct hid_device_id kye_devices[] = { USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, + USB_DEVICE_ID_GENIUS_MANTICORE) }, { } }; MODULE_DEVICE_TABLE(hid, kye_devices);
drivers/hwmon/hih6130.c +14 -2
@@ -43,6 +43,7 @@* @last_update: time of last update (jiffies) * @temperature: cached temperature measurement value * @humidity: cached humidity measurement value +* @write_length: length for I2C measurement request */ struct hih6130 {struct device *hwmon_dev;
@@ -51,6 +52,7 @@ struct hih6130 {unsigned long last_update;int temperature;int humidity; +size_t write_length; };/**
@@ -121,8 +123,15 @@ static int hih6130_update_measurements(struct i2c_client *client)*/ if (time_after (jiffies, hih6130->last_update +HZ ) || !hih6130->valid) { -/* write to slave address, no data, to request a measurement */ - ret =i2c_master_send (client, tmp,0 ); +/* +* Write to slave address to request a measurement. +* According with the datasheet it should be with no data, but +* for systems with I2C bus drivers that do not allow zero +* length packets we write one dummy byte to allow sensor +* measurements on them. +*/ + tmp[0 ] =0 ; + ret =i2c_master_send (client, tmp, hih6130->write_length);if (ret <0 ) goto out;
@@ -252,6 +261,9 @@ static int hih6130_probe(struct i2c_client *client, goto fail_remove_sysfs; } +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_QUICK )) + hih6130->write_length =1 ; +return 0 ; fail_remove_sysfs:
drivers/hwmon/lm78.c +2 -0
@@ -94,6 +94,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return clamp_val ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/sis5595.c +2 -0
@@ -141,6 +141,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return clamp_val ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/vt8231.c +1 -1
@@ -145,7 +145,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };*/ static inline u8 FAN_TO_REG (long rpm,int div) { -if (rpm ==0 ) +if (rpm <=0 || rpm >1310720 )return 0 ;return clamp_val (1310720 / (rpm * div),1 ,255 ); }
drivers/hwmon/w83l786ng.c +8 -5
@@ -481,9 +481,11 @@ store_pwm(struct device *dev, struct device_attribute *attr,if (err)return err; val =clamp_val (val,0 ,255 ); + val =DIV_ROUND_CLOSEST (val,0x11 );mutex_lock (&data->update_lock); - data->pwm[nr] = val; + data->pwm[nr] = val *0x11 ; + val |=w83l786ng_read_value (client,W83L786NG_REG_PWM [nr]) &0xf0 ;w83l786ng_write_value (client,W83L786NG_REG_PWM [nr], val);mutex_unlock (&data->update_lock);return count;
@@ -510,7 +512,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); reg =w83l786ng_read_value (client,W83L786NG_REG_FAN_CFG ); data->pwm_enable[nr] = val; - reg &= ~(0x02 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); + reg &= ~(0x03 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); reg |= (val -1 ) <<W83L786NG_PWM_ENABLE_SHIFT [nr];w83l786ng_write_value (client,W83L786NG_REG_FAN_CFG , reg);mutex_unlock (&data->update_lock);
@@ -776,9 +778,10 @@ static struct w83l786ng_data *w83l786ng_update_device(struct device *dev) ((pwmcfg >>W83L786NG_PWM_MODE_SHIFT [i]) &1 ) ?0 :1 ; data->pwm_enable[i] = - ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &2 ) +1 ; - data->pwm[i] =w83l786ng_read_value (client, -W83L786NG_REG_PWM [i]); + ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &3 ) +1 ; + data->pwm[i] = + (w83l786ng_read_value (client,W83L786NG_REG_PWM [i]) + &0x0f ) *0x11 ; }
drivers/input/mouse/elantech.c +1 -0
@@ -1313,6 +1313,7 @@ static int elantech_set_properties(struct elantech_data *etd)break ;case 6 :case 7 : +case 8 : etd->hw_version =4 ;break ;default :
drivers/input/touchscreen/usbtouchscreen.c +18 -4
@@ -106,6 +106,7 @@ struct usbtouch_device_info {struct usbtouch_usb {unsigned char *data;dma_addr_t data_dma; +int data_size;unsigned char *buffer;int buf_len;struct urb *irq;
@@ -1521,7 +1522,7 @@ static int usbtouch_reset_resume(struct usb_interface *intf)static void usbtouch_free_buffers (struct usb_device *udev,struct usbtouch_usb *usbtouch) { -usb_free_coherent (udev, usbtouch->type->rept_size, +usb_free_coherent (udev, usbtouch->data_size, usbtouch->data, usbtouch->data_dma);kfree (usbtouch->buffer); }
@@ -1566,7 +1567,20 @@ static int usbtouch_probe(struct usb_interface *intf,if (!type->process_pkt) type->process_pkt = usbtouch_process_pkt; - usbtouch->data =usb_alloc_coherent (udev, type->rept_size, + usbtouch->data_size = type->rept_size; +if (type->get_pkt_len) { +/* +* When dealing with variable-length packets we should +* not request more than wMaxPacketSize bytes at once +* as we do not know if there is more data coming or +* we filled exactly wMaxPacketSize bytes and there is +* nothing else. +*/ + usbtouch->data_size =min (usbtouch->data_size, +usb_endpoint_maxp (endpoint)); + } + + usbtouch->data =usb_alloc_coherent (udev, usbtouch->data_size,GFP_KERNEL , &usbtouch->data_dma);if (!usbtouch->data) goto out_free;
@@ -1626,12 +1640,12 @@ static int usbtouch_probe(struct usb_interface *intf,if (usb_endpoint_type (endpoint) ==USB_ENDPOINT_XFER_INT )usb_fill_int_urb (usbtouch->irq, udev,usb_rcvintpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch, endpoint->bInterval);else usb_fill_bulk_urb (usbtouch->irq, udev,usb_rcvbulkpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch); usbtouch->irq->dev = udev;
drivers/iommu/arm-smmu.c +26 -36
119 lines not on this page · raw message
drivers/md/dm-bufio.c +5 -0
@@ -1717,6 +1717,11 @@ static int __init dm_bufio_init(void) {__u64 mem; + dm_bufio_allocated_kmem_cache =0 ; + dm_bufio_allocated_get_free_pages =0 ; + dm_bufio_allocated_vmalloc =0 ; + dm_bufio_current_allocated =0 ; +memset (&dm_bufio_caches,0 ,sizeof dm_bufio_caches);memset (&dm_bufio_cache_names,0 ,sizeof dm_bufio_cache_names);
drivers/md/dm-delay.c +11 -12
@@ -20,6 +20,7 @@struct delay_c {struct timer_list delay_timer;struct mutex timer_lock; +struct workqueue_struct *kdelayd_wq;struct work_struct flush_expired_bios;struct list_head delayed_bios;atomic_t may_delay;
@@ -45,14 +46,13 @@ struct dm_delay_info {static DEFINE_MUTEX (delayed_bios_lock); -static struct workqueue_struct *kdelayd_wq;static struct kmem_cache *delayed_cache;static void handle_delayed_timer (unsigned long data) {struct delay_c *dc = (struct delay_c *)data; -queue_work (kdelayd_wq, &dc->flush_expired_bios); +queue_work (dc->kdelayd_wq, &dc->flush_expired_bios); }static void queue_timeout (struct delay_c *dc,unsigned long expires)
@@ -191,6 +191,12 @@ out: goto bad_dev_write; } + dc->kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); +if (!dc->kdelayd_wq) { +DMERR ("Couldn't start kdelayd" ); + goto bad_queue; + } +setup_timer (&dc->delay_timer, handle_delayed_timer, (unsigned long )dc);INIT_WORK (&dc->flush_expired_bios, flush_expired_bios);
@@ -203,6 +209,8 @@ out: ti->private = dc;return 0 ; +bad_queue: +mempool_destroy (dc->delayed_pool); bad_dev_write:if (dc->dev_write)dm_put_device (ti, dc->dev_write);
@@ -217,7 +225,7 @@ static void delay_dtr(struct dm_target *ti) {struct delay_c *dc = ti->private; -flush_workqueue (kdelayd_wq); +destroy_workqueue (dc->kdelayd_wq);dm_put_device (ti, dc->dev_read);
@@ -350,12 +358,6 @@ static int __init dm_delay_init(void) {int r = -ENOMEM ; - kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); -if (!kdelayd_wq) { -DMERR ("Couldn't start kdelayd" ); - goto bad_queue; - } - delayed_cache =KMEM_CACHE (dm_delay_info,0 );if (!delayed_cache) {DMERR ("Couldn't create delayed bio cache." );
@@ -373,8 +375,6 @@ static int __init dm_delay_init(void) bad_register:kmem_cache_destroy (delayed_cache); bad_memcache: -destroy_workqueue (kdelayd_wq); -bad_queue:return r; }
@@ -382,7 +382,6 @@ static void __exit dm_delay_exit(void) {dm_unregister_target (&delay_target);kmem_cache_destroy (delayed_cache); -destroy_workqueue (kdelayd_wq); }/* Module hooks */
drivers/md/dm-snap.c +64 -7
114 lines not on this page · raw message
drivers/md/dm-stats.c +1 -0
@@ -964,6 +964,7 @@ int dm_stats_message(struct mapped_device *md, unsigned argc, char **argv,int __init dm_statistics_init (void ) { + shared_memory_amount =0 ; dm_stat_need_rcu_barrier =0 ;return 0 ; }
drivers/md/dm-table.c +5 -0
@@ -200,6 +200,11 @@ int dm_table_create(struct dm_table **result, fmode_t mode, num_targets =dm_round_up (num_targets,KEYS_PER_NODE ); +if (!num_targets) { +kfree (t); +return -ENOMEM ; + } +if (alloc_targets (t, num_targets)) {kfree (t);return -ENOMEM ;
drivers/md/dm-thin-metadata.c +8 -0
@@ -1697,6 +1697,14 @@ void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd)up_write (&pmd->root_lock); } +void dm_pool_metadata_read_write (struct dm_pool_metadata *pmd) +{ +down_write (&pmd->root_lock); + pmd->read_only = false; +dm_bm_set_read_write (pmd->bm); +up_write (&pmd->root_lock); +} + int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, dm_block_t threshold, dm_sm_threshold_fn fn,
drivers/md/dm-thin-metadata.h +1 -0
@@ -193,6 +193,7 @@ int dm_pool_resize_metadata_dev(struct dm_pool_metadata *pmd, dm_block_t new_siz* that nothing is changing. */ void dm_pool_metadata_read_only (struct dm_pool_metadata *pmd); +void dm_pool_metadata_read_write (struct dm_pool_metadata *pmd); int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, dm_block_t threshold,
drivers/md/dm-thin.c +39 -27
166 lines not on this page · raw message
drivers/md/persistent-data/dm-array.c +9 -1
@@ -317,8 +317,16 @@ static int shadow_ablock(struct dm_array_info *info, dm_block_t *root,* The shadow op will often be a noop. Only insert if it really * copied data. */ -if (dm_block_location (*block) != b) +if (dm_block_location (*block) != b) { +/* +* dm_tm_shadow_block will have already decremented the old +* block, but it is still referenced by the btree. We +* increment to stop the insert decrementing it below zero +* when overwriting the old value. +*/ +dm_tm_inc (info->btree_info.tm, b); r =insert_ablock (info, index, *block, root); + }return r; }
drivers/md/persistent-data/dm-block-manager.c +6 -0
@@ -626,6 +626,12 @@ void dm_bm_set_read_only(struct dm_block_manager *bm) }EXPORT_SYMBOL_GPL (dm_bm_set_read_only); +void dm_bm_set_read_write (struct dm_block_manager *bm) +{ + bm->read_only = false; +} +EXPORT_SYMBOL_GPL (dm_bm_set_read_write); +u32 dm_bm_checksum (const void *data,size_t len,u32 init_xor) {return crc32c (~(u32 )0 , data, len) ^ init_xor;
drivers/md/persistent-data/dm-block-manager.h +4 -3
@@ -108,9 +108,9 @@ int dm_bm_unlock(struct dm_block *b);int dm_bm_flush_and_unlock (struct dm_block_manager *bm,struct dm_block *superblock); -/* -* Request data be prefetched into the cache. -*/ +/* +* Request data is prefetched into the cache. +*/ void dm_bm_prefetch (struct dm_block_manager *bm,dm_block_t b);/*
@@ -125,6 +125,7 @@ void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b);* be returned if you do. */ void dm_bm_set_read_only (struct dm_block_manager *bm); +void dm_bm_set_read_write (struct dm_block_manager *bm);u32 dm_bm_checksum (const void *data,size_t len,u32 init_xor);
drivers/md/persistent-data/dm-space-map-common.c +23 -9
@@ -381,7 +381,7 @@ int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin, }static int sm_ll_mutate (struct ll_disk *ll,dm_block_t b, -uint32_t (*mutator)(void *context,uint32_t old), +int (*mutator)(void *context,uint32_t old,uint32_t *new),void *context,enum allocation_event *ev) {int r;
@@ -410,11 +410,17 @@ static int sm_ll_mutate(struct ll_disk *ll, dm_block_t b,if (old >2 ) { r =sm_ll_lookup_big_ref_count (ll, b, &old); -if (r <0 ) +if (r <0 ) { +dm_tm_unlock (ll->tm, nb);return r; + } } - ref_count =mutator (context, old); + r =mutator (context, old, &ref_count); +if (r) { +dm_tm_unlock (ll->tm, nb); +return r; + }if (ref_count <=2 ) {sm_set_bitmap (bm_le, bit, ref_count);
@@ -465,9 +471,10 @@ static int sm_ll_mutate(struct ll_disk *ll, dm_block_t b,return ll->save_ie (ll, index, &ie_disk); } -static uint32_t set_ref_count (void *context,uint32_t old) +static int set_ref_count (void *context,uint32_t old,uint32_t *new) { -return *((uint32_t *) context); + *new = *((uint32_t *) context); +return 0 ; } int sm_ll_insert(struct ll_disk *ll, dm_block_t b,
@@ -476,9 +483,10 @@ int sm_ll_insert(struct ll_disk *ll, dm_block_t b,return sm_ll_mutate (ll, b, set_ref_count, &ref_count, ev); } -static uint32_t inc_ref_count (void *context,uint32_t old) +static int inc_ref_count (void *context,uint32_t old,uint32_t *new) { -return old +1 ; + *new = old +1 ; +return 0 ; }int sm_ll_inc (struct ll_disk *ll,dm_block_t b,enum allocation_event *ev)
@@ -486,9 +494,15 @@ int sm_ll_inc(struct ll_disk *ll, dm_block_t b, enum allocation_event *ev)return sm_ll_mutate (ll, b, inc_ref_count,NULL , ev); } -static uint32_t dec_ref_count (void *context,uint32_t old) +static int dec_ref_count (void *context,uint32_t old,uint32_t *new) { -return old -1 ; +if (!old) { +DMERR_LIMIT ("unable to decrement a reference count below 0" ); +return -EINVAL ; + } + + *new = old -1 ; +return 0 ; }int sm_ll_dec (struct ll_disk *ll,dm_block_t b,enum allocation_event *ev)
drivers/md/persistent-data/dm-space-map-metadata.c +6 -2
@@ -384,12 +384,16 @@ static int sm_metadata_new_block(struct dm_space_map *sm, dm_block_t *b) struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);int r =sm_metadata_new_block_ (sm, b); -if (r) +if (r) {DMERR ("unable to allocate new metadata block" ); +return r; + } r =sm_metadata_get_nr_free (sm, &count); -if (r) +if (r) {DMERR ("couldn't get free block count" ); +return r; + }check_threshold (&smm->threshold, count);
drivers/media/dvb-frontends/af9033.c +6 -6
@@ -170,18 +170,18 @@ static int af9033_rd_reg_mask(struct af9033_state *state, u32 reg, u8 *val,static int af9033_wr_reg_val_tab (struct af9033_state *state,const struct reg_val *tab,int tab_len) { +#define MAX_TAB_LEN 212int ret, i, j; -u8 buf[MAX_XFER_SIZE ]; +u8 buf[1 +MAX_TAB_LEN ]; + +dev_dbg (&state->i2c->dev,"%s: tab_len=%d\n" , __func__, tab_len);if (tab_len >sizeof (buf)) { -dev_warn (&state->i2c->dev, -"%s: i2c wr len=%d is too big!\n" , -KBUILD_MODNAME , tab_len); +dev_warn (&state->i2c->dev,"%s: tab len %d is too big\n" , +KBUILD_MODNAME , tab_len);return -EINVAL ; } -dev_dbg (&state->i2c->dev,"%s: tab_len=%d\n" , __func__, tab_len); -for (i =0 , j =0 ; i < tab_len; i++) { buf[j] = tab[i].val;
drivers/media/dvb-frontends/cxd2820r_core.c +2 -2
@@ -34,7 +34,7 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, { .addr = i2c, .flags = 0, - .len = sizeof(buf), + .len = len + 1, .buf = buf, } };
@@ -75,7 +75,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, }, { .addr = i2c, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } };
drivers/media/i2c/wm8775.c +1 -3
@@ -130,12 +130,10 @@ static int wm8775_s_routing(struct v4l2_subdev *sd,return -EINVAL ; } state->input = input; -if (!v4l2_ctrl_g_ctrl (state->mute)) +if (v4l2_ctrl_g_ctrl (state->mute))return 0 ;if (!v4l2_ctrl_g_ctrl (state->vol))return 0 ; -if (!v4l2_ctrl_g_ctrl (state->bal)) -return 0 ;wm8775_set_audio (sd,1 );return 0 ; }
drivers/media/pci/bt8xx/bttv-driver.c +2 -1
@@ -4182,7 +4182,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) } btv->std =V4L2_STD_PAL ;init_irqreg (btv); -v4l2_ctrl_handler_setup (hdl); +if (!bttv_tvcards[btv->c.type].no_video) +v4l2_ctrl_handler_setup (hdl);if (hdl->error) { result = hdl->error; goto fail2;
drivers/media/pci/saa7164/saa7164-core.c +3 -1
@@ -1354,9 +1354,11 @@ static int saa7164_initdev(struct pci_dev *pci_dev,if (fw_debug) { dev->kthread =kthread_run (saa7164_thread_function, dev,"saa7164 debug" ); -if (!dev->kthread) +if (IS_ERR (dev->kthread)) { + dev->kthread =NULL ;printk (KERN_ERR "%s() Failed to create " "debug kernel thread\n" , __func__); + } } }/* != BOARD_UNKNOWN */
drivers/media/radio/radio-tea5764.c +1 -1
@@ -356,7 +356,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,So we keep it as-is. */ return -EINVAL ; } -clamp (freq,FREQ_MIN *FREQ_MUL ,FREQ_MAX *FREQ_MUL ); + freq =clamp (freq,FREQ_MIN *FREQ_MUL ,FREQ_MAX *FREQ_MUL );tea5764_power_up (radio);tea5764_tune (radio, (freq *125 ) /2 );return 0 ;
drivers/media/radio/tef6862.c +1 -1
@@ -112,7 +112,7 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequenif (f->tuner !=0 )return -EINVAL ; -clamp (freq,TEF6862_LO_FREQ ,TEF6862_HI_FREQ ); + freq =clamp (freq,TEF6862_LO_FREQ ,TEF6862_HI_FREQ ); pll =1964 + ((freq -TEF6862_LO_FREQ ) *20 ) /FREQ_MUL ; i2cmsg[0 ] = (MODE_PRESET <<MODE_SHIFT ) |WM_SUB_PLLM ; i2cmsg[1 ] = (pll >>8 ) &0xff ;
drivers/media/usb/dvb-usb-v2/af9035.c +11 -6
@@ -131,7 +131,7 @@ static int af9035_wr_regs(struct dvb_usb_device *d, u32 reg, u8 *val, int len) {u8 wbuf[MAX_XFER_SIZE ];u8 mbox = (reg >>16 ) &0xff ; -struct usb_req req = {CMD_MEM_WR , mbox,sizeof (wbuf), wbuf,0 ,NULL }; +struct usb_req req = {CMD_MEM_WR , mbox,6 + len, wbuf,0 ,NULL };if (6 + len >sizeof (wbuf)) { dev_warn(&d->udev->dev, "%s: i2c wr: len=%d is too big!\n",
@@ -238,14 +238,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, }else {/* I2C */ u8 buf[MAX_XFER_SIZE ]; -struct usb_req req = {CMD_I2C_RD ,0 ,sizeof (buf), +struct usb_req req = {CMD_I2C_RD ,0 ,5 + msg[0 ].len, buf, msg[1 ].len, msg[1 ].buf };if (5 + msg[0 ].len >sizeof (buf)) {dev_warn (&d->udev->dev,"%s: i2c xfer: len=%d is too big!\n" ,KBUILD_MODNAME , msg[0 ].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[1 ].len;
@@ -274,14 +275,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, }else {/* I2C */ u8 buf[MAX_XFER_SIZE ]; -struct usb_req req = {CMD_I2C_WR ,0 ,sizeof (buf), buf, -0 ,NULL }; +struct usb_req req = {CMD_I2C_WR ,0 ,5 + msg[0 ].len, + buf,0 ,NULL };if (5 + msg[0 ].len >sizeof (buf)) {dev_warn (&d->udev->dev,"%s: i2c xfer: len=%d is too big!\n" ,KBUILD_MODNAME , msg[0 ].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[0 ].len;
@@ -319,6 +321,7 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, ret = -EOPNOTSUPP ; } +unlock:mutex_unlock (&d->i2c_mutex);if (ret <0 )
@@ -1534,6 +1537,8 @@ static const struct usb_device_id af9035_id_table[] = {/* XXX: that same ID [0ccd:0099] is used by af9015 driver too */ {DVB_USB_DEVICE (USB_VID_TERRATEC ,0x0099 , &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, + { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05, + &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) }, { } };MODULE_DEVICE_TABLE (usb, af9035_id_table);
drivers/mtd/nand/pxa3xx_nand.c +0 -4
@@ -1241,10 +1241,6 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = { .compatible = "marvell,pxa3xx-nand", .data = (void *)PXA3XX_NAND_VARIANT_PXA, }, - { - .compatible = "marvell,armada370-nand", - .data = (void *)PXA3XX_NAND_VARIANT_ARMADA370, - }, {} };MODULE_DEVICE_TABLE (of, pxa3xx_nand_dt_ids);
drivers/net/ethernet/allwinner/sun4i-emac.c +3 -2
@@ -717,8 +717,7 @@ static int emac_open(struct net_device *dev)if (netif_msg_ifup (db))dev_dbg (db->dev,"enabling %s\n" , dev->name); -if (devm_request_irq (db->dev, dev->irq, &emac_interrupt, -0 , dev->name, dev)) +if (request_irq (dev->irq, &emac_interrupt,0 , dev->name, dev))return -EAGAIN ;/* Initialize EMAC board */
@@ -774,6 +773,8 @@ static int emac_stop(struct net_device *ndev)emac_shutdown (ndev); +free_irq (ndev->irq, ndev); +return 0 ; }
drivers/net/ethernet/intel/igb/e1000_phy.c +4 -1
@@ -1730,7 +1730,10 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,* ownership of the resources, wait and try again to * see if they have relinquished the resources yet. */ -udelay (usec_interval); +if (usec_interval >=1000 ) +mdelay (usec_interval/1000 ); +else +udelay (usec_interval); } ret_val = hw->phy.ops.read_reg (hw,PHY_STATUS , &phy_status);if (ret_val)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +12 -10
@@ -3966,18 +3966,20 @@ static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)int quick_drop;s32 t[3 ], f[3 ] = {5180 ,5500 ,5785 }; -if (!(pBase->miscConfiguration &BIT (1 ))) +if (!(pBase->miscConfiguration &BIT (4 )))return ; -if (freq <4000 ) - quick_drop = eep->modalHeader2G.quick_drop; -else { - t[0 ] = eep->base_ext1.quick_drop_low; - t[1 ] = eep->modalHeader5G.quick_drop; - t[2 ] = eep->base_ext1.quick_drop_high; - quick_drop =ar9003_hw_power_interpolate (freq, f, t,3 ); +if (AR_SREV_9300 (ah) ||AR_SREV_9580 (ah) ||AR_SREV_9340 (ah)) { +if (freq <4000 ) { + quick_drop = eep->modalHeader2G.quick_drop; + }else { + t[0 ] = eep->base_ext1.quick_drop_low; + t[1 ] = eep->modalHeader5G.quick_drop; + t[2 ] = eep->base_ext1.quick_drop_high; + quick_drop =ar9003_hw_power_interpolate (freq, f, t,3 ); + } +REG_RMW_FIELD (ah,AR_PHY_AGC ,AR_PHY_AGC_QUICK_DROP , quick_drop); } -REG_RMW_FIELD (ah,AR_PHY_AGC ,AR_PHY_AGC_QUICK_DROP , quick_drop); }static void ar9003_hw_txend_to_xpa_off_apply (struct ath_hw *ah,bool is2ghz)
@@ -4017,7 +4019,7 @@ static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;u8 bias; -if (!(eep->baseEepHeader.featureEnable &0x40 )) +if (!(eep->baseEepHeader.miscConfiguration &0x40 ))return ;if (!AR_SREV_9300 (ah))
drivers/net/wireless/ath/ath9k/xmit.c +4 -0
@@ -1275,6 +1275,10 @@ static void ath_tx_fill_desc(struct ath_softc *sc, struct ath_buf *bf,if (!rts_thresh || (len > rts_thresh)) rts = true; } + +if (!aggr) + len = fi->framelen; +ath_buf_set_rate (sc, bf, &info, len, rts); }
drivers/net/wireless/iwlwifi/iwl-7000.c +7 -0
@@ -125,6 +125,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_2ac_cfg_high_temp = {
@@ -135,6 +136,7 @@ const struct iwl_cfg iwl7260_2ac_cfg_high_temp = { .nvm_ver = IWL7260_NVM_VERSION, .nvm_calib_ver = IWL7260_TX_POWER_VERSION, .high_temp = true, + .host_interrupt_operation_mode = true, };const struct iwl_cfg iwl7260_2n_cfg = {
@@ -144,6 +146,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 = {
@@ -153,6 +156,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 = {
@@ -162,6 +166,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 = {
@@ -171,6 +176,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 = {
@@ -180,6 +186,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
@@ -207,6 +207,8 @@ struct iwl_eeprom_params {* @rx_with_siso_diversity: 1x1 device with rx antenna diversity * @internal_wimax_coex: internal wifi/wimax combo device * @high_temp: Is this NIC is designated to be in high temperature. +* @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
@@ -235,6 +237,7 @@ struct iwl_cfg {enum iwl_led_mode led_mode;const bool rx_with_siso_diversity;const bool internal_wimax_coex; +const bool host_interrupt_operation_mode;bool high_temp; };
drivers/net/wireless/iwlwifi/iwl-csr.h +1 -4
@@ -463,14 +463,11 @@* 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)/***************************************************************************** * 7000/3000 series SHR DTS addresses *
drivers/net/wireless/iwlwifi/mvm/debugfs.c +4 -0
@@ -119,6 +119,10 @@ static ssize_t iwl_dbgfs_sta_drain_write(struct file *file,if (sscanf (buf,"%d %d" , &sta_id, &drain) !=2 )return -EINVAL ; +if (sta_id <0 || sta_id >=IWL_MVM_STATION_COUNT ) +return -EINVAL ; +if (drain <0 || drain >1 ) +return -EINVAL ;mutex_lock (&mvm->mutex);
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 ); }static void iwl_pcie_rx_init_rxb_lists (struct iwl_rxq *rxq)
drivers/net/wireless/iwlwifi/pcie/trans.c +0 -3
@@ -276,9 +276,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/sta_ioctl.c +2 -2
@@ -319,8 +319,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,if (bss_desc && bss_desc->ssid.ssid_len && (!mwifiex_ssid_cmp (&priv->curr_bss_params.bss_descriptor. ssid, &bss_desc->ssid))) { -kfree (bss_desc); -return 0 ; + ret =0 ; + goto done; }/* Exit Adhoc mode first */
drivers/pci/pci-driver.c +9 -3
@@ -19,6 +19,7 @@#include <linux/cpu.h> #include <linux/pm_runtime.h> #include <linux/suspend.h> +#include <linux/kexec.h> #include "pci.h" struct pci_dynid {
@@ -388,12 +389,17 @@ static void pci_device_shutdown(struct device *dev)pci_msi_shutdown (pci_dev);pci_msix_shutdown (pci_dev); +#ifdef CONFIG_KEXEC /* -* Turn off Bus Master bit on the device to tell it to not -* continue to do DMA. Don't touch devices in D3cold or unknown states. +* If this is a kexec reboot, turn off Bus Master bit on the +* device to tell it to not continue to do DMA. Don't touch +* devices in D3cold or unknown states. +* If it is not a kexec reboot, firmware will hit the PCI +* devices with big hammer and stop their DMA any way. */ -if (pci_dev->current_state <= PCI_D3hot) +if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot))pci_clear_master (pci_dev); +#endif }#ifdef CONFIG_PM
drivers/regulator/pfuze100-regulator.c +1 -1
@@ -38,7 +38,7 @@#define PFUZE100_DEVICEID 0x0#define PFUZE100_REVID 0x3 -#define PFUZE100_FABID 0x3 +#define PFUZE100_FABID 0x4#define PFUZE100_SW1ABVOL 0x20#define PFUZE100_SW1CVOL 0x2e
drivers/rtc/rtc-at91rm9200.c +2 -0
@@ -220,6 +220,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) at91_alarm_year = tm.tm_year; + tm.tm_mon = alrm->time.tm_mon; + tm.tm_mday = alrm->time.tm_mday; tm.tm_hour = alrm->time.tm_hour; tm.tm_min = alrm->time.tm_min; tm.tm_sec = alrm->time.tm_sec;
drivers/staging/comedi/drivers/amplc_pc263.c +3 -0
@@ -68,6 +68,9 @@ static int pc263_do_insn_bits(struct comedi_device *dev,outb (s->state &0xFF , dev->iobase);outb (s->state >>8 , dev->iobase +1 ); } + + data[1 ] = s->state; +return insn->n; }
drivers/staging/comedi/drivers/amplc_pci263.c +3 -0
@@ -55,6 +55,9 @@ static int pci263_do_insn_bits(struct comedi_device *dev,outb (s->state &0xFF , dev->iobase);outb (s->state >>8 , dev->iobase +1 ); } + + data[1 ] = s->state; +return insn->n; }
drivers/staging/comedi/drivers/ssv_dnp.c +3 -3
@@ -83,11 +83,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,/* on return, data[1] contains the value of the digital input lines. */ outb (PADR ,CSCIR ); - data[0 ] =inb (CSCDR ); + data[1 ] =inb (CSCDR );outb (PBDR ,CSCIR ); - data[0 ] +=inb (CSCDR ) <<8 ; + data[1 ] +=inb (CSCDR ) <<8 ;outb (PCDR ,CSCIR ); - data[0 ] += ((inb (CSCDR ) &0xF0 ) <<12 ); + data[1 ] += ((inb (CSCDR ) &0xF0 ) <<12 );return insn->n;
drivers/usb/core/hub.c +3 -2
@@ -4836,8 +4836,9 @@ static void hub_events(void) hub->ports[i -1 ]->child;dev_dbg (hub_dev,"warm reset port %d\n" , i); -if (!udev || !(portstatus & -USB_PORT_STAT_CONNECTION )) { +if (!udev || + !(portstatus &USB_PORT_STAT_CONNECTION ) || + udev->state ==USB_STATE_NOTATTACHED ) { status =hub_port_reset (hub, i,NULL ,HUB_BH_RESET_TIME , true);
drivers/usb/dwc3/ep0.c +2 -0
@@ -459,6 +459,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, dep =dwc3_wIndex_to_dep (dwc, wIndex);if (!dep)return -EINVAL ; +if (set ==0 && (dep->flags &DWC3_EP_WEDGE )) +break ; ret =__dwc3_gadget_ep_set_halt (dep, set);if (ret)return -EINVAL ;
drivers/usb/dwc3/gadget.c +1 -4
@@ -1200,9 +1200,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)else dep->flags |=DWC3_EP_STALL ; }else { -if (dep->flags &DWC3_EP_WEDGE ) -return 0 ; - ret =dwc3_send_gadget_ep_cmd (dwc, dep->number,DWC3_DEPCMD_CLEARSTALL , ¶ms);if (ret)
@@ -1210,7 +1207,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) value ?"set" :"clear" , dep->name); else - dep->flags &= ~DWC3_EP_STALL; + dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE); }return ret;
drivers/usb/gadget/composite.c +1 -0
@@ -593,6 +593,7 @@ static void reset_config(struct usb_composite_dev *cdev)bitmap_zero (f->endpoints,32 ); } cdev->config =NULL ; + cdev->delayed_status =0 ; } static int set_config(struct usb_composite_dev *cdev,
drivers/usb/host/xhci-ring.c +52 -2
60 lines not on this page · raw message
drivers/usb/musb/musb_cppi41.c +140 -24
232 lines not on this page · raw message
drivers/usb/serial/option.c +27 -0
@@ -85,6 +85,7 @@ static void option_instat_callback(struct urb *urb);#define HUAWEI_PRODUCT_K4505 0x1464#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_K4605 0x14C6 +#define HUAWEI_PRODUCT_E173S6 0x1C07#define QUANTA_VENDOR_ID 0x0408#define QUANTA_PRODUCT_Q101 0xEA02
@@ -572,6 +573,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
@@ -634,6 +637,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7A) },
@@ -688,6 +695,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
@@ -742,6 +753,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
@@ -796,6 +811,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
@@ -850,6 +869,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
@@ -904,6 +927,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
drivers/watchdog/sc1200wdt.c +2 -1
@@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void)#if definedCONFIG_PNP /* now that the user has specified an IO port and we haven't detected * any devices, disable pnp support */ +if (isapnp) +pnp_unregister_driver (&scl200wdt_pnp_driver); isapnp =0 ; -pnp_unregister_driver (&scl200wdt_pnp_driver);#endif if (!request_region (io, io_len,SC1200_MODULE_NAME )) {
fs/btrfs/acl.c +1 -1
@@ -229,7 +229,7 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,if (ret >0 ) {/* we need an acl */ ret =btrfs_set_acl (trans, inode, acl,ACL_TYPE_ACCESS ); - }else { + }else if (ret <0 ) {cache_no_acl (inode); } }else {
fs/btrfs/backref.c +3 -0
@@ -185,6 +185,9 @@ static int __add_prelim_ref(struct list_head *head, u64 root_id, {struct __prelim_ref *ref; +if (root_id ==BTRFS_DATA_RELOC_TREE_OBJECTID ) +return 0 ; + ref =kmem_cache_alloc (btrfs_prelim_ref_cache, gfp_mask);if (!ref)return -ENOMEM ;
fs/btrfs/ctree.c +6 -2
@@ -2758,7 +2758,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; -int prev_cmp; +int prev_cmp =-1 ; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2769,7 +2769,6 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: - prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2787,6 +2786,11 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); +/* +* Since we can unwind eb's we want to do a real search every +* time. +*/ + prev_cmp =-1 ; ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {
fs/btrfs/inode.c +28 -19
98 lines not on this page · raw message
fs/btrfs/ioctl.c +2 -1
@@ -2130,7 +2130,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, err =mutex_lock_killable_nested (&dir->i_mutex,I_MUTEX_PARENT );if (err == -EINTR ) - goto out; + goto out_drop_write; dentry =lookup_one_len (vol_args->name, parent, namelen);if (IS_ERR (dentry)) { err =PTR_ERR (dentry);
@@ -2293,6 +2293,7 @@ out_dput:dput (dentry); out_unlock_dir:mutex_unlock (&dir->i_mutex); +out_drop_write:mnt_drop_write_file (file); out:kfree (vol_args);
fs/btrfs/ordered-data.c +2 -0
@@ -537,7 +537,9 @@ void btrfs_remove_ordered_extent(struct inode *inode,*/ if (RB_EMPTY_ROOT (&tree->tree) && !mapping_tagged (inode->i_mapping,PAGECACHE_TAG_DIRTY )) { +spin_lock (&root->fs_info->ordered_root_lock);list_del_init (&BTRFS_I (inode)->ordered_operations); +spin_unlock (&root->fs_info->ordered_root_lock); }if (!root->nr_ordered_extents) {
fs/btrfs/send.c +74 -105
228 lines not on this page · raw message
mm/memcontrol.c +40 -1
41 lines not on this page · raw message
security/selinux/hooks.c +76 -17
93 lines not on this page · raw message
sound/pci/hda/hda_generic.c +46 -1
47 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.