Linux 2.6.36.2
Subsystems (104)
I'm announcing the release of the 2.6.36.2 kernel.
All users of the 2.6.36 kernel series must upgrade.
The updated 2.6.36.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.36.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.36.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/arm/include/asm/assembler.h | 2 arch/arm/lib/findbit.S | 6 arch/arm/mach-cns3xxx/pcie.c | 2 arch/arm/mm/fault-armv.c | 28 ++ arch/arm/plat-omap/dma.c | 50 ++++ arch/arm/plat-omap/include/plat/dma.h | 4 arch/microblaze/Makefile | 8 arch/powerpc/mm/hash_utils_64.c | 2 arch/s390/kernel/nmi.c | 10 arch/s390/kernel/vtime.c | 19 + arch/s390/lib/delay.c | 14 - arch/sh/include/asm/syscalls_32.h | 7 arch/um/drivers/line.c | 5 arch/um/kernel/uml.lds.S | 2 arch/um/os-Linux/time.c | 2 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 arch/x86/kernel/hw_breakpoint.c | 4 arch/x86/kvm/svm.c | 2 arch/x86/kvm/vmx.c | 19 - arch/x86/kvm/x86.c | 14 - arch/x86/xen/enlighten.c | 4 block/blk-map.c | 2 block/blk-settings.c | 2 block/genhd.c | 6 block/scsi_ioctl.c | 34 ++- drivers/acpi/battery.c | 38 +++ drivers/acpi/bus.c | 7 drivers/acpi/debugfs.c | 2 drivers/ata/libata-scsi.c | 5 drivers/ata/sata_via.c | 9 drivers/char/agp/intel-agp.c | 1 drivers/char/agp/intel-gtt.c | 63 ++--- drivers/char/hpet.c | 17 + drivers/char/ipmi/ipmi_si_intf.c | 30 +- drivers/char/tty_buffer.c | 14 + drivers/char/tty_io.c | 13 + drivers/char/tty_ldisc.c | 51 ++++ drivers/char/vt_ioctl.c | 11 - drivers/crypto/padlock-aes.c | 2 drivers/firewire/ohci.c | 60 ++++- drivers/gpio/cs5535-gpio.c | 16 + drivers/gpu/drm/i915/i915_dma.c | 3 drivers/gpu/drm/i915/i915_irq.c | 21 + drivers/gpu/drm/i915/i915_reg.h | 7 drivers/gpu/drm/i915/i915_suspend.c | 4 drivers/gpu/drm/i915/intel_crt.c | 3 drivers/gpu/drm/i915/intel_display.c | 7 drivers/gpu/drm/i915/intel_drv.h | 1 drivers/gpu/drm/i915/intel_overlay.c | 8 drivers/gpu/drm/i915/intel_sdvo.c | 8 drivers/gpu/drm/radeon/atom.c | 1 drivers/gpu/drm/radeon/r100.c | 6 drivers/gpu/drm/radeon/r100_track.h | 1 drivers/gpu/drm/radeon/r200.c | 2 drivers/gpu/drm/radeon/r600.c | 15 - drivers/gpu/drm/radeon/r600_blit_kms.c | 8 drivers/gpu/drm/radeon/r600_cs.c | 4 drivers/gpu/drm/radeon/r600_reg.h | 1 drivers/gpu/drm/radeon/radeon_atombios.c | 16 + drivers/gpu/drm/radeon/radeon_bios.c | 13 - drivers/gpu/drm/radeon/radeon_combios.c | 15 + drivers/gpu/drm/radeon/radeon_connectors.c | 34 +++ drivers/gpu/drm/radeon/radeon_encoders.c | 36 +++ drivers/gpu/drm/radeon/radeon_i2c.c | 1 drivers/gpu/drm/radeon/radeon_object.c | 4 drivers/gpu/drm/radeon/radeon_reg.h | 1 drivers/gpu/drm/radeon/rv770.c | 9 drivers/hid/hid-egalax.c | 16 + drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/lm85.c | 1 drivers/i2c/busses/i2c-pca-platform.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/isdn/gigaset/bas-gigaset.c | 89 +++----- drivers/isdn/gigaset/isocdata.c | 8 drivers/leds/leds-ss4200.c | 1 drivers/md/md.c | 6 drivers/md/raid1.c | 1 drivers/media/video/cx23885/cx23885-core.c | 1 drivers/media/video/gspca/gspca.c | 4 drivers/media/video/gspca/sonixj.c | 3 drivers/media/video/hdpvr/hdpvr-video.c | 1 drivers/media/video/msp3400-driver.c | 7 drivers/media/video/saa7134/saa7134-cards.c | 24 +- drivers/misc/ad525x_dpot-spi.c | 4 drivers/misc/sgi-xp/xpc_partition.c | 25 +- drivers/mmc/core/core.c | 2 drivers/net/e1000/e1000_main.c | 12 - drivers/net/jme.c | 22 +- drivers/net/pcmcia/pcnet_cs.c | 1 drivers/net/phy/marvell.c | 31 +- drivers/net/r6040.c | 22 +- drivers/net/r8169.c | 19 + drivers/net/usb/usbnet.c | 11 + drivers/net/wireless/ath/ath.h | 1 drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 191 ++++++++++++----- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 3 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 14 - drivers/net/wireless/ath/ath9k/ath9k.h | 7 drivers/net/wireless/ath/ath9k/beacon.c | 2 drivers/net/wireless/ath/ath9k/common.c | 11 + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 drivers/net/wireless/ath/ath9k/hif_usb.c | 20 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 drivers/net/wireless/ath/ath9k/hw.c | 1 drivers/net/wireless/ath/ath9k/init.c | 40 +++ drivers/net/wireless/ath/ath9k/mac.c | 5 drivers/net/wireless/ath/ath9k/main.c | 61 ++++- drivers/net/wireless/ath/ath9k/rc.c | 8 drivers/net/wireless/ath/ath9k/recv.c | 45 ++-- drivers/net/wireless/ath/ath9k/reg.h | 9 drivers/net/wireless/ath/ath9k/xmit.c | 112 +++++----- drivers/net/wireless/b43/sdio.c | 3 drivers/oprofile/timer_int.c | 13 + drivers/pci/pci-sysfs.c | 22 +- drivers/pci/pci.h | 7 drivers/pci/proc.c | 2 drivers/pcmcia/soc_common.c | 1 drivers/platform/x86/wmi.c | 2 drivers/pnp/pnpacpi/core.c | 29 ++ drivers/power/olpc_battery.c | 8 drivers/scsi/qla2xxx/qla_gbl.h | 1 drivers/scsi/qla2xxx/qla_init.c | 5 drivers/scsi/qla2xxx/qla_os.c | 5 drivers/serial/mfd.c | 18 - drivers/ssb/b43_pci_bridge.c | 1 drivers/staging/asus_oled/asus_oled.c | 8 drivers/staging/batman-adv/soft-interface.c | 4 drivers/staging/frontier/tranzport.c | 2 drivers/staging/iio/accel/adis16220_core.c | 2 drivers/staging/line6/control.c | 204 +++++++++---------- drivers/staging/line6/midi.c | 4 drivers/staging/line6/pod.c | 32 +- drivers/staging/line6/toneport.c | 4 drivers/staging/line6/variax.c | 12 - drivers/staging/rt2860/usb_main_dev.c | 2 drivers/staging/rtl8187se/r8185b_init.c | 30 ++ drivers/staging/samsung-laptop/samsung-laptop.c | 2 drivers/staging/udlfb/udlfb.c | 2 drivers/usb/atm/ueagle-atm.c | 7 drivers/usb/core/devio.c | 7 drivers/usb/gadget/atmel_usba_udc.c | 2 drivers/usb/host/ehci-dbg.c | 2 drivers/usb/host/ehci-hcd.c | 10 drivers/usb/host/ehci-pci.c | 12 + drivers/usb/host/ohci-jz4740.c | 2 drivers/usb/host/xhci-hub.c | 7 drivers/usb/host/xhci-mem.c | 168 +++++++++++++++ drivers/usb/host/xhci-ring.c | 1 drivers/usb/host/xhci.c | 18 + drivers/usb/host/xhci.h | 32 ++ drivers/usb/misc/cypress_cy7c63.c | 6 drivers/usb/misc/iowarrior.c | 1 drivers/usb/misc/sisusbvga/sisusb.c | 1 drivers/usb/misc/trancevibrator.c | 2 drivers/usb/misc/usbled.c | 2 drivers/usb/misc/usbsevseg.c | 10 drivers/usb/musb/musb_core.c | 1 drivers/usb/serial/ftdi_sio.c | 4 drivers/usb/serial/ftdi_sio_ids.h | 11 + drivers/usb/serial/option.c | 2 drivers/usb/serial/usb-serial.c | 3 drivers/usb/storage/sierra_ms.c | 2 drivers/video/backlight/backlight.c | 12 - drivers/video/via/accel.c | 7 drivers/video/via/via_i2c.c | 27 ++ drivers/xen/events.c | 2 fs/bio.c | 23 +- fs/cifs/dns_resolve.c | 2 fs/cifs/inode.c | 12 - fs/compat.c | 28 +- fs/ecryptfs/inode.c | 11 - fs/exec.c | 36 ++- fs/ext4/super.c | 1 fs/fuse/file.c | 10 fs/hostfs/hostfs.h | 3 fs/hostfs/hostfs_kern.c | 2 fs/hostfs/hostfs_user.c | 9 fs/nfs/file.c | 17 - fs/nfs/nfs4proc.c | 9 fs/nfs/nfs4state.c | 16 + fs/nfs/pagelist.c | 8 fs/pipe.c | 14 + fs/proc/base.c | 2 fs/reiserfs/ioctl.c | 7 fs/reiserfs/xattr_acl.c | 6 fs/splice.c | 24 -- include/linux/binfmts.h | 5 include/linux/blkdev.h | 4 include/linux/gfp.h | 4 include/linux/kfifo.h | 7 include/linux/netfilter.h | 2 include/linux/pci_ids.h | 1 include/linux/perf_event.h | 1 include/linux/pipe_fs_i.h | 1 include/linux/radix-tree.h | 36 +-- include/linux/socket.h | 2 include/linux/tty.h | 1 include/net/mac80211.h | 16 + ipc/compat.c | 6 ipc/compat_mq.c | 5 ipc/shm.c | 1 kernel/exit.c | 9 kernel/irq/proc.c | 2 kernel/latencytop.c | 17 - kernel/perf_event.c | 22 +- kernel/pm_qos_params.c | 4 kernel/power/hibernate.c | 22 +- kernel/power/suspend.c | 5 kernel/power/user.c | 2 kernel/sched.c | 12 + lib/percpu_counter.c | 1 lib/radix-tree.c | 83 +++++-- mm/filemap.c | 29 +- mm/hugetlb.c | 8 mm/internal.h | 2 mm/memcontrol.c | 43 ++-- mm/memory_hotplug.c | 2 mm/mempolicy.c | 2 mm/mprotect.c | 2 mm/nommu.c | 1 mm/page_alloc.c | 21 + net/8021q/vlan_core.c | 3 net/can/bcm.c | 2 net/compat.c | 10 net/core/dev.c | 16 + net/core/filter.c | 64 +++-- net/core/iovec.c | 20 - net/decnet/af_decnet.c | 2 net/econet/af_econet.c | 91 +++----- net/irda/iriap.c | 3 net/irda/parameters.c | 4 net/mac80211/cfg.c | 5 net/mac80211/ibss.c | 1 net/mac80211/ieee80211_i.h | 2 net/mac80211/main.c | 3 net/mac80211/mesh_plink.c | 17 + net/mac80211/mlme.c | 48 +++- net/mac80211/offchannel.c | 7 net/mac80211/rate.c | 3 net/mac80211/rc80211_minstrel_ht.c | 7 net/mac80211/status.c | 1 net/netfilter/nf_conntrack_core.c | 3 net/rds/rdma.c | 2 net/socket.c | 4 net/sunrpc/clnt.c | 2 net/wireless/chan.c | 51 ++++ net/wireless/nl80211.c | 11 - net/wireless/reg.c | 2 net/wireless/scan.c | 12 - net/x25/x25_facilities.c | 20 + net/x25/x25_in.c | 2 scripts/kconfig/conf.c | 2 sound/core/oss/mixer_oss.c | 12 - sound/core/oss/pcm_oss.c | 19 + sound/pci/hda/hda_codec.c | 8 sound/pci/hda/hda_codec.h | 1 sound/pci/hda/hda_intel.c | 25 +- sound/pci/hda/patch_analog.c | 7 sound/pci/hda/patch_ca0110.c | 2 sound/pci/hda/patch_conexant.c | 1 sound/pci/hda/patch_realtek.c | 51 ++++ sound/pci/hda/patch_sigmatel.c | 16 + sound/pci/intel8x0.c | 6 sound/soc/codecs/wm8900.c | 6 sound/soc/codecs/wm8961.c | 4 268 files changed, 2554 insertions(+), 1110 deletions(-)
Alan Stern (2):
USB: EHCI: fix obscure race in ehci_endpoint_disable
USB: fix autosuspend bug in usb-serial
Alex Deucher (15):
drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker drm/radeon/kms: register an i2c adapter name for the dp aux bus drm/radeon/kms: MC vram map needs to be >= pci aperture size drm/radeon/kms: properly compute group_size on 6xx/7xx drm/radeon/kms: make sure blit addr masks are 64 bit drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode() drm/radeon/kms: fix typos in disabled vbios code drm/radeon/kms: add workaround for dce3 ddc line vbios bug drm/radeon/kms: fix thermal sensor reporting on rv6xx drm/radeon/kms: fix i2c pad masks on rs4xx
drm/radeon/kms: fix resume regression for some r5xx laptops drm/radeon/kms: fix regression in rs4xx i2c setup drm/radeon/kms: fix interlaced and doublescan handling
Andiry Xu (1):
xHCI: fix wMaxPacketSize mask
Andres Salomon (1):
cs5535-gpio: apply CS5536 errata workaround for GPIOs
Andrew Morton (2):
kfifo: disable __kfifo_must_check_helper() drivers/media/video/cx23885/cx23885-core.c: fix cx23885_dev_checkrevision()
Anton Vorontsov (1):
ARM: cns3xxx: Fix build with CONFIG_PCI=y
Anupam Chanda (1):
e1000: fix screaming IRQ
Arnaud Lacombe (1):
kbuild: use getopt_long(), not its _only() variant
Arnaud Patard (1):
phy/marvell: fix 88e1121 support
Avi Kivity (2):
KVM: Correct ordering of ldt reload wrt fs/gs reload
KVM: VMX: Fix host userspace gsbase corruption
Axel Lin (2):
ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode
ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000
Ben Hutchings (2):
r6040: Fix multicast filter some more
net: NETIF_F_HW_CSUM does not imply FCoE CRC offload
Björn Smedman (3):
ath9k: built-in rate control A-MPDU fix
ath9k: A-MPDU rate control info fix
mac80211: minstrel_ht A-MPDU fix
Brian J. Tarricone (1):
USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
Chad Dupuis (1):
qla2xxx: Add module parameter to enable/disable GFF_ID device type check.
Chris Wilson (3):
drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing. agp/intel: Also add B43.1 to list of supported devices drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
Christian Lamparter (3):
mac80211: fix possible null-pointer de-reference
mac80211: clear txflags for ps-filtered frames
mac80211: don't sanitize invalid rates
Clemens Ladisch (3):
hpet: fix unwanted interrupt due to stale irq status bit
firewire: ohci: fix buffer overflow in AR split packet handling
firewire: ohci: fix race in AR split packet handling
Colin Cross (1):
PM / PM QoS: Fix reversed min and max
Daisuke Nishimura (1):
memcg: avoid deadlock between move charge and try_charge()
Dan Rosenberg (4):
ipc: initialize structure memory to zero for compat functions
DECnet: don't leak uninitialized stack byte
x25: Prevent crashing when parsing bad X.25 facilities
rds: Integer overflow in RDS cmsg handling
Daniel Klaffenbach (1):
ssb: b43-pci-bridge: Add new vendor for BCM4318
Daniel T Chen (6):
ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J
ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
ALSA: hda: Add speaker pin to automute Acer Aspire 8943G
ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
ALSA: hda: Use "alienware" model quirk for another SSID
Daniel Vetter (1):
intel-gtt: fix gtt_total_entries detection
Darrick J. Wong (1):
PCI: fix offset check for sysfs mmapped files
Dave Hansen (1):
mm/vfs: revalidate page->mapping in do_generic_file_read()
Dave Jones (1):
ACPI: debugfs custom_method open to non-root
David Henningsson (3):
ALSA: HDA: Enable internal mic on Dell E6410 and Dell E6510
ALSA: HDA: Add fixup pins for Ideapad Y550
ALSA: HDA: Add an extra DAC for Realtek ALC887-VD
David Howells (1):
SH: Add missing consts to sys_execve() declaration
David S. Miller (2):
net: Limit socket I/O iovec total length to INT_MAX.
filter: make sure filters dont read uninitialized memory
Dean Nelson (2):
mm/hugetlb.c: add missing spin_lock() to hugetlb_cow() mm/hugetlb.c: avoid double unlock_page() in hugetlb_fault()
Dmitri Belimov (1):
saa7134: Fix autodetect for Behold A7 and H7 TV cards
Dmitry Torokhov (2):
PNPACPI: cope with invalid device IDs
Input: i8042 - add Sony VAIO VPCZ122GX to nomux list
Eric Dumazet (4):
ipmi: proper spinlock initialization
numa: fix slab_node(MPOL_BIND)
netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages
r8169: fix rx checksum offload
Eric Paris (1):
netfilter: NF_HOOK_COND has wrong conditional
Eric W. Biederman (1):
Revert "vfs: show unreachable paths in getcwd and proc"
Felix Fietkau (8):
ath9k: fix channel flag / regd issues with multiple cards
ath9k: clean up / fix aggregation session flush
ath9k: fix an aggregation start related race condition
ath9k_hw: handle rx key miss
ath9k: fix spurious MIC failure reports
ath9k: resume aggregation immediately after a hardware reset
ath9k: fix tx aggregation flush on AR9003
ath9k: fix timeout on stopping rx dma
Feng Tang (1):
serial: mfd: adjust the baud rate setting
Florian Tobias Schandinat (2):
viafb: fix i2c_transfer error handling
viafb: use proper register for colour when doing fill ops
Frederic Weisbecker (3):
reiserfs: fix inode mutex - reiserfs lock misordering
reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
x86: Ignore trap bits on single step exceptions
Graham Gower (1):
drivers/char/vt_ioctl.c: fix VT_OPENQRY error value
Greg Kroah-Hartman (17):
Staging: asus_oled: fix up some sysfs attribute permissions
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
Staging: line6: fix up some sysfs attribute permissions
USB: ehci: fix debugfs 'lpm' permissions
USB: storage: sierra_ms: fix sysfs file attribute
USB: atm: ueagle-atm: fix up some permissions on the sysfs files
USB: misc: cypress_cy7c63: fix up some sysfs attribute permissions
USB: misc: usbled: fix up some sysfs attribute permissions
USB: misc: trancevibrator: fix up a sysfs attribute permission
USB: misc: usbsevseg: fix up some sysfs attribute permissions
Staging: udlfb: fix up some sysfs attribute permissions
Staging: iio: adis16220: fix up some sysfs attribute permissions
Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
Staging: samsung-laptop: fix up some sysfs attribute permissions
Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
Staging: frontier: fix up some sysfs attribute permissions
Linux 2.6.36.2
Guennadi Liakhovetski (2):
wireless: b43: fix error path in SDIO
mmc: fix rmmod race for hosts using card-detection polling
Guo-Fu Tseng (1):
jme: Fix PHY power-off error
Haitao Zhang (1):
ath9k_htc: Add support for device ID 3346
Hans Verkuil (1):
msp3400: fix mute audio regression
Heiko Carstens (2):
nohz/s390: fix arch_needs_cpu() return value on offline cpus
nmi: fix clock comparator revalidation
Herbert Xu (1):
crypto: padlock - Fix AES-CBC handling on odd-block-sized input
Herton Ronaldo Krzesinski (1):
ALSA: hda - Fix ALC660-VD/ALC861-VD capture/playback mixers
Ian Campbell (1):
xen: ensure that all event channels start off bound to VCPU 0
Jacques Viviers (1):
USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
James Jones (1):
ARM: 6482/2: Fix find_next_zero_bit and related assembly
James M McLaren (1):
hdpvr: Add missing URB_NO_TRANSFER_DMA_MAP flag
Jan Kara (1):
block: Fix race during disk initialization
Jarkko Nikula (1):
omap: dma: Fix buffering disable bit setting for omap24xx
Jaroslav Kysela (1):
ALSA: OSS mixer emulation - fix locking
Jean Delvare (1):
hwmon: (lm85) Fix ADT7468 frequency table
Jean-François Moine (2):
gspca - main: Fix a regression with the PS3 Eye webcam gspca - sonixj: Fix a regression of sensors hv7131r and mi0360
Jeff Layton (2):
nfs: handle lock context allocation failures in nfs_create_request
cifs: fix parsing of hostname in dfs referrals
Jens Axboe (4):
block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
block: take care not to overflow when calculating total iov length
block: check for proper length of iov entries in blk_rq_map_user_iov()
bio: take care not overflow page count when mapping/copying user data
Jeremy Fitzhardinge (1):
xen: don't bother to stop other cpus on shutdown/reboot
Jesse Barnes (1):
drm/i915: diasable clock gating for the panel power sequencer
Jesse Gross (1):
vlan: Avoid hwaccel vlan packets when vid not used.
Jiri Olsa (1):
tty: prevent DOS in the flush_to_ldisc
Jiri Slaby (5):
hpet: unmap unused I/O space
TTY: restore tty_ldisc_wait_idle
TTY: ldisc, fix open flag handling
TTY: don't allow reopen when ldisc is changing
TTY: open/hangup race fixup
Johannes Berg (3):
cfg80211: fix BSS double-unlinking
cfg80211: fix locking
mac80211: use correct station flags lock
John Tapsell (1):
Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
Josh Wu (1):
USB: gadget: AT91: fix typo in atmel_usba_udc driver
Jouni Malinen (1):
mac80211: Fix signal strength average initialization for CQM events
Justin Maggard (1):
md: fix return value of rdev_size_change()
KAMEZAWA Hiroyuki (2):
mm: fix return value of scan_lru_pages in memory unplug
mm: fix is_mem_section_removable() page_order BUG_ON check
Kailang Yang (1):
ALSA: hda - Fixed ALC887-VD initial error
Keith Packard (1):
drm/i915: Free hardware status page on unload when physically mapped
Ken Chen (1):
latencytop: fix per task accumulator
Ken Kawasaki (1):
pcnet_cs: add new_id
Ken Sumrall (1):
fuse: fix attributes after open(O_TRUNC)
Kenji Kaneshige (1):
genirq: Fix incorrect proc spurious output
Kyle McMartin (1):
i915: reprogram power monitoring registers on resume
Larry Finger (3):
staging: rt2870: Add new USB ID for Belkin F6D4050 v1
b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd
staging: rtl8187se: Change panic to warn when RF switch turned off
Linus Torvalds (4):
net: Truncate recvfrom and sendto length to INT_MAX. Rename 'pipe_info()' to 'get_pipe_info()' Export 'get_pipe_info()' to other users Un-inline get_pipe_info() helper function
Luis R. Rodriguez (19):
ath9k: fix power save race conditions
ath9k: fix regression which disabled ps on ath9k
ath9k: fix regression on beacon loss after bgscan
ath9k_hw: Fix TX carrier leakage for IEEE compliance on AR9003 2.2
ath9k: rename rxflushlock to pcu_lock
ath9k: add locking for stopping RX
ath9k: fix enabling ANI / tx monitor after bg scan
ath9k: add locking for starting the PCU on RX
ath9k: lock reset and PCU start/stopping
cfg80211: fix regression on processing country IEs
mac80211: fix channel assumption for association done work
mac80211: fix offchannel assumption upon association
mac80211: reset connection idle when going offchannel
mac80211: add helper for reseting the connection monitor
mac80211: make the beacon monitor available externally
mac80211: send last 3/5 probe requests as unicast
mac80211: disable beacon monitor while going offchannel
mac80211: reset probe send counter upon connection timer reset
cfg80211: fix extension channel checks to initiate communication
Marcelo Roberto Jimenez (1):
ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
Marek Lindner (1):
Staging: batman-adv: ensure that eth_type_trans gets linear memory
Mark Brown (1):
ASoC: Remove volatility from WM8900 POWER1 register
Martin K. Petersen (1):
block: Ensure physical block size is unsigned int
Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files
Masanori ITOH (1):
percpu: fix list_head init bug in __percpu_counter_init()
Mel Gorman (1):
mm, page-allocator: do not check the state of a non-existant buddy during free
Michael Hennerich (1):
drivers/misc/ad525x_dpot.c: fix typo in spi write16 and write24 transfer counts
Michael Neuling (1):
powerpc: Fix call to subpage_protection()
Michael S. Tsirkin (1):
KVM: Write protect memory after slot swap
Michael Stuermer (1):
USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
Michel Dänzer (1):
drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
Mika Westerberg (1):
ARM: 6464/2: fix spinlock recursion in adjust_pte()
Ming Lei (2):
usbnet: fix usb_autopm_get_interface failure(v1)
usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
Mohammed Shafi Shajakhan (1):
ath9k: Fix incorrect access of rate flags in RC
NeilBrown (2):
md: Fix regression with raid1 arrays without persistent metadata. md/raid1: really fix recovery looping when single good device fails.
Nelson Elhage (1):
do_exit(): make sure that we run with get_fs() == USER_DS
Nick Piggin (1):
radix-tree: fix RCU bug
Nobuhiro Iwamatsu (1):
i2c-pca-platform: Change device name of request_irq
Oleg Nesterov (2):
exec: make argv/envp memory visible to oom-killer
exec: copy-and-paste the fixes into compat_do_execve() paths
Oliver Hartkopp (1):
can-bcm: fix minor heap overflow
Oskar Schirmer (1):
cifs: fix another memleak, in cifs_root_iget
Paul Zimmerman (1):
xhci: Fix reset-device and configure-endpoint commands
Pekka Enberg (1):
perf_events: Fix perf_counter_mmap() hook in mprotect()
Peter Ujfalusi (1):
OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
Peter Zijlstra (1):
sched: fix RCU lockdep splat from task_group()
Phil Blundell (3):
econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
econet: fix CVE-2010-3850
econet: fix CVE-2010-3848Philipp Merkel (1):
HID: Fix for problems with eGalax/DWAV multi-touch-screen
Philippe Rétornaz (1):
tty_ldisc: Fix BUG() on hangup
Rafael J. Wysocki (1):
PM / Hibernate: Fix memory corruption related to swap
Rajkumar Manoharan (7):
ath9k_htc: Set proper firmware offset for Netgear WNDA3200
ath9k_hw: Fix memory leak on ath9k_hw_rf_alloc_ext_banks failure
ath9k_htc: Avoid setting QoS control for non-QoS frames
ath9k_hw: Set proper eeprom offset for AR9287 HTC devices
ath9k_htc: Add new devices into AR7010
ath9k_htc: Update usb device ID list
mac80211: Fix ibss station got expired immediately
Richard A. Smith (1):
olpc_battery: Fix endian neutral breakage for s16 values
Richard Weinberger (3):
hostfs: fix UML crash: remove f_spare from hostfs
um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
um: fix global timer issue when using CONFIG_NO_HZ
Roberto Sassu (1):
ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
[email protected] (1):
sgi-xpc: XPC fails to discover partitions with all nasids above 128
Samuel Ortiz (2):
irda: Fix parameter extraction stack overflow
irda: Fix heap memory corruption in iriap.c
Santosh Shilimkar (1):
oprofile: Fix the hang while taking the cpu offline
Sarah Sharp (3):
xhci: Remove excessive printks with shared IRQs.
xhci: Setup array of USB 2.0 and USB 3.0 ports.
xhci: Don't let the USB core disable SuperSpeed ports.
Sebastien Bourdeauducq (1):
USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
Senthil Balasubramanian (2):
ath9k: fix regression which prevents chip sleep after CAB data
ath9k_hw: Fix divide by zero cases in paprd.
Sergey Senozhatsky (1):
ext4: fix NULL pointer dereference in print_daily_error_info()
Shan Wei (1):
r8169: fix checksum broken
Stanislaw Gruszka (1):
r8169: (re)init phy on resume
Stefan Weil (1):
USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
Steven J. Magnani (1):
nommu: yield CPU while disposing VM
Steven Rostedt (1):
leds: fix bug with reading NAS SS4200 dmi code
Takashi Iwai (6):
ALSA: hda - Disable sticky PCM stream assignment for AD codecs
ALSA: hda - Add workarounds for CT-IBG controllers
ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
ALSA: hda - Add some workarounds for Creative IBG
ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization
ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
Tejun Heo (2):
sata_via: apply magic FIFO fix to vt6420 too
libata: fix NULL sdev dereference race in atapi_qc_complete()
Thadeu Lima de Souza Cascardo (1):
wmi: use memcmp instead of strncmp to compare GUIDs
Thomas Backlund (1):
microblaze: Fix build with make 3.82
Thomas Gleixner (1):
perf: Fix inherit vs. context rotation bug
Tilman Schmidt (3):
isdn/gigaset: fix bas_gigaset AT read error handling isdn/gigaset: correct bas_gigaset rx buffer handling isdn/gigaset: bas_gigaset locking fix
Trond Myklebust (5):
SUNRPC: After calling xprt_release(), we must restart from call_reserve
NFSv4: Don't call nfs4_reclaim_complete() on receiving NFS4ERR_STALE_CLIENTID
NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers
NFSv4: Fix open recovery
NFS: Don't SIGBUS if nfs_vm_page_mkwrite races with a cache invalidation
Tyler Hicks (1):
eCryptfs: Clear LOOKUP_OPEN flag when creating lower file
Uwe Kleine-König (1):
backlight: grab ops_lock before testing bd->ops
Valentine Sinitsyn (1):
ALSA: hda - Added fixup for Lenovo Y550P
Vasanthakumar Thiagarajan (2):
ath9k: Fix tx struck state with paprd
ath9k_hw: Fix AR9280 surprise removal during frequent idle on/off
Vasiliy Kulikov (5):
ipc: shm: fix information leak to userland
KVM: x86: fix information leak to userland
usb: misc: sisusbvga: fix information leak to userland
usb: misc: iowarrior: fix information leak to userland
usb: core: fix information leak to userland
Will Deacon (1):
ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
Will Newton (1):
uml: disable winch irq before freeing handler data
Yuanhan Liu (2):
drm/i915: Update hotplug interrupts register definitions for Sandybridge drm/i915/crt: Make sure the hotplug interrupt is enabled
Zhang Rui (3):
ACPI: install ACPI table handler before any dynamic tables being loaded ACPI battery: support percentage battery remaining capacity
acpi-cpufreq: fix a memleak when unloading driver
andrew hendry (1):
memory corruption in X.25 facilities parsing
françois romieu (1):
r8169: revert "Handle rxfifo errors on 8168 chips"
ma rui (1):
USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 36 -EXTRAVERSION = .1 +EXTRAVERSION = .2 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION*
arch/arm/include/asm/assembler.h +1 -1
@@ -215,7 +215,7 @@ @ Slightly optimised to avoid incrementing the pointer twice usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort .if \rept == 2 - usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort + usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort .endif add\cond \ptr, #\rept * \inc
arch/arm/lib/findbit.S +4 -2
@@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be) */ .L_found: #if __LINUX_ARM_ARCH__ >= 5 - rsb r1, r3, #0 - and r3, r3, r1 + rsb r0, r3, #0 + and r3, r3, r0 clz r3, r3 rsb r3, r3, #31 add r0, r2, r3
@@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be) addeq r2, r2, #1 mov r0, r2 #endif + cmp r1, r0 @ Clamp to maxbit + movlo r0, r1 mov pc, lr
arch/arm/mach-cns3xxx/pcie.c +1 -1
@@ -369,7 +369,7 @@ static int __init cns3xxx_pcie_init(void) {int i; -hook_fault_code (16 +6 , cns3xxx_pcie_abort_handler,SIGBUS , +hook_fault_code (16 +6 , cns3xxx_pcie_abort_handler,SIGBUS ,0 ,"imprecise external abort" );for (i =0 ; i <ARRAY_SIZE (cns3xxx_pcie); i++) {
arch/arm/mm/fault-armv.c +26 -2
@@ -65,6 +65,30 @@ static int do_adjust_pte(struct vm_area_struct *vma, unsigned long address,return ret; } +#if USE_SPLIT_PTLOCKS +/* +* If we are using split PTE locks, then we need to take the page +* lock here. Otherwise we are using shared mm->page_table_lock +* which is already locked, thus cannot take it. +*/ +static inline void do_pte_lock (spinlock_t *ptl) +{ +/* +* Use nested version here to indicate that we are already +* holding one similar spinlock. +*/ +spin_lock_nested (ptl,SINGLE_DEPTH_NESTING ); +} + +static inline void do_pte_unlock (spinlock_t *ptl) +{ +spin_unlock (ptl); +} +#else /* !USE_SPLIT_PTLOCKS */ +static inline void do_pte_lock (spinlock_t *ptl) {} +static inline void do_pte_unlock (spinlock_t *ptl) {} +#endif /* USE_SPLIT_PTLOCKS */ +static int adjust_pte (struct vm_area_struct *vma,unsigned long address,unsigned long pfn) {
@@ -89,11 +113,11 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address,*/ ptl =pte_lockptr (vma->vm_mm, pmd); pte =pte_offset_map_nested (pmd, address); -spin_lock (ptl); +do_pte_lock (ptl); ret =do_adjust_pte (vma, address, pfn, pte); -spin_unlock (ptl); +do_pte_unlock (ptl);pte_unmap_nested (pte);return ret;
arch/arm/plat-omap/dma.c +44 -6
69 lines not on this page · raw message
arch/arm/plat-omap/include/plat/dma.h +4 -0
@@ -335,6 +335,10 @@#define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11)#define OMAP_DMA_CCR_EN (1 << 7) +#define OMAP_DMA_CCR_RD_ACTIVE (1 << 9) +#define OMAP_DMA_CCR_WR_ACTIVE (1 << 10) +#define OMAP_DMA_CCR_SEL_SRC_DST_SYNC (1 << 24) +#define OMAP_DMA_CCR_BUFFERING_DISABLE (1 << 25)#define OMAP_DMA_DATA_TYPE_S8 0x00#define OMAP_DMA_DATA_TYPE_S16 0x01
arch/microblaze/Makefile +6 -2
@@ -72,12 +72,16 @@ export MMU DTB all: linux.bin -BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.% +# With make 3.82 we cannot mix normal and wildcard targets +BOOT_TARGETS1 = linux.bin linux.bin.gz +BOOT_TARGETS2 = simpleImage.% archclean: $(Q)$(MAKE) $(clean)=$(boot) -$(BOOT_TARGETS): vmlinux +$(BOOT_TARGETS1): vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ +$(BOOT_TARGETS2): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ define archhelp
arch/powerpc/mm/hash_utils_64.c +1 -1
@@ -1122,7 +1122,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, else#endif /* CONFIG_PPC_HAS_HASH_64K */ rc =__hash_page_4K (ea, access, vsid, ptep, trap, local, ssize, -subpage_protection (pgdir, ea)); +subpage_protection (mm, ea));/* Dump some info in case of hash insertion failure, they should * never happen so it is really useful to know if/when they do
arch/s390/kernel/nmi.c +4 -6
@@ -95,7 +95,6 @@ EXPORT_SYMBOL_GPL(s390_handle_mcck); static int notrace s390_revalidate_registers(struct mci *mci) {int kill_task; -u64 tmpclock;u64 zero;void *fpt_save_area, *fpt_creg_save_area;
@@ -214,11 +213,10 @@ static int notrace s390_revalidate_registers(struct mci *mci) : "0", "cc");#endif /* Revalidate clock comparator register */ - asmvolatile ( -" stck 0(%1)\n" -" sckc 0(%1)" - :"=m" (tmpclock) :"a" (&(tmpclock)) :"cc" ,"memory" ); - +if (S390_lowcore.clock_comparator ==-1 ) +set_clock_comparator (S390_lowcore.mcck_clock); +else +set_clock_comparator (S390_lowcore.clock_comparator);/* Check if old PSW is valid */ if (!mci->wp)/*
arch/s390/kernel/vtime.c +19 -0
@@ -19,6 +19,7 @@#include <linux/kernel_stat.h> #include <linux/rcupdate.h> #include <linux/posix-timers.h> +#include <linux/cpu.h> #include <asm/s390_ext.h> #include <asm/timer.h>
@@ -565,6 +566,23 @@ void init_cpu_vtimer(void)__ctl_set_bit (0 ,10 ); } +static int __cpuinit s390_nohz_notify (struct notifier_block *self, +unsigned long action,void *hcpu) +{ +struct s390_idle_data *idle; +long cpu = (long ) hcpu; + + idle = &per_cpu (s390_idle, cpu); +switch (action) { +case CPU_DYING : +case CPU_DYING_FROZEN : + idle->nohz_delay =0 ; +default : +break ; + } +return NOTIFY_OK ; +} +void __init vtime_init (void ) {/* request the cpu timer external interrupt */
@@ -573,5 +591,6 @@ void __init vtime_init(void)/* Enable cpu timer interrupts on the boot cpu. */ init_cpu_vtimer (); +cpu_notifier (s390_nohz_notify,0 ); }
arch/s390/lib/delay.c +9 -5
@@ -29,17 +29,21 @@ static void __udelay_disabled(unsigned long long usecs) {unsigned long mask, cr0, cr0_saved;u64 clock_saved; +u64 end; + mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ; + end =get_clock () + (usecs <<12 ); clock_saved =local_tick_disable (); -set_clock_comparator (get_clock () + (usecs <<12 ));__ctl_store (cr0_saved,0 ,0 ); cr0 = (cr0_saved &0xffff00e0 ) |0x00000800 ;__ctl_load (cr0 ,0 ,0 ); - mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ;lockdep_off (); -trace_hardirqs_on (); -__load_psw_mask (mask); -local_irq_disable (); +do { +set_clock_comparator (end); +trace_hardirqs_on (); +__load_psw_mask (mask); +local_irq_disable (); + }while (get_clock () < end);lockdep_on ();__ctl_load (cr0_saved,0 ,0 );local_tick_enable (clock_saved);
arch/sh/include/asm/syscalls_32.h +4 -3
@@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,unsigned long r6,unsigned long r7,struct pt_regs __regs); -asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv, -char __user *__user *uenvp,unsigned long r7, -struct pt_regs __regs); +asmlinkage int sys_execve(const char __user *ufilename, +const char __user *const __user *uargv, +const char __user *const __user *uenvp, +unsigned long r7,struct pt_regs __regs); asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,unsigned long r6,unsigned long r7,struct pt_regs __regs);
arch/um/drivers/line.c +3 -2
@@ -727,6 +727,9 @@ struct winch {static void free_winch (struct winch *winch,int free_irq_ok) { +if (free_irq_ok) +free_irq (WINCH_IRQ , winch); +list_del (&winch->list);if (winch->pid !=-1 )
@@ -735,8 +738,6 @@ static void free_winch(struct winch *winch, int free_irq_ok)os_close_file (winch->fd);if (winch->stack !=0 )free_stack (winch->stack,0 ); -if (free_irq_ok) -free_irq (WINCH_IRQ , winch);kfree (winch); }
arch/um/kernel/uml.lds.S +1 -1
@@ -22,7 +22,7 @@ SECTIONS _text = .; _stext = .; __init_begin = .; - INIT_TEXT_SECTION(PAGE_SIZE) + INIT_TEXT_SECTION(0) . = ALIGN(PAGE_SIZE); .text :
arch/um/os-Linux/time.c +1 -1
@@ -60,7 +60,7 @@ static inline long long timeval_to_ns(const struct timeval *tv)long long disable_timer (void ) {struct itimerval time = ((struct itimerval ) { {0 ,0 }, {0 ,0 } }); -int remain, max =UM_NSEC_PER_SEC /UM_HZ ; +long long remain, max =UM_NSEC_PER_SEC /UM_HZ ;if (setitimer (ITIMER_VIRTUAL , &time, &time) <0 ) printk(UM_KERN_ERR "disable_timer - setitimer failed, "
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -0
@@ -701,6 +701,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)per_cpu (acfreq_data, policy->cpu) =NULL ;acpi_processor_unregister_performance (data->acpi_data, policy->cpu); +kfree (data->freq_table);kfree (data); }
arch/x86/kernel/hw_breakpoint.c +4 -0
@@ -433,6 +433,10 @@ static int __kprobes hw_breakpoint_handler(struct die_args *args) dr6_p = (unsigned long *)ERR_PTR (args->err); dr6 = *dr6_p; +/* If it's a single step, TRAP bits are random */ +if (dr6 &DR_STEP ) +return NOTIFY_DONE ; +/* Do an early return if no trap bits are set in DR6 */ if ((dr6 &DR_TRAP_BITS ) ==0 )return NOTIFY_DONE ;
arch/x86/kvm/svm.c +1 -1
@@ -3281,6 +3281,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) vcpu->arch.regs[VCPU_REGS_RIP ] = svm->vmcb->save.rip;load_host_msrs (vcpu); +kvm_load_ldt (ldt_selector);loadsegment (fs, fs_selector);#ifdef CONFIG_X86_64 load_gs_index (gs_selector);
@@ -3288,7 +3289,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)#else loadsegment (gs, gs_selector);#endif -kvm_load_ldt (ldt_selector);reload_tss (vcpu);
arch/x86/kvm/vmx.c +9 -10
@@ -828,10 +828,9 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)#endif #ifdef CONFIG_X86_64 -if (is_long_mode (&vmx->vcpu)) { -rdmsrl (MSR_KERNEL_GS_BASE , vmx->msr_host_kernel_gs_base); +rdmsrl (MSR_KERNEL_GS_BASE , vmx->msr_host_kernel_gs_base); +if (is_long_mode (&vmx->vcpu))wrmsrl (MSR_KERNEL_GS_BASE , vmx->msr_guest_kernel_gs_base); - }#endif for (i =0 ; i < vmx->save_nmsrs; ++i) kvm_set_shared_msr(vmx->guest_msrs[i].index,
@@ -846,23 +845,23 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) ++vmx->vcpu.stat.host_state_reload; vmx->host_state.loaded =0 ; -if (vmx->host_state.fs_reload_needed) -loadsegment (fs, vmx->host_state.fs_sel); +#ifdef CONFIG_X86_64 +if (is_long_mode (&vmx->vcpu)) +rdmsrl (MSR_KERNEL_GS_BASE , vmx->msr_guest_kernel_gs_base); +#endif if (vmx->host_state.gs_ldt_reload_needed) {kvm_load_ldt (vmx->host_state.ldt_sel);#ifdef CONFIG_X86_64 load_gs_index (vmx->host_state.gs_sel); -wrmsrl (MSR_KERNEL_GS_BASE , current->thread.gs);#else loadsegment (gs, vmx->host_state.gs_sel);#endif } +if (vmx->host_state.fs_reload_needed) +loadsegment (fs, vmx->host_state.fs_sel);reload_tss ();#ifdef CONFIG_X86_64 -if (is_long_mode (&vmx->vcpu)) { -rdmsrl (MSR_KERNEL_GS_BASE , vmx->msr_guest_kernel_gs_base); -wrmsrl (MSR_KERNEL_GS_BASE , vmx->msr_host_kernel_gs_base); - } +wrmsrl (MSR_KERNEL_GS_BASE , vmx->msr_host_kernel_gs_base);#endif if (current_thread_info ()->status &TS_USEDFPU )clts ();
arch/x86/kvm/x86.c +10 -4
@@ -2305,6 +2305,7 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, !kvm_exception_is_soft (vcpu->arch.exception.nr); events->exception.nr = vcpu->arch.exception.nr; events->exception.has_error_code = vcpu->arch.exception.has_error_code; + events->exception.pad =0 ; events->exception.error_code = vcpu->arch.exception.error_code; events->interrupt.injected =
@@ -2318,12 +2319,14 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, events->nmi.injected = vcpu->arch.nmi_injected; events->nmi.pending = vcpu->arch.nmi_pending; events->nmi.masked = kvm_x86_ops->get_nmi_mask (vcpu); + events->nmi.pad =0 ; events->sipi_vector = vcpu->arch.sipi_vector; events->flags = (KVM_VCPUEVENT_VALID_NMI_PENDING |KVM_VCPUEVENT_VALID_SIPI_VECTOR |KVM_VCPUEVENT_VALID_SHADOW ); +memset (&events->reserved,0 ,sizeof (events->reserved)); } static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
@@ -2366,6 +2369,7 @@ static void kvm_vcpu_ioctl_x86_get_debugregs(struct kvm_vcpu *vcpu, dbgregs->dr6 = vcpu->arch.dr6; dbgregs->dr7 = vcpu->arch.dr7; dbgregs->flags =0 ; +memset (&dbgregs->reserved,0 ,sizeof (dbgregs->reserved)); } static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
@@ -2849,6 +2853,7 @@ static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) sizeof(ps->channels)); ps->flags = kvm->arch.vpit->pit_state.flags;mutex_unlock (&kvm->arch.vpit->pit_state.lock); +memset (&ps->reserved,0 ,sizeof (ps->reserved));return r; }
@@ -2912,10 +2917,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,struct kvm_memslots *slots, *old_slots;unsigned long *dirty_bitmap; -spin_lock (&kvm->mmu_lock); -kvm_mmu_slot_remove_write_access (kvm, log->slot); -spin_unlock (&kvm->mmu_lock); - r = -ENOMEM ; dirty_bitmap =vmalloc (n);if (!dirty_bitmap)
@@ -2937,6 +2938,10 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, dirty_bitmap = old_slots->memslots[log->slot].dirty_bitmap;kfree (old_slots); +spin_lock (&kvm->mmu_lock); +kvm_mmu_slot_remove_write_access (kvm, log->slot); +spin_unlock (&kvm->mmu_lock); + r = -EFAULT ;if (copy_to_user (log->dirty_bitmap, dirty_bitmap, n)) {vfree (dirty_bitmap);
@@ -3229,6 +3234,7 @@ long kvm_arch_vm_ioctl(struct file *filp, now_ns =timespec_to_ns (&now); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; user_ns.flags =0 ; +memset (&user_ns.pad,0 ,sizeof (user_ns.pad)); r = -EFAULT ;if (copy_to_user (argp, &user_ns,sizeof (user_ns)))
arch/x86/xen/enlighten.c +0 -4
@@ -1017,10 +1017,6 @@ static void xen_reboot(int reason) {struct sched_shutdown r = { .reason = reason }; -#ifdef CONFIG_SMP -stop_other_cpus (); -#endif -if (HYPERVISOR_sched_op (SCHEDOP_shutdown, &r))BUG (); }
block/blk-map.c +2 -0
@@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unaligned =1 ;break ; } +if (!iov[i].iov_len) +return -EINVAL ; }if (unaligned || (q->dma_pad_mask & len) || map_data)
block/blk-settings.c +1 -1
@@ -343,7 +343,7 @@ EXPORT_SYMBOL(blk_queue_logical_block_size);* hardware can operate on without reverting to read-modify-write * operations. */ -void blk_queue_physical_block_size (struct request_queue *q,unsigned short size) +void blk_queue_physical_block_size (struct request_queue *q,unsigned int size) { q->limits.physical_block_size = size;
block/genhd.c +4 -2
@@ -541,13 +541,15 @@ void add_disk(struct gendisk *disk) disk->major =MAJOR (devt); disk->first_minor =MINOR (devt); +/* Register BDI before referencing it from bdev */ + bdi = &disk->queue->backing_dev_info; +bdi_register_dev (bdi,disk_devt (disk)); +blk_register_region (disk_devt (disk), disk->minors,NULL , exact_match, exact_lock, disk);register_disk (disk);blk_register_queue (disk); - bdi = &disk->queue->backing_dev_info; -bdi_register_dev (bdi,disk_devt (disk)); retval =sysfs_create_link (&disk_to_dev (disk)->kobj, &bdi->dev->kobj,"bdi" );WARN_ON (retval);
block/scsi_ioctl.c +24 -10
@@ -321,33 +321,47 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,if (hdr->iovec_count) {const int size =sizeof (struct sg_iovec ) * hdr->iovec_count;size_t iov_data_len; -struct sg_iovec *iov; +struct sg_iovec *sg_iov; +struct iovec *iov; +int i; - iov =kmalloc (size,GFP_KERNEL ); -if (!iov) { + sg_iov =kmalloc (size,GFP_KERNEL ); +if (!sg_iov) { ret = -ENOMEM ; goto out; } -if (copy_from_user (iov, hdr->dxferp, size)) { -kfree (iov); +if (copy_from_user (sg_iov, hdr->dxferp, size)) { +kfree (sg_iov); ret = -EFAULT ; goto out; } +/* +* Sum up the vecs, making sure they don't overflow +*/ + iov = (struct iovec *) sg_iov; + iov_data_len =0 ; +for (i =0 ; i < hdr->iovec_count; i++) { +if (iov_data_len + iov[i].iov_len < iov_data_len) { +kfree (sg_iov); + ret = -EINVAL ; + goto out; + } + iov_data_len += iov[i].iov_len; + } +/* SG_IO howto says that the shorter of the two wins */ - iov_data_len =iov_length ((struct iovec *)iov, - hdr->iovec_count);if (hdr->dxfer_len < iov_data_len) { - hdr->iovec_count =iov_shorten ((struct iovec *)iov, + hdr->iovec_count =iov_shorten (iov, hdr->iovec_count, hdr->dxfer_len); iov_data_len = hdr->dxfer_len; } - ret =blk_rq_map_user_iov (q, rq,NULL , iov, hdr->iovec_count, + ret =blk_rq_map_user_iov (q, rq,NULL , sg_iov, hdr->iovec_count, iov_data_len,GFP_KERNEL ); -kfree (iov); +kfree (sg_iov); }else if (hdr->dxfer_len) ret =blk_rq_map_user (q, rq,NULL , hdr->dxferp, hdr->dxfer_len,GFP_KERNEL );
drivers/acpi/battery.c +37 -1
@@ -98,6 +98,7 @@ enum {* due to bad math. */ ACPI_BATTERY_QUIRK_SIGNED16_CURRENT , + ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, }; struct acpi_battery {
@@ -412,6 +413,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery) result =extract_package (battery, buffer.pointer, info_offsets,ARRAY_SIZE (info_offsets));kfree (buffer.pointer); +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags)) + battery->full_charge_capacity = battery->design_capacity;return result; }
@@ -448,6 +451,10 @@ static int acpi_battery_get_state(struct acpi_battery *battery) battery->rate_now != -1) battery->rate_now =abs ((s16 )battery->rate_now); +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags) + && battery->capacity_now >=0 && battery->capacity_now <=100 ) + battery->capacity_now = (battery->capacity_now * + battery->full_charge_capacity) /100 ;return result; }
@@ -561,6 +568,33 @@ static void acpi_battery_quirks(struct acpi_battery *battery) } } +/* +* According to the ACPI spec, some kinds of primary batteries can +* report percentage battery remaining capacity directly to OS. +* In this case, it reports the Last Full Charged Capacity == 100 +* and BatteryPresentRate == 0xFFFFFFFF. +* +* Now we found some battery reports percentage remaining capacity +* even if it's rechargeable. +* https://bugzilla.kernel.org/show_bug.cgi?id=15979 +* +* Handle this correctly so that they won't break userspace. +*/ +static void acpi_battery_quirks2 (struct acpi_battery *battery) +{ +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags)) +return ; + +if (battery->full_charge_capacity ==100 && + battery->rate_now ==ACPI_BATTERY_VALUE_UNKNOWN && + battery->capacity_now >=0 && battery->capacity_now <=100 ) { +set_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags); + battery->full_charge_capacity = battery->design_capacity; + battery->capacity_now = (battery->capacity_now * + battery->full_charge_capacity) /100 ; + } +} +static int acpi_battery_update (struct acpi_battery *battery) {int result, old_present =acpi_battery_present (battery);
@@ -586,7 +620,9 @@ static int acpi_battery_update(struct acpi_battery *battery)if (!battery->bat.dev)sysfs_add_battery (battery);#endif -return acpi_battery_get_state (battery); + result =acpi_battery_get_state (battery); +acpi_battery_quirks2 (battery); +return result; }/* --------------------------------------------------------------------------
drivers/acpi/bus.c +6 -1
@@ -935,6 +935,12 @@ static int __init acpi_bus_init(void) goto error1; } +/* +* _PDC control method may load dynamic SSDT tables, +* and we need to install the table handler before that. +*/ +acpi_sysfs_init (); +acpi_early_processor_set_pdc ();/*
@@ -1026,7 +1032,6 @@ static int __init acpi_init(void)acpi_scan_init ();acpi_ec_init ();acpi_power_init (); -acpi_sysfs_init ();acpi_debugfs_init ();acpi_sleep_proc_init ();acpi_wakeup_device_init ();
drivers/acpi/debugfs.c +1 -1
@@ -79,7 +79,7 @@ int __init acpi_debugfs_init(void)if (!acpi_dir) goto err; - cm_dentry =debugfs_create_file ("custom_method" ,S_IWUGO , + cm_dentry =debugfs_create_file ("custom_method" ,S_IWUSR , acpi_dir,NULL , &cm_fops);if (!cm_dentry) goto err;
drivers/ata/libata-scsi.c +4 -1
@@ -2577,8 +2577,11 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)* * If door lock fails, always clear sdev->locked to * avoid this infinite loop. +* +* This may happen before SCSI scan is complete. Make +* sure qc->dev->sdev isn't NULL before dereferencing. */ -if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL ) +if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) qc->dev->sdev->locked =0 ; qc->scsicmd->result =SAM_STAT_CHECK_CONDITION ;
drivers/ata/sata_via.c +5 -4
@@ -538,7 +538,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)return 0 ; } -static void svia_configure (struct pci_dev *pdev) +static void svia_configure (struct pci_dev *pdev,int board_id) {u8 tmp8;
@@ -577,7 +577,7 @@ static void svia_configure(struct pci_dev *pdev) }/* -* vt6421 has problems talking to some drives. The following +* vt6420/1 has problems talking to some drives. The following * is the fix from Joseph Chan <[email protected]>. * * When host issues HOLD, device may send up to 20DW of data
@@ -596,8 +596,9 @@ static void svia_configure(struct pci_dev *pdev)* * https://bugzilla.kernel.org/show_bug.cgi?id=15173 * http://article.gmane.org/gmane.linux.ide/46352 +* http://thread.gmane.org/gmane.linux.kernel/1062139 */ -if (pdev->device ==0x3249 ) { +if (board_id == vt6420 || board_id == vt6421) {pci_read_config_byte (pdev,0x52 , &tmp8); tmp8 |=1 <<2 ;pci_write_config_byte (pdev,0x52 , tmp8);
@@ -652,7 +653,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (rc)return rc; -svia_configure (pdev); +svia_configure (pdev, board_id);pci_set_master (pdev); return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,
drivers/char/agp/intel-agp.c +1 -0
@@ -1049,6 +1049,7 @@ static struct pci_device_id agp_intel_pci_table[] = {ID (PCI_DEVICE_ID_INTEL_G45_HB ),ID (PCI_DEVICE_ID_INTEL_G41_HB ),ID (PCI_DEVICE_ID_INTEL_B43_HB ), +ID (PCI_DEVICE_ID_INTEL_B43_1_HB ),ID (PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB ),ID (PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB ), ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),
drivers/char/agp/intel-gtt.c +27 -36
100 lines not on this page · raw message
drivers/char/hpet.c +17 -0
@@ -479,6 +479,21 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)if (irq) {unsigned long irq_flags; +if (devp->hd_flags &HPET_SHARED_IRQ ) { +/* +* To prevent the interrupt handler from seeing an +* unwanted interrupt status bit, program the timer +* so that it will not fire in the near future ... +*/ +writel (readl (&timer->hpet_config) & ~Tn_TYPE_CNF_MASK, + &timer->hpet_config); +write_counter (read_counter (&hpet->hpet_mc), + &timer->hpet_compare); +/* ... and clear any left-over status. */ + isr =1 << (devp - devp->hd_hpets->hp_dev); +writel (isr, &hpet->hpet_isr); + } +sprintf (devp->hd_name,"hpet%d" , (int )(devp - hpetp->hp_dev)); irq_flags = devp->hd_flags &HPET_SHARED_IRQ ?IRQF_SHARED :IRQF_DISABLED ;
@@ -970,6 +985,8 @@ static int hpet_acpi_add(struct acpi_device *device)return -ENODEV ;if (!data.hd_address || !data.hd_nirqs) { +if (data.hd_address) +iounmap (data.hd_address);printk ("%s: no address or irqs in _CRS\n" , __func__);return -ENODEV ; }
drivers/char/ipmi/ipmi_si_intf.c +19 -11
@@ -1665,6 +1665,17 @@ static int check_hotmod_int_op(const char *curr, const char *option,return 0 ; } +static struct smi_info *smi_info_alloc (void ) +{ +struct smi_info *info =kzalloc (sizeof (*info),GFP_KERNEL ); + +if (info) { +spin_lock_init (&info->si_lock); +spin_lock_init (&info->msg_lock); + } +return info; +} +static int hotmod_handler (const char *val,struct kernel_param *kp) {char *str =kstrdup (val,GFP_KERNEL );
@@ -1779,7 +1790,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp) }if (op ==HM_ADD ) { - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info) { rv = -ENOMEM ; goto out;
@@ -1844,7 +1855,7 @@ static __devinit void hardcode_find_bmc(void)if (!ports[i] && !addrs[i])continue ; - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info)return ;
@@ -2028,7 +2039,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)return -ENODEV ; } - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");return -ENOMEM ;
@@ -2138,7 +2149,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,if (!acpi_dev)return -ENODEV ; - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info)return -ENOMEM ;
@@ -2319,7 +2330,7 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data) {struct smi_info *info; - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info) { printk(KERN_ERR PFX "Could not allocate SI data\n");return ;
@@ -2426,7 +2437,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,int class_type = pdev->class &PCI_ERMC_CLASSCODE_TYPE_MASK ;struct smi_info *info; - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info)return -ENOMEM ;
@@ -2567,7 +2578,7 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,return -EINVAL ; } - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info) { dev_err(&dev->dev,
@@ -3014,7 +3025,7 @@ static __devinit void default_find_bmc(void)if (check_legacy_ioport (ipmi_defaults[i].port))continue ;#endif - info =kzalloc (sizeof (*info),GFP_KERNEL ); + info =smi_info_alloc ();if (!info)return ;
@@ -3139,9 +3150,6 @@ static int try_smi_init(struct smi_info *new_smi) goto out_err; } -spin_lock_init (&(new_smi->si_lock)); -spin_lock_init (&(new_smi->msg_lock)); -/* Do low-level detection first. */ if (new_smi->handlers->detect (new_smi->si_sm)) {if (new_smi->addr_source)
drivers/char/tty_buffer.c +12 -2
@@ -413,7 +413,8 @@ static void flush_to_ldisc(struct work_struct *work)spin_lock_irqsave (&tty->buf.lock, flags);if (!test_and_set_bit (TTY_FLUSHING , &tty->flags)) { -struct tty_buffer *head; +struct tty_buffer *head, *tail = tty->buf.tail; +int seen_tail =0 ;while ((head = tty->buf.head) !=NULL ) {int count;char *char_buf;
@@ -423,6 +424,15 @@ static void flush_to_ldisc(struct work_struct *work)if (!count) {if (head->next ==NULL )break ; +/* +There's a possibility tty might get new buffer +added during the unlock window below. We could +end up spinning in here forever hogging the CPU +completely. To avoid this let's have a rest each +time we processed the tail buffer. +*/ +if (tail == head) + seen_tail =1 ; tty->buf.head = head->next;tty_buffer_free (tty, head);continue ;
@@ -432,7 +442,7 @@ static void flush_to_ldisc(struct work_struct *work)line discipline as we want to empty the queue */ if (test_bit (TTY_FLUSHPENDING , &tty->flags))break ; -if (!tty->receive_room) { +if (!tty->receive_room || seen_tail) {schedule_delayed_work (&tty->buf.work,1 );break ; }
drivers/char/tty_io.c +11 -2
@@ -553,6 +553,9 @@ void __tty_hangup(struct tty_struct *tty)tty_lock (); +/* some functions below drop BTM, so we need this bit */ +set_bit (TTY_HUPPING , &tty->flags); +/* inuse_filps is protected by the single tty lock, this really needs to change if we want to flush the workqueue with the lock held */
@@ -572,6 +575,10 @@ void __tty_hangup(struct tty_struct *tty) }spin_unlock (&tty_files_lock); +/* +* it drops BTM and thus races with reopen +* we protect the race by TTY_HUPPING +*/ tty_ldisc_hangup (tty);read_lock (&tasklist_lock);
@@ -609,7 +616,6 @@ void __tty_hangup(struct tty_struct *tty) tty->session =NULL ; tty->pgrp =NULL ; tty->ctrl_status =0 ; -set_bit (TTY_HUPPED , &tty->flags);spin_unlock_irqrestore (&tty->ctrl_lock, flags);/* Account for the p->signal references we killed */
@@ -635,6 +641,7 @@ void __tty_hangup(struct tty_struct *tty)* can't yet guarantee all that. */ set_bit (TTY_HUPPED , &tty->flags); +clear_bit (TTY_HUPPING , &tty->flags);tty_ldisc_enable (tty);tty_unlock ();
@@ -1304,7 +1311,9 @@ static int tty_reopen(struct tty_struct *tty) {struct tty_driver *driver = tty->driver; -if (test_bit (TTY_CLOSING , &tty->flags)) +if (test_bit (TTY_CLOSING , &tty->flags) || +test_bit (TTY_HUPPING , &tty->flags) || +test_bit (TTY_LDISC_CHANGING , &tty->flags))return -EIO ; if (driver->type == TTY_DRIVER_TYPE_PTY &&
drivers/char/tty_ldisc.c +44 -7
114 lines not on this page · raw message
drivers/char/vt_ioctl.c +6 -5
@@ -503,6 +503,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,struct kbd_struct * kbd;unsigned int console;unsigned char ucval; +unsigned int uival;void __user *up = (void __user *)arg;int i, perm;int ret =0 ;
@@ -657,7 +658,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGETMODE : - ucval = vc->vc_mode; + uival = vc->vc_mode; goto setint;case KDMAPDISP :
@@ -695,7 +696,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGKBMODE : - ucval = ((kbd->kbdmode ==VC_RAW ) ?K_RAW : + uival = ((kbd->kbdmode ==VC_RAW ) ?K_RAW : (kbd->kbdmode ==VC_MEDIUMRAW ) ?K_MEDIUMRAW : (kbd->kbdmode ==VC_UNICODE ) ?K_UNICODE :K_XLATE );
@@ -717,9 +718,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGKBMETA : - ucval = (vc_kbd_mode (kbd,VC_META ) ?K_ESCPREFIX :K_METABIT ); + uival = (vc_kbd_mode (kbd,VC_META ) ?K_ESCPREFIX :K_METABIT ); setint: - ret =put_user (ucval, (int __user *)arg); + ret =put_user (uival, (int __user *)arg);break ;case KDGETKEYCODE :
@@ -949,7 +950,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,for (i =0 ; i <MAX_NR_CONSOLES ; ++i)if (!VT_IS_IN_USE (i))break ; - ucval = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; + uival = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; goto setint;/*
drivers/crypto/padlock-aes.c +1 -1
@@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,if (initial) asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ :"+S" (input),"+D" (output),"+a" (iv) - :"d" (control_word),"b" (key),"c" (count)); + :"d" (control_word),"b" (key),"c" (initial)); asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ : "+S" (input), "+D" (output), "+a" (iv)
drivers/firewire/ohci.c +48 -12
80 lines not on this page · raw message
drivers/gpio/cs5535-gpio.c +14 -2
@@ -56,6 +56,18 @@ static struct cs5535_gpio_chip {* registers, see include/linux/cs5535.h. */ +static void errata_outl (u32 val,unsigned long addr) +{ +/* +* According to the CS5536 errata (#36), after suspend +* a write to the high bank GPIO register will clear all +* non-selected bits; the recommended workaround is a +* read-modify-write operation. +*/ + val |=inl (addr); +outl (val, addr); +} +static void __cs5535_gpio_set (struct cs5535_gpio_chip *chip,unsigned offset,unsigned int reg) {
@@ -64,7 +76,7 @@ static void __cs5535_gpio_set(struct cs5535_gpio_chip *chip, unsigned offset,outl (1 << offset, chip->base + reg); else /* high bank register */ - outl(1 << (offset - 16), chip->base + 0x80 + reg); + errata_outl(1 << (offset - 16), chip->base + 0x80 + reg); }void cs5535_gpio_set (unsigned offset,unsigned int reg)
@@ -86,7 +98,7 @@ static void __cs5535_gpio_clear(struct cs5535_gpio_chip *chip, unsigned offset,outl (1 << (offset +16 ), chip->base + reg); else/* high bank register */ - outl(1 << offset, chip->base + 0x80 + reg); + errata_outl(1 << offset, chip->base + 0x80 + reg); }void cs5535_gpio_clear (unsigned offset,unsigned int reg)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -2306,6 +2306,9 @@ int i915_driver_unload(struct drm_device *dev)i915_gem_lastclose (dev);intel_cleanup_overlay (dev); + +if (!I915_NEED_GFX_HWS (dev)) +i915_free_hws (dev); }intel_teardown_mchbar (dev);
drivers/gpu/drm/i915/i915_irq.c +16 -5
@@ -310,6 +310,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int ret =IRQ_NONE ;u32 de_iir, gt_iir, de_ier, pch_iir; +u32 hotplug_mask;struct drm_i915_master_private *master_priv;struct intel_ring_buffer *render_ring = &dev_priv->render_ring;
@@ -325,6 +326,11 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)if (de_iir ==0 && gt_iir ==0 && pch_iir ==0 ) goto done; +if (HAS_PCH_CPT (dev)) + hotplug_mask =SDE_HOTPLUG_MASK_CPT ; +else + hotplug_mask =SDE_HOTPLUG_MASK ; + ret =IRQ_HANDLED ;if (dev->primary->master) {
@@ -366,10 +372,8 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)drm_handle_vblank (dev,1 );/* check event from PCH */ -if ((de_iir &DE_PCH_EVENT ) && - (pch_iir &SDE_HOTPLUG_MASK )) { +if ((de_iir &DE_PCH_EVENT ) && (pch_iir & hotplug_mask))queue_work (dev_priv->wq, &dev_priv->hotplug_work); - }if (de_iir &DE_PCU_EVENT ) {I915_WRITE16 (MEMINTRSTS ,I915_READ (MEMINTRSTS ));
@@ -1424,8 +1428,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev)u32 display_mask =DE_MASTER_IRQ_CONTROL |DE_GSE |DE_PCH_EVENT |DE_PLANEA_FLIP_DONE |DE_PLANEB_FLIP_DONE ;u32 render_mask =GT_PIPE_NOTIFY |GT_BSD_USER_INTERRUPT ; -u32 hotplug_mask =SDE_CRT_HOTPLUG |SDE_PORTB_HOTPLUG | -SDE_PORTC_HOTPLUG |SDE_PORTD_HOTPLUG ; +u32 hotplug_mask; dev_priv->irq_mask_reg = ~display_mask; dev_priv->de_irq_enable_reg = display_mask |DE_PIPEA_VBLANK |DE_PIPEB_VBLANK ;
@@ -1450,6 +1453,14 @@ static int ironlake_irq_postinstall(struct drm_device *dev)I915_WRITE (GTIER , dev_priv->gt_irq_enable_reg); (void )I915_READ (GTIER ); +if (HAS_PCH_CPT (dev)) { + hotplug_mask =SDE_CRT_HOTPLUG_CPT |SDE_PORTB_HOTPLUG_CPT | +SDE_PORTC_HOTPLUG_CPT |SDE_PORTD_HOTPLUG_CPT ; + }else { + hotplug_mask =SDE_CRT_HOTPLUG |SDE_PORTB_HOTPLUG | +SDE_PORTC_HOTPLUG |SDE_PORTD_HOTPLUG ; + } + dev_priv->pch_irq_mask_reg = ~hotplug_mask; dev_priv->pch_irq_enable_reg = hotplug_mask;
drivers/gpu/drm/i915/i915_reg.h +7 -0
@@ -2551,6 +2551,10 @@#define SDE_PORTD_HOTPLUG_CPT (1 << 23)#define SDE_PORTC_HOTPLUG_CPT (1 << 22)#define SDE_PORTB_HOTPLUG_CPT (1 << 21) +#define SDE_HOTPLUG_MASK_CPT (SDE_CRT_HOTPLUG_CPT | \ + SDE_PORTD_HOTPLUG_CPT | \ + SDE_PORTC_HOTPLUG_CPT | \ + SDE_PORTB_HOTPLUG_CPT)#define SDEISR 0xc4000#define SDEIMR 0xc4004
@@ -2722,6 +2726,9 @@#define FDI_RXB_CHICKEN 0xc2010#define FDI_RX_PHASE_SYNC_POINTER_ENABLE (1) +#define SOUTH_DSPCLK_GATE_D 0xc2020 +#define PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29) +/* CPU: FDI_TX */ #define FDI_TXA_CTL 0x60100#define FDI_TXB_CTL 0x61100
drivers/gpu/drm/i915/i915_suspend.c +3 -1
@@ -862,8 +862,10 @@ int i915_restore_state(struct drm_device *dev)/* Clock gating state */ intel_init_clock_gating (dev); -if (HAS_PCH_SPLIT (dev)) +if (HAS_PCH_SPLIT (dev)) {ironlake_enable_drps (dev); +intel_init_emon (dev); + }/* Cache mode state */ I915_WRITE (CACHE_MODE_0 , dev_priv->saveCACHE_MODE_0 |0xffff0000 );
drivers/gpu/drm/i915/intel_crt.c +2 -1
@@ -191,7 +191,8 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)DRM_DEBUG_KMS ("timed out waiting for FORCE_TRIGGER" );if (turn_off_dac) { -I915_WRITE (PCH_ADPA , temp); +/* Make sure hotplug is enabled */ +I915_WRITE (PCH_ADPA , temp |ADPA_CRT_HOTPLUG_ENABLE ); (void )I915_READ (PCH_ADPA ); }
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -5674,6 +5674,13 @@ void intel_init_clock_gating(struct drm_device *dev)I915_WRITE (PCH_DSPCLK_GATE_D , dspclk_gate);/* +* On Ibex Peak and Cougar Point, we need to disable clock +* gating for the panel power sequencer or it will fail to +* start up when no ports are active. +*/ +I915_WRITE (SOUTH_DSPCLK_GATE_D ,PCH_DPLSUNIT_CLOCK_GATE_DISABLE ); + +/* * According to the spec the following bits should be set in * order to enable memory self-refresh * The bit 22/21 of 0x42004
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -250,6 +250,7 @@ extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,extern void intel_init_clock_gating (struct drm_device *dev);extern void ironlake_enable_drps (struct drm_device *dev);extern void ironlake_disable_drps (struct drm_device *dev); +extern void intel_init_emon (struct drm_device *dev);extern int intel_pin_and_fence_fb_obj (struct drm_device *dev,struct drm_gem_object *obj);
drivers/gpu/drm/i915/intel_overlay.c +8 -0
@@ -1367,6 +1367,12 @@ void intel_setup_overlay(struct drm_device *dev) goto out_free_bo; } overlay->flip_addr = overlay->reg_bo->gtt_offset; + + ret =i915_gem_object_set_to_gtt_domain (reg_bo, true); +if (ret) { +DRM_ERROR ("failed to move overlay register bo into the GTT\n" ); + goto out_unpin_bo; + } }else { ret = i915_gem_attach_phys_object(dev, reg_bo, I915_GEM_PHYS_OVERLAY_REGS,
@@ -1399,6 +1405,8 @@ void intel_setup_overlay(struct drm_device *dev)DRM_INFO ("initialized overlay support\n" );return ; +out_unpin_bo: +i915_gem_object_unpin (reg_bo); out_free_bo:drm_gem_object_unreference (reg_bo); out_free:
drivers/gpu/drm/i915/intel_sdvo.c +5 -3
@@ -1498,10 +1498,12 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)if (!intel_sdvo_write_cmd (intel_sdvo,SDVO_CMD_GET_ATTACHED_DISPLAYS ,NULL ,0 ))return connector_status_unknown; -if (intel_sdvo->is_tv) { -/* add 30ms delay when the output type is SDVO-TV */ + +/* add 30ms delay when the output type might be TV */ +if (intel_sdvo->caps.output_flags & + (SDVO_OUTPUT_SVID0 |SDVO_OUTPUT_CVBS0 ))mdelay (30 ); - } +if (!intel_sdvo_read_response (intel_sdvo, &response,2 ))return connector_status_unknown;
drivers/gpu/drm/radeon/atom.c +1 -0
@@ -112,6 +112,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, base +=3 ;break ;case ATOM_IIO_WRITE : + (void )ctx->card->ioreg_read (ctx->card,CU16 (base +1 )); ctx->card->ioreg_write (ctx->card,CU16 (base +1 ), temp); base +=3 ;break ;
drivers/gpu/drm/radeon/r100.c +6 -0
@@ -2318,6 +2318,9 @@ void r100_vram_init_sizes(struct radeon_device *rdev)/* Fix for RN50, M6, M7 with 8/16/32(??) MBs of VRAM - * Novell bug 204882 + along with lots of ubuntu ones */ +if (rdev->mc.aper_size > config_aper_size) + config_aper_size = rdev->mc.aper_size; +if (config_aper_size > rdev->mc.real_vram_size) rdev->mc.mc_vram_size = config_aper_size;else
@@ -3225,6 +3228,8 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev,for (u =0 ; u < track->num_texture; u++) {if (!track->textures[u].enabled)continue ; +if (track->textures[u].lookup_disable) +continue ; robj = track->textures[u].robj;if (robj ==NULL ) {DRM_ERROR ("No texture bound to unit %u\n" , u);
@@ -3459,6 +3464,7 @@ void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track track->textures[i].robj =NULL ;/* CS IB emission code makes sure texture unit are disabled */ track->textures[i].enabled = false; + track->textures[i].lookup_disable = false; track->textures[i].roundup_w = true; track->textures[i].roundup_h = true;if (track->separate_cube)
drivers/gpu/drm/radeon/r100_track.h +1 -0
@@ -46,6 +46,7 @@ struct r100_cs_track_texture {unsigned height_11;bool use_pitch;bool enabled; +bool lookup_disable;bool roundup_w;bool roundup_h;unsigned compress_format;
drivers/gpu/drm/radeon/r200.c +2 -0
@@ -447,6 +447,8 @@ int r200_packet0_check(struct radeon_cs_parser *p, track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); } +if (idx_value &R200_TXFORMAT_LOOKUP_DISABLE ) + track->textures[i].lookup_disable = true;switch ((idx_value &RADEON_TXFORMAT_FORMAT_MASK )) {case R200_TXFORMAT_I8 :case R200_TXFORMAT_RGB332 :
drivers/gpu/drm/radeon/r600.c +6 -9
@@ -97,14 +97,8 @@ u32 rv6xx_get_temp(struct radeon_device *rdev) {u32 temp = (RREG32 (CG_THERMAL_STATUS ) &ASIC_T_MASK ) >>ASIC_T_SHIFT ; -u32 actual_temp =0 ; -if ((temp >>7 ) &1 ) - actual_temp =0 ; -else - actual_temp = (temp >>1 ) &0xff ; - -return actual_temp *1000 ; +return temp *1000 ; }void r600_pm_get_dynpm_state (struct radeon_device *rdev)
@@ -1608,8 +1602,11 @@ void r600_gpu_init(struct radeon_device *rdev) rdev->config.r600.tiling_npipes = rdev->config.r600.max_tile_pipes; rdev->config.r600.tiling_nbanks =4 << ((ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); tiling_config |=BANK_TILING ((ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); - tiling_config |=GROUP_SIZE (0 ); - rdev->config.r600.tiling_group_size =256 ; + tiling_config |=GROUP_SIZE ((ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ); +if ((ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ) + rdev->config.r600.tiling_group_size =512 ; +else + rdev->config.r600.tiling_group_size =256 ; tmp = (ramcfg &NOOFROWS_MASK ) >>NOOFROWS_SHIFT ;if (tmp >3 ) { tiling_config |=ROW_TILING (3 );
drivers/gpu/drm/radeon/r600_blit_kms.c +4 -4
@@ -650,8 +650,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev,int src_x = src_gpu_addr &255 ;int dst_x = dst_gpu_addr &255 ;int h =1 ; - src_gpu_addr = src_gpu_addr & ~255 ; - dst_gpu_addr = dst_gpu_addr & ~255 ; + src_gpu_addr = src_gpu_addr & ~255ULL ; + dst_gpu_addr = dst_gpu_addr & ~255ULL ;if (!src_x && !dst_x) { h = (cur_size / max_bytes);
@@ -744,8 +744,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev,int src_x = (src_gpu_addr &255 );int dst_x = (dst_gpu_addr &255 );int h =1 ; - src_gpu_addr = src_gpu_addr & ~255 ; - dst_gpu_addr = dst_gpu_addr & ~255 ; + src_gpu_addr = src_gpu_addr & ~255ULL ; + dst_gpu_addr = dst_gpu_addr & ~255ULL ;if (!src_x && !dst_x) { h = (cur_size / max_bytes);
drivers/gpu/drm/radeon/r600_cs.c +2 -2
@@ -228,7 +228,7 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) __func__, __LINE__, pitch);return -EINVAL ; } -if (!IS_ALIGNED ((height /8 ), track->nbanks)) { +if (!IS_ALIGNED ((height /8 ), track->npipes)) {dev_warn (p->dev,"%s:%d cb height (%d) invalid\n" , __func__, __LINE__, height);return -EINVAL ;
@@ -367,7 +367,7 @@ static int r600_cs_track_check(struct radeon_cs_parser *p) __func__, __LINE__, pitch);return -EINVAL ; } -if ((height /8 ) & (track->nbanks -1 )) { +if (!IS_ALIGNED ((height /8 ), track->npipes)) {dev_warn (p->dev,"%s:%d db height (%d) invalid\n" , __func__, __LINE__, height);return -EINVAL ;
drivers/gpu/drm/radeon/r600_reg.h +1 -0
@@ -86,6 +86,7 @@#define R600_HDP_NONSURFACE_BASE 0x2c04#define R600_BUS_CNTL 0x5420 +# define R600_BIOS_ROM_DIS (1 << 1)#define R600_CONFIG_CNTL 0x5424#define R600_CONFIG_MEMSIZE 0x5428#define R600_CONFIG_F0_BASE 0x542C
drivers/gpu/drm/radeon/radeon_atombios.c +16 -0
@@ -98,6 +98,14 @@ static inline struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio(struct radeon_dev } } +/* some DCE3 boards have bad data for this entry */ +if (ASIC_IS_DCE3 (rdev)) { +if ((i ==4 ) && + (gpio->usClkMaskRegisterIndex ==0x1fda ) && + (gpio->sucI2cId.ucAccess ==0x94 )) + gpio->sucI2cId.ucAccess =0x14 ; + } +if (gpio->sucI2cId.ucAccess == id) { i2c.mask_clk_reg =le16_to_cpu (gpio->usClkMaskRegisterIndex) *4 ; i2c.mask_data_reg =le16_to_cpu (gpio->usDataMaskRegisterIndex) *4 ;
@@ -174,6 +182,14 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev) } } +/* some DCE3 boards have bad data for this entry */ +if (ASIC_IS_DCE3 (rdev)) { +if ((i ==4 ) && + (gpio->usClkMaskRegisterIndex ==0x1fda ) && + (gpio->sucI2cId.ucAccess ==0x94 )) + gpio->sucI2cId.ucAccess =0x14 ; + } + i2c.mask_clk_reg =le16_to_cpu (gpio->usClkMaskRegisterIndex) *4 ; i2c.mask_data_reg =le16_to_cpu (gpio->usDataMaskRegisterIndex) *4 ; i2c.en_clk_reg =le16_to_cpu (gpio->usClkEnRegisterIndex) *4 ;
drivers/gpu/drm/radeon/radeon_bios.c +7 -6
@@ -130,6 +130,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) }return true; } +static bool r700_read_disabled_bios (struct radeon_device *rdev) {uint32_t viph_control;
@@ -143,7 +144,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev)bool r; viph_control =RREG32 (RADEON_VIPH_CONTROL ); - bus_cntl =RREG32 (RADEON_BUS_CNTL ); + bus_cntl =RREG32 (R600_BUS_CNTL ); d1vga_control =RREG32 (AVIVO_D1VGA_CONTROL ); d2vga_control =RREG32 (AVIVO_D2VGA_CONTROL ); vga_render_control =RREG32 (AVIVO_VGA_RENDER_CONTROL );
@@ -152,7 +153,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev)/* disable VIP */ WREG32 (RADEON_VIPH_CONTROL , (viph_control & ~RADEON_VIPH_EN ));/* enable the rom */ -WREG32 (RADEON_BUS_CNTL , (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM )); +WREG32 (R600_BUS_CNTL , (bus_cntl & ~R600_BIOS_ROM_DIS ));/* Disable VGA mode */ WREG32(AVIVO_D1VGA_CONTROL, (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
@@ -191,7 +192,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev) cg_spll_status =RREG32 (R600_CG_SPLL_STATUS ); }WREG32 (RADEON_VIPH_CONTROL , viph_control); -WREG32 (RADEON_BUS_CNTL , bus_cntl); +WREG32 (R600_BUS_CNTL , bus_cntl);WREG32 (AVIVO_D1VGA_CONTROL , d1vga_control);WREG32 (AVIVO_D2VGA_CONTROL , d2vga_control);WREG32 (AVIVO_VGA_RENDER_CONTROL , vga_render_control);
@@ -216,7 +217,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)bool r; viph_control =RREG32 (RADEON_VIPH_CONTROL ); - bus_cntl =RREG32 (RADEON_BUS_CNTL ); + bus_cntl =RREG32 (R600_BUS_CNTL ); d1vga_control =RREG32 (AVIVO_D1VGA_CONTROL ); d2vga_control =RREG32 (AVIVO_D2VGA_CONTROL ); vga_render_control =RREG32 (AVIVO_VGA_RENDER_CONTROL );
@@ -231,7 +232,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)/* disable VIP */ WREG32 (RADEON_VIPH_CONTROL , (viph_control & ~RADEON_VIPH_EN ));/* enable the rom */ -WREG32 (RADEON_BUS_CNTL , (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM )); +WREG32 (R600_BUS_CNTL , (bus_cntl & ~R600_BIOS_ROM_DIS ));/* Disable VGA mode */ WREG32(AVIVO_D1VGA_CONTROL, (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
@@ -262,7 +263,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)/* restore regs */ WREG32 (RADEON_VIPH_CONTROL , viph_control); -WREG32 (RADEON_BUS_CNTL , bus_cntl); +WREG32 (R600_BUS_CNTL , bus_cntl);WREG32 (AVIVO_D1VGA_CONTROL , d1vga_control);WREG32 (AVIVO_D2VGA_CONTROL , d2vga_control);WREG32 (AVIVO_VGA_RENDER_CONTROL , vga_render_control);
drivers/gpu/drm/radeon/radeon_combios.c +14 -1
@@ -571,6 +571,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde }if (clk_mask && data_mask) { +/* system specific masks */ i2c.mask_clk_mask = clk_mask; i2c.mask_data_mask = data_mask; i2c.a_clk_mask = clk_mask;
@@ -579,7 +580,19 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde i2c.en_data_mask = data_mask; i2c.y_clk_mask = clk_mask; i2c.y_data_mask = data_mask; + }else if ((ddc_line ==RADEON_GPIOPAD_MASK ) || + (ddc_line ==RADEON_MDGPIO_MASK )) { +/* default gpiopad masks */ + i2c.mask_clk_mask = (0x20 <<8 ); + i2c.mask_data_mask =0x80 ; + i2c.a_clk_mask = (0x20 <<8 ); + i2c.a_data_mask =0x80 ; + i2c.en_clk_mask = (0x20 <<8 ); + i2c.en_data_mask =0x80 ; + i2c.y_clk_mask = (0x20 <<8 ); + i2c.y_data_mask =0x80 ; }else { +/* default masks for ddc pads */ i2c.mask_clk_mask =RADEON_GPIO_EN_1 ; i2c.mask_data_mask =RADEON_GPIO_EN_0 ; i2c.a_clk_mask =RADEON_GPIO_A_1 ;
@@ -716,7 +729,7 @@ void radeon_combios_i2c_init(struct radeon_device *rdev) clk =RBIOS8 (offset +3 + (i *5 ) +3 ); data =RBIOS8 (offset +3 + (i *5 ) +4 ); i2c =combios_setup_i2c_bus (rdev,DDC_MONID , - clk, data); + (1 << clk), (1 << data)); rdev->i2c_bus[4 ] =radeon_i2c_create (dev, &i2c,"GPIOPAD_MASK" );break ; }
drivers/gpu/drm/radeon/radeon_connectors.c +34 -0
@@ -1119,6 +1119,8 @@ radeon_add_atom_connector(struct drm_device *dev,/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; connector->polled =DRM_CONNECTOR_POLL_CONNECT ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVIA :drm_connector_init (dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -1134,6 +1136,8 @@ radeon_add_atom_connector(struct drm_device *dev, 1);/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_DVID :
@@ -1163,6 +1167,11 @@ radeon_add_atom_connector(struct drm_device *dev, rdev->mode_info.load_detect_property, 1); } + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_DVII ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_HDMIA :case DRM_MODE_CONNECTOR_HDMIB :
@@ -1186,6 +1195,11 @@ radeon_add_atom_connector(struct drm_device *dev, rdev->mode_info.underscan_property, UNDERSCAN_AUTO); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_HDMIB ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_DisplayPort:case DRM_MODE_CONNECTOR_eDP:
@@ -1216,6 +1230,9 @@ radeon_add_atom_connector(struct drm_device *dev,drm_connector_attach_property (&radeon_connector->base, rdev->mode_info.underscan_property,UNDERSCAN_AUTO ); + connector->interlace_allowed = true; +/* in theory with a DP to VGA converter... */ + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_SVIDEO :case DRM_MODE_CONNECTOR_Composite:
@@ -1231,6 +1248,8 @@ radeon_add_atom_connector(struct drm_device *dev, radeon_atombios_get_tv_info(rdev));/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_LVDS : radeon_dig_connector =kzalloc (sizeof (struct radeon_connector_atom_dig ),GFP_KERNEL );
@@ -1249,6 +1268,8 @@ radeon_add_atom_connector(struct drm_device *dev, dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ; }
@@ -1326,6 +1347,8 @@ radeon_add_legacy_connector(struct drm_device *dev,/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; connector->polled =DRM_CONNECTOR_POLL_CONNECT ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVIA :drm_connector_init (dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -1341,6 +1364,8 @@ radeon_add_legacy_connector(struct drm_device *dev, 1);/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_DVID :
@@ -1358,6 +1383,11 @@ radeon_add_legacy_connector(struct drm_device *dev, 1); } subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_DVII ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_SVIDEO :case DRM_MODE_CONNECTOR_Composite:
@@ -1380,6 +1410,8 @@ radeon_add_legacy_connector(struct drm_device *dev, radeon_combios_get_tv_info(rdev));/* no HPD on analog connectors */ radeon_connector->hpd.hpd =RADEON_HPD_NONE ; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_LVDS :drm_connector_init (dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
@@ -1393,6 +1425,8 @@ radeon_add_legacy_connector(struct drm_device *dev, dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ; }
drivers/gpu/drm/radeon/radeon_encoders.c +33 -3
@@ -595,6 +595,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)int atombios_get_encoder_mode (struct drm_encoder *encoder) { +struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;struct drm_connector *connector;
@@ -602,9 +603,20 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)struct radeon_connector_atom_dig *dig_connector; connector =radeon_get_connector_for_encoder (encoder); -if (!connector) -return 0 ; - +if (!connector) { +switch (radeon_encoder->encoder_id) { +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY : +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 : +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 : +return ATOM_ENCODER_MODE_DVI ; +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : +default : +return ATOM_ENCODER_MODE_CRT ; + } + } radeon_connector =to_radeon_connector (connector);switch (connector->connector_type) {
@@ -1547,6 +1559,23 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig; + +/* check for pre-DCE3 cards with shared encoders; +* can't really use the links individually, so don't disable +* the encoder if it's in use by another connector +*/ +if (!ASIC_IS_DCE3 (rdev)) { +struct drm_encoder *other_encoder; +struct radeon_encoder *other_radeon_encoder; + +list_for_each_entry (other_encoder, &dev->mode_config.encoder_list, head) { + other_radeon_encoder =to_radeon_encoder (other_encoder); +if ((radeon_encoder->encoder_id == other_radeon_encoder->encoder_id) && +drm_helper_encoder_in_use (other_encoder)) + goto disable_done; + } + } +radeon_atom_encoder_dpms (encoder,DRM_MODE_DPMS_OFF );switch (radeon_encoder->encoder_id) {
@@ -1586,6 +1615,7 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)break ; } +disable_done:if (radeon_encoder_is_digital (encoder)) {if (atombios_get_encoder_mode (encoder) ==ATOM_ENCODER_MODE_HDMI )r600_hdmi_disable (encoder);
drivers/gpu/drm/radeon/radeon_i2c.c +1 -0
@@ -946,6 +946,7 @@ struct radeon_i2c_chan *radeon_i2c_create_dp(struct drm_device *dev, i2c->rec = *rec; i2c->adapter.owner =THIS_MODULE ; i2c->dev = dev; +sprintf (i2c->adapter.name,"Radeon aux bus %s" , name);i2c_set_adapdata (&i2c->adapter, i2c); i2c->adapter.algo_data = &i2c->algo.dp; i2c->algo.dp.aux_ch = radeon_dp_i2c_aux_ch;
drivers/gpu/drm/radeon/radeon_object.c +2 -2
@@ -102,6 +102,8 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, type = ttm_bo_type_device; } *bo_ptr =NULL ; + +retry: bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ;
@@ -109,8 +111,6 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, bo->gobj = gobj; bo->surface_reg =-1 ;INIT_LIST_HEAD (&bo->list); - -retry:radeon_ttm_placement_from_domain (bo, domain);/* Kernel allocation are uninterruptible */ mutex_lock (&rdev->vram_mutex);
drivers/gpu/drm/radeon/radeon_reg.h +1 -0
@@ -2836,6 +2836,7 @@# define R200_TXFORMAT_ST_ROUTE_STQ5 (5 << 24)# define R200_TXFORMAT_ST_ROUTE_MASK (7 << 24)# define R200_TXFORMAT_ST_ROUTE_SHIFT 24 +# define R200_TXFORMAT_LOOKUP_DISABLE (1 << 27)# define R200_TXFORMAT_ALPHA_MASK_ENABLE (1 << 28)# define R200_TXFORMAT_CHROMA_KEY_ENABLE (1 << 29)# define R200_TXFORMAT_CUBIC_MAP_ENABLE (1 << 30)
drivers/gpu/drm/radeon/rv770.c +5 -4
@@ -643,10 +643,11 @@ static void rv770_gpu_init(struct radeon_device *rdev)else gb_tiling_config |=BANK_TILING ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); rdev->config.rv770.tiling_nbanks =4 << ((gb_tiling_config >>4 ) &0x3 ); - - gb_tiling_config |=GROUP_SIZE (0 ); - rdev->config.rv770.tiling_group_size =256 ; - + gb_tiling_config |=GROUP_SIZE ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ); +if ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ) + rdev->config.rv770.tiling_group_size =512 ; +else + rdev->config.rv770.tiling_group_size =256 ;if (((mc_arb_ramcfg &NOOFROWS_MASK ) >>NOOFROWS_SHIFT ) >3 ) { gb_tiling_config |=ROW_TILING (3 ); gb_tiling_config |=SAMPLE_SPLIT (3 );
drivers/hid/hid-egalax.c +11 -5
@@ -31,7 +31,7 @@ struct egalax_data {bool first;/* is this the first finger in the frame? */ bool valid;/* valid finger data, or just placeholder? */ bool activity;/* at least one active finger previously? */ -__u16 lastx, lasty;/* latest valid (x, y) in the frame */ +__u16 lastx, lasty, lastz;/* latest valid (x, y, z) in the frame */ }; static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -79,6 +79,10 @@ static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,case HID_DG_TIPPRESSURE :hid_map_usage (hi, usage, bit, max,EV_ABS ,ABS_MT_PRESSURE ); +/* touchscreen emulation */ +input_set_abs_params (hi->input,ABS_PRESSURE , + field->logical_minimum, + field->logical_maximum,0 ,0 );return 1 ; }return 0 ;
@@ -109,8 +113,8 @@ static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)if (td->valid) {/* emit multitouch events */ input_event (input,EV_ABS ,ABS_MT_TRACKING_ID , td->id); -input_event (input,EV_ABS ,ABS_MT_POSITION_X , td->x); -input_event (input,EV_ABS ,ABS_MT_POSITION_Y , td->y); +input_event (input,EV_ABS ,ABS_MT_POSITION_X , td->x >>3 ); +input_event (input,EV_ABS ,ABS_MT_POSITION_Y , td->y >>3 );input_event (input,EV_ABS ,ABS_MT_PRESSURE , td->z);input_mt_sync (input);
@@ -121,6 +125,7 @@ static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)*/ td->lastx = td->x; td->lasty = td->y; + td->lastz = td->z; }/*
@@ -129,8 +134,9 @@ static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)* the oldest on the panel, the one we want for single touch */ if (!td->first && td->activity) { -input_event (input,EV_ABS ,ABS_X , td->lastx); -input_event (input,EV_ABS ,ABS_Y , td->lasty); +input_event (input,EV_ABS ,ABS_X , td->lastx >>3 ); +input_event (input,EV_ABS ,ABS_Y , td->lasty >>3 ); +input_event (input,EV_ABS ,ABS_PRESSURE , td->lastz); }if (!td->valid) {
drivers/hid/usbhid/hid-quirks.c +0 -1
@@ -34,7 +34,6 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET }, - { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
drivers/hwmon/lm85.c +1 -0
@@ -1259,6 +1259,7 @@ static int lm85_probe(struct i2c_client *client,switch (data->type) {case adm1027:case adt7463: +case adt7468:case emc6d100:case emc6d102: data->freq_map = adm1027_freq_map;
drivers/i2c/busses/i2c-pca-platform.c +1 -1
@@ -224,7 +224,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)if (irq) { ret =request_irq (irq, i2c_pca_pf_handler, -IRQF_TRIGGER_FALLING , i2c->adap.name, i2c); +IRQF_TRIGGER_FALLING , pdev->name, i2c);if (ret) goto e_reqirq; }
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -333,6 +333,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { }, }, { +/* Sony Vaio VPCZ122GX */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCZ122GX"), + }, + }, + {/* Sony Vaio FS-115b */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
drivers/isdn/gigaset/bas-gigaset.c +36 -53
157 lines not on this page · raw message
drivers/isdn/gigaset/isocdata.c +5 -3
@@ -842,13 +842,14 @@ static inline void trans_receive(unsigned char *src, unsigned count,if (unlikely (bcs->ignore)) { bcs->ignore--; -hdlc_flush (bcs);return ; } skb = bcs->rx_skb; -if (skb ==NULL ) +if (skb ==NULL ) { skb =gigaset_new_rx_skb (bcs); - bcs->hw.bas->goodbytes += skb->len; +if (skb ==NULL ) +return ; + } dobytes = bcs->rx_bufsize - skb->len;while (count >0 ) { dst =skb_put (skb, count < dobytes ? count : dobytes);
@@ -860,6 +861,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,if (dobytes ==0 ) {dump_bytes (DEBUG_STREAM_DUMP ,"rcv data" , skb->data, skb->len); + bcs->hw.bas->goodbytes += skb->len;gigaset_skb_rcvd (bcs, skb); skb =gigaset_new_rx_skb (bcs);if (skb ==NULL )
drivers/leds/leds-ss4200.c +1 -0
@@ -102,6 +102,7 @@ static struct dmi_system_id __initdata nas_led_whitelist[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "1.00.00") } }, + {} };/*
drivers/md/md.c +4 -2
@@ -1329,7 +1329,7 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors)md_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }
@@ -1697,7 +1697,7 @@ super_1_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors)md_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }static struct super_type super_types[] = {
@@ -2172,6 +2172,8 @@ repeat:if (!mddev->persistent) {clear_bit (MD_CHANGE_CLEAN , &mddev->flags);clear_bit (MD_CHANGE_DEVS , &mddev->flags); +if (!mddev->external) +clear_bit (MD_CHANGE_PENDING , &mddev->flags);wake_up (&mddev->sb_wait);return ; }
drivers/md/raid1.c +1 -0
@@ -1210,6 +1210,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)* is not possible. */ if (!test_bit (Faulty, &rdev->flags) && + !mddev->recovery_disabled && mddev->degraded < conf->raid_disks) { err = -EBUSY ; goto abort;
drivers/media/video/cx23885/cx23885-core.c +1 -0
@@ -815,6 +815,7 @@ static void cx23885_dev_checkrevision(struct cx23885_dev *dev)case 0x0e :/* CX23887-15Z */ dev->hwrevision =0xc0 ; +break ;case 0x0f :/* CX23887-14Z */ dev->hwrevision =0xb1 ;
drivers/media/video/gspca/gspca.c +2 -2
@@ -652,7 +652,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev) : USB_ENDPOINT_XFER_ISOC; i = gspca_dev->alt;/* previous alt setting */ if (gspca_dev->cam.reverse_alts) { -if (gspca_dev->audio) +if (gspca_dev->audio && i < gspca_dev->nbalt -2 ) i++;while (++i < gspca_dev->nbalt) { ep =alt_xfer (&intf->altsetting[i], xfer);
@@ -660,7 +660,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)break ; } }else { -if (gspca_dev->audio) +if (gspca_dev->audio && i >1 ) i--;while (--i >=0 ) { ep =alt_xfer (&intf->altsetting[i], xfer);
drivers/media/video/gspca/sonixj.c +1 -2
@@ -2474,8 +2474,7 @@ static int sd_start(struct gspca_dev *gspca_dev) reg1 =0x44 ; reg17 =0xa2 ;break ; -default : -/* case SENSOR_SP80708: */ +case SENSOR_SP80708 : init = sp80708_sensor_param1;if (mode) {/*?? reg1 = 0x04; * 320 clk 48Mhz */
drivers/media/video/hdpvr/hdpvr-video.c +1 -0
@@ -157,6 +157,7 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count) mem, dev->bulk_in_size, hdpvr_read_bulk_callback, buf); + buf->urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ; buf->status =BUFSTAT_AVAILABLE ;list_add_tail (&buf->buff_list, &dev->free_buff_list); }
drivers/media/video/msp3400-driver.c +6 -1
@@ -382,7 +382,12 @@ static int msp_s_ctrl(struct v4l2_ctrl *ctrl)void msp_update_volume (struct msp_state *state) { -v4l2_ctrl_s_ctrl (state->volume,v4l2_ctrl_g_ctrl (state->volume)); +/* Force an update of the volume/mute cluster */ +v4l2_ctrl_lock (state->volume); + state->volume->val = state->volume->cur.val; + state->muted->val = state->muted->cur.val; +msp_s_ctrl (state->volume); +v4l2_ctrl_unlock (state->volume); }/* --- v4l2 ioctls --- */
drivers/media/video/saa7134/saa7134-cards.c +12 -12
@@ -6661,6 +6661,18 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x2804, .driver_data = SAA7134_BOARD_TECHNOTREND_BUDGET_T3000, }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7190, + .driver_data = SAA7134_BOARD_BEHOLD_H7, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7090, + .driver_data = SAA7134_BOARD_BEHOLD_A7, + }, { /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -6698,18 +6710,6 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, .driver_data = SAA7134_BOARD_UNKNOWN, - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7133, - .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ - .subdevice = 0x7190, - .driver_data = SAA7134_BOARD_BEHOLD_H7, - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7133, - .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ - .subdevice = 0x7090, - .driver_data = SAA7134_BOARD_BEHOLD_A7, },{/* --- end of list --- */ }
drivers/misc/ad525x_dpot-spi.c +2 -2
@@ -53,13 +53,13 @@ static int write8(void *client, u8 val)static int write16 (void *client,u8 reg,u8 val) {u8 data[2 ] = {reg, val}; -return spi_write (client, data,1 ); +return spi_write (client, data,2 ); }static int write24 (void *client,u8 reg,u16 val) {u8 data[3 ] = {reg, val >>8 , val}; -return spi_write (client, data,1 ); +return spi_write (client, data,3 ); }static int read8 (void *client)
drivers/misc/sgi-xp/xpc_partition.c +15 -10
@@ -439,18 +439,23 @@ xpc_discovery(void)* nodes that can comprise an access protection grouping. The access * protection is in regards to memory, IOI and IPI. */ - max_regions =64 ; region_size = xp_region_size; -switch (region_size) { -case 128 : - max_regions *=2 ; -case 64 : - max_regions *=2 ; -case 32 : - max_regions *=2 ; - region_size =16 ; -DBUG_ON (!is_shub2 ()); +if (is_uv ()) + max_regions =256 ; +else { + max_regions =64 ; + +switch (region_size) { +case 128 : + max_regions *=2 ; +case 64 : + max_regions *=2 ; +case 32 : + max_regions *=2 ; + region_size =16 ; +DBUG_ON (!is_shub2 ()); + } }for (region =0 ; region < max_regions; region++) {
drivers/mmc/core/core.c +1 -1
@@ -1514,7 +1514,7 @@ void mmc_stop_host(struct mmc_host *host)if (host->caps &MMC_CAP_DISABLE )cancel_delayed_work (&host->disable); -cancel_delayed_work (&host->detect); +cancel_delayed_work_sync (&host->detect);mmc_flush_scheduled_work ();/* clear pm flags now and let card drivers set them as needed */
drivers/net/e1000/e1000_main.c +8 -4
@@ -31,7 +31,7 @@char e1000_driver_name[] ="e1000" ;static char e1000_driver_string[] ="Intel(R) PRO/1000 Network Driver" ; -#define DRV_VERSION "7.3.21-k6-NAPI" +#define DRV_VERSION "7.3.21-k8-NAPI"const char e1000_driver_version[] =DRV_VERSION ;static const char e1000_copyright[] ="Copyright (c) 1999-2006 Intel Corporation." ;
@@ -483,9 +483,6 @@ void e1000_down(struct e1000_adapter *adapter)struct net_device *netdev = adapter->netdev;u32 rctl, tctl; -/* signal that we're down so the interrupt handler does not -* reschedule our watchdog timer */ -set_bit (__E1000_DOWN, &adapter->flags);/* disable receives in the hardware */ rctl =er32 (RCTL );
@@ -506,6 +503,13 @@ void e1000_down(struct e1000_adapter *adapter)e1000_irq_disable (adapter); +/* +* Setting DOWN must be after irq_disable to prevent +* a screaming interrupt. Setting DOWN also prevents +* timers and tasks from rescheduling. +*/ +set_bit (__E1000_DOWN, &adapter->flags); +del_timer_sync (&adapter->tx_fifo_stall_timer);del_timer_sync (&adapter->watchdog_timer);del_timer_sync (&adapter->phy_info_timer);
drivers/net/jme.c +18 -4
@@ -1575,6 +1575,16 @@ jme_free_irq(struct jme_adapter *jme) } } +static inline void +jme_phy_on (struct jme_adapter *jme) +{ +u32 bmcr; + + bmcr =jme_mdio_read (jme->dev, jme->mii_if.phy_id,MII_BMCR ); + bmcr &= ~BMCR_PDOWN ; +jme_mdio_write (jme->dev, jme->mii_if.phy_id,MII_BMCR , bmcr); +} +static int jme_open (struct net_device *netdev) {
@@ -1595,10 +1605,12 @@ jme_open(struct net_device *netdev)jme_start_irq (jme); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_reset_link (jme);
@@ -3006,10 +3018,12 @@ jme_resume(struct pci_dev *pdev)jme_clear_pm (jme);pci_restore_state (pdev); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_start_irq (jme);netif_device_attach (netdev);
drivers/net/pcmcia/pcnet_cs.c +1 -0
@@ -1622,6 +1622,7 @@ static struct pcmcia_device_id pcnet_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("COMPU-SHACK" ,"FASTline PCMCIA 10/100 Fast-Ethernet" ,0xfa2e424d ,0x3953d9b9 ),PCMCIA_DEVICE_PROD_ID12 ("CONTEC" ,"C-NET(PC)C-10L" ,0x21cab552 ,0xf6f90722 ),PCMCIA_DEVICE_PROD_ID12 ("corega" ,"FEther PCC-TXF" ,0x0a21501a ,0xa51564a2 ), +PCMCIA_DEVICE_PROD_ID12 ("corega" ,"Ether CF-TD" ,0x0a21501a ,0x6589340a ),PCMCIA_DEVICE_PROD_ID12 ("corega K.K." ,"corega EtherII PCC-T" ,0x5261440f ,0xfa9d85bd ),PCMCIA_DEVICE_PROD_ID12 ("corega K.K." ,"corega EtherII PCC-TD" ,0x5261440f ,0xc49bd73d ), PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),
drivers/net/phy/marvell.c +19 -12
@@ -196,20 +196,27 @@ static int m88e1121_config_aneg(struct phy_device *phydev) MII_88E1121_PHY_MSCR_PAGE);if (err <0 )return err; - mscr =phy_read (phydev,MII_88E1121_PHY_MSCR_REG ) & -MII_88E1121_PHY_MSCR_DELAY_MASK ; -if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) - mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY | -MII_88E1121_PHY_MSCR_TX_DELAY ); -else if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) - mscr |=MII_88E1121_PHY_MSCR_RX_DELAY ; -else if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) - mscr |=MII_88E1121_PHY_MSCR_TX_DELAY ; +if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII ) || + (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || + (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) || + (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )) { - err =phy_write (phydev,MII_88E1121_PHY_MSCR_REG , mscr); -if (err <0 ) -return err; + mscr =phy_read (phydev,MII_88E1121_PHY_MSCR_REG ) & +MII_88E1121_PHY_MSCR_DELAY_MASK ; + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) + mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY | +MII_88E1121_PHY_MSCR_TX_DELAY ); +else if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) + mscr |=MII_88E1121_PHY_MSCR_RX_DELAY ; +else if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) + mscr |=MII_88E1121_PHY_MSCR_TX_DELAY ; + + err =phy_write (phydev,MII_88E1121_PHY_MSCR_REG , mscr); +if (err <0 ) +return err; + }phy_write (phydev,MII_88E1121_PHY_PAGE , oldpage);
drivers/net/r6040.c +12 -10
@@ -893,16 +893,18 @@ static void r6040_multicast_list(struct net_device *dev)/* Multicast Address 1~4 case */ i =0 ;netdev_for_each_mc_addr (ha, dev) { -if (i <MCAST_MAX ) { - adrp = (u16 *) ha->addr; -iowrite16 (adrp[0 ], ioaddr +MID_1L +8 * i); -iowrite16 (adrp[1 ], ioaddr +MID_1M +8 * i); -iowrite16 (adrp[2 ], ioaddr +MID_1H +8 * i); - }else { -iowrite16 (0xffff , ioaddr +MID_1L +8 * i); -iowrite16 (0xffff , ioaddr +MID_1M +8 * i); -iowrite16 (0xffff , ioaddr +MID_1H +8 * i); - } +if (i >=MCAST_MAX ) +break ; + adrp = (u16 *) ha->addr; +iowrite16 (adrp[0 ], ioaddr +MID_1L +8 * i); +iowrite16 (adrp[1 ], ioaddr +MID_1M +8 * i); +iowrite16 (adrp[2 ], ioaddr +MID_1H +8 * i); + i++; + } +while (i <MCAST_MAX ) { +iowrite16 (0xffff , ioaddr +MID_1L +8 * i); +iowrite16 (0xffff , ioaddr +MID_1M +8 * i); +iowrite16 (0xffff , ioaddr +MID_1H +8 * i); i++; } }
drivers/net/r8169.c +11 -8
@@ -2936,7 +2936,7 @@ static const struct rtl_cfg_info { .hw_start = rtl_hw_start_8168, .region = 2, .align = 8, - .intr_event = SYSErr | RxFIFOOver | LinkChg | RxOverflow | + .intr_event = SYSErr | LinkChg | RxOverflow | TxErr | TxOK | RxOK | RxErr, .napi_event = TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI,
@@ -4455,14 +4455,12 @@ static inline int rtl8169_fragmented_frame(u32 status)return (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag); } -static inline void rtl8169_rx_csum (struct sk_buff *skb,struct RxDesc *desc) +static inline void rtl8169_rx_csum (struct sk_buff *skb,u32 opts1) { -u32 opts1 =le32_to_cpu (desc->opts1);u32 status = opts1 & RxProtoMask;if (((status == RxProtoTCP) && !(opts1 & TCPFail)) || - ((status == RxProtoUDP) && !(opts1 & UDPFail)) || - ((status == RxProtoIP) && !(opts1 & IPFail))) + ((status == RxProtoUDP) && !(opts1 & UDPFail))) skb->ip_summed =CHECKSUM_UNNECESSARY ;else skb->ip_summed =CHECKSUM_NONE ;
@@ -4551,8 +4549,6 @@ static int rtl8169_rx_interrupt(struct net_device *dev,continue ; } -rtl8169_rx_csum (skb, desc); -if (rtl8169_try_rx_copy (&skb, tp, pkt_size, addr)) {dma_sync_single_for_device (&pdev->dev, addr, pkt_size,PCI_DMA_FROMDEVICE );
@@ -4563,6 +4559,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, tp->Rx_skbuff[entry] =NULL ; } +rtl8169_rx_csum (skb, status);skb_put (skb, pkt_size); skb->protocol =eth_type_trans (skb, dev);
@@ -4630,7 +4627,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) }/* Work around for rx fifo overflow */ -if (unlikely (status & RxFIFOOver)) { +if (unlikely (status & RxFIFOOver) && + (tp->mac_version ==RTL_GIGA_MAC_VER_11 )) {netif_stop_queue (dev);rtl8169_tx_timeout (dev);break ;
@@ -4891,6 +4889,9 @@ static int rtl8169_resume(struct device *device) {struct pci_dev *pdev =to_pci_dev (device);struct net_device *dev =pci_get_drvdata (pdev); +struct rtl8169_private *tp =netdev_priv (dev); + +rtl8169_init_phy (dev, tp);if (netif_running (dev))__rtl8169_resume (dev);
@@ -4931,6 +4932,8 @@ static int rtl8169_runtime_resume(struct device *device) tp->saved_wolopts =0 ;spin_unlock_irq (&tp->lock); +rtl8169_init_phy (dev, tp); +__rtl8169_resume (dev);return 0 ;
drivers/net/usb/usbnet.c +11 -0
@@ -45,6 +45,7 @@#include <linux/usb/usbnet.h> #include <linux/slab.h> #include <linux/kernel.h> +#include <linux/pm_runtime.h> #define DRIVER_VERSION "22-Aug-2005"
@@ -1273,6 +1274,16 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)struct usb_device *xdev;int status;const char *name; +struct usb_driver *driver =to_usb_driver (udev->dev.driver); + +/* usbnet already took usb runtime pm, so have to enable the feature +* for usb interface, otherwise usb_autopm_get_interface may return +* failure if USB_SUSPEND(RUNTIME_PM) is enabled. +*/ +if (!driver->supports_autosuspend) { + driver->supports_autosuspend =1 ; +pm_runtime_enable (&udev->dev); + } name = udev->dev.driver->name; info = (struct driver_info *) prod->driver_info;
drivers/net/wireless/ath/ath.h +1 -0
@@ -119,6 +119,7 @@ struct ath_common {u32 keymax;DECLARE_BITMAP (keymap,ATH_KEYMAX ); +DECLARE_BITMAP (tkip_keymap,ATH_KEYMAX );u8 splitmic;struct ath_regulatory regulatory;
drivers/net/wireless/ath/ath9k/ar9002_hw.c +3 -0
@@ -411,6 +411,9 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, val &= ~(AR_WA_BIT6 |AR_WA_BIT7 ); } +if (AR_SREV_9280 (ah)) + val |=AR_WA_BIT22 ; +if (AR_SREV_9285E_20 (ah)) val |=AR_WA_BIT23 ;
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +135 -56
354 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/ar9003_mac.c +2 -1
@@ -616,7 +616,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, rxs->rs_status |=ATH9K_RXERR_DECRYPT ; }else if (rxsp->status11 & AR_MichaelErr) { rxs->rs_status |=ATH9K_RXERR_MIC ; - } + }else if (rxsp->status11 & AR_KeyMiss) + rxs->rs_status |=ATH9K_RXERR_DECRYPT ; }return 0 ;
drivers/net/wireless/ath/ath9k/ar9003_paprd.c +9 -5
@@ -347,6 +347,10 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain) (((Y [6 ] -Y [3 ]) *1 << scale_factor) + (x_est[6 ] - x_est[3 ])) / (x_est[6 ] - x_est[3 ]); +/* prevent division by zero */ +if (G_fxp ==0 ) +return false; + Y_intercept = (G_fxp * (x_est[0 ] - x_est[3 ]) + (1 << scale_factor)) / (1 << scale_factor) +Y [3 ];
@@ -356,14 +360,12 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)for (i =0 ; i <=3 ; i++) { y_est[i] = i *32 ; - -/* prevent division by zero */ -if (G_fxp ==0 ) -return false; - x_est[i] = ((y_est[i] *1 << scale_factor) + G_fxp) / G_fxp; } +if (y_est[max_index] ==0 ) +return false; + x_est_fxp1_nonlin = x_est[max_index] - ((1 << scale_factor) * y_est[max_index] + G_fxp) / G_fxp;
@@ -457,6 +459,8 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain) Q_scale_B =find_proper_scale (find_expn (abs (scale_B)),10 ); scale_B = scale_B / (1 << Q_scale_B); +if (scale_B ==0 ) +return false; Q_beta =find_proper_scale (find_expn (abs (beta_raw)),10 ); Q_alpha =find_proper_scale (find_expn (abs (alpha_raw)),10 ); beta_raw = beta_raw / (1 << Q_beta);
drivers/net/wireless/ath/ath9k/ath9k.h +3 -4
@@ -312,7 +312,7 @@ struct ath_rx {u8 rxotherant;u32 *rxlink;unsigned int rxfilter; -spinlock_t rxflushlock; +spinlock_t pcu_lock;spinlock_t rxbuflock;struct list_head rxbuf;struct ath_descdma rxdma;
@@ -346,8 +346,8 @@ void ath_tx_tasklet(struct ath_softc *sc);void ath_tx_edma_tasklet (struct ath_softc *sc);void ath_tx_cabq (struct ieee80211_hw *hw,struct sk_buff *skb);bool ath_tx_aggr_check (struct ath_softc *sc,struct ath_node *an,u8 tidno); -void ath_tx_aggr_start (struct ath_softc *sc,struct ieee80211_sta *sta, -u16 tid,u16 *ssn); +int ath_tx_aggr_start (struct ath_softc *sc,struct ieee80211_sta *sta, +u16 tid,u16 *ssn);void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath9k_enable_ps (struct ath_softc *sc);
@@ -516,7 +516,6 @@ void ath_deinit_leds(struct ath_softc *sc);#define SC_OP_RXFLUSH BIT(7)#define SC_OP_LED_ASSOCIATED BIT(8)#define SC_OP_LED_ON BIT(9) -#define SC_OP_SCANNING BIT(10)#define SC_OP_TSF_RESET BIT(11)#define SC_OP_BT_PRIORITY_DETECTED BIT(12)#define SC_OP_BT_SCAN BIT(13)
drivers/net/wireless/ath/ath9k/beacon.c +1 -1
@@ -366,7 +366,7 @@ void ath_beacon_tasklet(unsigned long data)ath_print (common,ATH_DBG_BEACON ,"beacon is officially stuck\n" ); sc->sc_flags |=SC_OP_TSF_RESET ; -ath_reset (sc, false); +ath_reset (sc, true); }
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/common.c +11 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/eeprom_9287.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/hif_usb.c +18 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/htc_drv_init.c +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/main.c +46 -15
61 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/recv.c +25 -20
45 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/xmit.c +57 -55
112 lines not on this page · raw message
drivers/staging/batman-adv/soft-interface.c +4 -0
Lines of this file are not shown. View the raw message.
drivers/staging/iio/accel/adis16220_core.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/line6/control.c +102 -102
204 lines not on this page · raw message
drivers/staging/rtl8187se/r8185b_init.c +22 -8
Lines of this file are not shown. View the raw message.
drivers/staging/samsung-laptop/samsung-laptop.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/usb/host/xhci-mem.c +166 -2
168 lines not on this page · raw message
lib/radix-tree.c +58 -25
83 lines not on this page · raw message
mm/memcontrol.c +26 -17
43 lines not on this page · raw message
net/core/filter.c +35 -29
64 lines not on this page · raw message
net/econet/af_econet.c +42 -49
91 lines not on this page · raw message
net/mac80211/mlme.c +33 -15
48 lines not on this page · raw message
net/wireless/chan.c +51 -0
51 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +45 -6
51 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.