Linux 2.6.32.17
Subsystems (67)
I'm announcing the release of the 2.6.32.17 kernel.
All users of the 2.6.32 kernel series should upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/arm/kernel/kprobes-decode.c | 5 arch/arm/mach-omap2/board-rx51-peripherals.c | 17 - arch/arm/mach-realview/Kconfig | 2 arch/arm/mach-realview/include/mach/barriers.h | 8 arch/ia64/mm/tlb.c | 2 arch/mips/include/asm/mipsregs.h | 9 arch/mips/math-emu/cp1emu.c | 15 - arch/sparc/include/asm/stat.h | 4 arch/x86/include/asm/msr-index.h | 1 arch/x86/include/asm/suspend_32.h | 2 arch/x86/include/asm/suspend_64.h | 2 arch/x86/include/asm/system.h | 2 arch/x86/kernel/acpi/cstate.c | 9 arch/x86/kernel/acpi/sleep.c | 2 arch/x86/kernel/apic/apic.c | 2 arch/x86/kernel/hpet.c | 2 arch/x86/kernel/pci-calgary_64.c | 17 - arch/x86/kvm/mmu.c | 5 arch/x86/kvm/svm.c | 99 ++++++ arch/x86/power/cpu.c | 4 drivers/acpi/processor_idle.c | 2 drivers/acpi/sleep.c | 157 ---------- drivers/base/firmware_class.c | 26 + drivers/char/agp/amd64-agp.c | 27 + drivers/char/tpm/tpm.h | 1 drivers/char/tpm/tpm_tis.c | 9 drivers/cpufreq/cpufreq.c | 11 drivers/gpu/drm/i915/i915_drv.c | 1 drivers/gpu/drm/i915/i915_gem.c | 10 drivers/gpu/drm/i915/i915_reg.h | 64 ++++ drivers/gpu/drm/i915/intel_display.c | 4 drivers/gpu/drm/radeon/r200.c | 2 drivers/gpu/drm/radeon/radeon_atombios.c | 9 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 drivers/hwmon/coretemp.c | 32 ++ drivers/hwmon/it87.c | 22 + drivers/hwmon/k8temp.c | 12 drivers/ide/cmd640.c | 6 drivers/ide/ide-taskfile.c | 6 drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 drivers/input/keyboard/twl4030_keypad.c | 17 - drivers/input/serio/i8042-x86ia64io.h | 7 drivers/media/dvb/dvb-core/dvb_net.c | 12 drivers/media/dvb/ttpci/Kconfig | 5 drivers/media/video/cx23885/cx23885-i2c.c | 12 drivers/media/video/cx88/cx88-i2c.c | 16 + drivers/media/video/uvc/uvc_driver.c | 30 +- drivers/media/video/uvc/uvcvideo.h | 7 drivers/mmc/host/sdhci-s3c.c | 20 + drivers/net/cpmac.c | 3 drivers/net/cxgb3/ael1002.c | 2 drivers/net/dm9000.c | 38 +- drivers/net/forcedeth.c | 2 drivers/net/igb/e1000_82575.c | 13 drivers/net/igb/e1000_hw.h | 2 drivers/net/igb/e1000_mac.c | 17 - drivers/net/sky2.c | 19 - drivers/net/wireless/ath/ath5k/attach.c | 1 drivers/net/wireless/ath/ath5k/base.c | 7 drivers/net/wireless/ath/ath9k/initvals.h | 8 drivers/net/wireless/ath/ath9k/main.c | 7 drivers/net/wireless/hostap/hostap_cs.c | 10 drivers/net/wireless/hostap/hostap_hw.c | 13 drivers/net/wireless/hostap/hostap_wlan.h | 2 drivers/net/wireless/iwlwifi/iwl-scan.c | 1 drivers/net/wireless/iwlwifi/iwl-tx.c | 5 drivers/net/wireless/libertas/if_sdio.c | 22 + drivers/net/wireless/p54/p54pci.c | 2 drivers/pci/pci.c | 1 drivers/platform/x86/eeepc-laptop.c | 18 + drivers/rtc/rtc-ds1307.c | 4 drivers/scsi/aacraid/commctrl.c | 4 drivers/serial/cpm_uart/cpm_uart_core.c | 143 +++++---- drivers/ssb/driver_chipcommon.c | 3 drivers/ssb/driver_chipcommon_pmu.c | 17 - drivers/ssb/pci.c | 46 ++- drivers/ssb/sprom.c | 15 + drivers/staging/rtl8192su/r8192U_core.c | 4 drivers/usb/core/driver.c | 15 - drivers/usb/core/quirks.c | 7 drivers/usb/gadget/u_serial.c | 16 - drivers/usb/misc/sisusbvga/sisusb.c | 5 drivers/usb/serial/ftdi_sio.c | 9 drivers/usb/serial/ftdi_sio_ids.h | 15 + drivers/usb/serial/option.c | 4 drivers/usb/serial/sierra.c | 1 drivers/virtio/virtio_pci.c | 3 fs/btrfs/ioctl.c | 4 fs/cifs/cifsfs.c | 6 fs/cifs/dns_resolve.c | 69 ++++ fs/cifs/dns_resolve.h | 4 fs/cifs/inode.c | 4 fs/cifs/sess.c | 10 fs/ecryptfs/messaging.c | 17 - fs/ext4/dir.c | 12 fs/ext4/ext4.h | 157 +++++++++- fs/ext4/ext4_extents.h | 3 fs/ext4/ext4_jbd2.c | 2 fs/ext4/ext4_jbd2.h | 6 fs/ext4/extents.c | 251 +++++++++++++--- fs/ext4/file.c | 6 fs/ext4/fsync.c | 49 ++- fs/ext4/ialloc.c | 98 +++--- fs/ext4/inode.c | 360 ++++++++++++++---------- fs/ext4/ioctl.c | 37 ++ fs/ext4/mballoc.c | 138 +++++---- fs/ext4/migrate.c | 37 +- fs/ext4/move_extent.c | 28 + fs/ext4/namei.c | 24 + fs/ext4/resize.c | 3 fs/ext4/super.c | 67 ++-- fs/ext4/xattr.c | 28 + fs/gfs2/acl.c | 170 +++++++---- fs/gfs2/acl.h | 24 - fs/gfs2/xattr.c | 18 - fs/jbd2/checkpoint.c | 15 + fs/jbd2/commit.c | 19 - fs/nfs/nfs4xdr.c | 4 fs/nfs/super.c | 22 + include/acpi/processor.h | 3 include/linux/acpi.h | 1 include/linux/ethtool.h | 2 include/linux/fb.h | 4 include/linux/firmware.h | 1 include/linux/ieee80211.h | 2 include/linux/jbd2.h | 1 include/linux/mmc/sdio.h | 2 include/linux/ssb/ssb.h | 1 include/linux/ssb/ssb_driver_chipcommon.h | 2 include/linux/ssb/ssb_regs.h | 3 include/math-emu/op-common.h | 2 kernel/futex.c | 17 - kernel/irq/manage.c | 3 kernel/module.c | 4 kernel/sched.c | 9 net/core/ethtool.c | 43 ++ net/core/neighbour.c | 5 net/ipv4/tcp_output.c | 3 net/ipv6/netfilter/ip6t_REJECT.c | 6 net/mac80211/mlme.c | 17 - net/mac80211/rx.c | 5 net/mac80211/scan.c | 21 - net/netfilter/ipvs/ip_vs_conn.c | 4 net/sunrpc/xprtsock.c | 38 +- scripts/mod/modpost.c | 2 sound/pci/echoaudio/echoaudio.c | 4 sound/pci/hda/patch_realtek.c | 1 sound/soc/codecs/wm8776.c | 1 tools/perf/util/callchain.h | 3 150 files changed, 2122 insertions(+), 1027 deletions(-)
Adam Jackson (1):
drm/i915: Make G4X-style PLL search more permissive
Akira Fujita (3):
ext4: Fix insertion point of extent in mext_insert_across_blocks()
ext4: Fix the NULL reference in double_down_write_data_sem()
ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl
Alan Jenkins (1):
eeepc-laptop: check wireless hotplug events
Alan Stern (1):
USB: obey the sysfs power/wakeup setting
Alex Deucher (2):
drm/radeon/kms: add quirk for ASUS HD 3600 board drm/radeon/kms: fix legacy LVDS dpms sequence
Alex,Shi (1):
sched: Fix over-scheduling bug
Alexander Duyck (1):
igb: change how we handle alternate mac addresses
Andi Kleen (1):
x86: Fix vsyscall on gcc 4.5 with -Os
Andre Osterhues (1):
ecryptfs: Bugfix for error related to ecryptfs_hash_buckets
Andreas Herrmann (1):
hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions
Andrej Gelenberg (1):
revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"
Aneesh Kumar K.V (4):
ext4: Ensure zeroout blocks have no dirty metadata
ext4: Handle -EDQUOT error on write
ext4: Fix quota accounting error with fallocate
ext4: Drop EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE flag
Ang Way Chuang (1):
V4L/DVB: dvb-core: Fix ULE decapsulation bug
Avi Kivity (1):
KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page
Ayaz Abdulla (1):
forcedeth: fix tx limit2 flag check
Baruch Siach (1):
dm9000: fix "BUG: spinlock recursion"
Ben Hutchings (6):
amd64-agp: Probe unknown AGP devices the right way
ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL
ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH
ext4: Conditionally define compat ioctl numbers
ext4: Fix compat EXT4_IOC_ADD_GROUP
V4L/DVB: budget: Select correct frontends
Bob Copeland (1):
ath5k: initialize ah->ah_current_channel
Brandon Philips (1):
sky2: enable rx/tx in sky2_phy_reinit()
Catalin Marinas (1):
ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220
Christian Borntraeger (1):
ext4: allow defrag (EXT4_IOC_MOVE_EXT) in 32bit compat mode
Christoph Fritz (1):
ssb: Handle Netbook devices where the SPROM address is changed
Colin Leitner (1):
USB: ftdi_sio: support for Signalyzer tools based on FTDI chips
Corey Minyard (1):
USB: FTDI: Add support for the RT System VX-7 radio programming cable
Curt Wohlgemuth (5):
ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode
ext4: Fix possible lost inode write in no journal mode
ext4: Fix buffer head leaks after calls to ext4_get_inode_loc()
ext4: Remove extraneous newlines in ext4_msg() calls
ext4: check for a good block group before loading buddy pages
Dan Rosenberg (1):
Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE
Daniel J Blueman (1):
i915: fix lock imbalance on error path...
Daniel Mack (1):
libertas/sdio: 8686: set ECSI bit for 1-bit transfers
Daniel Ritz (1):
V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras
Darrick J. Wong (2):
x86, Calgary: Increase max PHB number x86, Calgary: Limit the max PHB number to 256
Dave Airlie (2):
fb: fix colliding defines for fb flags. drm/i915: enable low power render writes on GEN3 hardware.
David Howells (1):
CIFS: Fix a malicious redirect problem in the DNS lookup code
David Woodhouse (1):
firmware_class: fix memory leak - free allocated pages
Dennis Jansen (1):
USB: option: Add support for AMOI Skypephone S2
Dmitry Monakhov (11):
ext4: Fix potential quota deadlock
ext4: fix error handling in migrate
ext4: explicitly remove inode from orphan list after failed direct io
ext4: Handle non empty on-disk orphan link
ext4: check missed return value in ext4_sync_file()
ext4: fix quota accounting in case of fallocate
ext4: Do not zero out uninitialized extents beyond i_size
ext4: clean up inode bitmaps manipulation in ext4_free_inode
ext4: init statistics after journal recovery
ext4: Use bitops to read/modify i_flags in struct ext4_inode_info
ext4: restart ext4_ext_remove_space() after transaction restart
Dmitry Torokhov (2):
Input: twl40300-keypad - fix handling of "all ground" rows
Input: RX51 keymap - fix recent compile breakage
Dongdong Deng (1):
serial: cpm_uart: implement the cpm_uart_early_write() function for console poll
Doug Kehn (1):
net/core: neighbour update Oops
Eric Dumazet (1):
netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
Eric Sandeen (5):
ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs
ext4: check s_log_groups_per_flex in online resize code
ext4: don't return to userspace after freezing the fs with a mutex held
ext4: stop issuing discards if not supported by device
ext4: don't scan/accumulate more pages than mballoc will allocate
Florian Fainelli (1):
cpmac: do not leak struct net_device on phy_connect errors
Frank Mayhar (1):
ext4: Make fsync sync new parent directories in no-journal mode
Frederic Weisbecker (1):
perf: Resurrect flat callchains
Giuliano Pochini (1):
ALSA: Echoaudio, fix Guru Meditation #00000005.48454C50
Greg Kroah-Hartman (1):
Linux 2.6.32.17
Hiroshi Shimamoto (1):
cxgb3: fix linkup issue
Ilpo Järvinen (1):
tcp: fix crash in tcp_xmit_retransmit_queue
Jan Kara (2):
ext4: Fix estimate of # of blocks needed to write indirect-mapped files
ext4: Show journal_checksum option
Jason Baron (1):
dynamic debug: move ddebug_remove_module() down into free_module()
Javier Cardona (1):
mac80211: Handle mesh action frames in ieee80211_rx_h_action
Jean Delvare (5):
hwmon: (k8temp) Bypass core swapping on single-core processors
hwmon: (coretemp) Properly label the sensors
hwmon: (coretemp) Skip duplicate CPU entries
hwmon: (it87) Fix in7 on IT8720F
V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing
Jeff Layton (2):
cifs: remove bogus first_time check in NTLMv2 session setup code
cifs: don't attempt busy-file rename unless it's in same directory
Jiaying Zhang (1):
ext4: Add flag to files with blocks intentionally past EOF
Jing Zhang (3):
ext4: fix memory leaks in error path handling of ext4_ext_zeroout()
ext4: Remove unnecessary call to ext4_get_group_desc() in mballoc
ext4: rename ext4_mb_release_desc() to ext4_mb_unload_buddy()
Joakim Tjernlund (1):
rtc: fix ds1388 time corruption
Joerg Albert (1):
p54pci: add Symbol AP-300 minipci adapters pciid
Joerg Roedel (2):
KVM: SVM: Handle MCEs early in the vmexit process
KVM: SVM: Implement workaround for Erratum 383
John W. Linville (1):
iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
Jon Povey (2):
USB: g_serial: don't set low_latency flag
USB: g_serial: fix tty cleanup on unload
Julia Lawall (2):
SCSI: aacraid: Eliminate use after free
ext4: Eliminate potential double free on error path
Kamal Mostafa (1):
Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
Keith Packard (1):
drm/i915: Define MI_ARB_STATE bits
Krzysztof Halasa (1):
kbuild: Fix modpost segfault
Laurent Pinchart (3):
V4L/DVB: uvcvideo: Add support for unbranded Arkmicro 18ec:3290 webcams V4L/DVB: uvcvideo: Add support for Packard Bell EasyNote MX52 integrated webcam V4L/DVB: uvcvideo: Add support for V4L2_PIX_FMT_Y16
Len Brown (1):
ACPI: skip checking BM_STS if the BIOS doesn't ask for it
Luis R. Rodriguez (2):
ath5k: drop warning on jumbo frames
ath9k: re-enable ps by default for new single chip families
Luke Yelavich (1):
ALSA: hda - Add Macbook 5,2 quirk
Marcelo Tosatti (1):
KVM: MMU: invalidate and flush on spte small->large page size change
Marek Szyprowski (1):
sdhci-s3c: add missing remove function
Mark Brown (1):
ASoC: Remove duplicate AUX definition from WM8776
Matthew Garrett (1):
ACPI: Unconditionally set SCI_EN on resume
Michael S. Tsirkin (1):
virtio-pci: disable msi at startup
Michal Hocko (1):
futex: futex_find_get_task remove credentails check
Mikael Pettersson (1):
math-emu: correct test for downshifting fraction in _FP_FROM_INT()
Mikulas Patocka (1):
ide: Fix IDE taskfile with cfq scheduler
Nicolas Pitre (1):
ARM: 6226/1: fix kprobe bug in ldr instruction emulation
Nikanth Karthikesan (1):
ext4: Prevent creation of files larger than RLIMIT_FSIZE using fallocate
Oliver Neukum (2):
USB: sisusbvga: Fix for USB 3.0
USB: add quirk for Broadcom BT dongle
Ondrej Zary (1):
PM / x86: Save/restore MISC_ENABLE register
Or Gerlitz (1):
IPoIB: Fix world-writable child interface control sysfs attributes
Paul Mortier (1):
USB: adds Artisman USB dongle to list of quirky devices
Pavel Roskin (1):
Staging: rtl8192su: add USB ID for 0bda:8171
Rajiv Andrade (2):
TPM: ReadPubEK output struct fix
tpm_tis: fix subsequent suspend failures
Richard Airlie (1):
staging: rtl8192su: add Support for Belkin F5D8053 v6
Richard Kennedy (1):
ext4: return correct wbc.nr_to_write in ext4_da_writepages
Rob Landley (1):
sparc: Fix use of uid16_t and gid16_t in asm/stat.h
Roland Scheidegger (1):
drm/radeon/r200: handle more hw tex coord types
Sergei Shtylyov (1):
cmd640: fix kernel oops in test_irq() method
Shane McDonald (1):
MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
Shanyu Zhao (1):
iwlagn: verify flow id in compressed BA packet
Stanislaw Gruszka (2):
mac80211: do not wip out old supported rates
mac80211: fix supported rates IE if AP doesn't give us it's rates
Stefano Stabellini (1):
x86: Do not try to disable hpet if it hasn't been initialized before
Stephane Glondu (1):
staging: rtl8192su: add USB VID/PID for HWNUm-300
Steven Whitehouse (1):
GFS2: Fix up system xattrs
Surbhi Palande (1):
ext4: replace BUG() with return -EIO in ext4_ext_get_blocks
Sven Wegener (1):
ipvs: Add missing locking during connection table hashing and unhashing
Tao Ma (1):
ext4: Fix fencepost error in chosing choosing group vs file preallocation.
Theodore Ts'o (8):
ext4, jbd2: Add barriers for file systems with exernal journals
ext4: Patch up how we claim metadata blocks for quota purposes
ext4: Fix accounting of reserved metadata blocks
ext4: Calculate metadata requirements more accurately
ext4: Use bitops to read/modify EXT4_I(inode)->i_state
ext4: Issue the discard operation *before* releasing the blocks to be reused
ext4: Avoid crashing on NULL ptr dereference on a filesystem error
ext4: Clear the EXT4_EOFBLOCKS_FL flag only when warranted
Thomas Gleixner (1):
genirq: Deal with desc->set_type() changing desc->chip
Tim Gardner (1):
hostap: Protect against initialization interrupt
Tony Luck (1):
Fix spinaphore down_spin()
Toshiyuki Okajima (1):
ext4: make "offset" consistent in ext4_check_dir_entry()
Trond Myklebust (3):
NFSv4: Fix an embarassing typo in encode_attrs()
NFSv4: Ensure that /proc/self/mountinfo displays the minor version number
SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()
Vivek Natarajan (1):
ath9k: Avoid corrupt frames being forwarded to mac80211.
Will Deacon (1):
sched: Prevent compiler from optimising the sched_avg_update() loop
Yinghai Lu (1):
x86: Fix x2apic preenabled system with kexec
august huber (1):
USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c
Ömer Sezgin Ugurlu (1):
USB: option: add support for 1da5:4518
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .16 +EXTRAVERSION = .17 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/kernel/kprobes-decode.c +3 -2
@@ -583,13 +583,14 @@ static void __kprobes emulate_ldr(struct kprobe *p, struct pt_regs *regs) {insn_llret_3arg_fn_t *i_fn = (insn_llret_3arg_fn_t *)&p->ainsn.insn[0 ];kprobe_opcode_t insn = p->opcode; +long ppc = (long )p->addr +8 ;union reg_pair fnr;int rd = (insn >>12 ) &0xf ;int rn = (insn >>16 ) &0xf ;int rm = insn &0xf ;long rdv; -long rnv = regs->uregs[rn]; -long rmv = regs->uregs[rm];/* rm/rmv may be invalid, don't care. */ +long rnv = (rn ==15 ) ? ppc : regs->uregs[rn]; +long rmv = (rm ==15 ) ? ppc : regs->uregs[rm];long cpsr = regs->ARM_cpsr; fnr.dr =insnslot_llret_3arg_rflags (rnv,0 , rmv, cpsr, i_fn);
arch/arm/mach-omap2/board-rx51-peripherals.c +14 -3
@@ -37,6 +37,10 @@#define SYSTEM_REV_S_USES_VAUX3 0x8static int board_keymap[] = { +/* +* Note that KEY(x, 8, KEY_XXX) entries represent "entrire row +* connected to the ground" matrix state. +*/ KEY (0 ,0 ,KEY_Q ),KEY (0 ,1 ,KEY_O ),KEY (0 ,2 ,KEY_P ),
@@ -44,6 +48,7 @@ static int board_keymap[] = {KEY (0 ,4 ,KEY_BACKSPACE ),KEY (0 ,6 ,KEY_A ),KEY (0 ,7 ,KEY_S ), +KEY (1 ,0 ,KEY_W ),KEY (1 ,1 ,KEY_D ), KEY(1, 2, KEY_F),
@@ -52,6 +57,7 @@ static int board_keymap[] = {KEY (1 ,5 ,KEY_J ),KEY (1 ,6 ,KEY_K ),KEY (1 ,7 ,KEY_L ), +KEY (2 ,0 ,KEY_E ),KEY (2 ,1 ,KEY_DOT ), KEY(2, 2, KEY_UP),
@@ -59,6 +65,8 @@ static int board_keymap[] = {KEY (2 ,5 ,KEY_Z ),KEY (2 ,6 ,KEY_X ),KEY (2 ,7 ,KEY_C ), +KEY (2 ,8 ,KEY_F9 ), +KEY (3 ,0 ,KEY_R ),KEY (3 ,1 ,KEY_V ), KEY(3, 2, KEY_B),
@@ -67,20 +75,23 @@ static int board_keymap[] = {KEY (3 ,5 ,KEY_SPACE ),KEY (3 ,6 ,KEY_SPACE ),KEY (3 ,7 ,KEY_LEFT ), +KEY (4 ,0 ,KEY_T ),KEY (4 ,1 ,KEY_DOWN ),KEY (4 ,2 ,KEY_RIGHT ),KEY (4 ,4 ,KEY_LEFTCTRL ),KEY (4 ,5 ,KEY_RIGHTALT ),KEY (4 ,6 ,KEY_LEFTSHIFT ), +KEY (4 ,8 ,KEY_F10 ), +KEY (5 ,0 ,KEY_Y ), +KEY (5 ,8 ,KEY_F11 ), +KEY (6 ,0 ,KEY_U ), +KEY (7 ,0 ,KEY_I ),KEY (7 ,1 ,KEY_F7 ), KEY(7, 2, KEY_F8), -KEY (0xff ,2 ,KEY_F9 ), -KEY (0xff ,4 ,KEY_F10 ), - KEY(0xff, 5, KEY_F11), }; static struct matrix_keymap_data board_map_data = {
arch/arm/mach-realview/Kconfig +2 -0
@@ -18,6 +18,7 @@ config REALVIEW_EB_ARM11MP bool "Support ARM11MPCore tile" depends on MACH_REALVIEW_EB select CPU_V6 + select ARCH_HAS_BARRIERS if SMP help Enable support for the ARM11MPCore tile on the Realview platform.
@@ -35,6 +36,7 @@ config MACH_REALVIEW_PB11MP select CPU_V6 select ARM_GIC select HAVE_PATA_PLATFORM + select ARCH_HAS_BARRIERS if SMP help Include support for the ARM(R) RealView MPCore Platform Baseboard. PB11MPCore is a platform with an on-board ARM11MPCore and has
arch/arm/mach-realview/include/mach/barriers.h new file +8 -0
@@ -0,0 +1,8 @@ +/* +* Barriers redefined for RealView ARM11MPCore platforms with L220 cache +* controller to work around hardware errata causing the outer_sync() +* operation to deadlock the system. +*/ +#define mb () dsb() +#define rmb () dmb() +#define wmb () mb()
arch/ia64/mm/tlb.c +1 -1
@@ -120,7 +120,7 @@ static inline void down_spin(struct spinaphore *ss)ia64_invala ();for (;;) { - asmvolatile ("ld4.c.nc %0=[%1]" :"=r" (serve) :"r" (&ss->serve) :"memory" ); + asmvolatile ("ld8.c.nc %0=[%1]" :"=r" (serve) :"r" (&ss->serve) :"memory" );if (time_before (t, serve))return ;cpu_relax ();
arch/mips/include/asm/mipsregs.h +8 -1
@@ -135,6 +135,12 @@#define FPU_CSR_COND7 0x80000000/* $fcc7 */ /* +* Bits 18 - 20 of the FPU Status Register will be read as 0, +* and should be written as zero. +*/ +#define FPU_CSR_RSVD 0x001c0000 + +/* * X the exception cause indicator * E the exception enable * S the sticky/flag bit
@@ -161,7 +167,8 @@#define FPU_CSR_UDF_S 0x00000008#define FPU_CSR_INE_S 0x00000004 -/* rounding mode */ +/* Bits 0 and 1 of FPU Status Register specify the rounding mode */ +#define FPU_CSR_RM 0x00000003#define FPU_CSR_RN 0x0/* nearest */ #define FPU_CSR_RZ 0x1/* towards zero */ #define FPU_CSR_RU 0x2/* towards +Infinity */
arch/mips/math-emu/cp1emu.c +11 -4
@@ -75,6 +75,9 @@ struct mips_fpu_emulator_stats fpuemustats;#define FPCREG_RID 0/* $0 = revision id */ #define FPCREG_CSR 31/* $31 = csr */ +/* Determine rounding mode from the RM bits of the FCSR */ +#define modeindex (v) ((v) & FPU_CSR_RM) +/* Convert Mips rounding mode (0..3) to IEEE library modes. */ static const unsigned char ieee_rm[4 ] = { [FPU_CSR_RN ] =IEEE754_RN ,
@@ -381,10 +384,14 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx) (void *) (xcp->cp0_epc), MIPSInst_RT(ir), value);#endif - value &= (FPU_CSR_FLUSH |FPU_CSR_ALL_E |FPU_CSR_ALL_S |0x03 ); - ctx->fcr31 &= ~(FPU_CSR_FLUSH |FPU_CSR_ALL_E |FPU_CSR_ALL_S |0x03 ); -/* convert to ieee library modes */ - ctx->fcr31 |= (value & ~0x3 ) | ieee_rm[value &0x3 ]; + +/* +* Don't write reserved bits, +* and convert to ieee library modes +*/ + ctx->fcr31 = (value & + ~(FPU_CSR_RSVD |FPU_CSR_RM )) | + ieee_rm[modeindex (value)]; }if ((ctx->fcr31 >>5 ) & ctx->fcr31 &FPU_CSR_ALL_E ) {return SIGFPE ;
arch/sparc/include/asm/stat.h +2 -2
@@ -53,8 +53,8 @@ struct stat {ino_t st_ino;mode_t st_mode;short st_nlink; -uid16_t st_uid; -gid16_t st_gid; +unsigned short st_uid; +unsigned short st_gid;unsigned short st_rdev;off_t st_size;time_t st_atime;
arch/x86/include/asm/msr-index.h +1 -0
@@ -106,6 +106,7 @@#define MSR_AMD64_PATCH_LOADER 0xc0010020#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_DC_CFG 0xc0011022#define MSR_AMD64_IBSFETCHCTL 0xc0011030#define MSR_AMD64_IBSFETCHLINAD 0xc0011031#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032
arch/x86/include/asm/suspend_32.h +2 -0
@@ -15,6 +15,8 @@ static inline int arch_prepare_suspend(void) { return 0; }struct saved_context {u16 es, fs, gs, ss;unsigned long cr0, cr2, cr3, cr4; +u64 misc_enable; +bool misc_enable_saved;struct desc_ptr gdt;struct desc_ptr idt;u16 ldt;
arch/x86/include/asm/suspend_64.h +2 -0
@@ -27,6 +27,8 @@ struct saved_context {u16 ds, es, fs, gs, ss;unsigned long gs_base, gs_kernel_base, fs_base;unsigned long cr0, cr2, cr3, cr4, cr8; +u64 misc_enable; +bool misc_enable_saved;unsigned long efer;u16 gdt_pad;u16 gdt_limit;
arch/x86/include/asm/system.h +1 -1
@@ -449,7 +449,7 @@ void stop_this_cpu(void *dummy);* * (Could use an alternative three way for this if there was one.) */ -static inline void rdtsc_barrier (void ) +static __always_inline void rdtsc_barrier(void) {alternative (ASM_NOP3 ,"mfence" ,X86_FEATURE_MFENCE_RDTSC );alternative (ASM_NOP3 ,"lfence" ,X86_FEATURE_LFENCE_RDTSC );
arch/x86/kernel/acpi/cstate.c +9 -0
@@ -145,6 +145,15 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, percpu_entry->states[cx->index].eax = cx->address; percpu_entry->states[cx->index].ecx =MWAIT_ECX_INTERRUPT_BREAK ; } + +/* +* For _CST FFH on Intel, if GAS.access_size bit 1 is cleared, +* then we should skip checking BM_STS for this C-state. +* ref: "Intel Processor Vendor-Specific ACPI Interface Specification" +*/ +if ((c->x86_vendor ==X86_VENDOR_INTEL ) && !(reg->access_size &0x2 )) + cx->bm_sts_skip =1 ; +return retval; }EXPORT_SYMBOL_GPL (acpi_processor_ffh_cstate_probe);
arch/x86/kernel/acpi/sleep.c +0 -2
@@ -162,8 +162,6 @@ static int __init acpi_sleep_setup(char *str)#endif if (strncmp (str,"old_ordering" ,12 ) ==0 )acpi_old_suspend_ordering (); -if (strncmp (str,"sci_force_enable" ,16 ) ==0 ) -acpi_set_sci_en_on_resume (); str =strchr (str,',' );if (str !=NULL ) str +=strspn (str,", \t" );
arch/x86/kernel/apic/apic.c +1 -1
@@ -941,7 +941,7 @@ void disable_local_APIC(void)unsigned int value;/* APIC hasn't been mapped yet */ -if (!apic_phys) +if (!x2apic_mode && !apic_phys)return ;clear_local_APIC ();
arch/x86/kernel/hpet.c +1 -1
@@ -949,7 +949,7 @@ fs_initcall(hpet_late_init);void hpet_disable (void ) { -if (is_hpet_capable ()) { +if (is_hpet_capable () && hpet_virt_address) {unsigned long cfg =hpet_readl (HPET_CFG );if (hpet_legacy_int_enabled) {
arch/x86/kernel/pci-calgary_64.c +10 -7
@@ -102,11 +102,16 @@ int use_calgary __read_mostly = 0;#define PMR_SOFTSTOPFAULT 0x40000000#define PMR_HARDSTOP 0x20000000 -#define MAX_NUM_OF_PHBS 8/* how many PHBs in total? */ -#define MAX_NUM_CHASSIS 8/* max number of chassis */ -/* MAX_PHB_BUS_NUM is the maximal possible dev->bus->number */ -#define MAX_PHB_BUS_NUM (MAX_NUM_OF_PHBS * MAX_NUM_CHASSIS * 2) -#define PHBS_PER_CALGARY 4 +/* +* The maximum PHB bus number. +* x3950M2 (rare): 8 chassis, 48 PHBs per chassis = 384 +* x3950M2: 4 chassis, 48 PHBs per chassis = 192 +* x3950 (PCIE): 8 chassis, 32 PHBs per chassis = 256 +* x3950 (PCIX): 8 chassis, 16 PHBs per chassis = 128 +*/ +#define MAX_PHB_BUS_NUM 256 + +#define PHBS_PER_CALGARY 4/* register offsets in Calgary's internal register space */ static const unsigned long tar_offsets[] = {
@@ -1053,8 +1058,6 @@ static int __init calgary_init_one(struct pci_dev *dev)struct iommu_table *tbl;int ret; -BUG_ON (dev->bus->number >=MAX_PHB_BUS_NUM ); - bbar =busno_to_bbar (dev->bus->number); ret =calgary_setup_tar (dev, bbar);if (ret)
arch/x86/kvm/mmu.c +5 -0
@@ -1843,6 +1843,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, spte |=PT_WRITABLE_MASK ; +if (!tdp_enabled && !(pte_access &ACC_WRITE_MASK )) + spte &= ~PT_USER_MASK ; +/* * Optimization: for pte sync, if spte was writable the hash * lookup is unnecessary (and expensive). Write protection
@@ -1898,6 +1901,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, child =page_header (pte &PT64_BASE_ADDR_MASK );mmu_page_remove_parent_pte (child, sptep); +__set_spte (sptep, shadow_trap_nonpresent_pte); +kvm_flush_remote_tlbs (vcpu->kvm); }else if (pfn !=spte_to_pfn (*sptep)) {pgprintk ("hfn old %lx new %lx\n" ,spte_to_pfn (*sptep), pfn);
arch/x86/kvm/svm.c +97 -2
148 lines not on this page · raw message
arch/x86/power/cpu.c +4 -0
@@ -104,6 +104,8 @@ static void __save_processor_state(struct saved_context *ctxt) ctxt->cr4 =read_cr4 (); ctxt->cr8 =read_cr8 ();#endif + ctxt->misc_enable_saved = !rdmsrl_safe (MSR_IA32_MISC_ENABLE , + &ctxt->misc_enable); }/* Needed by apm.c */
@@ -176,6 +178,8 @@ static void fix_processor_context(void)*/ static void __restore_processor_state (struct saved_context *ctxt) { +if (ctxt->misc_enable_saved) +wrmsrl (MSR_IA32_MISC_ENABLE , ctxt->misc_enable);/* * control registers */
drivers/acpi/processor_idle.c +1 -1
@@ -962,7 +962,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,if (acpi_idle_suspend)return (acpi_idle_enter_c1 (dev, state)); -if (acpi_idle_bm_check ()) { +if (!cx->bm_sts_skip &&acpi_idle_bm_check ()) {if (dev->safe_state) { dev->last_state = dev->safe_state;return dev->safe_state->enter (dev, dev->safe_state);
drivers/acpi/sleep.c +2 -155
193 lines not on this page · raw message
drivers/base/firmware_class.c +20 -6
@@ -125,6 +125,17 @@ static ssize_t firmware_loading_show(struct device *dev,return sprintf (buf,"%d\n" , loading); } +static void firmware_free_data (const struct firmware *fw) +{ +int i; +vunmap (fw->data); +if (fw->pages) { +for (i =0 ; i <PFN_UP (fw->size); i++) +__free_page (fw->pages[i]); +kfree (fw->pages); + } +} +/* Some architectures don't have PAGE_KERNEL_RO */ #ifndef PAGE_KERNEL_RO #define PAGE_KERNEL_RO PAGE_KERNEL
@@ -157,21 +168,21 @@ static ssize_t firmware_loading_store(struct device *dev,mutex_unlock (&fw_lock);break ; } -vfree (fw_priv->fw->data); - fw_priv->fw->data =NULL ; +firmware_free_data (fw_priv->fw); +memset (fw_priv->fw,0 ,sizeof (struct firmware )); +/* If the pages are not owned by 'struct firmware' */ for (i =0 ; i < fw_priv->nr_pages; i++)__free_page (fw_priv->pages[i]);kfree (fw_priv->pages); fw_priv->pages =NULL ; fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ; - fw_priv->fw->size =0 ;set_bit (FW_STATUS_LOADING , &fw_priv->status);mutex_unlock (&fw_lock);break ;case 0 :if (test_bit (FW_STATUS_LOADING , &fw_priv->status)) { -vfree (fw_priv->fw->data); +vunmap (fw_priv->fw->data); fw_priv->fw->data =vmap (fw_priv->pages, fw_priv->nr_pages,0 ,PAGE_KERNEL_RO );
@@ -179,7 +190,10 @@ static ssize_t firmware_loading_store(struct device *dev,dev_err (dev,"%s: vmap() failed\n" , __func__); goto err; } -/* Pages will be freed by vfree() */ +/* Pages are now owned by 'struct firmware' */ + fw_priv->fw->pages = fw_priv->pages; + fw_priv->pages =NULL ; + fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ;complete (&fw_priv->completion);
@@ -572,7 +586,7 @@ release_firmware(const struct firmware *fw)if (fw->data == builtin->data) goto free_fw; } -vfree (fw->data); +firmware_free_data (fw); free_fw:kfree (fw); }
drivers/char/agp/amd64-agp.c +15 -12
@@ -499,6 +499,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,u8 cap_ptr;int err; +/* The Highlander principle */ +if (agp_bridges_found) +return -ENODEV ; + cap_ptr =pci_find_capability (pdev,PCI_CAP_ID_AGP );if (!cap_ptr)return -ENODEV ;
@@ -562,6 +566,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev) amd64_aperture_sizes[bridge->aperture_size_idx].size);agp_remove_bridge (bridge);agp_put_bridge (bridge); + + agp_bridges_found--; }#ifdef CONFIG_PM
@@ -709,6 +715,11 @@ static struct pci_device_id agp_amd64_pci_table[] = {MODULE_DEVICE_TABLE (pci, agp_amd64_pci_table); +static DEFINE_PCI_DEVICE_TABLE (agp_amd64_pci_promisc_table) = { + {PCI_DEVICE_CLASS (0 ,0 ) }, + { } +}; +static struct pci_driver agp_amd64_pci_driver = { .name ="agpgart-amd64" , .id_table = agp_amd64_pci_table,
@@ -733,7 +744,6 @@ int __init agp_amd64_init(void)return err;if (agp_bridges_found ==0 ) { -struct pci_dev *dev;if (!agp_try_unsupported && !agp_try_unsupported_boot) { printk(KERN_INFO PFX "No supported AGP bridge found.\n");#ifdef MODULE
@@ -749,17 +759,10 @@ int __init agp_amd64_init(void)return -ENODEV ;/* Look for any AGP bridge */ - dev =NULL ; - err = -ENODEV ; -for_each_pci_dev (dev) { -if (!pci_find_capability (dev,PCI_CAP_ID_AGP )) -continue ; -/* Only one bridge supported right now */ -if (agp_amd64_probe (dev,NULL ) ==0 ) { - err =0 ; -break ; - } - } + agp_amd64_pci_driver.id_table = agp_amd64_pci_promisc_table; + err =driver_attach (&agp_amd64_pci_driver.driver); +if (err ==0 && agp_bridges_found ==0 ) + err = -ENODEV ; }return err; }
drivers/char/tpm/tpm.h +1 -0
@@ -224,6 +224,7 @@ struct tpm_readpubek_params_out {u8 algorithm[4 ];u8 encscheme[2 ];u8 sigscheme[2 ]; +__be32 paramsize;u8 parameters[12 ];/*assuming RSA*/ __be32 keysize;u8 modulus[256 ];
drivers/char/tpm/tpm_tis.c +8 -1
@@ -622,7 +622,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)static int tpm_tis_pnp_resume (struct pnp_dev *dev) { -return tpm_pm_resume (&dev->dev); +struct tpm_chip *chip =pnp_get_drvdata (dev); +int ret; + + ret =tpm_pm_resume (&dev->dev); +if (!ret) +tpm_continue_selftest (chip); + +return ret; }static struct pnp_device_id tpm_pnp_tbl[]__devinitdata = {
drivers/cpufreq/cpufreq.c +1 -10
@@ -1741,17 +1741,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data,dprintk ("governor switch\n" );/* end old governor */ -if (data->governor) { -/* -* Need to release the rwsem around governor -* stop due to lock dependency between -* cancel_delayed_work_sync and the read lock -* taken in the delayed work handler. -*/ -unlock_policy_rwsem_write (data->cpu); +if (data->governor)__cpufreq_governor (data,CPUFREQ_GOV_STOP ); -lock_policy_rwsem_write (data->cpu); - }/* start new governor */ data->governor = policy->governor;
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -192,6 +192,7 @@ int i965_reset(struct drm_device *dev, u8 flags) } }else {DRM_ERROR ("Error occurred. Don't know how to reset this chip.\n" ); +mutex_unlock (&dev->struct_mutex);return -ENODEV ; }
drivers/gpu/drm/i915/i915_gem.c +10 -0
@@ -4697,6 +4697,16 @@ i915_gem_load(struct drm_device *dev)list_add (&dev_priv->mm.shrink_list, &shrink_list);spin_unlock (&shrink_list_lock); +/* On GEN3 we really need to make sure the ARB C3 LP bit is set */ +if (IS_I915G (dev) ||IS_I915GM (dev) ||IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) { +u32 tmp =I915_READ (MI_ARB_STATE ); +if (!(tmp &MI_ARB_C3_LP_WRITE_ENABLE )) { +/* arb state is a masked write, so set bit + bit in mask */ + tmp =MI_ARB_C3_LP_WRITE_ENABLE | (MI_ARB_C3_LP_WRITE_ENABLE <<MI_ARB_MASK_SHIFT ); +I915_WRITE (MI_ARB_STATE , tmp); + } + } +/* Old X drivers will take 0-2 for front, back, depth buffers */ dev_priv->fence_reg_start =3 ;
drivers/gpu/drm/i915/i915_reg.h +64 -0
70 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -785,8 +785,8 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,intel_clock_t clock;int max_n;bool found; -/* approximately equals target * 0.00488 */ -int err_most = (target >>8 ) + (target >>10 ); +/* approximately equals target * 0.00585 */ +int err_most = (target >>8 ) + (target >>9 ); found = false;if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {
drivers/gpu/drm/radeon/r200.c +2 -0
@@ -368,6 +368,8 @@ int r200_packet0_check(struct radeon_cs_parser *p,/* 2D, 3D, CUBE */ switch (tmp) {case 0 : +case 3 : +case 4 :case 5 :case 6 :case 7 :
drivers/gpu/drm/radeon/radeon_atombios.c +9 -0
@@ -161,6 +161,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, } } +/* ASUS HD 3600 board lists the DVI port as HDMI */ +if ((dev->pdev->device ==0x9598 ) && + (dev->pdev->subsystem_vendor ==0x1043 ) && + (dev->pdev->subsystem_device ==0x01e4 )) { +if (*connector_type ==DRM_MODE_CONNECTOR_HDMIA ) { + *connector_type =DRM_MODE_CONNECTOR_DVII ; + } + } +/* ASUS HD 3450 board lists the DVI port as HDMI */ if ((dev->pdev->device == 0x95C5) && (dev->pdev->subsystem_vendor == 0x1043) &&
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +1 -0
@@ -89,6 +89,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)udelay (panel_pwr_delay *1000 );WREG32 (RADEON_LVDS_GEN_CNTL , lvds_gen_cntl);WREG32_PLL (RADEON_PIXCLKS_CNTL , pixclks_cntl); +udelay (panel_pwr_delay *1000 );break ; }
drivers/hwmon/coretemp.c +30 -2
@@ -53,6 +53,7 @@ struct coretemp_data {struct mutex update_lock;const char *name;u32 id; +u16 core_id;char valid;/* zero until following fields are valid */ unsigned long last_updated;/* in jiffies */ int temp;
@@ -75,7 +76,7 @@ static ssize_t show_name(struct device *dev, struct device_attributeif (attr->index ==SHOW_NAME ) ret =sprintf (buf,"%s\n" , data->name);else /* show label */ - ret =sprintf (buf,"Core %d\n" , data->id); + ret =sprintf (buf,"Core %d\n" , data->core_id);return ret; }
@@ -255,6 +256,9 @@ static int __devinit coretemp_probe(struct platform_device *pdev) } data->id = pdev->id; +#ifdef CONFIG_SMP + data->core_id = c->cpu_core_id; +#endif data->name ="coretemp" ;mutex_init (&data->update_lock);
@@ -352,6 +356,10 @@ struct pdev_entry {struct list_head list;struct platform_device *pdev;unsigned int cpu; +#ifdef CONFIG_SMP +u16 phys_proc_id; +u16 cpu_core_id; +#endif };static LIST_HEAD (pdev_list);
@@ -362,6 +370,22 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)int err;struct platform_device *pdev;struct pdev_entry *pdev_entry; +#ifdef CONFIG_SMP +struct cpuinfo_x86 *c = &cpu_data (cpu); +#endif + +mutex_lock (&pdev_list_mutex); + +#ifdef CONFIG_SMP +/* Skip second HT entry of each core */ +list_for_each_entry (pdev_entry, &pdev_list, list) { +if (c->phys_proc_id == pdev_entry->phys_proc_id && + c->cpu_core_id == pdev_entry->cpu_core_id) { + err =0 ;/* Not an error */ + goto exit; + } + } +#endif pdev =platform_device_alloc (DRVNAME , cpu);if (!pdev) {
@@ -385,7 +409,10 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) pdev_entry->pdev = pdev; pdev_entry->cpu = cpu; -mutex_lock (&pdev_list_mutex); +#ifdef CONFIG_SMP + pdev_entry->phys_proc_id = c->phys_proc_id; + pdev_entry->cpu_core_id = c->cpu_core_id; +#endif list_add_tail (&pdev_entry->list, &pdev_list);mutex_unlock (&pdev_list_mutex);
@@ -396,6 +423,7 @@ exit_device_free: exit_device_put:platform_device_put (pdev); exit: +mutex_unlock (&pdev_list_mutex);return err; }
drivers/hwmon/it87.c +22 -0
@@ -80,6 +80,13 @@ superio_inb(int reg)return inb (VAL ); } +static inline void +superio_outb (int reg,int val) +{ +outb (reg,REG ); +outb (val,VAL ); +} +static int superio_inw (int reg) {int val;
@@ -1036,6 +1043,21 @@ static int __init it87_find(unsigned short *address, sio_data->vid_value =superio_inb (IT87_SIO_VID_REG ); reg =superio_inb (IT87_SIO_PINX2_REG ); +/* +* The IT8720F has no VIN7 pin, so VCCH should always be +* routed internally to VIN7 with an internal divider. +* Curiously, there still is a configuration bit to control +* this, which means it can be set incorrectly. And even +* more curiously, many boards out there are improperly +* configured, even though the IT8720F datasheet claims +* that the internal routing of VCCH to VIN7 is the default +* setting. So we force the internal routing in this case. +*/ +if (sio_data->type == it8720 && !(reg & (1 <<1 ))) { + reg |= (1 <<1 ); +superio_outb (IT87_SIO_PINX2_REG , reg); +pr_notice ("it87: Routing internal VCCH to in7\n" ); + }if (reg & (1 <<0 ))pr_info ("it87: in3 is VCC (+5V)\n" );if (reg & (1 <<1 ))
drivers/hwmon/k8temp.c +7 -5
@@ -120,7 +120,7 @@ static ssize_t show_temp(struct device *dev,int temp;struct k8temp_data *data =k8temp_update_device (dev); -if (data->swap_core_select) +if (data->swap_core_select && (data->sensorsp &SEL_CORE )) core = core ?0 :1 ; temp =TEMP_FROM_REG (data->temp[core][place]) + data->temp_offset;
@@ -180,11 +180,13 @@ static int __devinit k8temp_probe(struct pci_dev *pdev, }if ((model >=0x69 ) && - !(model ==0xc1 || model ==0x6c || model ==0x7c )) { + !(model ==0xc1 || model ==0x6c || model ==0x7c || + model ==0x6b || model ==0x6f || model ==0x7f )) {/* -* RevG desktop CPUs (i.e. no socket S1G1 parts) -* need additional offset, otherwise reported -* temperature is below ambient temperature +* RevG desktop CPUs (i.e. no socket S1G1 or +* ASB1 parts) need additional offset, +* otherwise reported temperature is below +* ambient temperature */ data->temp_offset =21000 ; }
drivers/ide/cmd640.c +2 -4
@@ -632,12 +632,10 @@ static void cmd640_init_dev(ide_drive_t *drive)static int cmd640_test_irq (ide_hwif_t *hwif) { -struct pci_dev *dev =to_pci_dev (hwif->dev);int irq_reg = hwif->channel ?ARTTIM23 :CFR ; -u8 irq_stat, irq_mask = hwif->channel ?ARTTIM23_IDE23INTR : +u8 irq_mask = hwif->channel ?ARTTIM23_IDE23INTR :CFR_IDE01INTR ; - -pci_read_config_byte (dev, irq_reg, &irq_stat); +u8 irq_stat =get_cmd640_reg (irq_reg);return (irq_stat & irq_mask) ?1 :0 ; }
drivers/ide/ide-taskfile.c +2 -4
@@ -428,13 +428,11 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, {struct request *rq;int error; +int rw = !(cmd->tf_flags &IDE_TFLAG_WRITE ) ?READ :WRITE ; - rq =blk_get_request (drive->queue,READ , __GFP_WAIT); + rq =blk_get_request (drive->queue, rw, __GFP_WAIT); rq->cmd_type =REQ_TYPE_ATA_TASKFILE ; -if (cmd->tf_flags &IDE_TFLAG_WRITE ) - rq->cmd_flags |=REQ_RW ; -/* * (ks) We transfer currently only whole sectors. * This is suffient for now. But, it would be great,
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -2
@@ -1163,7 +1163,7 @@ static ssize_t create_child(struct device *dev,return ret ? ret : count; } -static DEVICE_ATTR(create_child, S_IWUGO, NULL, create_child); +static DEVICE_ATTR(create_child, S_IWUSR, NULL, create_child); static ssize_t delete_child(struct device *dev, struct device_attribute *attr,
@@ -1183,7 +1183,7 @@ static ssize_t delete_child(struct device *dev,return ret ? ret : count; } -static DEVICE_ATTR(delete_child, S_IWUGO, NULL, delete_child); +static DEVICE_ATTR(delete_child, S_IWUSR, NULL, delete_child);int ipoib_add_pkey_attr (struct net_device *dev) {
drivers/input/keyboard/twl4030_keypad.c +11 -6
@@ -50,8 +50,12 @@*/ #define TWL4030_MAX_ROWS 8/* TWL4030 hard limit */ #define TWL4030_MAX_COLS 8 -#define TWL4030_ROW_SHIFT 3 -#define TWL4030_KEYMAP_SIZE (TWL4030_MAX_ROWS * TWL4030_MAX_COLS) +/* +* Note that we add space for an extra column so that we can handle +* row lines connected to the gnd (see twl4030_col_xlate()). +*/ +#define TWL4030_ROW_SHIFT 4 +#define TWL4030_KEYMAP_SIZE (TWL4030_MAX_ROWS << TWL4030_ROW_SHIFT)struct twl4030_keypad {unsigned short keymap[TWL4030_KEYMAP_SIZE ];
@@ -181,7 +185,7 @@ static int twl4030_read_kp_matrix_state(struct twl4030_keypad *kp, u16 *state)return ret; } -static int twl4030_is_in_ghost_state (struct twl4030_keypad *kp,u16 *key_state) +static bool twl4030_is_in_ghost_state (struct twl4030_keypad *kp,u16 *key_state) {int i;u16 check =0 ;
@@ -190,12 +194,12 @@ static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)u16 col = key_state[i];if ((col & check) &&hweight16 (col) >1 ) -return 1 ; +return true; check |= col; } -return 0 ; +return false; }static void twl4030_kp_scan (struct twl4030_keypad *kp,bool release_all)
@@ -224,7 +228,8 @@ static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all)if (!changed)continue ; -for (col =0 ; col < kp->n_cols; col++) { +/* Extra column handles "all gnd" rows */ +for (col =0 ; col < kp->n_cols +1 ; col++) {int code;if (!(changed & (1 << col)))
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -166,6 +166,13 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { }, }, { +/* Gigabyte Spring Peak - defines wrong chassis type */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"), + }, + }, + { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
drivers/media/dvb/dvb-core/dvb_net.c +11 -1
@@ -350,6 +350,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )const u8 *ts, *ts_end, *from_where =NULL ;u8 ts_remain =0 , how_much =0 , new_ts =1 ;struct ethhdr *ethh =NULL ; +bool error = false;#ifdef ULE_DEBUG /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */
@@ -459,10 +460,16 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )/* Drop partly decoded SNDU, reset state, resync on PUSI. */ if (priv->ule_skb) { -dev_kfree_skb ( priv->ule_skb ); + error = true; +dev_kfree_skb (priv->ule_skb); + } + +if (error || priv->ule_sndu_remain) { dev->stats.rx_errors++; dev->stats.rx_frame_errors++; + error = false; } +reset_ule (priv); priv->need_pusi =1 ;continue ;
@@ -534,6 +541,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) from_where +=2 ; } + priv->ule_sndu_remain = priv->ule_sndu_len +2 ;/* * State of current TS: * ts_remain (remaining bytes in the current TS cell)
@@ -543,6 +551,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )*/ switch (ts_remain) {case 1 : + priv->ule_sndu_remain--; priv->ule_sndu_type = from_where[0 ] <<8 ; priv->ule_sndu_type_1 =1 ;/* first byte of ule_type is set. */ ts_remain -=1 ; from_where +=1 ;
@@ -556,6 +565,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )default :/* complete ULE header is present in current TS. */ /* Extract ULE type field. */ if (priv->ule_sndu_type_1) { + priv->ule_sndu_type_1 =0 ; priv->ule_sndu_type |= from_where[0 ]; from_where +=1 ;/* points to payload start. */ ts_remain -=1 ;
drivers/media/dvb/ttpci/Kconfig +3 -2
@@ -68,13 +68,14 @@ config DVB_BUDGET select DVB_VES1820 if !DVB_FE_CUSTOMISE select DVB_L64781 if !DVB_FE_CUSTOMISE select DVB_TDA8083 if !DVB_FE_CUSTOMISE - select DVB_TDA10021 if !DVB_FE_CUSTOMISE - select DVB_TDA10023 if !DVB_FE_CUSTOMISE select DVB_S5H1420 if !DVB_FE_CUSTOMISE select DVB_TDA10086 if !DVB_FE_CUSTOMISE select DVB_TDA826X if !DVB_FE_CUSTOMISE select DVB_LNBP21 if !DVB_FE_CUSTOMISE select DVB_TDA1004X if !DVB_FE_CUSTOMISE + select DVB_ISL6423 if !DVB_FE_CUSTOMISE + select DVB_STV090x if !DVB_FE_CUSTOMISE + select DVB_STV6110x if !DVB_FE_CUSTOMISE help Support for simple SAA7146 based DVB cards (so called Budget- or Nova-PCI cards) without onboard MPEG2 decoder, and without
drivers/media/video/cx23885/cx23885-i2c.c +11 -1
@@ -365,7 +365,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)memset (&info,0 ,sizeof (struct i2c_board_info ));strlcpy (info.type,"ir_video" ,I2C_NAME_SIZE ); -i2c_new_probed_device (&bus->i2c_adap, &info, addr_list); +/* +* We can't call i2c_new_probed_device() because it uses +* quick writes for probing and the IR receiver device only +* replies to reads. +*/ +if (i2c_smbus_xfer (&bus->i2c_adap, addr_list[0 ],0 , +I2C_SMBUS_READ ,0 ,I2C_SMBUS_QUICK , +NULL ) >=0 ) { + info.addr = addr_list[0 ]; +i2c_new_device (&bus->i2c_adap, &info); + } }return bus->i2c_rc;
drivers/media/video/cx88/cx88-i2c.c +15 -1
@@ -188,10 +188,24 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)0x18 ,0x6b ,0x71 , I2C_CLIENT_END }; +const unsigned short *addrp;memset (&info,0 ,sizeof (struct i2c_board_info ));strlcpy (info.type,"ir_video" ,I2C_NAME_SIZE ); -i2c_new_probed_device (&core->i2c_adap, &info, addr_list); +/* +* We can't call i2c_new_probed_device() because it uses +* quick writes for probing and at least some R receiver +* devices only reply to reads. +*/ +for (addrp = addr_list; *addrp !=I2C_CLIENT_END ; addrp++) { +if (i2c_smbus_xfer (&core->i2c_adap, *addrp,0 , +I2C_SMBUS_READ ,0 , +I2C_SMBUS_QUICK ,NULL ) >=0 ) { + info.addr = *addrp; +i2c_new_device (&core->i2c_adap, &info); +break ; + } + } }return core->i2c_rc; }
drivers/media/video/uvc/uvc_driver.c +29 -1
@@ -58,6 +58,11 @@ static struct uvc_format_desc uvc_fmts[] = { .fcc = V4L2_PIX_FMT_YUYV, }, { + .name = "YUV 4:2:2 (YUYV)", + .guid = UVC_GUID_FORMAT_YUY2_ISIGHT, + .fcc = V4L2_PIX_FMT_YUYV, + }, + { .name = "YUV 4:2:0 (NV12)", .guid = UVC_GUID_FORMAT_NV12, .fcc = V4L2_PIX_FMT_NV12,
@@ -83,11 +88,16 @@ static struct uvc_format_desc uvc_fmts[] = { .fcc = V4L2_PIX_FMT_UYVY, }, { - .name = "Greyscale", + .name = "Greyscale (8-bit)", .guid = UVC_GUID_FORMAT_Y800, .fcc = V4L2_PIX_FMT_GREY, }, { + .name = "Greyscale (16-bit)", + .guid = UVC_GUID_FORMAT_Y16, + .fcc = V4L2_PIX_FMT_Y16, + }, + { .name = "RGB Bayer", .guid = UVC_GUID_FORMAT_BY8, .fcc = V4L2_PIX_FMT_SBGGR8,
@@ -2048,6 +2058,15 @@ static struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_STREAM_NO_FID }, +/* Syntek (Packard Bell EasyNote MX52 */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x174f, + .idProduct = 0x8a12, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_QUIRK_STREAM_NO_FID }, /* Syntek (Asus F9SG) */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2112,6 +2131,15 @@ static struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_PROBE_MINMAX }, +/* Arkmicro unbranded */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x18ec, + .idProduct = 0x3290, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_QUIRK_PROBE_DEF }, /* Bodelin ProScopeHR */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |USB_DEVICE_ID_MATCH_DEV_HI
drivers/media/video/uvc/uvcvideo.h +6 -1
@@ -112,6 +112,9 @@ struct uvc_xu_control {#define UVC_GUID_FORMAT_YUY2 \ { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_YUY2_ISIGHT \ + { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0x9b, 0x71}#define UVC_GUID_FORMAT_NV12 \ { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
@@ -127,11 +130,13 @@ struct uvc_xu_control {#define UVC_GUID_FORMAT_Y800 \ { 'Y', '8', '0', '0', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_Y16 \ + { 'Y', '1', '6', ' ', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}#define UVC_GUID_FORMAT_BY8 \ { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} -/* ------------------------------------------------------------------------ * Driver specific constants. */
drivers/mmc/host/sdhci-s3c.c +20 -0
@@ -372,6 +372,26 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) static int __devexit sdhci_s3c_remove(struct platform_device *pdev) { +struct sdhci_host *host =platform_get_drvdata (pdev); +struct sdhci_s3c *sc =sdhci_priv (host); +int ptr; + +sdhci_remove_host (host,1 ); + +for (ptr =0 ; ptr <3 ; ptr++) { +clk_disable (sc->clk_bus[ptr]); +clk_put (sc->clk_bus[ptr]); + } +clk_disable (sc->clk_io); +clk_put (sc->clk_io); + +iounmap (host->ioaddr); +release_resource (sc->ioarea); +kfree (sc->ioarea); + +sdhci_free_host (host); +platform_set_drvdata (pdev,NULL ); +return 0 ; }
drivers/net/cpmac.c +2 -1
@@ -1176,7 +1176,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)if (netif_msg_drv (priv))printk (KERN_ERR "%s: Could not attach to PHY\n" , dev->name); -return PTR_ERR (priv->phy); + rc =PTR_ERR (priv->phy); + goto fail; }if ((rc =register_netdev (dev))) {
drivers/net/cxgb3/ael1002.c +1 -1
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = {int t3_xaui_direct_phy_prep (struct cphy *phy,struct adapter *adapter,int phy_addr,const struct mdio_ops *mdio_ops) { -cphy_init (phy, adapter,MDIO_PRTAD_NONE , &xaui_direct_ops, mdio_ops, +cphy_init (phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops, SUPPORTED_10000baseT_Full |SUPPORTED_AUI |SUPPORTED_TP ,"10GBASE-CX4" );return 0 ;
drivers/net/dm9000.c +27 -11
@@ -471,17 +471,13 @@ static uint32_t dm9000_get_rx_csum(struct net_device *dev)return dm->rx_csum; } -static int dm9000_set_rx_csum (struct net_device *dev,uint32_t data) +static int dm9000_set_rx_csum_unlocked (struct net_device *dev,uint32_t data) {board_info_t *dm =to_dm9000_board (dev); -unsigned long flags;if (dm->can_csum) { dm->rx_csum = data; - -spin_lock_irqsave (&dm->lock, flags);iow (dm,DM9000_RCSR , dm->rx_csum ?RCSR_CSUM :0 ); -spin_unlock_irqrestore (&dm->lock, flags);return 0 ; }
@@ -489,6 +485,19 @@ static int dm9000_set_rx_csum(struct net_device *dev, uint32_t data)return -EOPNOTSUPP ; } +static int dm9000_set_rx_csum (struct net_device *dev,uint32_t data) +{ +board_info_t *dm =to_dm9000_board (dev); +unsigned long flags; +int ret; + +spin_lock_irqsave (&dm->lock, flags); + ret =dm9000_set_rx_csum_unlocked (dev, data); +spin_unlock_irqrestore (&dm->lock, flags); + +return ret; +} +static int dm9000_set_tx_csum (struct net_device *dev,uint32_t data) {board_info_t *dm =to_dm9000_board (dev);
@@ -667,7 +676,7 @@ static unsigned char dm9000_type_to_char(enum dm9000_type type)* Set DM9000 multicast address */ static void -dm9000_hash_table (struct net_device *dev) +dm9000_hash_table_unlocked (struct net_device *dev) {board_info_t *db =netdev_priv (dev);struct dev_mc_list *mcptr = dev->mc_list;
@@ -676,12 +685,9 @@ dm9000_hash_table(struct net_device *dev)u32 hash_val;u16 hash_table[4 ];u8 rcr =RCR_DIS_LONG |RCR_DIS_CRC |RCR_RXEN ; -unsigned long flags;dm9000_dbg (db,1 ,"entering %s\n" , __func__); -spin_lock_irqsave (&db->lock, flags); -for (i =0 , oft =DM9000_PAR ; i <6 ; i++, oft++)iow (db, oft, dev->dev_addr[i]);
@@ -711,6 +717,16 @@ dm9000_hash_table(struct net_device *dev) }iow (db,DM9000_RCR , rcr); +} + +static void +dm9000_hash_table (struct net_device *dev) +{ +board_info_t *db =netdev_priv (dev); +unsigned long flags; + +spin_lock_irqsave (&db->lock, flags); +dm9000_hash_table_unlocked (dev);spin_unlock_irqrestore (&db->lock, flags); }
@@ -729,7 +745,7 @@ dm9000_init_dm9000(struct net_device *dev) db->io_mode =ior (db,DM9000_ISR ) >>6 ;/* ISR bit7:6 keeps I/O mode */ /* Checksum mode */ -dm9000_set_rx_csum (dev, db->rx_csum); +dm9000_set_rx_csum_unlocked (dev, db->rx_csum);/* GPIO0 on pre-activate PHY */ iow (db,DM9000_GPR ,0 );/* REG_1F bit0 activate phyxcer */
@@ -749,7 +765,7 @@ dm9000_init_dm9000(struct net_device *dev)iow (db,DM9000_ISR ,ISR_CLR_STATUS );/* Clear interrupt status */ /* Set address filter table */ -dm9000_hash_table (dev); +dm9000_hash_table_unlocked (dev); imr =IMR_PAR |IMR_PTM |IMR_PRM ;if (db->type !=TYPE_DM9000E )
drivers/net/forcedeth.c +1 -1
@@ -5900,7 +5900,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i/* Limit the number of tx's outstanding for hw bug */ if (id->driver_data &DEV_NEED_TX_LIMIT ) { np->tx_limit =1 ; -if ((id->driver_data &DEV_NEED_TX_LIMIT2 ) && +if (((id->driver_data &DEV_NEED_TX_LIMIT2 ) ==DEV_NEED_TX_LIMIT2 ) && pci_dev->revision >=0xA2 ) np->tx_limit =0 ; }
drivers/net/igb/e1000_82575.c +11 -2
@@ -1168,9 +1168,18 @@ static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) {s32 ret_val =0 ; -if (igb_check_alt_mac_addr (hw)) - ret_val =igb_read_mac_addr (hw); +/* +* If there's an alternate MAC address place it in RAR0 +* so that it will override the Si installed default perm +* address. +*/ + ret_val =igb_check_alt_mac_addr (hw); +if (ret_val) + goto out; + + ret_val =igb_read_mac_addr (hw); +out:return ret_val; }
drivers/net/igb/e1000_hw.h +2 -0
@@ -53,6 +53,8 @@ struct e1000_hw;#define E1000_FUNC_1 1 +#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1 3 +enum e1000_mac_type { e1000_undefined =0 , e1000_82575,
drivers/net/igb/e1000_mac.c +9 -8
@@ -185,13 +185,12 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) }if (nvm_alt_mac_addr_offset ==0xFFFF ) { - ret_val = -(E1000_NOT_IMPLEMENTED ); +/* There is no Alternate MAC Address */ goto out; }if (hw->bus.func ==E1000_FUNC_1 ) - nvm_alt_mac_addr_offset +=ETH_ALEN /sizeof (u16); - + nvm_alt_mac_addr_offset +=E1000_ALT_MAC_ADDRESS_OFFSET_LAN1 ;for (i =0 ; i <ETH_ALEN ; i +=2 ) { offset = nvm_alt_mac_addr_offset + (i >>1 ); ret_val = hw->nvm.ops.read (hw, offset,1 , &nvm_data);
@@ -206,14 +205,16 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw)/* if multicast bit is set, the alternate address will not be used */ if (alt_mac_addr[0 ] &0x01 ) { - ret_val = -(E1000_NOT_IMPLEMENTED ); +hw_dbg ("Ignoring Alternate Mac Address with MC bit set\n" ); goto out; } -for (i =0 ; i <ETH_ALEN ; i++) - hw->mac.addr[i] = hw->mac.perm_addr[i] = alt_mac_addr[i]; - - hw->mac.ops.rar_set (hw, hw->mac.perm_addr,0 ); +/* +* We have a valid alternate MAC address, and we want to treat it the +* same as the normal permanent MAC address stored by the HW into the +* RAR. Do this by mapping this address into RAR0. +*/ + hw->mac.ops.rar_set (hw, alt_mac_addr,0 ); out:return ret_val;
drivers/net/sky2.c +14 -5
@@ -704,11 +704,24 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)sky2_write8 (hw,B2_TST_CTRL1 ,TST_CFG_WRITE_OFF ); } +/* Enable Rx/Tx */ +static void sky2_enable_rx_tx (struct sky2_port *sky2) +{ +struct sky2_hw *hw = sky2->hw; +unsigned port = sky2->port; +u16 reg; + + reg =gma_read16 (hw, port,GM_GP_CTRL ); + reg |=GM_GPCR_RX_ENA |GM_GPCR_TX_ENA ; +gma_write16 (hw, port,GM_GP_CTRL , reg); +} +/* Force a renegotiation */ static void sky2_phy_reinit (struct sky2_port *sky2) {spin_lock_bh (&sky2->phy_lock);sky2_phy_init (sky2->hw, sky2->port); +sky2_enable_rx_tx (sky2);spin_unlock_bh (&sky2->phy_lock); }
@@ -1929,7 +1942,6 @@ static void sky2_link_up(struct sky2_port *sky2) {struct sky2_hw *hw = sky2->hw;unsigned port = sky2->port; -u16 reg;static const char *fc_name[] = { [FC_NONE ] ="none" , [FC_TX ] ="tx" ,
@@ -1937,10 +1949,7 @@ static void sky2_link_up(struct sky2_port *sky2) [FC_BOTH ] ="both" , }; -/* enable Rx/Tx */ - reg =gma_read16 (hw, port,GM_GP_CTRL ); - reg |=GM_GPCR_RX_ENA |GM_GPCR_TX_ENA ; -gma_write16 (hw, port,GM_GP_CTRL , reg); +sky2_enable_rx_tx (sky2);gm_phy_write (hw, port,PHY_MARV_INT_MASK ,PHY_M_DEF_MSK );
drivers/net/wireless/ath/ath5k/attach.c +1 -0
@@ -133,6 +133,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc) ah->ah_cw_min =AR5K_TUNE_CWMIN ; ah->ah_limit_tx_retries =AR5K_INIT_TX_RETRY ; ah->ah_software_retry = false; + ah->ah_current_channel = &sc->channels[0 ];/* * Find the mac version
drivers/net/wireless/ath/ath5k/base.c +2 -5
@@ -1818,11 +1818,6 @@ ath5k_tasklet_rx(unsigned long data)return ; } -if (unlikely (rs.rs_more)) { -ATH5K_WARN (sc,"unsupported jumbo\n" ); - goto next; - } -if (unlikely (rs.rs_status)) {if (rs.rs_status &AR5K_RXERR_PHY ) goto next;
@@ -1852,6 +1847,8 @@ ath5k_tasklet_rx(unsigned long data) sc->opmode != NL80211_IFTYPE_MONITOR) goto next; } +if (unlikely (rs.rs_more)) + goto next; accept: next_skb =ath5k_rx_skb_alloc (sc, &next_skb_addr);
drivers/net/wireless/ath/ath9k/initvals.h +4 -4
@@ -2762,7 +2762,7 @@ static const u32 ar9280Common_9280_2[][2] = { { 0x00008258, 0x00000000 }, { 0x0000825c, 0x400000ff }, { 0x00008260, 0x00080922 }, - { 0x00008264, 0xa8a00010 }, + { 0x00008264, 0x88a00010 }, { 0x00008270, 0x00000000 }, { 0x00008274, 0x40000000 }, { 0x00008278, 0x003e4180 },
@@ -3935,7 +3935,7 @@ static const u_int32_t ar9285Common_9285[][2] = { { 0x00008258, 0x00000000 }, { 0x0000825c, 0x400000ff }, { 0x00008260, 0x00080922 }, - { 0x00008264, 0xa8a00010 }, + { 0x00008264, 0x88a00010 }, { 0x00008270, 0x00000000 }, { 0x00008274, 0x40000000 }, { 0x00008278, 0x003e4180 },
@@ -5072,7 +5072,7 @@ static const u_int32_t ar9287Common_9287_1_0[][2] = { { 0x00008258, 0x00000000 }, { 0x0000825c, 0x400000ff }, { 0x00008260, 0x00080922 }, - { 0x00008264, 0xa8a00010 }, + { 0x00008264, 0x88a00010 }, { 0x00008270, 0x00000000 }, { 0x00008274, 0x40000000 }, { 0x00008278, 0x003e4180 },
@@ -6864,7 +6864,7 @@ static const u_int32_t ar9271Common_9271_1_0[][2] = { { 0x00008258, 0x00000000 }, { 0x0000825c, 0x400000ff }, { 0x00008260, 0x00080922 }, - { 0x00008264, 0xa8a00010 }, + { 0x00008264, 0x88a00010 }, { 0x00008270, 0x00000000 }, { 0x00008274, 0x40000000 }, { 0x00008278, 0x003e4180 },
drivers/net/wireless/ath/ath9k/main.c +6 -1
@@ -1538,6 +1538,8 @@ bad_no_ah:void ath_set_hw_capab (struct ath_softc *sc,struct ieee80211_hw *hw) { +struct ath_hw *ah = sc->sc_ah; + hw->flags =IEEE80211_HW_RX_INCLUDES_FCS |IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | IEEE80211_HW_SIGNAL_DBM |
@@ -1558,7 +1560,10 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_MESH_POINT ); - hw->wiphy->ps_default = false; +if (AR_SREV_5416 (ah)) + hw->wiphy->ps_default = false; +else + hw->wiphy->ps_default = true; hw->queues =4 ; hw->max_rates =4 ;
drivers/net/wireless/hostap/hostap_cs.c +10 -0
@@ -626,6 +626,7 @@ static int prism2_config(struct pcmcia_device *link)int ret =1 ;int last_fn, last_ret;struct hostap_cs_priv *hw_priv; +unsigned long flags;PDEBUG (DEBUG_FLOW ,"prism2_config()\n" );
@@ -661,6 +662,12 @@ static int prism2_config(struct pcmcia_device *link) link->dev_node = &hw_priv->node;/* +* Make sure the IRQ handler cannot proceed until at least +* dev->base_addr is initialized. +*/ +spin_lock_irqsave (&local->irq_init_lock, flags); + +/* * Allocate an interrupt line. Note that this does not assign a * handler to the interrupt, unless the 'Handler' member of the * irq structure is initialized.
@@ -686,6 +693,8 @@ static int prism2_config(struct pcmcia_device *link) dev->irq = link->irq.AssignedIRQ; dev->base_addr = link->io.BasePort1; +spin_unlock_irqrestore (&local->irq_init_lock, flags); +/* Finally, report what we've done */ printk (KERN_INFO "%s: index 0x%02x: " , dev_info, link->conf.ConfigIndex);
@@ -715,6 +724,7 @@ static int prism2_config(struct pcmcia_device *link)return ret; cs_failed: +spin_unlock_irqrestore (&local->irq_init_lock, flags);cs_error (link, last_fn, last_ret); failed:
drivers/net/wireless/hostap/hostap_hw.c +13 -0
@@ -2621,6 +2621,18 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) iface =netdev_priv (dev); local = iface->local; +/* Detect early interrupt before driver is fully configued */ +spin_lock (&local->irq_init_lock); +if (!dev->base_addr) { +if (net_ratelimit ()) { +printk (KERN_DEBUG "%s: Interrupt, but dev not configured\n" , + dev->name); + } +spin_unlock (&local->irq_init_lock); +return IRQ_HANDLED ; + } +spin_unlock (&local->irq_init_lock); +prism2_io_debug_add (dev,PRISM2_IO_DEBUG_CMD_INTERRUPT ,0 ,0 );if (local->func->card_present && !local->func->card_present (local)) {
@@ -3138,6 +3150,7 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,spin_lock_init (&local->cmdlock);spin_lock_init (&local->baplock);spin_lock_init (&local->lock); +spin_lock_init (&local->irq_init_lock);mutex_init (&local->rid_bap_mtx);if (card_idx <0 || card_idx >=MAX_PARM_DEVICES )
drivers/net/wireless/hostap/hostap_wlan.h +1 -1
@@ -654,7 +654,7 @@ struct local_info {rwlock_t iface_lock;/* hostap_interfaces read lock; use write lock * when removing entries from the list. * TX and RX paths can use read lock. */ -spinlock_t cmdlock, baplock, lock; +spinlock_t cmdlock, baplock, lock, irq_init_lock;struct mutex rid_bap_mtx;u16 infofid;/* MAC buffer id for info frame */ /* txfid, intransmitfid, next_txtid, and next_alloc are protected by
drivers/net/wireless/iwlwifi/iwl-scan.c +1 -0
@@ -799,6 +799,7 @@ void iwl_bg_abort_scan(struct work_struct *work)mutex_lock (&priv->mutex); +cancel_delayed_work_sync (&priv->scan_check);set_bit (STATUS_SCAN_ABORTING , &priv->status);iwl_send_scan_abort (priv);
drivers/net/wireless/iwlwifi/iwl-tx.c +5 -0
@@ -1479,6 +1479,11 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, sta_id = ba_resp->sta_id; tid = ba_resp->tid; agg = &priv->stations[sta_id].tid[tid].agg; +if (unlikely (agg->txq_id != scd_flow)) { +IWL_ERR (priv,"BA scd_flow %d does not match txq_id %d\n" , + scd_flow, agg->txq_id); +return ; + }/* Find index just before block-ack window */ index =iwl_queue_dec_wrap (ba_resp_scd_ssn &0xff , txq->q.n_bd);
drivers/net/wireless/libertas/if_sdio.c +22 -0
@@ -34,6 +34,8 @@#include <linux/mmc/card.h> #include <linux/mmc/sdio_func.h> #include <linux/mmc/sdio_ids.h> +#include <linux/mmc/sdio.h> +#include <linux/mmc/host.h> #include "host.h" #include "decl.h"
@@ -883,6 +885,7 @@ static int if_sdio_probe(struct sdio_func *func,int ret, i;unsigned int model;struct if_sdio_packet *packet; +struct mmc_host *host = func->card->host;lbs_deb_enter (LBS_DEB_SDIO );
@@ -963,6 +966,25 @@ static int if_sdio_probe(struct sdio_func *func,if (ret) goto disable; +/* For 1-bit transfers to the 8686 model, we need to enable the +* interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 +* bit to allow access to non-vendor registers. */ +if ((card->model ==IF_SDIO_MODEL_8686 ) && + (host->caps &MMC_CAP_SDIO_IRQ ) && + (host->ios.bus_width ==MMC_BUS_WIDTH_1 )) { +u8 reg; + + func->card->quirks |=MMC_QUIRK_LENIENT_FN0 ; + reg =sdio_f0_readb (func,SDIO_CCCR_IF , &ret); +if (ret) + goto release_int; + + reg |=SDIO_BUS_ECSI ; +sdio_f0_writeb (func, reg,SDIO_CCCR_IF , &ret); +if (ret) + goto release_int; + } + card->ioport =sdio_readb (func,IF_SDIO_IOPORT , &ret);if (ret) goto release_int;
drivers/net/wireless/p54/p54pci.c +2 -0
@@ -40,6 +40,8 @@ static struct pci_device_id p54p_table[] __devinitdata = { { PCI_DEVICE(0x1260, 0x3877) },/* Intersil PRISM Javelin/Xbow Wireless LAN adapter */ { PCI_DEVICE(0x1260, 0x3886) }, +/* Intersil PRISM Xbow Wireless LAN adapter (Symbol AP-300) */ + { PCI_DEVICE(0x1260, 0xffff) }, { }, };
drivers/pci/pci.c +1 -0
@@ -2046,6 +2046,7 @@ void pci_msi_off(struct pci_dev *dev)pci_write_config_word (dev, pos +PCI_MSIX_FLAGS , control); } } +EXPORT_SYMBOL_GPL (pci_msi_off);#ifndef HAVE_ARCH_PCI_SET_DMA_MASK /*
drivers/platform/x86/eeepc-laptop.c +18 -0
@@ -752,6 +752,8 @@ static void eeepc_rfkill_hotplug(void)struct pci_dev *dev;struct pci_bus *bus;bool blocked =eeepc_wlan_rfkill_blocked (); +bool absent; +u32 l;if (ehotk->wlan_rfkill)rfkill_set_sw_state (ehotk->wlan_rfkill, blocked);
@@ -765,6 +767,22 @@ static void eeepc_rfkill_hotplug(void) goto out_unlock; } +if (pci_bus_read_config_dword (bus,0 ,PCI_VENDOR_ID , &l)) { +pr_err ("Unable to read PCI config space?\n" ); + goto out_unlock; + } + absent = (l ==0xffffffff ); + +if (blocked != absent) { +pr_warning ("BIOS says wireless lan is %s, " +"but the pci device is %s\n" , + blocked ?"blocked" :"unblocked" , + absent ?"absent" :"present" ); +pr_warning ("skipped wireless hotplug as probably " +"inappropriate for this model\n" ); + goto out_unlock; + } +if (!blocked) { dev =pci_get_slot (bus,0 );if (dev) {
drivers/rtc/rtc-ds1307.c +2 -2
@@ -775,7 +775,7 @@ static int __devinit ds1307_probe(struct i2c_client *client, read_rtc:/* read RTC registers */ - tmp = ds1307->read_block_data (ds1307->client,0 ,8 , buf); + tmp = ds1307->read_block_data (ds1307->client, ds1307->offset,8 , buf);if (tmp !=8 ) {pr_debug ("read error %d\n" , tmp); err = -EIO ;
@@ -860,7 +860,7 @@ read_rtc:if (ds1307->regs[DS1307_REG_HOUR ] &DS1307_BIT_PM ) tmp +=12 ;i2c_smbus_write_byte_data (client, -DS1307_REG_HOUR , + ds1307->offset +DS1307_REG_HOUR ,bin2bcd (tmp)); }
drivers/scsi/aacraid/commctrl.c +2 -2
@@ -655,9 +655,9 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)/* Does this really need to be GFP_DMA? */ p =kmalloc (usg->sg[i].count,GFP_KERNEL |__GFP_DMA);if (!p) { -kfree (usg); -dprintk ((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n" , +dprintk ((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n" , usg->sg[i].count,i,usg->count)); +kfree (usg); rcode = -ENOMEM ; goto cleanup; }
drivers/serial/cpm_uart/cpm_uart_core.c +79 -64
167 lines not on this page · raw message
drivers/ssb/driver_chipcommon.c +3 -0
@@ -233,6 +233,9 @@ void ssb_chipcommon_init(struct ssb_chipcommon *cc) {if (!cc->dev)return ;/* We don't have a ChipCommon */ +if (cc->dev->id.revision >=11 ) + cc->status =chipco_read32 (cc,SSB_CHIPCO_CHIPSTAT ); + ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);ssb_pmu_init (cc);chipco_powercontrol_init (cc);ssb_chipco_set_clockmode (cc,SSB_CLKMODE_FAST );
drivers/ssb/driver_chipcommon_pmu.c +7 -10
@@ -495,9 +495,9 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)chipco_write32 (cc,SSB_CHIPCO_PMU_MAXRES_MSK , max_msk); } +/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */ void ssb_pmu_init (struct ssb_chipcommon *cc) { -struct ssb_bus *bus = cc->dev->bus;u32 pmucap;if (!(cc->capabilities &SSB_CHIPCO_CAP_PMU ))
@@ -509,15 +509,12 @@ void ssb_pmu_init(struct ssb_chipcommon *cc) ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, pmucap); -if (cc->pmu.rev >=1 ) { -if ((bus->chip_id ==0x4325 ) && (bus->chip_rev <2 )) { -chipco_mask32 (cc,SSB_CHIPCO_PMU_CTL , - ~SSB_CHIPCO_PMU_CTL_NOILPONW ); - }else { -chipco_set32 (cc,SSB_CHIPCO_PMU_CTL , -SSB_CHIPCO_PMU_CTL_NOILPONW ); - } - } +if (cc->pmu.rev ==1 ) +chipco_mask32 (cc,SSB_CHIPCO_PMU_CTL , + ~SSB_CHIPCO_PMU_CTL_NOILPONW ); +else +chipco_set32 (cc,SSB_CHIPCO_PMU_CTL , +SSB_CHIPCO_PMU_CTL_NOILPONW );ssb_pmu_pll_init (cc);ssb_pmu_resources_init (cc); }
drivers/ssb/pci.c +40 -6
89 lines not on this page · raw message
drivers/ssb/sprom.c +15 -0
@@ -179,3 +179,18 @@ const struct ssb_sprom *ssb_get_fallback_sprom(void) {return fallback_sprom; } + +/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */ +bool ssb_is_sprom_available (struct ssb_bus *bus) +{ +/* status register only exists on chipcomon rev >= 11 and we need check +for >= 31 only */ +/* this routine differs from specs as we do not access SPROM directly +on PCMCIA */ +if (bus->bustype ==SSB_BUSTYPE_PCI && + bus->chipco.dev &&/* can be unavailible! */ + bus->chipco.dev->id.revision >=31 ) +return bus->chipco.capabilities &SSB_CHIPCO_CAP_SPROM ; + +return true; +}
drivers/staging/rtl8192su/r8192U_core.c +4 -0
@@ -112,12 +112,14 @@ u32 rt_global_debug_component = \static struct usb_device_id rtl8192_usb_id_tbl[] = {/* Realtek */ + {USB_DEVICE (0x0bda ,0x8171 )}, {USB_DEVICE (0x0bda ,0x8192 )}, {USB_DEVICE (0x0bda ,0x8709 )},/* Corega */ {USB_DEVICE (0x07aa ,0x0043 )},/* Belkin */ {USB_DEVICE (0x050d ,0x805E )}, + {USB_DEVICE (0x050d ,0x815F )},/* Belkin F5D8053 v6 */ /* Sitecom */ {USB_DEVICE (0x0df6 ,0x0031 )}, {USB_DEVICE (0x0df6 ,0x004b )},/* WL-349 */
@@ -127,6 +129,8 @@ static struct usb_device_id rtl8192_usb_id_tbl[] = { {USB_DEVICE(0x2001, 0x3301)},/* Zinwell */ {USB_DEVICE(0x5a57, 0x0290)}, +/* Guillemot */ + {USB_DEVICE(0x06f8, 0xe031)},//92SU {USB_DEVICE(0x0bda, 0x8172)}, {}
drivers/usb/core/driver.c +2 -13
@@ -1743,9 +1743,6 @@ int usb_external_resume_device(struct usb_device *udev, pm_message_t msg)static void choose_wakeup (struct usb_device *udev,pm_message_t msg) { -int w, i; -struct usb_interface *intf; -/* Remote wakeup is needed only when we actually go to sleep. * For things like FREEZE and QUIESCE, if the device is already * autosuspended then its current wakeup setting is okay.
@@ -1755,18 +1752,10 @@ static void choose_wakeup(struct usb_device *udev, pm_message_t msg)return ; } -/* If remote wakeup is permitted, see whether any interface drivers +/* Allow remote wakeup if it is enabled, even if no interface drivers * actually want it. */ - w =0 ; -if (device_may_wakeup (&udev->dev) && udev->actconfig) { -for (i =0 ; i < udev->actconfig->desc.bNumInterfaces; i++) { - intf = udev->actconfig->interface[i]; - w |= intf->needs_remote_wakeup; - } - } - - udev->do_remote_wakeup = w; + udev->do_remote_wakeup =device_may_wakeup (&udev->dev); }int usb_suspend (struct device *dev,pm_message_t msg)
drivers/usb/core/quirks.c +7 -0
@@ -41,6 +41,10 @@ static const struct usb_device_id usb_quirk_list[] = {/* Philips PSC805 audio device */ { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Artisman Watchdog Dongle */ + { USB_DEVICE(0x04b4, 0x0526), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Roland SC-8820 */ { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -64,6 +68,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF }, + /* Broadcom BCM92035DGROM BT dongle */ + { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Action Semiconductor flash disk */ { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 },
drivers/usb/gadget/u_serial.c +3 -13
@@ -535,17 +535,11 @@ recycle:list_move (&req->list, &port->read_pool); } -/* Push from tty to ldisc; this is immediate with low_latency, and -* may trigger callbacks to this driver ... so drop the spinlock. +/* Push from tty to ldisc; without low_latency set this is handled by +* a workqueue, so we won't get callbacks and can hold port_lock */ if (tty && do_push) { -spin_unlock_irq (&port->port_lock);tty_flip_buffer_push (tty); -wake_up_interruptible (&tty->read_wait); -spin_lock_irq (&port->port_lock); - -/* tty may have been closed */ - tty = port->port_tty; }
@@ -783,11 +777,6 @@ static int gs_open(struct tty_struct *tty, struct file *file) port->open_count =1 ; port->openclose = false; -/* low_latency means ldiscs work in tasklet context, without -* needing a workqueue schedule ... easier to keep up. -*/ - tty->low_latency =1 ; -/* if connected, start the I/O stream */ if (port->port_usb) {struct gserial *gser = port->port_usb;
@@ -1194,6 +1183,7 @@ void gserial_cleanup(void) n_ports =0 ;tty_unregister_driver (gs_tty_driver); +put_tty_driver (gs_tty_driver); gs_tty_driver =NULL ;pr_debug ("%s: cleaned up ttyGS* support\n" , __func__);
drivers/usb/misc/sisusbvga/sisusb.c +3 -2
@@ -2435,7 +2435,8 @@ sisusb_open(struct inode *inode, struct file *file) }if (!sisusb->devinit) { -if (sisusb->sisusb_dev->speed ==USB_SPEED_HIGH ) { +if (sisusb->sisusb_dev->speed ==USB_SPEED_HIGH || + sisusb->sisusb_dev->speed ==USB_SPEED_SUPER ) {if (sisusb_init_gfxdevice (sisusb,0 )) {mutex_unlock (&sisusb->lock);dev_err (&sisusb->sisusb_dev->dev,"Failed to initialize device\n" );
@@ -3167,7 +3168,7 @@ static int sisusb_probe(struct usb_interface *intf, sisusb->present =1 ; -if (dev->speed ==USB_SPEED_HIGH ) { +if (dev->speed ==USB_SPEED_HIGH || dev->speed ==USB_SPEED_SUPER ) {int initscreen =1 ;#ifdef INCL_SISUSB_CON if (sisusb_first_vc > 0 &&
drivers/usb/serial/ftdi_sio.c +9 -0
@@ -697,6 +697,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID), .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
@@ -743,6 +744,14 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) }, { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) }, + { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_ST_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +15 -0
@@ -703,6 +703,12 @@#define TELLDUS_TELLSTICK_PID 0x0C30/* RF control dongle 433 MHz using FT232RL */ /* +* RT Systems programming cables for various ham radios +*/ +#define RTSYSTEMS_VID 0x2100/* Vendor ID */ +#define RTSYSTEMS_SERIAL_VX7_PID 0x9e52/* Serial converter for VX-7 Radios using FT232RL */ + +/* * Bayer Ascensia Contour blood glucose meter USB-converter cable. * http://winglucofacts.com/cables/ */
@@ -1024,3 +1030,12 @@#define MJSG_SR_RADIO_PID 0x9379#define MJSG_XM_RADIO_PID 0x937A#define MJSG_HD_RADIO_PID 0x937C + +/* +* Xverve Signalyzer tools (http://www.signalyzer.com/) +*/ +#define XVERVE_SIGNALYZER_ST_PID 0xBCA0 +#define XVERVE_SIGNALYZER_SLITE_PID 0xBCA1 +#define XVERVE_SIGNALYZER_SH2_PID 0xBCA2 +#define XVERVE_SIGNALYZER_SH4_PID 0xBCA4 +
drivers/usb/serial/option.c +4 -0
@@ -226,6 +226,7 @@ static int option_resume(struct usb_serial *serial);#define AMOI_PRODUCT_H01 0x0800#define AMOI_PRODUCT_H01A 0x7002#define AMOI_PRODUCT_H02 0x0802 +#define AMOI_PRODUCT_SKYPEPHONE_S2 0x0407#define DELL_VENDOR_ID 0x413C
@@ -316,6 +317,7 @@ static int option_resume(struct usb_serial *serial);#define QISDA_PRODUCT_H21_4512 0x4512#define QISDA_PRODUCT_H21_4523 0x4523#define QISDA_PRODUCT_H20_4515 0x4515 +#define QISDA_PRODUCT_H20_4518 0x4518#define QISDA_PRODUCT_H20_4519 0x4519/* TLAYTECH PRODUCTS */
@@ -503,6 +505,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_SKYPEPHONE_S2) }, { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
@@ -836,6 +839,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) }, { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) }, { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) }, + { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4518) }, { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) }, { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) }, { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
drivers/usb/serial/sierra.c +1 -0
@@ -210,6 +210,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */ { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */ { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */ + { USB_DEVICE(0x1199, 0x0301) }, /* Sierra Wireless USB Dongle 250U *//* Sierra Wireless C597 */ { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) },/* Sierra Wireless T598 */
drivers/virtio/virtio_pci.c +3 -0
@@ -635,6 +635,9 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,INIT_LIST_HEAD (&vp_dev->virtqueues);spin_lock_init (&vp_dev->lock); +/* Disable MSI/MSIX to bring device to a known good state. */ +pci_msi_off (pci_dev); +/* enable the device */ err =pci_enable_device (pci_dev);if (err)
fs/btrfs/ioctl.c +2 -2
@@ -947,7 +947,7 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,*/ /* the destination must be opened for writing */ -if (!(file->f_mode &FMODE_WRITE )) +if (!(file->f_mode &FMODE_WRITE ) || (file->f_flags &O_APPEND ))return -EINVAL ; ret =mnt_want_write (file->f_path.mnt);
@@ -1000,7 +1000,7 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,/* determine range to clone */ ret = -EINVAL ; -if (off >= src->i_size || off + len > src->i_size) +if (off + len > src->i_size || off + len < off) goto out_unlock;if (len ==0 ) olen = len = src->i_size - off;
fs/cifs/cifsfs.c +3 -3
@@ -1033,7 +1033,7 @@ init_cifs(void) goto out_unregister_filesystem;#endif #ifdef CONFIG_CIFS_DFS_UPCALL - rc =register_key_type (&key_type_dns_resolver); + rc =cifs_init_dns_resolver ();if (rc) goto out_unregister_key_type;#endif
@@ -1045,7 +1045,7 @@ init_cifs(void) out_unregister_resolver_key: #ifdef CONFIG_CIFS_DFS_UPCALL -unregister_key_type (&key_type_dns_resolver); +cifs_exit_dns_resolver (); out_unregister_key_type:#endif #ifdef CONFIG_CIFS_UPCALL
@@ -1071,7 +1071,7 @@ exit_cifs(void)cifs_proc_clean ();#ifdef CONFIG_CIFS_DFS_UPCALL cifs_dfs_release_automount_timer (); -unregister_key_type (&key_type_dns_resolver); +cifs_exit_dns_resolver ();#endif #ifdef CONFIG_CIFS_UPCALL unregister_key_type (&cifs_spnego_key_type);
fs/cifs/dns_resolve.c +69 -0
99 lines not on this page · raw message
fs/cifs/dns_resolve.h +2 -2
@@ -24,8 +24,8 @@#define _DNS_RESOLVE_H#ifdef __KERNEL__ -#include <linux/key-type.h> -extern struct key_type key_type_dns_resolver; +extern int __init cifs_init_dns_resolver (void ); +extern void __exit cifs_exit_dns_resolver(void);extern int dns_resolve_server_name_to_ip (const char *unc,char **ip_addr);#endif /* KERNEL */
fs/cifs/inode.c +4 -0
@@ -1284,6 +1284,10 @@ cifs_do_rename(int xid, struct dentry *from_dentry, const char *fromPath,if (rc ==0 || rc != -ETXTBSY )return rc; +/* open-file renames don't work across directories */ +if (to_dentry->d_parent != from_dentry->d_parent) +return rc; +/* open the file to be renamed -- we need DELETE perms */ rc = CIFSSMBOpen(xid, pTcon, fromPath, FILE_OPEN, DELETE, CREATE_NOT_DIR, &srcfid, &oplock, NULL,
fs/cifs/sess.c +1 -9
@@ -723,15 +723,7 @@ ssetup_ntlmssp_authenticate:/* calculate session key */ setup_ntlmv2_rsp (ses, v2_sess_key, nls_cp); -if (first_time)/* should this be moved into common code -with similar ntlmv2 path? */ -/* cifs_calculate_ntlmv2_mac_key(ses->server->mac_signing_key, -response BB FIXME, v2_sess_key); */ - -/* copy session key */ - -/* memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE); -bcc_ptr += LM2_SESS_KEY_SIZE; */ +/* FIXME: calculate MAC key */ memcpy (bcc_ptr, (char *)v2_sess_key,sizeof (struct ntlmv2_resp )); bcc_ptr +=sizeof (struct ntlmv2_resp );
fs/ecryptfs/messaging.c +9 -8
@@ -30,9 +30,9 @@ static struct mutex ecryptfs_msg_ctx_lists_mux;static struct hlist_head *ecryptfs_daemon_hash;struct mutex ecryptfs_daemon_hash_mux; -static int ecryptfs_hash_buckets; +static int ecryptfs_hash_bits;#define ecryptfs_uid_hash (uid) \ - hash_long((unsigned long)uid, ecryptfs_hash_buckets) + hash_long((unsigned long)uid, ecryptfs_hash_bits)static u32 ecryptfs_msg_counter;static struct ecryptfs_msg_ctx *ecryptfs_msg_ctx_arr;
@@ -485,18 +485,19 @@ int ecryptfs_init_messaging(void) }mutex_init (&ecryptfs_daemon_hash_mux);mutex_lock (&ecryptfs_daemon_hash_mux); - ecryptfs_hash_buckets =1 ; -while (ecryptfs_number_of_users >> ecryptfs_hash_buckets) - ecryptfs_hash_buckets++; + ecryptfs_hash_bits =1 ; +while (ecryptfs_number_of_users >> ecryptfs_hash_bits) + ecryptfs_hash_bits++; ecryptfs_daemon_hash =kmalloc ((sizeof (struct hlist_head ) - * ecryptfs_hash_buckets),GFP_KERNEL ); + * (1 << ecryptfs_hash_bits)), +GFP_KERNEL );if (!ecryptfs_daemon_hash) { rc = -ENOMEM ;printk (KERN_ERR "%s: Failed to allocate memory\n" , __func__);mutex_unlock (&ecryptfs_daemon_hash_mux); goto out; } -for (i =0 ; i < ecryptfs_hash_buckets; i++) +for (i =0 ; i < (1 << ecryptfs_hash_bits); i++)INIT_HLIST_HEAD (&ecryptfs_daemon_hash[i]);mutex_unlock (&ecryptfs_daemon_hash_mux); ecryptfs_msg_ctx_arr = kmalloc((sizeof(struct ecryptfs_msg_ctx)
@@ -553,7 +554,7 @@ void ecryptfs_release_messaging(void)int i;mutex_lock (&ecryptfs_daemon_hash_mux); -for (i =0 ; i < ecryptfs_hash_buckets; i++) { +for (i =0 ; i < (1 << ecryptfs_hash_bits); i++) {int rc; hlist_for_each_entry(daemon, elem,
fs/ext4/dir.c +7 -5
@@ -84,9 +84,11 @@ int ext4_check_dir_entry(const char *function, struct inode *dir,if (error_msg !=NULL )ext4_error (dir->i_sb, function, -"bad entry in directory #%lu: %s - " -"offset=%u, inode=%u, rec_len=%d, name_len=%d" , - dir->i_ino, error_msg, offset, +"bad entry in directory #%lu: %s - block=%llu" +"offset=%u(%u), inode=%u, rec_len=%d, name_len=%d" , + dir->i_ino, error_msg, + (unsigned long long ) bh->b_blocknr, + (unsigned ) (offset%bh->b_size), offset,le32_to_cpu (de->inode), rlen, de->name_len);return error_msg ==NULL ?1 :0 ;
@@ -109,7 +111,7 @@ static int ext4_readdir(struct file *filp,if (EXT4_HAS_COMPAT_FEATURE (inode->i_sb,EXT4_FEATURE_COMPAT_DIR_INDEX ) && - ((EXT4_I (inode)->i_flags &EXT4_INDEX_FL ) || + ((ext4_test_inode_flag (inode,EXT4_INODE_INDEX )) || ((inode->i_size >> sb->s_blocksize_bits) ==1 ))) { err =ext4_dx_readdir (filp, dirent, filldir);if (err !=ERR_BAD_DX_DIR ) {
@@ -120,7 +122,7 @@ static int ext4_readdir(struct file *filp,* We don't set the inode dirty flag since it's not * critical that it get flushed back to the disk. */ -EXT4_I (filp->f_path.dentry->d_inode)->i_flags &= ~EXT4_INDEX_FL ; +ext4_clear_inode_flag (filp->f_path.dentry->d_inode,EXT4_INODE_INDEX ); } stored =0 ; offset = filp->f_pos & (sb->s_blocksize -1 );
fs/ext4/ext4.h +138 -19
253 lines not on this page · raw message
fs/ext4/ext4_extents.h +2 -1
@@ -225,7 +225,8 @@ static inline void ext4_ext_mark_initialized(struct ext4_extent *ext) ext->ee_len =cpu_to_le16 (ext4_ext_get_actual_len (ext)); } -extern int ext4_ext_calc_metadata_amount (struct inode *inode,int blocks); +extern int ext4_ext_calc_metadata_amount (struct inode *inode, +sector_t lblocks);extern ext4_fsblk_t ext_pblock (struct ext4_extent *ex);extern ext4_fsblk_t idx_pblock (struct ext4_extent_idx *);extern void ext4_ext_store_pblock (struct ext4_extent *,ext4_fsblk_t );
fs/ext4/ext4_jbd2.c +1 -1
@@ -89,7 +89,7 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle,ext4_journal_abort_handle (where, __func__, bh, handle, err); }else { -if (inode && bh) +if (inode)mark_buffer_dirty_inode (bh, inode);else mark_buffer_dirty (bh);
fs/ext4/ext4_jbd2.h +3 -3
@@ -282,7 +282,7 @@ static inline int ext4_should_journal_data(struct inode *inode)return 1 ;if (test_opt (inode->i_sb,DATA_FLAGS ) ==EXT4_MOUNT_JOURNAL_DATA )return 1 ; -if (EXT4_I (inode)->i_flags &EXT4_JOURNAL_DATA_FL ) +if (ext4_test_inode_flag (inode,EXT4_INODE_JOURNAL_DATA ))return 1 ;return 0 ; }
@@ -293,7 +293,7 @@ static inline int ext4_should_order_data(struct inode *inode)return 0 ;if (!S_ISREG (inode->i_mode))return 0 ; -if (EXT4_I (inode)->i_flags &EXT4_JOURNAL_DATA_FL ) +if (ext4_test_inode_flag (inode,EXT4_INODE_JOURNAL_DATA ))return 0 ;if (test_opt (inode->i_sb,DATA_FLAGS ) ==EXT4_MOUNT_ORDERED_DATA )return 1 ;
@@ -306,7 +306,7 @@ static inline int ext4_should_writeback_data(struct inode *inode)return 0 ;if (EXT4_JOURNAL (inode) ==NULL )return 1 ; -if (EXT4_I (inode)->i_flags &EXT4_JOURNAL_DATA_FL ) +if (ext4_test_inode_flag (inode,EXT4_INODE_JOURNAL_DATA ))return 0 ;if (test_opt (inode->i_sb,DATA_FLAGS ) ==EXT4_MOUNT_WRITEBACK_DATA )return 1 ;
fs/ext4/extents.c +195 -56
48 lines not on this page · raw message
fs/ext4/fsync.c +44 -5
49 lines not on this page · raw message
fs/ext4/ialloc.c +46 -52
98 lines not on this page · raw message
fs/ext4/inode.c +215 -145
360 lines not on this page · raw message
fs/ext4/mballoc.c +89 -49
138 lines not on this page · raw message
fs/ext4/super.c +33 -34
67 lines not on this page · raw message
fs/gfs2/acl.c +115 -55
170 lines not on this page · raw message
include/linux/ssb/ssb_driver_chipcommon.h +2 -0
Lines of this file are not shown. View the raw message.
net/core/ethtool.c +32 -11
43 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.