Linux 2.6.32.16
Subsystems (70)
I'm announcing the release of the 2.6.32.16 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
------------
Documentation/hwmon/ltc4245 | 4 Documentation/networking/3c509.txt | 12 - Makefile | 2 arch/arm/common/sa1111.c | 9 arch/arm/mm/copypage-feroceon.c | 4 arch/arm/mm/copypage-v4wb.c | 4 arch/arm/mm/copypage-v4wt.c | 4 arch/arm/mm/copypage-xsc3.c | 4 arch/arm/mm/fault.c | 3 arch/arm/mm/init.c | 6 arch/arm/vfp/vfphw.S | 2 arch/blackfin/include/asm/cache.h | 2 arch/frv/include/asm/cache.h | 2 arch/m68k/include/asm/cache.h | 2 arch/mn10300/include/asm/cache.h | 2 arch/parisc/math-emu/decode_exc.c | 1 arch/powerpc/kvm/powerpc.c | 3 arch/powerpc/lib/string.S | 4 arch/powerpc/oprofile/op_model_cell.c | 2 arch/powerpc/platforms/pseries/hotplug-cpu.c | 30 --- arch/powerpc/platforms/pseries/plpar_wrappers.h | 8 arch/powerpc/platforms/pseries/smp.c | 28 ++ arch/s390/kvm/kvm-s390.c | 4 arch/x86/include/asm/kvm_host.h | 1 arch/x86/include/asm/msr-index.h | 5 arch/x86/kernel/amd_iommu.c | 2 arch/x86/kernel/cpu/perf_event.c | 5 arch/x86/kernel/pvclock.c | 24 ++ arch/x86/kernel/setup.c | 11 + arch/x86/kernel/tboot.c | 1 arch/x86/kvm/mmu.c | 10 - arch/x86/kvm/vmx.c | 32 ++- arch/x86/kvm/x86.c | 55 +++-- arch/x86/oprofile/nmi_int.c | 10 - arch/x86/xen/suspend.c | 4 arch/xtensa/include/asm/cache.h | 1 drivers/acpi/video_detect.c | 2 drivers/ata/libata-core.c | 7 drivers/ata/libata-sff.c | 2 drivers/ata/sata_nv.c | 5 drivers/ata/sata_via.c | 13 + drivers/base/cpu.c | 2 drivers/char/ipmi/ipmi_si_intf.c | 11 - drivers/clocksource/sh_cmt.c | 21 +- drivers/firewire/core-card.c | 24 ++ drivers/gpu/drm/drm_edid.c | 2 drivers/gpu/drm/i915/i915_gem.c | 19 ++ drivers/gpu/drm/i915/intel_lvds.c | 4 drivers/gpu/drm/radeon/radeon_atombios.c | 2 drivers/gpu/drm/radeon/radeon_cp.c | 1 drivers/gpu/drm/radeon/radeon_drv.h | 2 drivers/gpu/drm/radeon/radeon_state.c | 7 drivers/hid/hid-core.c | 1 drivers/hid/hid-gyration.c | 1 drivers/hid/hid-ids.h | 1 drivers/hwmon/ltc4245.c | 18 - drivers/input/mouse/psmouse-base.c | 14 + drivers/md/dm-exception-store.h | 2 drivers/md/md.c | 29 +++ drivers/md/raid1.c | 9 drivers/md/raid10.c | 2 drivers/media/video/gspca/stv06xx/stv06xx.c | 2 drivers/net/arcnet/com20020-pci.c | 4 drivers/net/atl1e/atl1e_ethtool.c | 2 drivers/net/can/sja1000/sja1000.c | 20 +- drivers/net/can/sja1000/sja1000.h | 1 drivers/net/ixgbe/ixgbe_main.c | 8 drivers/net/mlx4/icm.c | 3 drivers/net/pppol2tp.c | 3 drivers/net/tulip/Kconfig | 4 drivers/net/tulip/dmfe.c | 21 ++ drivers/net/tulip/tulip_core.c | 32 ++- drivers/net/ucc_geth.c | 12 - drivers/net/via-velocity.c | 8 drivers/net/virtio_net.c | 3 drivers/net/wireless/ath/ar9170/hw.h | 1 drivers/net/wireless/ath/ar9170/main.c | 2 drivers/net/wireless/ath/ar9170/usb.c | 10 + drivers/net/wireless/ath/ath5k/base.c | 4 drivers/net/wireless/ath/ath9k/hw.c | 7 drivers/net/wireless/ath/ath9k/hw.h | 1 drivers/net/wireless/ath/ath9k/main.c | 4 drivers/net/wireless/ath/ath9k/pci.c | 1 drivers/net/wireless/iwlwifi/iwl-5000.c | 23 ++ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 24 ++ drivers/net/wireless/iwlwifi/iwl-agn.c | 74 ++++++- drivers/net/wireless/iwlwifi/iwl-dev.h | 3 drivers/net/wireless/iwlwifi/iwl-tx.c | 18 + drivers/net/wireless/p54/p54usb.c | 1 drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 drivers/net/wireless/wl12xx/wl1251_sdio.c | 1 drivers/oprofile/cpu_buffer.c | 63 +----- drivers/pci/quirks.c | 14 + drivers/rtc/rtc-cmos.c | 5 drivers/rtc/rtc-s3c.c | 5 drivers/scsi/qla2xxx/qla_isr.c | 28 +- drivers/staging/comedi/drivers/ni_mio_cs.c | 2 drivers/staging/rtl8192su/r8192U_core.c | 1 drivers/staging/vt6655/device_main.c | 2 drivers/usb/class/cdc-acm.c | 6 drivers/usb/gadget/fsl_udc_core.c | 2 drivers/usb/host/ehci-hub.c | 17 + drivers/usb/host/xhci-hcd.c | 54 ++++- drivers/usb/host/xhci-ring.c | 37 +++ drivers/usb/serial/cp210x.c | 11 + drivers/usb/serial/ftdi_sio.c | 4 drivers/usb/serial/ir-usb.c | 2 drivers/usb/serial/kl5kusb105.c | 1 drivers/usb/serial/kobil_sct.c | 3 drivers/usb/serial/mos7840.c | 1 drivers/usb/serial/option.c | 226 ++++++++++++++++++++++++ drivers/usb/serial/visor.c | 1 drivers/usb/storage/unusual_devs.h | 15 + drivers/xen/xenbus/xenbus_xs.c | 2 fs/btrfs/acl.c | 3 fs/cifs/cifsproto.h | 6 fs/cifs/dir.c | 20 +- fs/cifs/file.c | 11 - fs/exofs/dir.c | 2 fs/fs-writeback.c | 14 + fs/gfs2/file.c | 7 fs/jbd/journal.c | 2 fs/jbd2/journal.c | 3 fs/libfs.c | 3 fs/namespace.c | 9 fs/nfsd/nfssvc.c | 2 include/linux/fs.h | 4 include/linux/pci_ids.h | 1 include/linux/swap.h | 10 - include/linux/tboot.h | 1 include/net/sctp/structs.h | 1 kernel/compat.c | 25 +- kernel/mutex.c | 7 kernel/perf_event.c | 40 ++-- kernel/posix-timers.c | 11 - kernel/signal.c | 6 mm/filemap.c | 10 - mm/hugetlb.c | 2 net/mac80211/Kconfig | 9 net/mac80211/rx.c | 3 net/mac80211/tx.c | 5 net/sctp/sm_make_chunk.c | 62 ++++++ net/tipc/bearer.c | 37 --- net/tipc/bearer.h | 2 net/tipc/net.c | 25 -- net/wireless/core.h | 2 net/wireless/nl80211.c | 37 --- net/wireless/util.c | 33 +++ net/wireless/wext-compat.c | 5 security/keys/keyring.c | 18 - security/keys/process_keys.c | 6 sound/pci/hda/hda_intel.c | 11 - sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_sigmatel.c | 2 sound/soc/codecs/wm8350.c | 4 sound/soc/codecs/wm8400.c | 18 - sound/soc/codecs/wm8990.c | 18 - 157 files changed, 1286 insertions(+), 516 deletions(-)
Adam Jackson (1):
drm/edid: Fix 1024x768@85Hz
Al Viro (1):
Fix racy use of anon_inode_getfd() in perf_event.c
Alek Du (1):
USB: EHCI: clear PHCD before resuming
Alex Deucher (2):
PCI quirks: disable msi on AMD rs4xx internal gfx bridges drm/radeon/kms/atom: fix typo in LVDS panel info parsing
Andi Kleen (1):
oprofile: remove double ring buffering
Andiry Xu (1):
USB: xHCI: Fix wrong usage of macro TRB_TYPE
Andrea Arcangeli (1):
mm: hugetlb: fix clear_huge_page()
Andreas Bombe (1):
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
Andres Salomon (1):
mac80211: give warning if building w/out rate ctrl algorithm
Andrey Vagin (1):
posix_timer: Fix error path in timer_create
Anfei (1):
ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6
Anton Vorontsov (2):
ucc_geth: Fix empty TX queue processing
ucc_geth: Fix netdev watchdog triggering on link changes
Avi Kivity (5):
KVM: Don't allow lmsw to clear cr0.pe
KVM: MMU: Segregate shadow pages with different cr0.wp
KVM: MMU: Don't read pdptrs with mmu spinlock held in mmu_alloc_roots
KVM: Fix wallclock version writing race
KVM: x86: Add missing locking to arch specific vcpu ioctls
Axel Lin (1):
USB: cdc-acm: fix resource reclaim in error path of acm_probe
Ben Hutchings (6):
PCI: Disable MSI for MCP55 on P5N32-E SLI
atl1e: Allow TX checksum offload and TSO to be disabled and reenabled
via-velocity: Give RX descriptors to the NIC later on open or MTU change dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips Documentation/3c509: document ethtool support
qla2xxx: Disable MSI on qla24xx chips other than QLA2432.
Bob Copeland (1):
ath5k: retain promiscuous setting
Chris Wilson (2):
drm/i915: Reject bind_to_gtt() early if object > aperture drm/i915: Rebind bo if currently bound with incorrect alignment.
Christian Lamparter (2):
ar9170usb: add a couple more USB IDs
ar9170usb: fix panic triggered by undersized rxstream buffer
Cory Maccarrone (1):
HID: Add the GYR4101US USB ID to hid-gyration
Craig Shelley (1):
USB: CP210x New Device IDs 11 New device IDs
Dan Carpenter (3):
exofs: confusion between kmap() and kmap_atomic() api
rtc-cmos: do dev_set_drvdata() earlier in the initialization
KEYS: Return more accurate error codes
Dan Williams (1):
md: set mddev readonly flag on blkdev BLKROSET ioctl
Daniel Mack (1):
USB: ftdi_sio: fix DTR/RTS line modes
Daniel T Chen (9):
ALSA: hda: Fix model quirk for Dell M1730
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Use LPIB for an ASUS device
ALSA: hda: Use mb31 quirk for an iMac model
ALSA: hda: Use LPIB for another mainboard
ALSA: hda: Use LPIB for ASUS M2V
Dave Airlie (2):
drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/radeon: fix the r100/r200 ums block 0 page fix
Denis Kirjanov (1):
powerpc/oprofile: fix potential buffer overrun in op_model_cell.c
Dinh Nguyen (1):
USB: mxc: gadget: Fix bitfield for calculating maximum packet size
Dmitry Torokhov (1):
Input: psmouse - reset all types of mice before reconnecting
Erik Andrén (1):
V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver
FUJITA Tomonori (5):
mn10300: set ARCH_KMALLOC_MINALIGN
m68k: set ARCH_KMALLOC_MINALIGN
frv: set ARCH_KMALLOC_MINALIGN
xtensa: set ARCH_KMALLOC_MINALIGN
Blackfin: set ARCH_KMALLOC_MINALIGN
Gabor Gombas (1):
x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
Glauber Costa (1):
x86, paravirt: Add a global synchronization point for pvclock
Grazvydas Ignotas (1):
wl1251: fix a memory leak in probe
Greg Kroah-Hartman (2):
USB: serial: option: add cinterion device id Linux 2.6.32.16
Hans de Goede (1):
USB: unusual-dev: Add bad sense flag for Appotech ax203 based picture frames
Helge Deller (1):
parisc: clear floating point exception flag on SIGFPE signal
Herbert Xu (1):
virtio_net: Make delayed refill more reliable
Ian Campbell (2):
xen: ensure timer tick is resumed even on CPU driving the resume
xen: avoid allocation causing potential swap activity on the resume path
Ira W. Snyder (1):
hwmon: (ltc4245) Read only one GPIO pin
James Chapman (1):
l2tp: Fix oops in pppol2tp_xmit
Jan Beulich (1):
drivers/base/cpu.c: fix the output from /sys/devices/system/cpu/offline
Jason Dravet (1):
p54usb: Add device ID for Dell WLA3310 USB
Jeff Mahoney (1):
powerpc: Fix handling of strncmp with zero len
Jeff Moyer (1):
do_generic_file_read: clear page errors when issuing a fresh read of the page
Jens Axboe (1):
writeback: disable periodic old data writeback for !dirty_writeback_centisecs
Jesse Barnes (1):
drm/i915: give up on 8xx lid status
Jiajun Wu (1):
ucc_geth: Fix full TX queue processing
Jiri Kosina (1):
ipmi: handle run_to_completion properly in deliver_recv_msg()
Joerg Roedel (1):
x86/amd-iommu: Fix suspend/resume with IOMMU
Johan Hovold (5):
USB: visor: fix memory leak
USB: kobil: fix memory leak
USB: ir-usb: fix double free
USB: kl5usb105: fix memory leak
USB: mos7840: fix null-pointer dereference
John W. Linville (2):
rtl8180: fix tx status reporting
wireless: report reasonable bitrate for MCS rates through wext
Jouni Malinen (1):
mac80211: Fix robust management frame handling (MFP)
KOSAKI Motohiro (2):
cpumask: fix compat getaffinity
tmpfs: insert tmpfs cache pages to inactive list at first
Kamal Mostafa (1):
ACPI: video: fix acpi_backlight=video
Khem Raj (1):
ARM: 6164/1: Add kto and kfrom to input operands list.
Krishna Kumar (1):
ixgbe: Fix return of invalid txq
Larry Finger (1):
staging: vt6655: Fix kernel BUG on driver wpa initialization
Linus Walleij (1):
ARM: 6144/1: TCM memory bug freeing bug
Luis R. Rodriguez (1):
ath9k: add support for 802.11n bonded out AR2427
Marek Vašut (1):
ARM: 6146/1: sa1111: Prevent deadlock in resume path
Mark Brown (3):
ASoC: Fix dB scales for WM835x
ASoC: Fix dB scales for WM8400
ASoC: Fix dB scales for WM8990
Martin Homuth-Rosemann (1):
Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c
Matthew Wilcox (1):
PCI quirk: Disable MSI on VIA K8T890 systems
Maurus Cuelenaere (1):
rtc: s3c: initialize driver data before using it
Michael Neuling (2):
powerpc/pseries: Only call start-cpu when a CPU is stopped powerpc/pseries: Make query_cpu_stopped callable outside hotplug cpu
Miklos Szeredi (1):
vfs: add NOFOLLOW flag to umount(2)
Mikulas Patocka (1):
dm snapshot: simplify sector_to_chunk expression
Neil Horman (2):
sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
tipc: Fix oops on send prior to entering networked mode (v3)
NeilBrown (2):
md/raid1: fix counting of write targets.
md: Fix read balancing in RAID1 and RAID10 on drives > 2TB
Nils Radtke (1):
USB: option.c: OLIVETTI OLICARD100 support
Oleg Nesterov (1):
signals: check_kill_permission(): don't check creds if same_thread_group()
Oliver Hartkopp (1):
can: Fix SJA1000 command register writes on SMP systems
Paul Mundt (1):
clocksource: sh_cmt: compute mult and shift before registration
Pavel Emelyanov (1):
NFSD: don't report compiled-out versions as present
Reinette Chatre (1):
iwlwifi: recalculate average tpt if not current
Robert Richter (1):
oprofile/x86: fix uninitialized counter usage during cpu hotplug
Roberto Sassu (1):
wrong type for 'magic' argument in simple_fill_super()
Rodrigo Linfati (1):
Staging: add Add Sitecom WL-349 to rtl8192su
Roedel, Joerg (1):
KVM: x86: Inject #GP with the right rip on efer writes
Russell King (1):
ARM: VFP: Fix vfp_put_double() for d16-d31
Sarah Sharp (4):
USB: xhci: Fix issue with set interface after stall.
USB: xhci: Fix check for room on the ring.
USB: xhci: Wait for host to start running.
USB: xhci: Wait for controller to be ready after reset.
Sebastian Andrzej Siewior (1):
libata: don't flush dcache on slab pages
Sebastien Dugue (1):
mlx4_core: Fix possible chunk sg list overflow in mlx4_alloc_icm()
Shane Wang (1):
KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)
Shanyu Zhao (1):
mac80211: fix rts threshold check
Sheng Yang (1):
KVM: x86: Check LMA bit before set_efer
Shi Weihua (1):
Btrfs: should add a permission check for setfacl
Stefan Richter (1):
firewire: core: check for 1394a compliant IRM, fix inaccessibility of Sony camcorder
Stephane Eranian (1):
perf_events: Fix resource leak in x86 __hw_perf_event_init()
Steve French (1):
CIFS: Allow null nd (as nfs server uses) on create
Steven Whitehouse (1):
GFS2: Fix permissions checking for setflags ioctl()
Tejun Heo (5):
sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()
libata: disable ATAPI AN by default
ahci: add pci quirk for JMB362
sata_nv: don't diddle with nIEN on mcp55
sata_via: magic vt6421 fix for transmission problems w/ WD drives
Tony Breeds (1):
mutex: Fix optimistic spinning vs. BKL
Toshiyuki Okajima (1):
KEYS: find_keyring_by_name() can gain access to a freed keyring
Wei Yongjun (3):
KVM: s390: Fix possible memory leak of in kvm_arch_vcpu_create()
KVM: PPC: Do not create debugfs if fail to create vcpu
sctp: fix append error cause to ERROR chunk correctly
Wey-Yi Guy (2):
iwlwifi: check for aggregation frame and queue
iwlwifi: update supported PCI_ID list for 5xx0 series
Yin Kangkai (1):
jbd: jbd-debug and jbd2-debug should be writable
spark (1):
USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff
zhao1980ming (1):
USB: option: add PID for ZTE product
Documentation/hwmon/ltc4245 +1 -3
@@ -72,9 +72,7 @@ in6_min_alarm 5v output undervoltage alarm in7_min_alarm 3v output undervoltage alarm in8_min_alarm Vee (-12v) output undervoltage alarm -in9_input GPIO #1 voltage data -in10_input GPIO #2 voltage data -in11_input GPIO #3 voltage data +in9_input GPIO voltage data power1_input 12v power usage (mW) power2_input 5v power usage (mW)
Documentation/networking/3c509.txt +8 -4
@@ -48,11 +48,11 @@ for LILO parameters for doing this: This configures the first found 3c509 card for IRQ 10, base I/O 0x310, and transceiver type 3 (10base2). The flag "0x3c509" must be set to avoid conflicts with other card types when overriding the I/O address. When the driver is -loaded as a module, only the IRQ and transceiver setting may be overridden. -For example, setting two cards to 10base2/IRQ10 and AUI/IRQ11 is done by using -the xcvr and irq module options: +loaded as a module, only the IRQ may be overridden. For example, +setting two cards to IRQ10 and IRQ11 is done by using the irq module +option: - options 3c509 xcvr=3,1 irq=10,11 + options 3c509 irq=10,11 (2) Full-duplex mode
@@ -77,6 +77,8 @@ operation. itself full-duplex capable. This is almost certainly one of two things: a full- duplex-capable Ethernet switch (*not* a hub), or a full-duplex-capable NIC on another system that's connected directly to the 3c509B via a crossover cable. + +Full-duplex mode can be enabled using 'ethtool'. /////Extremely important caution concerning full-duplex mode///// Understand that the 3c509B's hardware's full-duplex support is much more
@@ -113,6 +115,8 @@ This insured that merely upgrading the driver from an earlier version would never automatically enable full-duplex mode in an existing installation; it must always be explicitly enabled via one of these code in order to be activated. + +The transceiver type can be changed using 'ethtool'. (4a) Interpretation of error messages and common problems
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .15 +EXTRAVERSION = .16 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/common/sa1111.c +7 -2
@@ -887,8 +887,6 @@ static int sa1111_resume(struct platform_device *dev)if (!save)return 0 ; -spin_lock_irqsave (&sachip->lock, flags); -/* * Ensure that the SA1111 is still here. * FIXME: shouldn't do this here.
@@ -905,6 +903,13 @@ static int sa1111_resume(struct platform_device *dev)* First of all, wake up the chip. */ sa1111_wake (sachip); + +/* +* Only lock for write ops. Also, sa1111_wake must be called with +* released spinlock! +*/ +spin_lock_irqsave (&sachip->lock, flags); +sa1111_writel (0 , sachip->base +SA1111_INTC +SA1111_INTEN0 );sa1111_writel (0 , sachip->base +SA1111_INTC +SA1111_INTEN1 );
arch/arm/mm/copypage-feroceon.c +2 -2
@@ -18,7 +18,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4-r9, lr} \n\ - mov ip, %0 \n\ + mov ip, %2 \n\ 1: mov lr, r1 \n\ ldmia r1!, {r2 - r9} \n\ pld [lr, #32] \n\
@@ -64,7 +64,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\ ldmfd sp!, {r4-r9, pc}" : - : "I" (PAGE_SIZE)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE)); } void feroceon_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-v4wb.c +2 -2
@@ -27,7 +27,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, lr} @ 2\n\ - mov r2, %0 @ 1\n\ + mov r2, %2 @ 1\n\ ldmia r1!, {r3, r4, ip, lr} @ 4\n\ 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ stmia r0!, {r3, r4, ip, lr} @ 4\n\
@@ -44,7 +44,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\ ldmfd sp!, {r4, pc} @ 3" : - : "I" (PAGE_SIZE / 64)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); } void v4wb_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-v4wt.c +2 -2
@@ -25,7 +25,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, lr} @ 2\n\ - mov r2, %0 @ 1\n\ + mov r2, %2 @ 1\n\ ldmia r1!, {r3, r4, ip, lr} @ 4\n\ 1: stmia r0!, {r3, r4, ip, lr} @ 4\n\ ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\
@@ -40,7 +40,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, r2, c7, c7, 0 @ flush ID cache\n\ ldmfd sp!, {r4, pc} @ 3" : - : "I" (PAGE_SIZE / 64)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); } void v4wt_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-xsc3.c +2 -2
@@ -34,7 +34,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, r5, lr} \n\ - mov lr, %0 \n\ + mov lr, %2 \n\ \n\ pld [r1, #0] \n\ pld [r1, #32] \n\
@@ -67,7 +67,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) \n\ ldmfd sp!, {r4, r5, pc}" : - : "I" (PAGE_SIZE / 64 - 1)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64 - 1)); } void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/fault.c +3 -0
@@ -386,6 +386,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,if (addr <TASK_SIZE )return do_page_fault (addr, fsr, regs); +if (user_mode (regs)) + goto bad_area; + index =pgd_index (addr);/*
arch/arm/mm/init.c +3 -3
@@ -632,10 +632,10 @@ void __init mem_init(void)void free_initmem (void ) {#ifdef CONFIG_HAVE_TCM -extern char *__tcm_start, *__tcm_end; +extern char __tcm_start, __tcm_end; - totalram_pages +=free_area (__phys_to_pfn (__pa (__tcm_start)), -__phys_to_pfn (__pa (__tcm_end)), + totalram_pages +=free_area (__phys_to_pfn (__pa (&__tcm_start)), +__phys_to_pfn (__pa (&__tcm_end)),"TCM link" );#endif
arch/arm/vfp/vfphw.S +1 -1
@@ -277,7 +277,7 @@ ENTRY(vfp_put_double) #ifdef CONFIG_VFPv3 @ d16 - d31 registers .irp dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 -1: mcrr p11, 3, r1, r2, c\dr @ fmdrr r1, r2, d\dr +1: mcrr p11, 3, r0, r1, c\dr @ fmdrr r0, r1, d\dr mov pc, lr .org 1b + 8 .endr
arch/blackfin/include/asm/cache.h +2 -0
@@ -15,6 +15,8 @@#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)#define SMP_CACHE_BYTES L1_CACHE_BYTES +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#ifdef CONFIG_SMP #define __cacheline_aligned#else
arch/frv/include/asm/cache.h +2 -0
@@ -17,6 +17,8 @@#define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))#define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
arch/m68k/include/asm/cache.h +2 -0
@@ -8,4 +8,6 @@#define L1_CACHE_SHIFT 4#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#endif
arch/mn10300/include/asm/cache.h +2 -0
@@ -21,6 +21,8 @@#define L1_CACHE_DISPARITY L1_CACHE_NENTRIES * L1_CACHE_BYTES#endif +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +/* data cache purge registers * - read from the register to unconditionally purge that cache line * - write address & 0xffffff00 to conditionally purge that cache line
arch/parisc/math-emu/decode_exc.c +1 -0
@@ -342,6 +342,7 @@ decode_fpu(unsigned int Fpu_register[], unsigned int trap_counts[])return SIGNALCODE (SIGFPE ,FPE_FLTINV );case DIVISIONBYZEROEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts); +Clear_excp_register (exception_index);return SIGNALCODE (SIGFPE ,FPE_FLTDIV );case INEXACTEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts);
arch/powerpc/kvm/powerpc.c +2 -1
@@ -176,7 +176,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) {struct kvm_vcpu *vcpu; vcpu =kvmppc_core_vcpu_create (kvm, id); -kvmppc_create_vcpu_debugfs (vcpu, id); +if (!IS_ERR (vcpu)) +kvmppc_create_vcpu_debugfs (vcpu, id);return vcpu; }
arch/powerpc/lib/string.S +3 -1
@@ -71,7 +71,7 @@ _GLOBAL(strcmp) _GLOBAL(strncmp) PPC_LCMPI r5,0 - beqlr + ble- 2f mtctr r5 addi r5,r3,-1 addi r4,r4,-1
@@ -82,6 +82,8 @@ _GLOBAL(strncmp) beqlr 1 bdnzt eq,1b blr +2: li r3,0 + blr _GLOBAL(strlen) addi r4,r3,-1
arch/powerpc/oprofile/op_model_cell.c +1 -1
@@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n) index =ENTRIES -1 ;/* make sure index is valid */ -if ((index >ENTRIES ) || (index <0 )) +if ((index >=ENTRIES ) || (index <0 )) index =ENTRIES -1 ;return initial_lfsr[index];
arch/powerpc/platforms/pseries/hotplug-cpu.c +4 -26
@@ -66,30 +66,6 @@ static void pseries_mach_cpu_die(void)for (;;); } -static int qcss_tok;/* query-cpu-stopped-state token */ - -/* Get state of physical CPU. -* Return codes: -* 0 - The processor is in the RTAS stopped state -* 1 - stop-self is in progress -* 2 - The processor is not in the RTAS stopped state -* -1 - Hardware Error -* -2 - Hardware Busy, Try again later. -*/ -static int query_cpu_stopped (unsigned int pcpu) -{ -int cpu_status, status; - - status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); -if (status !=0 ) { -printk (KERN_ERR -"RTAS query-cpu-stopped-state failed: %i\n" , status); -return status; - } - -return cpu_status; -} -static int pseries_cpu_disable (void ) {int cpu =smp_processor_id ();
@@ -113,8 +89,9 @@ static void pseries_cpu_die(unsigned int cpu)unsigned int pcpu =get_hard_smp_processor_id (cpu);for (tries =0 ; tries <25 ; tries++) { - cpu_status =query_cpu_stopped (pcpu); -if (cpu_status ==0 || cpu_status ==-1 ) + cpu_status =smp_query_cpu_stopped (pcpu); +if (cpu_status ==QCSS_STOPPED || + cpu_status ==QCSS_HARDWARE_ERROR )break ;cpu_relax (); }
@@ -256,6 +233,7 @@ static int __init pseries_cpu_hotplug_init(void) {struct device_node *np;const char *typep; +int qcss_tok;for_each_node_by_name (np,"interrupt-controller" ) { typep =of_get_property (np,"compatible" ,NULL );
arch/powerpc/platforms/pseries/plpar_wrappers.h +8 -0
@@ -4,6 +4,14 @@#include <asm/hvcall.h> #include <asm/page.h> +/* Get state of physical CPU from query_cpu_stopped */ +int smp_query_cpu_stopped (unsigned int pcpu); +#define QCSS_STOPPED 0 +#define QCSS_STOPPING 1 +#define QCSS_NOT_STOPPED 2 +#define QCSS_HARDWARE_ERROR -1 +#define QCSS_HARDWARE_BUSY -2 +static inline long poll_pending (void ) {return plpar_hcall_norets (H_POLL_PENDING );
arch/powerpc/platforms/pseries/smp.c +28 -0
@@ -56,6 +56,28 @@*/ static cpumask_t of_spin_map; +/* Query where a cpu is now. Return codes #defined in plpar_wrappers.h */ +int smp_query_cpu_stopped (unsigned int pcpu) +{ +int cpu_status, status; +int qcss_tok =rtas_token ("query-cpu-stopped-state" ); + +if (qcss_tok ==RTAS_UNKNOWN_SERVICE ) { +printk (KERN_INFO "Firmware doesn't support " +"query-cpu-stopped-state\n" ); +return QCSS_HARDWARE_ERROR ; + } + + status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); +if (status !=0 ) { +printk (KERN_ERR +"RTAS query-cpu-stopped-state failed: %i\n" , status); +return status; + } + +return cpu_status; +} +/** * smp_startup_cpu() - start the given cpu *
@@ -81,6 +103,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) pcpu =get_hard_smp_processor_id (lcpu); +/* Check to see if the CPU out of FW already for kexec */ +if (smp_query_cpu_stopped (pcpu) ==QCSS_NOT_STOPPED ){ +cpu_set (lcpu, of_spin_map); +return 1 ; + } +/* Fixup atomic count: it exited inside IRQ handler. */ task_thread_info (paca[lcpu].__current)->preempt_count =0 ;
arch/s390/kvm/kvm-s390.c +3 -1
@@ -338,11 +338,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, rc =kvm_vcpu_init (vcpu, kvm, id);if (rc) - goto out_free_cpu; + goto out_free_sie_block;VM_EVENT (kvm,3 ,"create cpu %d at %p, sie block at %p" , id, vcpu, vcpu->arch.sie_block);return vcpu; +out_free_sie_block: +free_page ((unsigned long )(vcpu->arch.sie_block)); out_free_cpu:kfree (vcpu); out_nomem:
arch/x86/include/asm/kvm_host.h +1 -0
@@ -193,6 +193,7 @@ union kvm_mmu_page_role { unsigned invalid:1; unsigned cr4_pge:1; unsigned nxe:1; + unsigned cr0_wp:1; }; };
arch/x86/include/asm/msr-index.h +3 -2
@@ -198,8 +198,9 @@#define MSR_IA32_EBL_CR_POWERON 0x0000002a#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED (1<<2) +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2)#define MSR_IA32_APICBASE 0x0000001b#define MSR_IA32_APICBASE_BSP (1<<8)
arch/x86/kernel/amd_iommu.c +1 -1
@@ -544,7 +544,7 @@ static void flush_devices_by_domain(struct protection_domain *domain)for (i =0 ; i <= amd_iommu_last_bdf; ++i) {if ((domain ==NULL && amd_iommu_pd_table[i] ==NULL ) || - (amd_iommu_pd_table[i] != domain)) + (domain !=NULL && amd_iommu_pd_table[i] != domain))continue ; iommu = amd_iommu_rlookup_table[i];
arch/x86/kernel/cpu/perf_event.c +4 -1
@@ -1005,8 +1005,11 @@ static int __hw_perf_event_init(struct perf_event *event)if (atomic_read (&active_events) ==0 ) {if (!reserve_pmc_hardware ()) err = -EBUSY ; -else +else { err =reserve_bts_hardware (); +if (err) +release_pmc_hardware (); + } }if (!err)atomic_inc (&active_events);
arch/x86/kernel/pvclock.c +24 -0
@@ -109,11 +109,14 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)return pv_tsc_khz; } +static atomic64_t last_value =ATOMIC64_INIT (0 ); +cycle_t pvclock_clocksource_read (struct pvclock_vcpu_time_info *src) {struct pvclock_shadow_time shadow;unsigned version;cycle_t ret, offset; +u64 last; do { version = pvclock_get_time_values(&shadow, src);
@@ -123,6 +126,27 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)barrier (); }while (version != src->version); +/* +* Assumption here is that last_value, a global accumulator, always goes +* forward. If we are less than that, we should not be much smaller. +* We assume there is an error marging we're inside, and then the correction +* does not sacrifice accuracy. +* +* For reads: global may have changed between test and return, +* but this means someone else updated poked the clock at a later time. +* We just need to make sure we are not seeing a backwards event. +* +* For updates: last_value = ret is not enough, since two vcpus could be +* updating at the same time, and one of them could be slightly behind, +* making the assumption that last_value always go forward fail to hold. +*/ + last =atomic64_read (&last_value); +do { +if (ret < last) +return last; + last =atomic64_cmpxchg (&last_value, last, ret); + }while (unlikely (last != ret)); +return ret; }
arch/x86/kernel/setup.c +11 -0
@@ -688,6 +688,17 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "DG45FC"), }, }, + /* + * The Dell Inspiron Mini 1012 has DMI_BIOS_VENDOR = "Dell Inc.", so + * match on the product name. + */ + { + .callback = dmi_low_memory_corruption, + .ident = "Phoenix BIOS", + .matches = { + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"), + }, + }, #endif {} };
arch/x86/kernel/tboot.c +1 -0
@@ -46,6 +46,7 @@/* Global pointer to shared data; NULL means no measured launch. */ struct tboot *tboot__read_mostly ; +EXPORT_SYMBOL (tboot);/* timeout for APs (in secs) to enter wait-for-SIPI state during shutdown */ #define AP_WAIT_TIMEOUT 1
arch/x86/kvm/mmu.c +9 -1
@@ -221,7 +221,7 @@ void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, }EXPORT_SYMBOL_GPL (kvm_mmu_set_mask_ptes); -static int is_write_protection (struct kvm_vcpu *vcpu) +static bool is_write_protection (struct kvm_vcpu *vcpu) {return vcpu->arch.cr0 &X86_CR0_WP ; }
@@ -2091,11 +2091,13 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) direct =1 ;if (mmu_check_root (vcpu, root_gfn))return 1 ; +spin_lock (&vcpu->kvm->mmu_lock); sp =kvm_mmu_get_page (vcpu, root_gfn,0 ,PT64_ROOT_LEVEL , direct,ACC_ALL ,NULL ); root =__pa (sp->spt); ++sp->root_count; +spin_unlock (&vcpu->kvm->mmu_lock); vcpu->arch.mmu.root_hpa = root;return 0 ; }
@@ -2117,11 +2119,14 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) root_gfn =0 ;if (mmu_check_root (vcpu, root_gfn))return 1 ; +spin_lock (&vcpu->kvm->mmu_lock); sp =kvm_mmu_get_page (vcpu, root_gfn, i <<30 ,PT32_ROOT_LEVEL , direct,ACC_ALL ,NULL ); root =__pa (sp->spt); ++sp->root_count; +spin_unlock (&vcpu->kvm->mmu_lock); + vcpu->arch.mmu.pae_root[i] = root |PT_PRESENT_MASK ; } vcpu->arch.mmu.root_hpa =__pa (vcpu->arch.mmu.pae_root);
@@ -2445,6 +2450,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu) r =paging32_init_context (vcpu); vcpu->arch.mmu.base_role.glevels = vcpu->arch.mmu.root_level; + vcpu->arch.mmu.base_role.cr0_wp =is_write_protection (vcpu);return r; }
@@ -2484,7 +2490,9 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu) goto out;spin_lock (&vcpu->kvm->mmu_lock);kvm_mmu_free_some_pages (vcpu); +spin_unlock (&vcpu->kvm->mmu_lock); r =mmu_alloc_roots (vcpu); +spin_lock (&vcpu->kvm->mmu_lock);mmu_sync_roots (vcpu);spin_unlock (&vcpu->kvm->mmu_lock);if (r)
arch/x86/kvm/vmx.c +21 -11
@@ -26,6 +26,7 @@#include <linux/sched.h> #include <linux/moduleparam.h> #include <linux/ftrace_event.h> +#include <linux/tboot.h> #include "kvm_cache_regs.h" #include "x86.h"
@@ -1140,9 +1141,16 @@ static __init int vmx_disabled_by_bios(void)u64 msr;rdmsrl (MSR_IA32_FEATURE_CONTROL , msr); -return (msr & (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) - ==FEATURE_CONTROL_LOCKED ; +if (msr &FEATURE_CONTROL_LOCKED ) { +if (!(msr &FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX ) + &&tboot_enabled ()) +return 1 ; +if (!(msr &FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX ) + && !tboot_enabled ()) +return 1 ; + } + +return 0 ;/* locked but not enabled */ }
@@ -1150,18 +1158,20 @@ static void hardware_enable(void *garbage) {int cpu =raw_smp_processor_id ();u64 phys_addr =__pa (per_cpu (vmxarea, cpu)); -u64 old; +u64 old, test_bits;INIT_LIST_HEAD (&per_cpu (vcpus_on_cpu, cpu));rdmsrl (MSR_IA32_FEATURE_CONTROL , old); -if ((old & (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) - != (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) + + test_bits =FEATURE_CONTROL_LOCKED ; + test_bits |=FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX ; +if (tboot_enabled ()) + test_bits |=FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX ; + +if ((old & test_bits) != test_bits) {/* enable and lock */ -wrmsrl (MSR_IA32_FEATURE_CONTROL , old | -FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED ); +wrmsrl (MSR_IA32_FEATURE_CONTROL , old | test_bits); + }write_cr4 (read_cr4 () |X86_CR4_VMXE );/* FIXME: not cpu hotplug safe */ asmvolatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr)
arch/x86/kvm/x86.c +31 -24
139 lines not on this page · raw message
arch/x86/oprofile/nmi_int.c +8 -2
@@ -95,7 +95,10 @@ static void nmi_cpu_save_registers(struct op_msrs *msrs)static void nmi_cpu_start (void *dummy) {struct op_msrs const *msrs = &__get_cpu_var (cpu_msrs); - model->start (msrs); +if (!msrs->controls) +WARN_ON_ONCE (1 ); +else + model->start (msrs); }static int nmi_start (void )
@@ -107,7 +110,10 @@ static int nmi_start(void)static void nmi_cpu_stop (void *dummy) {struct op_msrs const *msrs = &__get_cpu_var (cpu_msrs); - model->stop (msrs); +if (!msrs->controls) +WARN_ON_ONCE (1 ); +else + model->stop (msrs); }static void nmi_stop (void )
arch/x86/xen/suspend.c +2 -2
@@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data)void xen_arch_resume (void ) { -smp_call_function (xen_vcpu_notify_restore, - (void *)CLOCK_EVT_NOTIFY_RESUME ,1 ); +on_each_cpu (xen_vcpu_notify_restore, + (void *)CLOCK_EVT_NOTIFY_RESUME ,1 ); }
arch/xtensa/include/asm/cache.h +1 -0
@@ -29,5 +29,6 @@# define CACHE_WAY_SIZE ICACHE_WAY_SIZE#endif +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES#endif /* _XTENSA_CACHE_H */
drivers/acpi/video_detect.c +1 -1
@@ -250,7 +250,7 @@ static int __init acpi_backlight(char *str)ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR ;if (!strcmp ("video" , str)) acpi_video_support |= -ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO ; +ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO ; }return 1 ; }
drivers/ata/libata-core.c +6 -1
@@ -159,6 +159,10 @@ int libata_allow_tpm = 0;module_param_named (allow_tpm, libata_allow_tpm, int,0444 );MODULE_PARM_DESC (allow_tpm,"Permit the use of TPM commands (0=off [default], 1=on)" ); +static int atapi_an; +module_param (atapi_an, int,0444 ); +MODULE_PARM_DESC (atapi_an,"Enable ATAPI AN media presence notification (0=0ff [default], 1=on)" ); +MODULE_AUTHOR ("Jeff Garzik" );MODULE_DESCRIPTION ("Library module for ATA devices" );MODULE_LICENSE ("GPL" );
@@ -2570,7 +2574,8 @@ int ata_dev_configure(struct ata_device *dev)* to enable ATAPI AN to discern between PHY status * changed notifications and ATAPI ANs. */ -if ((ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && +if (atapi_an && + (ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && (!sata_pmp_attached (ap) ||sata_scr_read (&ap->link,SCR_NOTIFICATION , &sntf) ==0 )) {unsigned int err_mask;
drivers/ata/libata-sff.c +1 -1
@@ -893,7 +893,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) do_write); } -if (!do_write) +if (!do_write && !PageSlab (page))flush_dcache_page (page); qc->curbytes += qc->sect_size;
drivers/ata/sata_nv.c +1 -4
@@ -1673,7 +1673,6 @@ static void nv_mcp55_freeze(struct ata_port *ap) mask =readl (mmio_base +NV_INT_ENABLE_MCP55 ); mask &= ~(NV_INT_ALL_MCP55 << shift);writel (mask, mmio_base +NV_INT_ENABLE_MCP55 ); -ata_sff_freeze (ap); }static void nv_mcp55_thaw (struct ata_port *ap)
@@ -1687,7 +1686,6 @@ static void nv_mcp55_thaw(struct ata_port *ap) mask =readl (mmio_base +NV_INT_ENABLE_MCP55 ); mask |= (NV_INT_MASK_MCP55 << shift);writel (mask, mmio_base +NV_INT_ENABLE_MCP55 ); -ata_sff_thaw (ap); }static void nv_adma_error_handler (struct ata_port *ap)
@@ -2478,8 +2476,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) }pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ipriv->irq_handler, -IRQF_SHARED , ipriv->sht); +return ata_pci_sff_activate_host (host, ipriv->irq_handler, ipriv->sht); }#ifdef CONFIG_PM
drivers/ata/sata_via.c +13 -0
@@ -558,6 +558,19 @@ static void svia_configure(struct pci_dev *pdev) tmp8 |=NATIVE_MODE_ALL ;pci_write_config_byte (pdev,SATA_NATIVE_MODE , tmp8); } + +/* +* vt6421 has problems talking to some drives. The following +* is the magic fix from Joseph Chan <[email protected]>. +* Please add proper documentation if possible. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=15173 +*/ +if (pdev->device ==0x3249 ) { +pci_read_config_byte (pdev,0x52 , &tmp8); + tmp8 |=1 <<2 ; +pci_write_config_byte (pdev,0x52 , tmp8); + } }static int svia_init_one (struct pci_dev *pdev,const struct pci_device_id *ent)
drivers/base/cpu.c +1 -1
@@ -149,7 +149,7 @@ static ssize_t print_cpus_offline(struct sysdev_class *class, char *buf)/* display offline cpus < nr_cpu_ids */ if (!alloc_cpumask_var (&offline,GFP_KERNEL ))return -ENOMEM ; -cpumask_complement (offline, cpu_online_mask); +cpumask_andnot (offline, cpu_possible_mask, cpu_online_mask); n =cpulist_scnprintf (buf, len, offline);free_cpumask_var (offline);
drivers/char/ipmi/ipmi_si_intf.c +8 -3
@@ -310,9 +310,14 @@ static void deliver_recv_msg(struct smi_info *smi_info, {/* Deliver the message to the upper layer with the lock released. */ -spin_unlock (&(smi_info->si_lock)); -ipmi_smi_msg_received (smi_info->intf, msg); -spin_lock (&(smi_info->si_lock)); + +if (smi_info->run_to_completion) { +ipmi_smi_msg_received (smi_info->intf, msg); + }else { +spin_unlock (&(smi_info->si_lock)); +ipmi_smi_msg_received (smi_info->intf, msg); +spin_lock (&(smi_info->si_lock)); + } }static void return_hosed_msg (struct smi_info *smi_info,int cCode)
drivers/clocksource/sh_cmt.c +12 -9
@@ -413,18 +413,10 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)static int sh_cmt_clocksource_enable (struct clocksource *cs) {struct sh_cmt_priv *p =cs_to_sh_cmt (cs); -int ret; p->total_cycles =0 ; - ret =sh_cmt_start (p,FLAG_CLOCKSOURCE ); -if (ret) -return ret; - -/* TODO: calculate good shift from rate and counter bit width */ - cs->shift =0 ; - cs->mult =clocksource_hz2mult (p->rate, cs->shift); -return 0 ; +return sh_cmt_start (p,FLAG_CLOCKSOURCE ); }static void sh_cmt_clocksource_disable (struct clocksource *cs)
@@ -444,7 +436,18 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, cs->disable = sh_cmt_clocksource_disable; cs->mask =CLOCKSOURCE_MASK (sizeof (unsigned long ) *8 ); cs->flags =CLOCK_SOURCE_IS_CONTINUOUS ; + +/* clk_get_rate() needs an enabled clock */ +clk_enable (p->clk); + p->rate =clk_get_rate (p->clk) / (p->width ==16 ) ?512 :8 ; +clk_disable (p->clk); + +/* TODO: calculate good shift from rate and counter bit width */ + cs->shift =10 ; + cs->mult =clocksource_hz2mult (p->rate, cs->shift); +pr_info ("sh_cmt: %s used as clock source\n" , cs->name); +clocksource_register (cs);return 0 ; }
drivers/firewire/core-card.c +19 -5
@@ -239,7 +239,7 @@ void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)static void fw_card_bm_work (struct work_struct *work) { struct fw_card *card = container_of(work, struct fw_card, work.work); -struct fw_device *root_device; +struct fw_device *root_device, *irm_device;struct fw_node *root_node;unsigned long flags;int root_id, new_root_id, irm_id, local_id;
@@ -247,6 +247,7 @@ static void fw_card_bm_work(struct work_struct *work)bool do_reset = false;bool root_device_is_running;bool root_device_is_cmc; +bool irm_is_1394_1995_only;spin_lock_irqsave (&card->lock, flags);
@@ -256,12 +257,18 @@ static void fw_card_bm_work(struct work_struct *work) } generation = card->generation; + root_node = card->root_node;fw_node_get (root_node); root_device = root_node->data; root_device_is_running = root_device &&atomic_read (&root_device->state) ==FW_DEVICE_RUNNING ; root_device_is_cmc = root_device && root_device->cmc; + + irm_device = card->irm_node->data; + irm_is_1394_1995_only = irm_device && irm_device->config_rom && + (irm_device->config_rom[2 ] &0x000000f0 ) ==0 ; + root_id = root_node->node_id; irm_id = card->irm_node->node_id; local_id = card->local_node->node_id;
@@ -284,8 +291,15 @@ static void fw_card_bm_work(struct work_struct *work)if (!card->irm_node->link_on) { new_root_id = local_id; -fw_notify ("IRM has link off, making local node (%02x) root.\n" , - new_root_id); +fw_notify ("%s, making local node (%02x) root.\n" , +"IRM has link off" , new_root_id); + goto pick_me; + } + +if (irm_is_1394_1995_only) { + new_root_id = local_id; +fw_notify ("%s, making local node (%02x) root.\n" , +"IRM is not 1394a compliant" , new_root_id); goto pick_me; }
@@ -324,8 +338,8 @@ static void fw_card_bm_work(struct work_struct *work)* root, and thus, IRM. */ new_root_id = local_id; -fw_notify ("BM lock failed, making local node (%02x) root.\n" , - new_root_id); +fw_notify ("%s, making local node (%02x) root.\n" , +"BM lock failed" , new_root_id); goto pick_me; } }else if (card->bm_generation != generation) {
drivers/gpu/drm/drm_edid.c +1 -1
@@ -324,7 +324,7 @@ static struct drm_display_mode drm_dmt_modes[] = { DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },/* 1024x768@85Hz */ {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,94500 ,1024 ,1072 , -1072 ,1376 ,0 ,768 ,769 ,772 ,808 ,0 , +1168 ,1376 ,0 ,768 ,769 ,772 ,808 ,0 , DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },/* 1152x864@75Hz */ { DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216,
drivers/gpu/drm/i915/i915_gem.c +19 -0
@@ -2615,6 +2615,14 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)return -EINVAL ; } +/* If the object is bigger than the entire aperture, reject it early +* before evicting everything in a vain attempt to find space. +*/ +if (obj->size > dev->gtt_total) { +DRM_ERROR ("Attempting to bind an object larger than the aperture\n" ); +return -E2BIG ; + } + search_free: free_space =drm_mm_search_free (&dev_priv->mm.gtt_space, obj->size, alignment,0 );
@@ -3939,6 +3947,17 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)int ret;i915_verify_inactive (dev, __FILE__, __LINE__); + +if (obj_priv->gtt_space !=NULL ) { +if (alignment ==0 ) + alignment =i915_gem_get_gtt_alignment (obj); +if (obj_priv->gtt_offset & (alignment -1 )) { + ret =i915_gem_object_unbind (obj); +if (ret) +return ret; + } + } +if (obj_priv->gtt_space ==NULL ) { ret =i915_gem_object_bind_to_gtt (obj, alignment);if (ret)
drivers/gpu/drm/i915/intel_lvds.c +4 -0
@@ -648,8 +648,12 @@ static const struct dmi_system_id bad_lid_status[] = {*/ static enum drm_connector_status intel_lvds_detect (struct drm_connector *connector) { +struct drm_device *dev = connector->dev;enum drm_connector_status status = connector_status_connected; +if (IS_I8XX (dev)) +return connector_status_connected; +if (!acpi_lid_open () && !dmi_check_system (bad_lid_status)) status = connector_status_disconnected;
drivers/gpu/drm/radeon/radeon_atombios.c +1 -1
@@ -942,7 +942,7 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct lvds->native_mode.vtotal = lvds->native_mode.vdisplay +le16_to_cpu (lvds_info->info.sLCDTiming.usVBlanking_Time); lvds->native_mode.vsync_start = lvds->native_mode.vdisplay + -le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncWidth); +le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncOffset); lvds->native_mode.vsync_end = lvds->native_mode.vsync_start +le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncWidth); lvds->panel_pwr_delay =
drivers/gpu/drm/radeon/radeon_cp.c +1 -0
@@ -1646,6 +1646,7 @@ static int radeon_do_resume_cp(struct drm_device *dev, struct drm_file *file_priradeon_cp_load_microcode (dev_priv);radeon_cp_init_ring_buffer (dev, dev_priv, file_priv); + dev_priv->have_z_offset =0 ;radeon_do_engine_reset (dev);radeon_irq_set_state (dev,RADEON_SW_INT_ENABLE ,1 );
drivers/gpu/drm/radeon/radeon_drv.h +2 -0
@@ -267,6 +267,8 @@ typedef struct drm_radeon_private {u32 scratch_ages[5 ]; +int have_z_offset; +/* starting from here on, data is preserved accross an open */ uint32_t flags;/* see radeon_chip_flags */ resource_size_t fb_aper_offset;
drivers/gpu/drm/radeon/radeon_state.c +7 -0
@@ -101,6 +101,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *DRM_ERROR ("Invalid depth buffer offset\n" );return -EINVAL ; } + dev_priv->have_z_offset =1 ;break ;case RADEON_EMIT_PP_CNTL :
@@ -876,6 +877,12 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,if (tmp &RADEON_BACK ) flags |=RADEON_FRONT ; } +if (flags & (RADEON_DEPTH |RADEON_STENCIL )) { +if (!dev_priv->have_z_offset) { +printk_once (KERN_ERR "radeon: illegal depth clear request. Buggy mesa detected - please update.\n" ); + flags &= ~(RADEON_DEPTH |RADEON_STENCIL ); + } + }if (flags & (RADEON_FRONT |RADEON_BACK )) {
drivers/hid/hid-core.c +1 -0
@@ -1306,6 +1306,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
drivers/hid/hid-gyration.c +1 -0
@@ -73,6 +73,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field,static const struct hid_device_id gyration_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE ) }, {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE_2 ) }, + {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE_3 ) }, { } };MODULE_DEVICE_TABLE (hid, gyration_devices);
drivers/hid/hid-ids.h +1 -0
@@ -251,6 +251,7 @@#define USB_VENDOR_ID_GYRATION 0x0c16#define USB_DEVICE_ID_GYRATION_REMOTE 0x0002#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 +#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008#define USB_VENDOR_ID_HAPP 0x078b#define USB_DEVICE_ID_UGCI_DRIVING 0x0010
drivers/hwmon/ltc4245.c +5 -13
@@ -45,9 +45,7 @@ enum ltc4245_cmd {LTC4245_VEEIN =0x19 ,LTC4245_VEESENSE =0x1a ,LTC4245_VEEOUT =0x1b , -LTC4245_GPIOADC1 =0x1c , -LTC4245_GPIOADC2 =0x1d , - LTC4245_GPIOADC3 = 0x1e, + LTC4245_GPIOADC = 0x1c, }; struct ltc4245_data {
@@ -61,7 +59,7 @@ struct ltc4245_data {u8 cregs[0x08 ];/* Voltage registers */ -u8 vregs[0x0f ]; +u8 vregs[0x0d ]; };static struct ltc4245_data *ltc4245_update_device (struct device *dev)
@@ -86,7 +84,7 @@ static struct ltc4245_data *ltc4245_update_device(struct device *dev) data->cregs[i] = val; } -/* Read voltage registers -- 0x10 to 0x1f */ +/* Read voltage registers -- 0x10 to 0x1c */ for (i =0 ; i <ARRAY_SIZE (data->vregs); i++) { val =i2c_smbus_read_byte_data (client, i+0x10 );if (unlikely (val <0 ))
@@ -128,9 +126,7 @@ static int ltc4245_get_voltage(struct device *dev, u8 reg)case LTC4245_VEEOUT : voltage = regval *-55 ;break ; -case LTC4245_GPIOADC1 : -case LTC4245_GPIOADC2 : -case LTC4245_GPIOADC3 : +case LTC4245_GPIOADC : voltage = regval *10 ;break ;default :
@@ -297,9 +293,7 @@ LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2);LTC4245_ALARM (in8_min_alarm, (1 <<3 ),LTC4245_FAULT2 );/* GPIO voltages */ -LTC4245_VOLTAGE (in9_input,LTC4245_GPIOADC1 ); -LTC4245_VOLTAGE (in10_input,LTC4245_GPIOADC2 ); -LTC4245_VOLTAGE (in11_input,LTC4245_GPIOADC3 ); +LTC4245_VOLTAGE (in9_input,LTC4245_GPIOADC );/* Power Consumption (virtual) */ LTC4245_POWER (power1_input,LTC4245_12VSENSE );
@@ -342,8 +336,6 @@ static struct attribute *ltc4245_attributes[] = { &sensor_dev_attr_in8_min_alarm.dev_attr.attr, &sensor_dev_attr_in9_input.dev_attr.attr, - &sensor_dev_attr_in10_input.dev_attr.attr, - &sensor_dev_attr_in11_input.dev_attr.attr, &sensor_dev_attr_power1_input.dev_attr.attr, &sensor_dev_attr_power2_input.dev_attr.attr,
drivers/input/mouse/psmouse-base.c +10 -4
@@ -1349,6 +1349,7 @@ static int psmouse_reconnect(struct serio *serio)struct psmouse *psmouse =serio_get_drvdata (serio);struct psmouse *parent =NULL ;struct serio_driver *drv = serio->drv; +unsigned char type;int rc =-1 ;if (!drv || !psmouse) {
@@ -1368,10 +1369,15 @@ static int psmouse_reconnect(struct serio *serio)if (psmouse->reconnect) {if (psmouse->reconnect (psmouse)) goto out; - }else if (psmouse_probe (psmouse) <0 || - psmouse->type !=psmouse_extensions (psmouse, - psmouse_max_proto, false)) { - goto out; + }else { +psmouse_reset (psmouse); + +if (psmouse_probe (psmouse) <0 ) + goto out; + + type =psmouse_extensions (psmouse, psmouse_max_proto, false); +if (psmouse->type != type) + goto out; }/* ok, the device type (and capabilities) match the old one,
drivers/md/dm-exception-store.h +1 -1
@@ -162,7 +162,7 @@ static inline sector_t get_dev_size(struct block_device *bdev)static inline chunk_t sector_to_chunk (struct dm_exception_store *store,sector_t sector) { -return (sector & ~store->chunk_mask) >> store->chunk_shift; +return sector >> store->chunk_shift; }int dm_exception_store_type_register (struct dm_exception_store_type *type);
drivers/md/md.c +29 -0
@@ -5334,6 +5334,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,int err =0 ;void __user *argp = (void __user *)arg;mddev_t *mddev =NULL ; +int ro;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -5469,6 +5470,34 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, err =do_md_stop (mddev,1 ,1 ); goto done_unlock; +case BLKROSET : +if (get_user (ro, (int __user *)(arg))) { + err = -EFAULT ; + goto done_unlock; + } + err = -EINVAL ; + +/* if the bdev is going readonly the value of mddev->ro +* does not matter, no writes are coming +*/ +if (ro) + goto done_unlock; + +/* are we are already prepared for writes? */ +if (mddev->ro !=1 ) + goto done_unlock; + +/* transitioning to readauto need only happen for +* arrays that call md_write_start +*/ +if (mddev->pers) { + err =restart_array (mddev); +if (err ==0 ) { + mddev->ro =2 ; +set_disk_ro (mddev->gendisk,0 ); + } + } + goto done_unlock; }/*
drivers/md/raid1.c +5 -4
@@ -417,7 +417,7 @@ static void raid1_end_write_request(struct bio *bio, int error)*/ static int read_balance (conf_t *conf,r1bio_t *r1_bio) { -const unsigned long this_sector = r1_bio->sector; +const sector_t this_sector = r1_bio->sector;int new_disk = conf->last_used, disk = new_disk;int wonly_disk =-1 ;const int sectors = r1_bio->sectors;
@@ -433,7 +433,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio) retry:if (conf->mddev->recovery_cp < MaxSector && (this_sector + sectors >= conf->next_resync)) { -/* Choose the first operation device, for consistancy */ +/* Choose the first operational device, for consistancy */ new_disk =0 ; for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);
@@ -891,9 +891,10 @@ static int make_request(struct request_queue *q, struct bio * bio)if (test_bit (Faulty, &rdev->flags)) {rdev_dec_pending (rdev, mddev); r1_bio->bios[i] =NULL ; - }else + }else { r1_bio->bios[i] = bio; - targets++; + targets++; + } }else r1_bio->bios[i] =NULL ; }
drivers/md/raid10.c +1 -1
@@ -493,7 +493,7 @@ static int raid10_mergeable_bvec(struct request_queue *q,*/ static int read_balance (conf_t *conf,r10bio_t *r10_bio) { -const unsigned long this_sector = r10_bio->sector; +const sector_t this_sector = r10_bio->sector;int disk, slot, nslot;const int sectors = r10_bio->sectors;sector_t new_distance, current_distance;
drivers/media/video/gspca/stv06xx/stv06xx.c +0 -2
@@ -497,8 +497,6 @@ static const __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x046D, 0x08F5), .driver_info = BRIDGE_ST6422 }, /* QuickCam Messenger (new) */ {USB_DEVICE(0x046D, 0x08F6), .driver_info = BRIDGE_ST6422 }, - /* QuickCam Messenger (new) */ - {USB_DEVICE(0x046D, 0x08DA), .driver_info = BRIDGE_ST6422 }, {} };MODULE_DEVICE_TABLE (usb, device_table);
drivers/net/arcnet/com20020-pci.c +2 -2
@@ -165,8 +165,8 @@ static struct pci_device_id com20020pci_id_table[] = { { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9030, 0x10B5, 0x2978, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9050, 0x10B5, 0x2273, 0, 0, ARC_CAN_10MBIT }, { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, {0,}
drivers/net/atl1e/atl1e_ethtool.c +2 -0
@@ -394,11 +394,13 @@ static const struct ethtool_ops atl1e_ethtool_ops = { .get_eeprom = atl1e_get_eeprom, .set_eeprom = atl1e_set_eeprom, .get_tx_csum = atl1e_get_tx_csum, + .set_tx_csum = ethtool_op_set_tx_hw_csum, .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, #ifdef NETIF_F_TSO .get_tso = ethtool_op_get_tso, #endif + .set_tso = ethtool_op_set_tso, };void atl1e_set_ethtool_ops (struct net_device *netdev)
drivers/net/can/sja1000/sja1000.c +17 -3
@@ -84,6 +84,20 @@ static struct can_bittiming_const sja1000_bittiming_const = { .brp_inc = 1, }; +static void sja1000_write_cmdreg (struct sja1000_priv *priv,u8 val) +{ +unsigned long flags; + +/* +* The command register needs some locking and time to settle +* the write_reg() operation - especially on SMP systems. +*/ +spin_lock_irqsave (&priv->cmdreg_lock, flags); + priv->write_reg (priv,REG_CMR , val); + priv->read_reg (priv,REG_SR ); +spin_unlock_irqrestore (&priv->cmdreg_lock, flags); +} +static int sja1000_probe_chip (struct net_device *dev) {struct sja1000_priv *priv =netdev_priv (dev);
@@ -279,7 +293,7 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,can_put_echo_skb (skb, dev,0 ); - priv->write_reg (priv,REG_CMR ,CMD_TR ); +sja1000_write_cmdreg (priv,CMD_TR );return NETDEV_TX_OK ; }
@@ -334,7 +348,7 @@ static void sja1000_rx(struct net_device *dev) cf->data[i++] =0 ;/* release receive buffer */ - priv->write_reg (priv,REG_CMR ,CMD_RRB ); +sja1000_write_cmdreg (priv,CMD_RRB );netif_rx (skb);
@@ -368,7 +382,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) cf->data[1 ] =CAN_ERR_CRTL_RX_OVERFLOW ; stats->rx_over_errors++; stats->rx_errors++; - priv->write_reg (priv,REG_CMR ,CMD_CDO );/* clear bit */ +sja1000_write_cmdreg (priv,CMD_CDO );/* clear bit */ }if (isrc &IRQ_EI ) {
drivers/net/can/sja1000/sja1000.h +1 -0
@@ -165,6 +165,7 @@ struct sja1000_priv {void __iomem *reg_base;/* ioremap'ed address to registers */ unsigned long irq_flags;/* for request_irq() */ +spinlock_t cmdreg_lock;/* lock for concurrent cmd register writes */ u16 flags;/* custom mode flags */ u8 ocr;/* output control register */
drivers/net/ixgbe/ixgbe_main.c +6 -2
@@ -5241,9 +5241,13 @@ static int ixgbe_maybe_stop_tx(struct net_device *netdev,static u16 ixgbe_select_queue (struct net_device *dev,struct sk_buff *skb) {struct ixgbe_adapter *adapter =netdev_priv (dev); +int txq =smp_processor_id (); -if (adapter->flags &IXGBE_FLAG_FDIR_HASH_CAPABLE ) -return smp_processor_id (); +if (adapter->flags &IXGBE_FLAG_FDIR_HASH_CAPABLE ) { +while (unlikely (txq >= dev->real_num_tx_queues)) + txq -= dev->real_num_tx_queues; +return txq; + }if (adapter->flags &IXGBE_FLAG_DCB_ENABLED )return (skb->vlan_tci &IXGBE_TX_FLAGS_VLAN_PRIO_MASK ) >>13 ;
drivers/net/mlx4/icm.c +2 -1
@@ -174,9 +174,10 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (chunk->nsg <=0 ) goto fail; + } +if (chunk->npages ==MLX4_ICM_CHUNK_LEN ) chunk =NULL ; - } npages -=1 << cur_order; }else {
drivers/net/pppol2tp.c +2 -1
@@ -1178,7 +1178,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)/* Calculate UDP checksum if configured to do so */ if (sk_tun->sk_no_check ==UDP_CSUM_NOXMIT ) skb->ip_summed =CHECKSUM_NONE ; -else if (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM )) { +else if ((skb_dst (skb) &&skb_dst (skb)->dev) && + (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM ))) { skb->ip_summed =CHECKSUM_COMPLETE ; csum =skb_checksum (skb,0 , udp_len,0 ); uh->check = csum_tcpudp_magic(inet->saddr, inet->daddr,
drivers/net/tulip/Kconfig +4 -0
@@ -101,6 +101,10 @@ config TULIP_NAPI_HW_MITIGATION If in doubt, say Y. +config TULIP_DM910X + def_bool y + depends on TULIP && SPARC + config DE4X5 tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA" depends on PCI || EISA
drivers/net/tulip/dmfe.c +21 -0
@@ -92,6 +92,10 @@#include <asm/uaccess.h> #include <asm/irq.h> +#ifdef CONFIG_TULIP_DM910X +#include <linux/of.h> +#endif +/* Board/System/Debug information/definition ---------------- */ #define PCI_DM9132_ID 0x91321282/* Davicom DM9132 ID */
@@ -377,6 +381,23 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,if (!printed_version++)printk (version); +/* +* SPARC on-board DM910x chips should be handled by the main +* tulip driver, except for early DM9100s. +*/ +#ifdef CONFIG_TULIP_DM910X +if ((ent->driver_data ==PCI_DM9100_ID && pdev->revision >=0x30 ) || + ent->driver_data ==PCI_DM9102_ID ) { +struct device_node *dp =pci_device_to_OF_node (pdev); + +if (dp &&of_get_property (dp,"local-mac-address" ,NULL )) { + printk(KERN_INFO DRV_NAME + ": skipping on-board DM910x (use tulip)\n"); +return -ENODEV ; + } + } +#endif +/* Init network device */ dev =alloc_etherdev (sizeof (*db));if (dev ==NULL )
drivers/net/tulip/tulip_core.c +25 -7
@@ -196,9 +196,13 @@ struct tulip_chip_table tulip_tbl[] = { | HAS_NWAY | HAS_PCI_MWI, tulip_timer, tulip_media_task },/* DM910X */ +#ifdef CONFIG_TULIP_DM910X {"Davicom DM9102/DM9102A" ,128 ,0x0001ebef ,HAS_MII |HAS_MEDIA_TABLE |CSR12_IN_SROM |HAS_ACPI , tulip_timer, tulip_media_task }, +#else + { NULL }, +#endif /* RS7112 */ { "Conexant LANfinity", 256, 0x0001ebef,
@@ -228,8 +232,10 @@ static struct pci_device_id tulip_pci_tbl[] = { { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 }, { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 }, +#ifdef CONFIG_TULIP_DM910X { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X }, { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X }, +#endif { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 }, { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
@@ -1299,18 +1305,30 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, }/* -* Early DM9100's need software CRC and the DMFE driver +* DM910x chips should be handled by the dmfe driver, except +* on-board chips on SPARC systems. Also, early DM9100s need +* software CRC which only the dmfe driver supports. */ -if (pdev->vendor ==0x1282 && pdev->device ==0x9100 ) - { -/* Read Chip revision */ -if (pdev->revision <0x30 ) - { - printk(KERN_ERR PFX "skipping early DM9100 with Crc bug (use dmfe)\n"); +#ifdef CONFIG_TULIP_DM910X +if (chip_idx ==DM910X ) { +struct device_node *dp; + +if (pdev->vendor ==0x1282 && pdev->device ==0x9100 && + pdev->revision <0x30 ) { + printk(KERN_INFO PFX + "skipping early DM9100 with Crc bug (use dmfe)\n"); +return -ENODEV ; + } + + dp =pci_device_to_OF_node (pdev); +if (!(dp &&of_get_property (dp,"local-mac-address" ,NULL ))) { + printk(KERN_INFO PFX + "skipping DM910x expansion card (use dmfe)\n");return -ENODEV ; } } +#endif /* * Looks for early PCI chipsets where people report hangs
drivers/net/ucc_geth.c +7 -5
@@ -1563,7 +1563,10 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode)static void ugeth_quiesce (struct ucc_geth_private *ugeth) { -/* Wait for and prevent any further xmits. */ +/* Prevent any further xmits, plus detach the device. */ +netif_device_detach (ugeth->ndev); + +/* Wait for any current xmits to finish. */ netif_tx_disable (ugeth->ndev);/* Disable the interrupt to avoid NAPI rescheduling. */
@@ -1577,7 +1580,7 @@ static void ugeth_activate(struct ucc_geth_private *ugeth) {napi_enable (&ugeth->napi);enable_irq (ugeth->ug_info->uf_info.irq); -netif_tx_wake_all_queues (ugeth->ndev); +netif_device_attach (ugeth->ndev); }/* Called every time the controller might need to be made
@@ -3273,13 +3276,12 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)/* Handle the transmitted buffer and release */ /* the BD to be used with the current frame */ -if ((bd == ugeth->txBd[txQ]) && (netif_queue_stopped (dev) ==0 )) + skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]]; +if (!skb)break ; dev->stats.tx_packets++; - skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]]; -if (skb_queue_len (&ugeth->rx_recycle) <RX_BD_RING_LEN && skb_recycle_check(skb, ugeth->ug_info->uf_info.max_rx_buf_length +
drivers/net/via-velocity.c +4 -4
@@ -2186,8 +2186,6 @@ static int velocity_open(struct net_device *dev)/* Ensure chip is running */ pci_set_power_state (vptr->pdev,PCI_D0 ); -velocity_give_many_rx_descs (vptr); -velocity_init_registers (vptr,VELOCITY_INIT_COLD ); ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
@@ -2199,6 +2197,8 @@ static int velocity_open(struct net_device *dev) goto out; } +velocity_give_many_rx_descs (vptr); +mac_enable_int (vptr->mac_regs);netif_start_queue (dev); vptr->flags |=VELOCITY_FLAGS_OPENED ;
@@ -2287,10 +2287,10 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu) dev->mtu = new_mtu; -velocity_give_many_rx_descs (vptr); -velocity_init_registers (vptr,VELOCITY_INIT_COLD ); +velocity_give_many_rx_descs (vptr); +mac_enable_int (vptr->mac_regs);netif_start_queue (dev);
drivers/net/virtio_net.c +1 -2
@@ -398,8 +398,7 @@ static void refill_work(struct work_struct *work) vi = container_of(work, struct virtnet_info, refill.work);napi_disable (&vi->napi); -try_fill_recv (vi,GFP_KERNEL ); - still_empty = (vi->num ==0 ); + still_empty = !try_fill_recv (vi,GFP_KERNEL );napi_enable (&vi->napi);/* In theory, this can happen: if we don't get any buffers in
drivers/net/wireless/ath/ar9170/hw.h +1 -0
@@ -422,5 +422,6 @@ enum ar9170_txq {#define AR9170_TXQ_DEPTH 32#define AR9170_TX_MAX_PENDING 128 +#define AR9170_RX_STREAM_MAX_SIZE 65535#endif /* __AR9170_HW_H */
drivers/net/wireless/ath/ar9170/main.c +1 -1
@@ -2526,7 +2526,7 @@ void *ar9170_alloc(size_t priv_size)* tends to split the streams into seperate rx descriptors. */ - skb =__dev_alloc_skb (AR9170_MAX_RX_BUFFER_SIZE ,GFP_KERNEL ); + skb =__dev_alloc_skb (AR9170_RX_STREAM_MAX_SIZE ,GFP_KERNEL );if (!skb) goto err_nomem;
drivers/net/wireless/ath/ar9170/usb.c +10 -0
@@ -66,18 +66,28 @@ static struct usb_device_id ar9170_usb_ids[] = { { USB_DEVICE(0x0cf3, 0x1001) },/* TP-Link TL-WN821N v2 */ { USB_DEVICE(0x0cf3, 0x1002) }, +/* 3Com Dual Band 802.11n USB Adapter */ + { USB_DEVICE(0x0cf3, 0x1010) }, +/* H3C Dual Band 802.11n USB Adapter */ + { USB_DEVICE(0x0cf3, 0x1011) },/* Cace Airpcap NX */ { USB_DEVICE(0xcace, 0x0300) },/* D-Link DWA 160 A1 */ { USB_DEVICE(0x07d1, 0x3c10) },/* D-Link DWA 160 A2 */ { USB_DEVICE(0x07d1, 0x3a09) }, +/* Netgear WNA1000 */ + { USB_DEVICE(0x0846, 0x9040) },/* Netgear WNDA3100 */ { USB_DEVICE(0x0846, 0x9010) },/* Netgear WN111 v2 */ { USB_DEVICE(0x0846, 0x9001) },/* Zydas ZD1221 */ { USB_DEVICE(0x0ace, 0x1221) }, +/* Proxim ORiNOCO 802.11n USB */ + { USB_DEVICE(0x1435, 0x0804) }, +/* WNC Generic 11n USB Dongle */ + { USB_DEVICE(0x1435, 0x0326) },/* ZyXEL NWD271N */ { USB_DEVICE(0x0586, 0x3417) }, /* Z-Com UB81 BG */
drivers/net/wireless/ath/ath5k/base.c +3 -1
@@ -2975,13 +2975,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,if (changed_flags & (FIF_PROMISC_IN_BSS |FIF_OTHER_BSS )) {if (*new_flags &FIF_PROMISC_IN_BSS ) { - rfilt |=AR5K_RX_FILTER_PROM ;__set_bit (ATH_STAT_PROMISC , sc->status); }else {__clear_bit (ATH_STAT_PROMISC , sc->status); } } +if (test_bit (ATH_STAT_PROMISC , sc->status)) + rfilt |=AR5K_RX_FILTER_PROM ; +/* Note, AR5K_RX_FILTER_MCAST is already enabled */ if (*new_flags &FIF_ALLMULTI ) { mfilt[0 ] = ~0 ;
drivers/net/wireless/ath/ath9k/hw.c +6 -1
@@ -398,7 +398,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah) ah->config.pcie_clock_req =0 ; ah->config.pcie_waen =0 ; ah->config.analog_shiftreg =1 ; - ah->config.ht_enable =1 ; ah->config.ofdm_trig_low =200 ; ah->config.ofdm_trig_high =500 ; ah->config.cck_trig_high =200 ;
@@ -412,6 +411,11 @@ static void ath9k_hw_init_config(struct ath_hw *ah) ah->config.spurchans[i][1 ] =AR_NO_SPUR ; } +if (ah->hw_version.devid !=AR2427_DEVID_PCIE ) + ah->config.ht_enable =1 ; +else + ah->config.ht_enable =0 ; + ah->config.intr_mitigation = true;/*
@@ -617,6 +621,7 @@ static bool ath9k_hw_devid_supported(u16 devid)case AR9285_DEVID_PCIE :case AR5416_DEVID_AR9287_PCI :case AR5416_DEVID_AR9287_PCIE : +case AR2427_DEVID_PCIE :return true;default :break ;
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -37,6 +37,7 @@#define AR9280_DEVID_PCI 0x0029#define AR9280_DEVID_PCIE 0x002a#define AR9285_DEVID_PCIE 0x002b +#define AR2427_DEVID_PCIE 0x002c#define AR5416_AR9100_DEVID 0x000b#define AR_SUBVENDOR_ID_NOG 0x0e11#define AR_SUBVENDOR_ID_NEW_A 0x7065
drivers/net/wireless/ath/ath9k/main.c +3 -1
@@ -1541,12 +1541,14 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->flags =IEEE80211_HW_RX_INCLUDES_FCS |IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |IEEE80211_HW_SIGNAL_DBM | -IEEE80211_HW_AMPDU_AGGREGATION |IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_PS_NULLFUNC_STACK |IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_SPECTRUM_MGMT ; +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_HT ) + hw->flags |=IEEE80211_HW_AMPDU_AGGREGATION ; +if (AR_SREV_9160_10_OR_LATER (sc->sc_ah) || modparam_nohwcrypt) hw->flags |=IEEE80211_HW_MFP_CAPABLE ;
drivers/net/wireless/ath/ath9k/pci.c +1 -0
@@ -25,6 +25,7 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = { { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */ { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */ { PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */ + { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */ { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */ { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */ { 0 }
drivers/net/wireless/iwlwifi/iwl-5000.c +19 -4
@@ -1674,12 +1674,12 @@ struct iwl_cfg iwl5300_agn_cfg = { .use_rts_for_ht = true, /* use rts/cts protection */ }; -struct iwl_cfg iwl5100_bg_cfg = { - .name ="5100BG" , +struct iwl_cfg iwl5100_bgn_cfg = { + .name ="5100BGN" , .fw_name_pre =IWL5000_FW_PRE , .ucode_api_max =IWL5000_UCODE_API_MAX , .ucode_api_min =IWL5000_UCODE_API_MIN , - .sku =IWL_SKU_G , + .sku =IWL_SKU_G |IWL_SKU_N , .ops = &iwl5000_ops, .eeprom_size =IWL_5000_EEPROM_IMG_SIZE , .eeprom_ver =EEPROM_5000_EEPROM_VERSION ,
@@ -1705,7 +1705,6 @@ struct iwl_cfg iwl5100_abg_cfg = { .valid_tx_ant = ANT_B, .valid_rx_ant = ANT_AB, .need_pll_cfg = true, - .ht_greenfield_support = true, };struct iwl_cfg iwl5100_agn_cfg = {
@@ -1762,6 +1761,22 @@ struct iwl_cfg iwl5150_agn_cfg = { .use_rts_for_ht = true, /* use rts/cts protection */ }; +struct iwl_cfg iwl5150_abg_cfg = { + .name ="5150ABG" , + .fw_name_pre =IWL5150_FW_PRE , + .ucode_api_max =IWL5150_UCODE_API_MAX , + .ucode_api_min =IWL5150_UCODE_API_MIN , + .sku =IWL_SKU_A |IWL_SKU_G , + .ops = &iwl5150_ops, + .eeprom_size =IWL_5000_EEPROM_IMG_SIZE , + .eeprom_ver =EEPROM_5050_EEPROM_VERSION , + .eeprom_calib_ver =EEPROM_5050_TX_POWER_VERSION , + .mod_params = &iwl50_mod_params, + .valid_tx_ant =ANT_A , + .valid_rx_ant =ANT_AB , + .need_pll_cfg = true, +}; +MODULE_FIRMWARE (IWL5000_MODULE_FIRMWARE (IWL5000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL5150_MODULE_FIRMWARE (IWL5150_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +20 -4
@@ -402,10 +402,23 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, struct iwl_lq_sta *lq_data, u8 tid, struct ieee80211_sta *sta) { + int ret; +if (rs_tl_get_load (lq_data, tid) >IWL_AGG_LOAD_THRESHOLD ) {IWL_DEBUG_HT (priv,"Starting Tx agg: STA: %pM tid: %d\n" , sta->addr, tid); -ieee80211_start_tx_ba_session (priv->hw, sta->addr, tid); + ret =ieee80211_start_tx_ba_session (priv->hw, sta->addr, tid); +if (ret == -EAGAIN ) { +/* +* driver and mac80211 is out of sync +* this might be cause by reloading firmware +* stop the tx ba session here +*/ +IWL_DEBUG_HT (priv,"Fail start Tx agg on tid: %d\n" , + tid); + ret =ieee80211_stop_tx_ba_session (priv->hw, sta->addr, tid, +WLAN_BACK_INITIATOR ); + } } }
@@ -2180,9 +2193,12 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,/* Else we have enough samples; calculate estimate of * actual average throughput */ - -BUG_ON (window->average_tpt != ((window->success_ratio * - tbl->expected_tpt[index] +64 ) /128 )); +if (window->average_tpt != ((window->success_ratio * + tbl->expected_tpt[index] +64 ) /128 )) { +IWL_ERR (priv,"expected_tpt should have been calculated by now\n" ); + window->average_tpt = ((window->success_ratio * + tbl->expected_tpt[index] +64 ) /128 ); + }/* If we are searching for better modulation mode, check success. */ if (lq_sta->search_better_tbl &&
drivers/net/wireless/iwlwifi/iwl-agn.c +57 -17
80 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-dev.h +2 -1
@@ -53,9 +53,10 @@ extern struct iwl_cfg iwl4965_agn_cfg;extern struct iwl_cfg iwl5300_agn_cfg;extern struct iwl_cfg iwl5100_agn_cfg;extern struct iwl_cfg iwl5350_agn_cfg; -extern struct iwl_cfg iwl5100_bg_cfg; +extern struct iwl_cfg iwl5100_bgn_cfg;extern struct iwl_cfg iwl5100_abg_cfg;extern struct iwl_cfg iwl5150_agn_cfg; +extern struct iwl_cfg iwl5150_abg_cfg;extern struct iwl_cfg iwl6000h_2agn_cfg;extern struct iwl_cfg iwl6000i_2agn_cfg;extern struct iwl_cfg iwl6000_3agn_cfg;
drivers/net/wireless/iwlwifi/iwl-tx.c +12 -6
@@ -791,8 +791,10 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) hdr->seq_ctrl |=cpu_to_le16 (seq_number); seq_number +=0x10 ;/* aggregation is on for this <sta,tid> */ -if (info->flags &IEEE80211_TX_CTL_AMPDU ) +if (info->flags &IEEE80211_TX_CTL_AMPDU && + priv->stations[sta_id].tid[tid].agg.state ==IWL_AGG_ON ) { txq_id = priv->stations[sta_id].tid[tid].agg.txq_id; + } } txq = &priv->txq[txq_id];
@@ -1273,7 +1275,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) {int tx_fifo_id, txq_id, sta_id, ssn =-1 ;struct iwl_tid_data *tid_data; -int ret, write_ptr, read_ptr; +int write_ptr, read_ptr;unsigned long flags;if (!ra) {
@@ -1325,13 +1327,17 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) priv->stations[sta_id].tid[tid].agg.state =IWL_AGG_OFF ;spin_lock_irqsave (&priv->lock, flags); - ret = priv->cfg->ops->lib->txq_agg_disable (priv, txq_id, ssn, +/* +* the only reason this call can fail is queue number out of range, +* which can happen if uCode is reloaded and all the station +* information are lost. if it is outside the range, there is no need +* to deactivate the uCode queue, just return "success" to allow +* mac80211 to clean up it own data. +*/ + priv->cfg->ops->lib->txq_agg_disable (priv, txq_id, ssn, tx_fifo_id);spin_unlock_irqrestore (&priv->lock, flags); -if (ret) -return ret; -ieee80211_stop_tx_ba_cb_irqsafe (priv->hw, ra, tid);return 0 ;
drivers/net/wireless/p54/p54usb.c +1 -0
@@ -78,6 +78,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ + {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */ {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ {USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */ {}
drivers/net/wireless/rtl818x/rtl8180_dev.c +1 -0
@@ -190,6 +190,7 @@ static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio) info->flags |=IEEE80211_TX_STAT_ACK ; info->status.rates[0 ].count = (flags &0xFF ) +1 ; + info->status.rates[1 ].idx =-1 ;ieee80211_tx_status_irqsafe (dev, skb);if (ring->entries -skb_queue_len (&ring->queue) ==2 )
drivers/net/wireless/wl12xx/wl1251_sdio.c +1 -0
@@ -160,6 +160,7 @@ disable:sdio_disable_func (func); release:sdio_release_host (func); +wl1251_free_hw (wl);return ret; }
drivers/oprofile/cpu_buffer.c +13 -50
108 lines not on this page · raw message
drivers/pci/quirks.c +10 -4
@@ -1444,7 +1444,8 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) conf5 &= ~(1 <<24 );/* Clear bit 24 */ switch (pdev->device) { -case PCI_DEVICE_ID_JMICRON_JMB360 : +case PCI_DEVICE_ID_JMICRON_JMB360 :/* SATA single port */ +case PCI_DEVICE_ID_JMICRON_JMB362 :/* SATA dual ports */ /* The controller should be in single function ahci mode */ conf1 |=0x0002A100 ;/* Set 8, 13, 15, 17 */ break ;
@@ -1480,12 +1481,14 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) }DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB360 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 , quirk_jmicron_ata); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB362 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB368 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB360 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 , quirk_jmicron_ata); +DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB362 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 , quirk_jmicron_ata);
@@ -2092,6 +2095,8 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev) } }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE , quirk_disable_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,0xa238 , quirk_disable_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x5a3f , quirk_disable_msi);/* Go through the list of Hypertransport capabilities and * return 1 if a HT MSI capability is found and enabled */
@@ -2183,15 +2188,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS,DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8132_BRIDGE , ht_enable_msi_mapping); -/* The P5N32-SLI Premium motherboard from Asus has a problem with msi +/* The P5N32-SLI motherboards from Asus have a problem with msi * for the MCP55 NIC. It is not yet determined whether the msi problem * also affects other devices. As for now, turn off msi for this device. */ static void __devinit nvenet_msi_disable (struct pci_dev *dev) { -if (dmi_name_in_vendors ("P5N32-SLI PREMIUM" )) { +if (dmi_name_in_vendors ("P5N32-SLI PREMIUM" ) || +dmi_name_in_vendors ("P5N32-E SLI" )) {dev_info (&dev->dev, -"Disabling msi for MCP55 NIC on P5N32-SLI Premium\n" ); +"Disabling msi for MCP55 NIC on P5N32-SLI\n" ); dev->no_msi =1 ; } }
drivers/rtc/rtc-cmos.c +3 -2
@@ -723,6 +723,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) } } + cmos_rtc.dev = dev; +dev_set_drvdata (dev, &cmos_rtc); + cmos_rtc.rtc =rtc_device_register (driver_name, dev, &cmos_rtc_ops,THIS_MODULE );if (IS_ERR (cmos_rtc.rtc)) {
@@ -730,8 +733,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup0; } - cmos_rtc.dev = dev; -dev_set_drvdata (dev, &cmos_rtc);rename_region (ports,dev_name (&cmos_rtc.rtc->dev));spin_lock_irq (&rtc_lock);
drivers/rtc/rtc-s3c.c +3 -2
@@ -456,8 +456,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)pr_debug ("s3c2410_rtc: RTCCON=%02x\n" ,readb (s3c_rtc_base +S3C2410_RTCCON )); -s3c_rtc_setfreq (&pdev->dev,1 ); -device_init_wakeup (&pdev->dev,1 );/* register RTC and exit */
@@ -474,6 +472,9 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) rtc->max_user_freq =128 ;platform_set_drvdata (pdev, rtc); + +s3c_rtc_setfreq (&pdev->dev,1 ); +return 0 ; err_nortc:
drivers/scsi/qla2xxx/qla_isr.c +13 -15
@@ -2240,30 +2240,28 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)/* If possible, enable MSI-X. */ if (!IS_QLA2432 (ha) && !IS_QLA2532 (ha) && - !IS_QLA8432 (ha) && !IS_QLA8001 (ha)) - goto skip_msix; + !IS_QLA8432 (ha) && !IS_QLA8001 (ha)) + goto skip_msi; + +if (ha->pdev->subsystem_vendor ==PCI_VENDOR_ID_HP && + (ha->pdev->subsystem_device ==0x7040 || + ha->pdev->subsystem_device ==0x7041 || + ha->pdev->subsystem_device ==0x1705 )) { +DEBUG2 (qla_printk (KERN_WARNING , ha, +"MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X,0x%X).\n" , + ha->pdev->subsystem_vendor, + ha->pdev->subsystem_device)); + goto skip_msi; + }if (IS_QLA2432 (ha) && (ha->pdev->revision <QLA_MSIX_CHIP_REV_24XX || !QLA_MSIX_FW_MODE_1 (ha->fw_attributes))) {DEBUG2 (qla_printk (KERN_WARNING , ha,"MSI-X: Unsupported ISP2432 (0x%X, 0x%X).\n" , ha->pdev->revision, ha->fw_attributes)); - goto skip_msix; } -if (ha->pdev->subsystem_vendor ==PCI_VENDOR_ID_HP && - (ha->pdev->subsystem_device ==0x7040 || - ha->pdev->subsystem_device ==0x7041 || - ha->pdev->subsystem_device ==0x1705 )) { -DEBUG2 (qla_printk (KERN_WARNING , ha, -"MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X, 0x%X).\n" , - ha->pdev->subsystem_vendor, - ha->pdev->subsystem_device)); - - goto skip_msi; - } - ret =qla24xx_enable_msix (ha, rsp);if (!ret) { DEBUG2(qla_printk(KERN_INFO, ha,
drivers/staging/comedi/drivers/ni_mio_cs.c +1 -1
@@ -123,7 +123,7 @@ static const struct ni_board_struct ni_boards[] = { .adbits = 12, .ai_fifo_depth = 1024, .alwaysdither = 0, - .gainlkup = ai_gain_16, + .gainlkup = ai_gain_4, .ai_speed = 5000, .n_aochan = 2, .aobits = 12,
drivers/staging/rtl8192su/r8192U_core.c +1 -0
@@ -120,6 +120,7 @@ static struct usb_device_id rtl8192_usb_id_tbl[] = { {USB_DEVICE(0x050d, 0x805E)},/* Sitecom */ {USB_DEVICE(0x0df6, 0x0031)}, + {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 *//* EnGenius */ {USB_DEVICE(0x1740, 0x9201)},/* Dlink */
drivers/staging/vt6655/device_main.c +2 -0
@@ -1089,11 +1089,13 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent) }//2008-07-21-01<Add>by MikeLiu //register wpadev +#if 0 if (wpa_set_wpadev (pDevice,1 )!=0 ) {printk ("Fail to Register WPADEV?\n" );unregister_netdev (pDevice->dev);free_netdev (dev); } +#endif device_print_info (pDevice);pci_set_drvdata (pcid, pDevice);return 0 ;
drivers/usb/class/cdc-acm.c +4 -2
@@ -1201,7 +1201,7 @@ made_compressed_probe:if (rcv->urb ==NULL ) {dev_dbg (&intf->dev,"out of memory (read urbs usb_alloc_urb)\n" ); - goto alloc_fail7; + goto alloc_fail6; } rcv->urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
@@ -1225,7 +1225,7 @@ made_compressed_probe:if (snd->urb ==NULL ) {dev_dbg (&intf->dev,"out of memory (write urbs usb_alloc_urb)" ); - goto alloc_fail7; + goto alloc_fail8; }if (usb_endpoint_xfer_int (epwrite))
@@ -1264,6 +1264,7 @@ made_compressed_probe: i =device_create_file (&intf->dev, &dev_attr_iCountryCodeRelDate);if (i <0 ) { +device_remove_file (&intf->dev, &dev_attr_wCountryCodes);kfree (acm->country_codes); goto skip_countries; }
@@ -1300,6 +1301,7 @@ alloc_fail8:usb_free_urb (acm->wb[i].urb); alloc_fail7:acm_read_buffers_free (acm); +alloc_fail6:for (i =0 ; i < num_rx_buf; i++)usb_free_urb (acm->ru[i].urb);usb_free_urb (acm->ctrlurb);
drivers/usb/gadget/fsl_udc_core.c +1 -1
@@ -489,7 +489,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,case USB_ENDPOINT_XFER_ISOC :/* Calculate transactions needed for high bandwidth iso */ mult = (unsigned char )(1 + ((max >>11 ) &0x03 )); - max = max &0x8ff ;/* bit 0~10 */ + max = max &0x7ff ;/* bit 0~10 */ /* 3 transactions at most */ if (mult >3 ) goto en_done;
drivers/usb/host/ehci-hub.c +17 -0
@@ -292,6 +292,16 @@ static int ehci_bus_resume (struct usb_hcd *hcd)/* manually resume the ports we suspended during bus_suspend() */ i =HCS_N_PORTS (ehci->hcs_params);while (i--) { +/* clear phy low power mode before resume */ +if (ehci->has_hostpc) { +u32 __iomem *hostpc_reg = + (u32 __iomem *)((u8 *)ehci->regs + +HOSTPC0 +4 * (i &0xff )); + temp =ehci_readl (ehci, hostpc_reg); +ehci_writel (ehci, temp & ~HOSTPC_PHCD , + hostpc_reg); +mdelay (5 ); + } temp =ehci_readl (ehci, &ehci->regs->port_status [i]); temp &= ~(PORT_RWC_BITS |PORT_WAKE_BITS ); if (test_bit(i, &ehci->bus_suspended) &&
@@ -676,6 +686,13 @@ static int ehci_hub_control (if (temp &PORT_SUSPEND ) {if ((temp &PORT_PE ) ==0 ) goto error; +/* clear phy low power mode before resume */ +if (hostpc_reg) { + temp1 =ehci_readl (ehci, hostpc_reg); +ehci_writel (ehci, temp1 & ~HOSTPC_PHCD , + hostpc_reg); +mdelay (5 ); + }/* resume signaling for 20 msec */ temp &= ~(PORT_RWC_BITS |PORT_WAKE_BITS ); ehci_writel(ehci, temp | PORT_RESUME,
drivers/usb/host/xhci-hcd.c +46 -8
84 lines not on this page · raw message
drivers/usb/host/xhci-ring.c +32 -5
@@ -241,10 +241,27 @@ static int room_on_ring(struct xhci_hcd *xhci, struct xhci_ring *ring,int i;union xhci_trb *enq = ring->enqueue;struct xhci_segment *enq_seg = ring->enq_seg; +struct xhci_segment *cur_seg; +unsigned int left_on_ring;/* Check if ring is empty */ -if (enq == ring->dequeue) +if (enq == ring->dequeue) { +/* Can't use link trbs */ + left_on_ring =TRBS_PER_SEGMENT -1 ; +for (cur_seg = enq_seg->next; cur_seg != enq_seg; + cur_seg = cur_seg->next) + left_on_ring +=TRBS_PER_SEGMENT -1 ; + +/* Always need one TRB free in the ring. */ + left_on_ring -=1 ; +if (num_trbs > left_on_ring) { +xhci_warn (xhci,"Not enough room on ring; " +"need %u TRBs, %u TRBs left\n" , + num_trbs, left_on_ring); +return 0 ; + }return 1 ; + }/* Make sure there's an extra empty TRB available */ for (i =0 ; i <= num_trbs; ++i) {if (enq == ring->dequeue)
@@ -333,7 +350,8 @@ static struct xhci_segment *find_trb_seg(while (cur_seg->trbs > trb || &cur_seg->trbs[TRBS_PER_SEGMENT -1 ] < trb) { generic_trb = &cur_seg->trbs[TRBS_PER_SEGMENT -1 ].generic; -if (TRB_TYPE (generic_trb->field[3 ]) ==TRB_LINK && +if ((generic_trb->field[3 ] &TRB_TYPE_BITMASK ) == +TRB_TYPE (TRB_LINK ) && (generic_trb->field[3 ] &LINK_TOGGLE )) *cycle_state = ~(*cycle_state) &0x1 ; cur_seg = cur_seg->next;
@@ -389,7 +407,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,BUG (); trb = &state->new_deq_ptr->generic; -if (TRB_TYPE (trb->field[3 ]) ==TRB_LINK && +if ((trb->field[3 ] &TRB_TYPE_BITMASK ) ==TRB_TYPE (TRB_LINK ) && (trb->field[3 ] &LINK_TOGGLE )) state->new_cycle_state = ~(state->new_cycle_state) &0x1 ;next_trb (xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
@@ -548,6 +566,8 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,/* Otherwise just ring the doorbell to restart the ring */ ring_ep_doorbell (xhci, slot_id, ep_index); } + ep->stopped_td =NULL ; + ep->stopped_trb =NULL ;/* * Drop the lock and complete the URBs in the cancelled TD list.
@@ -1065,8 +1085,13 @@ static int handle_tx_event(struct xhci_hcd *xhci, ep->stopped_td = td; ep->stopped_trb = event_trb; +xhci_queue_reset_ep (xhci, slot_id, ep_index);xhci_cleanup_stalled_ring (xhci, td->urb->dev, ep_index); + + ep->stopped_td =NULL ; + ep->stopped_trb =NULL ; +xhci_ring_cmd_db (xhci); goto td_cleanup;default :
@@ -1186,8 +1211,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,for (cur_trb = ep_ring->dequeue, cur_seg = ep_ring->deq_seg; cur_trb != event_trb;next_trb (xhci, ep_ring, &cur_seg, &cur_trb)) { -if (TRB_TYPE (cur_trb->generic.field[3 ]) !=TRB_TR_NOOP && -TRB_TYPE (cur_trb->generic.field[3 ]) !=TRB_LINK ) +if ((cur_trb->generic.field[3 ] & +TRB_TYPE_BITMASK ) !=TRB_TYPE (TRB_TR_NOOP ) && + (cur_trb->generic.field[3 ] & +TRB_TYPE_BITMASK ) !=TRB_TYPE (TRB_LINK )) td->urb->actual_length +=TRB_LEN (cur_trb->generic.field[2 ]); }
drivers/usb/serial/cp210x.c +11 -0
@@ -61,6 +61,8 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ + { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ + { USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */ { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */
@@ -72,9 +74,12 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x1601) }, /* Arkham Technology DS101 Adapter */ { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ + { USB_DEVICE(0x10C4, 0x8044) }, /* Cygnal Debug Adapter */ + { USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */ { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ + { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */ { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
@@ -82,12 +87,15 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */ { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */ { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */ + { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ + { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ + { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
@@ -105,6 +113,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */ { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */ { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */
@@ -115,6 +124,8 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ + { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ + { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { } /* Terminating Entry */
drivers/usb/serial/ftdi_sio.c +4 -0
@@ -2306,6 +2306,8 @@ static void ftdi_set_termios(struct tty_struct *tty, "urb failed to set to rts/cts flow control\n"); } +/* raise DTR/RTS */ +set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }else {/* * Xon/Xoff code
@@ -2353,6 +2355,8 @@ static void ftdi_set_termios(struct tty_struct *tty, } } +/* lower DTR/RTS */ +clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }return ; }
drivers/usb/serial/ir-usb.c +2 -0
@@ -312,6 +312,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)kfree (port->read_urb->transfer_buffer); port->read_urb->transfer_buffer = buffer; port->read_urb->transfer_buffer_length = buffer_size; + port->bulk_in_buffer = buffer; buffer =kmalloc (buffer_size,GFP_KERNEL );if (!buffer) {
@@ -321,6 +322,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)kfree (port->write_urb->transfer_buffer); port->write_urb->transfer_buffer = buffer; port->write_urb->transfer_buffer_length = buffer_size; + port->bulk_out_buffer = buffer; port->bulk_out_size = buffer_size; }
drivers/usb/serial/kl5kusb105.c +1 -0
@@ -310,6 +310,7 @@ err_cleanup:usb_free_urb (priv->write_urb_pool[j]); } } +kfree (priv);usb_set_serial_port_data (serial->port[i],NULL ); }return -ENOMEM ;
drivers/usb/serial/kobil_sct.c +2 -1
@@ -345,7 +345,8 @@ static void kobil_close(struct usb_serial_port *port)/* FIXME: Add rts/dtr methods */ if (port->write_urb) { -usb_kill_urb (port->write_urb); +usb_poison_urb (port->write_urb); +kfree (port->write_urb->transfer_buffer);usb_free_urb (port->write_urb); port->write_urb =NULL ; }
drivers/usb/serial/mos7840.c +0 -1
@@ -714,7 +714,6 @@ static void mos7840_bulk_in_callback(struct urb *urb) mos7840_port = urb->context;if (!mos7840_port) {dbg ("%s" ,"NULL mos7840_port pointer" ); - mos7840_port->read_urb_busy = false;return ; }
drivers/usb/serial/option.c +226 -0
262 lines not on this page · raw message
drivers/usb/serial/visor.c +1 -0
@@ -249,6 +249,7 @@ static struct usb_serial_driver clie_3_5_device = { .throttle = visor_throttle, .unthrottle = visor_unthrottle, .attach = clie_3_5_startup, + .release = visor_release, .write = visor_write, .write_room = visor_write_room, .write_bulk_callback = visor_write_bulk_callback,
drivers/usb/storage/unusual_devs.h +15 -0
@@ -1858,6 +1858,21 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), +/* Reported by Hans de Goede <[email protected]> +* These Appotech controllers are found in Picture Frames, they provide a +* (buggy) emulation of a cdrom drive which contains the windows software +* Uploading of pictures happens over the corresponding /dev/sg device. */ +UNUSUAL_DEV (0x1908 ,0x1315 ,0x0000 ,0x0000 , +"BUILDWIN" , +"Photo Frame" , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , +US_FL_BAD_SENSE ), +UNUSUAL_DEV (0x1908 ,0x1320 ,0x0000 ,0x0000 , +"BUILDWIN" , +"Photo Frame" , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , +US_FL_BAD_SENSE ), + UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001, "ST", "2A",
drivers/xen/xenbus/xenbus_xs.c +1 -1
@@ -499,7 +499,7 @@ int xenbus_printf(struct xenbus_transaction t,#define PRINTF_BUFFER_SIZE 4096char *printf_buffer; - printf_buffer =kmalloc (PRINTF_BUFFER_SIZE ,GFP_KERNEL ); + printf_buffer =kmalloc (PRINTF_BUFFER_SIZE ,GFP_NOIO | __GFP_HIGH);if (printf_buffer ==NULL )return -ENOMEM ;
fs/btrfs/acl.c +3 -0
@@ -157,6 +157,9 @@ static int btrfs_xattr_set_acl(struct inode *inode, int type,int ret =0 ;struct posix_acl *acl =NULL ; +if (!is_owner_or_cap (inode)) +return -EPERM ; +if (value) { acl =posix_acl_from_xattr (value, size);if (acl ==NULL ) {
fs/cifs/cifsproto.h +4 -2
@@ -95,8 +95,10 @@ extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, struct vfsmount *mnt, unsigned int oflags);extern int cifs_posix_open (char *full_path,struct inode **pinode, -struct vfsmount *mnt,int mode,int oflags, -__u32 *poplock,__u16 *pnetfid,int xid); +struct vfsmount *mnt, +struct super_block *sb, +int mode,int oflags, +__u32 *poplock,__u16 *pnetfid,int xid);extern void cifs_unix_basic_to_fattr (struct cifs_fattr *fattr,FILE_UNIX_BASIC_INFO *info,struct cifs_sb_info *cifs_sb);
fs/cifs/dir.c +12 -8
@@ -183,13 +183,14 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, }int cifs_posix_open (char *full_path,struct inode **pinode, -struct vfsmount *mnt,int mode,int oflags, -__u32 *poplock,__u16 *pnetfid,int xid) +struct vfsmount *mnt,struct super_block *sb, +int mode,int oflags, +__u32 *poplock,__u16 *pnetfid,int xid) {int rc;FILE_UNIX_BASIC_INFO *presp_data;__u32 posix_flags =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (mnt->mnt_sb); +struct cifs_sb_info *cifs_sb =CIFS_SB (sb);struct cifs_fattr fattr;cFYI (1 , ("posix open %s" , full_path));
@@ -241,7 +242,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,/* get new inode and set it up */ if (*pinode ==NULL ) { - *pinode =cifs_iget (mnt->mnt_sb, &fattr); + *pinode =cifs_iget (sb, &fattr);if (!*pinode) { rc = -ENOMEM ; goto posix_open_ret;
@@ -250,7 +251,8 @@ int cifs_posix_open(char *full_path, struct inode **pinode,cifs_fattr_to_inode (*pinode, &fattr); } -cifs_new_fileinfo (*pinode, *pnetfid,NULL , mnt, oflags); +if (mnt) +cifs_new_fileinfo (*pinode, *pnetfid,NULL , mnt, oflags); posix_open_ret:kfree (presp_data);
@@ -314,13 +316,14 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,if (nd && (nd->flags &LOOKUP_OPEN )) oflags = nd->intent.open.flags;else - oflags =FMODE_READ ; + oflags =FMODE_READ |SMB_O_CREAT ;if (tcon->unix_ext && (tcon->ses->capabilities &CAP_UNIX ) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &le64_to_cpu (tcon->fsUnixInfo.Capability))) { - rc =cifs_posix_open (full_path, &newinode, nd->path.mnt, - mode, oflags, &oplock, &fileHandle, xid); + rc =cifs_posix_open (full_path, &newinode, + nd ? nd->path.mnt :NULL , + inode->i_sb, mode, oflags, &oplock, &fileHandle, xid);/* EIO could indicate that (posix open) operation is not supported, despite what server claimed in capability negotation. EREMOTE indicates DFS junction, which is not
@@ -677,6 +680,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, (nd->flags & LOOKUP_OPEN) && !pTcon->broken_posix_open && (nd->intent.open.flags & O_CREAT)) { rc =cifs_posix_open (full_path, &newInode, nd->path.mnt, + parent_dir_inode->i_sb, nd->intent.open.create_mode, nd->intent.open.flags, &oplock, &fileHandle, xid);
fs/cifs/file.c +7 -4
@@ -295,10 +295,12 @@ int cifs_open(struct inode *inode, struct file *file) (CIFS_UNIX_POSIX_PATH_OPS_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))) {int oflags = (int )cifs_posix_convert_flags (file->f_flags); + oflags |=SMB_O_CREAT ;/* can not refresh inode info since size could be stale */ rc =cifs_posix_open (full_path, &inode, file->f_path.mnt, - cifs_sb->mnt_file_mode/* ignored */ , - oflags, &oplock, &netfid, xid); + inode->i_sb, + cifs_sb->mnt_file_mode/* ignored */ , + oflags, &oplock, &netfid, xid);if (rc ==0 ) {cFYI (1 , ("posix open succeeded" ));/* no need for special case handling of setting mode
@@ -510,8 +512,9 @@ reopen_error_exit:int oflags = (int )cifs_posix_convert_flags (file->f_flags);/* can not refresh inode info since size could be stale */ rc =cifs_posix_open (full_path,NULL , file->f_path.mnt, - cifs_sb->mnt_file_mode/* ignored */ , - oflags, &oplock, &netfid, xid); + inode->i_sb, + cifs_sb->mnt_file_mode/* ignored */ , + oflags, &oplock, &netfid, xid);if (rc ==0 ) {cFYI (1 , ("posix reopen succeeded" )); goto reopen_success;
fs/exofs/dir.c +1 -1
@@ -608,7 +608,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent) de->inode_no =cpu_to_le64 (parent->i_ino);memcpy (de->name,PARENT_DIR ,sizeof (PARENT_DIR ));exofs_set_de_type (de, inode); -kunmap_atomic (page,KM_USER0 ); +kunmap_atomic (kaddr,KM_USER0 ); err =exofs_commit_chunk (page,0 , chunk_size); fail:page_cache_release (page);
fs/fs-writeback.c +12 -2
@@ -859,6 +859,12 @@ static long wb_check_old_data_flush(struct bdi_writeback *wb)unsigned long expired;long nr_pages; +/* +* When set to zero, disable periodic writeback +*/ +if (!dirty_writeback_interval) +return 0 ; + expired = wb->last_old_flush +msecs_to_jiffies (dirty_writeback_interval *10 );if (time_before (jiffies, expired))
@@ -954,8 +960,12 @@ int bdi_writeback_task(struct bdi_writeback *wb)break ; } - wait_jiffies =msecs_to_jiffies (dirty_writeback_interval *10 ); -schedule_timeout_interruptible (wait_jiffies); +if (dirty_writeback_interval) { + wait_jiffies =msecs_to_jiffies (dirty_writeback_interval *10 ); +schedule_timeout_interruptible (wait_jiffies); + }else +schedule (); +try_to_freeze (); }
fs/gfs2/file.c +7 -0
@@ -218,6 +218,11 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)if (error) goto out_drop_write; + error = -EACCES ; +if (!is_owner_or_cap (inode)) + goto out; + + error =0 ; flags = ip->i_diskflags; new_flags = (flags & ~mask) | (reqflags & mask);if ((new_flags ^ flags) ==0 )
@@ -275,8 +280,10 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr) {struct inode *inode = filp->f_path.dentry->d_inode;u32 fsflags, gfsflags; +if (get_user (fsflags, ptr))return -EFAULT ; + gfsflags =fsflags_cvt (fsflags_to_gfs2, fsflags);if (!S_ISDIR (inode->i_mode)) {if (gfsflags &GFS2_DIF_INHERIT_JDATA )
fs/jbd/journal.c +1 -1
@@ -1913,7 +1913,7 @@ static void __init jbd_create_debugfs_entry(void) { jbd_debugfs_dir =debugfs_create_dir ("jbd" ,NULL );if (jbd_debugfs_dir) - jbd_debug =debugfs_create_u8 ("jbd-debug" ,S_IRUGO , + jbd_debug =debugfs_create_u8 ("jbd-debug" ,S_IRUGO |S_IWUSR , jbd_debugfs_dir, &journal_enable_debug); }
fs/jbd2/journal.c +2 -1
@@ -2115,7 +2115,8 @@ static void __init jbd2_create_debugfs_entry(void) { jbd2_debugfs_dir =debugfs_create_dir ("jbd2" ,NULL );if (jbd2_debugfs_dir) - jbd2_debug =debugfs_create_u8 (JBD2_DEBUG_NAME ,S_IRUGO , + jbd2_debug =debugfs_create_u8 (JBD2_DEBUG_NAME , +S_IRUGO |S_IWUSR , jbd2_debugfs_dir, &jbd2_journal_enable_debug); }
fs/libfs.c +2 -1
@@ -415,7 +415,8 @@ int simple_write_end(struct file *file, struct address_space *mapping,* unique inode values later for this filesystem, then you must take care * to pass it an appropriate max_reserved value to avoid collisions. */ -int simple_fill_super (struct super_block *s,int magic,struct tree_descr *files) +int simple_fill_super (struct super_block *s,unsigned long magic, +struct tree_descr *files) {struct inode *inode;struct dentry *root;
fs/namespace.c +8 -1
@@ -1119,8 +1119,15 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags) {struct path path;int retval; +int lookup_flags =0 ; - retval =user_path (name, &path); +if (flags & ~(MNT_FORCE |MNT_DETACH |MNT_EXPIRE |UMOUNT_NOFOLLOW )) +return -EINVAL ; + +if (!(flags &UMOUNT_NOFOLLOW )) + lookup_flags |=LOOKUP_FOLLOW ; + + retval =user_path_at (AT_FDCWD , name, lookup_flags, &path);if (retval) goto out; retval = -EINVAL ;
fs/nfsd/nfssvc.c +1 -1
@@ -136,7 +136,7 @@ u32 nfsd_supported_minorversion;int nfsd_vers (int vers,enum vers_op change) {if (vers <NFSD_MINVERS || vers >=NFSD_NRVERS ) -return -1 ; +return 0 ;switch (change) {case NFSD_SET : nfsd_versions[vers] = nfsd_version[vers];
include/linux/fs.h +3 -1
@@ -1310,6 +1310,8 @@ extern int send_sigurg(struct fown_struct *fown);#define MNT_FORCE 0x00000001/* Attempt to forcibily umount */ #define MNT_DETACH 0x00000002/* Just detach from the tree */ #define MNT_EXPIRE 0x00000004/* Mark for expiry */ +#define UMOUNT_NOFOLLOW 0x00000008/* Don't follow symlink on umount */ +#define UMOUNT_UNUSED 0x80000000/* Flag guaranteed to be unused */ extern struct list_head super_blocks;extern spinlock_t sb_lock;
@@ -2376,7 +2378,7 @@ extern const struct file_operations simple_dir_operations;extern const struct inode_operations simple_dir_inode_operations;struct tree_descr {char *name;const struct file_operations *ops;int mode; };struct dentry *d_alloc_name (struct dentry *,const char *); -extern int simple_fill_super (struct super_block *,int ,struct tree_descr *); +extern int simple_fill_super (struct super_block *,unsigned long ,struct tree_descr *);extern int simple_pin_fs (struct file_system_type *,struct vfsmount **mount,int *count);extern void simple_release_fs (struct vfsmount **mount,int *count);
include/linux/pci_ids.h +1 -0
@@ -2317,6 +2317,7 @@#define PCI_VENDOR_ID_JMICRON 0x197B#define PCI_DEVICE_ID_JMICRON_JMB360 0x2360#define PCI_DEVICE_ID_JMICRON_JMB361 0x2361 +#define PCI_DEVICE_ID_JMICRON_JMB362 0x2362#define PCI_DEVICE_ID_JMICRON_JMB363 0x2363#define PCI_DEVICE_ID_JMICRON_JMB365 0x2365#define PCI_DEVICE_ID_JMICRON_JMB366 0x2366
include/linux/swap.h +0 -10
@@ -218,21 +218,11 @@ static inline void lru_cache_add_anon(struct page *page)__lru_cache_add (page,LRU_INACTIVE_ANON ); } -static inline void lru_cache_add_active_anon (struct page *page) -{ -__lru_cache_add (page,LRU_ACTIVE_ANON ); -} -static inline void lru_cache_add_file (struct page *page) {__lru_cache_add (page,LRU_INACTIVE_FILE ); } -static inline void lru_cache_add_active_file (struct page *page) -{ -__lru_cache_add (page,LRU_ACTIVE_FILE ); -} -/* linux/mm/vmscan.c */ extern unsigned long try_to_free_pages (struct zonelist *zonelist,int order,gfp_t gfp_mask,nodemask_t *mask);
include/linux/tboot.h +1 -0
@@ -150,6 +150,7 @@ extern int tboot_force_iommu(void);#else +#define tboot_enabled () 0#define tboot_probe () do { } while (0)
Lines of this file are not shown. View the raw message.
net/sctp/sm_make_chunk.c +57 -5
62 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.