Linux 2.6.36.4
Subsystems (80)
I'm announcing the release of the 2.6.36.4 kernel.
All users of the 2.6.36 kernel series must upgrade.
No, scratch that, you should move to the .37 kernel series as this is the last .36 kernel to be released. It's now "end of life", "dead", "buried", "pining for the fjords", or whatever term you and your company uses for things that are no more.
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
------------
Documentation/kernel-parameters.txt | 1 Makefile | 2 arch/arm/mm/init.c | 6 + arch/avr32/include/asm/syscalls.h | 9 -- arch/parisc/kernel/firmware.c | 13 --- arch/powerpc/boot/dts/p1022ds.dts | 4 - arch/powerpc/kernel/cpu_setup_6xx.S | 40 ++++++------ arch/powerpc/mm/numa.c | 2 arch/powerpc/platforms/pseries/lpar.c | 37 +++++++++++ arch/powerpc/sysdev/fsl_rio.c | 1 arch/sh/include/asm/io.h | 10 ++- arch/sh/include/asm/pgtable_32.h | 7 +- arch/x86/include/asm/mmu_context.h | 5 - arch/x86/kernel/cpu/mtrr/main.c | 10 ++- arch/x86/kvm/i8259.c | 2 arch/x86/kvm/mmu.c | 10 ++- block/cfq-iosched.c | 4 + drivers/ata/pata_mpc52xx.c | 2 drivers/char/agp/intel-agp.c | 27 ++++---- drivers/char/ipmi/ipmi_si_intf.c | 12 --- drivers/char/tpm/tpm.c | 28 ++++++-- drivers/char/tpm/tpm.h | 2 drivers/char/tpm/tpm_tis.c | 28 ++++++++ drivers/char/virtio_console.c | 15 +++- drivers/cpuidle/cpuidle.c | 82 ++++++++++++------------- drivers/firewire/core-card.c | 11 ++- drivers/gpu/drm/Kconfig | 3 drivers/gpu/drm/drm_crtc_helper.c | 5 + drivers/gpu/drm/i915/i915_dma.c | 10 ++- drivers/gpu/drm/i915/i915_drv.c | 10 ++- drivers/gpu/drm/i915/i915_reg.h | 9 +- drivers/gpu/drm/i915/intel_dp.c | 23 ++++--- drivers/gpu/drm/i915/intel_lvds.c | 8 ++ drivers/gpu/drm/radeon/atombios_dp.c | 4 - drivers/gpu/drm/radeon/radeon_atombios.c | 37 +++++++---- drivers/gpu/drm/radeon/radeon_display.c | 4 + drivers/gpu/vga/vgaarb.c | 2 drivers/hwmon/applesmc.c | 48 +++++--------- drivers/hwmon/lm63.c | 59 ++++++++++++++--- drivers/hwmon/via686a.c | 14 +++- drivers/i2c/i2c-core.c | 14 +++- drivers/infiniband/hw/cxgb4/cm.c | 2 drivers/input/mouse/bcm5974.c | 40 ++++++++++++ drivers/input/serio/i8042-x86ia64io.h | 21 ++++++ drivers/input/serio/i8042.c | 6 + drivers/md/dm-mpath.c | 12 --- drivers/md/dm.c | 5 - drivers/md/md.c | 27 +++++--- drivers/md/md.h | 3 drivers/media/radio/radio-aimslab.c | 23 +------ drivers/media/video/em28xx/em28xx-cards.c | 4 - drivers/mmc/host/bfin_sdh.c | 2 drivers/net/atlx/atl1.c | 10 +++ drivers/net/fec.c | 4 - drivers/net/ixgbe/ixgbe_main.c | 11 ++- drivers/net/virtio_net.c | 27 ++++---- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 10 +-- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 14 ++-- drivers/net/wireless/ath/ath9k/ath9k.h | 7 -- drivers/net/wireless/ath/ath9k/hif_usb.c | 40 ++++++++++-- drivers/net/wireless/ath/ath9k/hif_usb.h | 1 drivers/net/wireless/ath/ath9k/hw.c | 6 + drivers/net/wireless/ath/ath9k/hw.h | 1 drivers/net/wireless/ath/ath9k/init.c | 1 drivers/net/wireless/ath/ath9k/main.c | 64 ++++++++----------- drivers/net/wireless/ath/ath9k/pci.c | 4 + drivers/net/wireless/ath/ath9k/recv.c | 2 drivers/net/wireless/ath/ath9k/xmit.c | 4 - drivers/net/wireless/iwlwifi/iwl-agn.c | 15 +++- drivers/net/wireless/iwlwifi/iwl-helpers.h | 6 + drivers/net/wireless/p54/txrx.c | 2 drivers/net/wireless/rt2x00/rt73usb.c | 1 drivers/pci/pci-stub.c | 3 drivers/power/ds2760_battery.c | 2 drivers/power/jz4740-battery.c | 7 ++ drivers/rtc/rtc-cmos.c | 16 ++-- drivers/s390/cio/qdio.h | 6 + drivers/s390/cio/qdio_main.c | 43 ++++++++----- drivers/scsi/libsas/sas_scsi_host.c | 1 drivers/scsi/mpt2sas/mpt2sas_base.c | 24 +++++-- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 64 +++++++++++++++---- drivers/scsi/sd.c | 9 ++ drivers/serial/8250.c | 3 drivers/ssb/pcmcia.c | 2 drivers/staging/comedi/drivers/jr3_pci.c | 7 ++ drivers/staging/comedi/drivers/ni_labpc.c | 3 drivers/staging/hv/blkvsc_drv.c | 1 drivers/staging/hv/netvsc.c | 2 drivers/staging/hv/netvsc_drv.c | 1 drivers/staging/rt2860/chips/rt3090.c | 3 drivers/staging/rt2860/chips/rt30xx.c | 4 - drivers/staging/rt2860/rt_main_dev.c | 2 drivers/staging/rt2860/usb_main_dev.c | 1 drivers/staging/usbip/vhci_hcd.c | 14 ---- drivers/staging/zram/zram_drv.c | 4 + drivers/usb/class/cdc-acm.c | 1 drivers/usb/core/hcd.c | 2 drivers/usb/core/hub.c | 26 +++++++ drivers/usb/gadget/printer.c | 19 ++--- drivers/usb/host/ehci-au1xxx.c | 2 drivers/usb/host/ehci-hcd.c | 27 ++++++-- drivers/usb/host/ehci-hub.c | 7 ++ drivers/usb/host/ehci-pci.c | 41 ++++++++++++ drivers/usb/host/ehci-sched.c | 79 ++++++++++++++++++++++++ drivers/usb/host/ehci.h | 1 drivers/usb/host/xhci.c | 14 +++- drivers/usb/serial/ch341.c | 10 +++ drivers/usb/serial/cp210x.c | 16 ---- drivers/usb/serial/digi_acceleport.c | 10 --- drivers/usb/serial/ftdi_sio.c | 39 +++++++++++ drivers/usb/serial/ftdi_sio_ids.h | 32 ++++++++- drivers/usb/serial/generic.c | 20 ++++++ drivers/usb/serial/io_edgeport.c | 4 - drivers/usb/serial/io_tables.h | 1 drivers/usb/serial/iuu_phoenix.c | 1 drivers/usb/serial/keyspan.h | 4 + drivers/usb/serial/keyspan_pda.c | 17 ----- drivers/usb/serial/moto_modem.c | 1 drivers/usb/serial/option.c | 23 ++++++- drivers/usb/serial/oti6858.c | 1 drivers/usb/serial/pl2303.c | 12 +++ drivers/usb/serial/pl2303.h | 1 drivers/usb/serial/qcaux.c | 3 drivers/usb/serial/siemens_mpi.c | 1 drivers/usb/serial/spcp8x5.c | 7 +- drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/serial/usb-serial.c | 8 +- drivers/usb/serial/usb_debug.c | 1 drivers/usb/storage/unusual_cypress.h | 5 + drivers/usb/storage/unusual_devs.h | 32 +++++++++ drivers/video/backlight/88pm860x_bl.c | 4 - drivers/virtio/virtio_pci.c | 20 ------ fs/direct-io.c | 10 ++- fs/ext4/inode.c | 1 fs/nfs/delegation.c | 6 + fs/nfs/direct.c | 34 ++++++---- fs/nilfs2/super.c | 3 fs/proc/kcore.c | 2 include/drm/drm_pciids.h | 1 include/linux/ieee80211.h | 2 include/linux/klist.h | 2 include/linux/mmzone.h | 10 --- include/linux/usb/serial.h | 3 include/linux/vmstat.h | 5 + include/net/cfg80211.h | 15 ++-- include/scsi/scsi.h | 1 init/calibrate.c | 6 - kernel/ptrace.c | 2 kernel/smp.c | 30 +++++++++ kernel/sys.c | 3 kernel/watchdog.c | 23 +++---- mm/memcontrol.c | 1 mm/migrate.c | 48 +++++--------- mm/mmzone.c | 21 ------ mm/page_alloc.c | 35 ++++++++-- mm/vmscan.c | 23 +++---- mm/vmstat.c | 68 ++++++++++++++++++++ net/core/rtnetlink.c | 3 net/mac80211/agg-rx.c | 11 --- net/mac80211/key.c | 6 + net/mac80211/rx.c | 4 - net/mac80211/tx.c | 6 + net/wireless/reg.c | 13 ++- security/keys/request_key.c | 1 security/selinux/hooks.c | 5 + security/selinux/nlmsgtab.c | 2 sound/atmel/ac97c.c | 5 + sound/core/hrtimer.c | 5 - sound/pci/au88x0/au88x0_pcm.c | 24 ++++++- sound/pci/hda/hda_eld.c | 2 sound/pci/hda/patch_conexant.c | 8 ++ sound/pci/hda/patch_realtek.c | 1 sound/soc/blackfin/bf5xx-ac97.c | 4 - sound/soc/blackfin/bf5xx-tdm.c | 2 sound/soc/codecs/wm8990.c | 10 +-- sound/soc/codecs/wm8994.c | 17 +++-- sound/soc/codecs/wm_hubs.c | 15 ++-- sound/usb/midi.c | 11 ++- sound/usb/usx2y/us122l.c | 41 ++++++------ 180 files changed, 1578 insertions(+), 687 deletions(-)
Alan Stern (8):
USB: usb-storage: unusual_devs entry for CamSport Evo
USB: usb-storage: unusual_devs entry for Coby MP3 player USB serial: add missing .usb_driver field in serial drivers
USB: EHCI: fix DMA deallocation bug
USB: g_printer: fix bug in unregistration
USB: g_printer: fix bug in module parameter definitions
USB: prevent buggy hubs from crashing the USB stack
USB: fix race between root-hub resume and wakeup requests
Alex Deucher (6):
drm/radeon/kms: add quirk for Mac Radeon HD 2600 card drm/radeon/kms: adjust quirk for acer laptop drm/radeon/kms: make the mac rv630 quirk generic drm/radeon/kms: add pll debugging output drm/radeon: remove 0x4243 pci id drm/radeon/kms: fix s/r issues with bios scratch regs
Alex He (2):
USB: EHCI: ASPM quirk of ISOC on AMD SB800
USB: EHCI: ASPM quirk of ISOC on AMD Hudson
Amit Shah (1):
virtio: console: Wake up outvq on host notifications
Amitkumar Karwar (1):
ieee80211: correct IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK macro
Anton Blanchard (3):
powerpc: Fix hcall tracepoint recursion powerpc/numa: Fix bug in unmap_cpu_from_node kernel/smp.c: fix smp_call_function_many() SMP race
Arvid Ephraim Picciani (1):
USB: cdc-acm: Adding second ACM channel support for Nokia N8
Avi Kivity (2):
KVM: i8259: initialize isr_ack
KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow
Benjamin Herrenschmidt (1):
powerpc: Fix some 6xx/7xxx CPU setup functions
Bjørn Mork (1):
USB: io_edgeport: fix the reported firmware major and minor
Bruce Rogers (1):
virtio_net: Add schedule check to napi_enable call
Chien-Chia Chen (2):
Staging: rt3090: Fix RT3090 scan AP function
Staging: rt2860: fix previous patch error
Chris Mason (1):
md_make_request: don't touch the bio after calling make_request
Chris Wilson (4):
drm: Restore the old_fb upon modeset failure drm/i915: Add dependency on CONFIG_TMPFS drm/i915: Recognise non-VGA display devices drm/i915: Only bind to function 0 of the PCI device
Christian Lamparter (1):
p54: fix sequence no. accounting off-by-one error
Chuck Lever (1):
NFS: Fix "kernel BUG at fs/aio.c:554!"
Clemens Ladisch (1):
ALSA: hrtimer: handle delayed timer interrupts
Corey Minyard (1):
char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver
Craig Shelley (2):
USB: CP210x Add two device IDs
USB: CP210x Removed incorrect device IDDan Williams (1):
USB: qcaux: add Pantech UML290 device ID
Dario Lombardo (1):
drivers: update to pl2303 usb-serial to support Motorola cables
Dave Anderson (1):
/proc/kcore: fix seeking
David Dillow (2):
fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
David Henningsson (2):
ALSA: HDA: Fix dmesg output of HDMI supported bits
ALSA: HDA: Add subwoofer quirk for Acer Aspire 8942G
David Howells (1):
KEYS: Don't call up_write() if __key_link_begin() returns an error
David Miller (1):
klist: Fix object alignment on 64-bit.
Denis Kirjanov (1):
staging: rt2860: Fix incorrect netif_stop_queue usage warning
Dimitris Papastamos (1):
ASoC: WM8990: msleep() takes milliseconds not jiffies
Dirk Eibach (1):
hwmon: (lm63) Consider LM64 temperature offset
Don Fry (1):
iwlagn: Re-enable RF_KILL interrupt when down
Don Skidmore (1):
ixgbe: fix for 82599 erratum on Header Splitting
Edgar (gimli) Hucek (1):
input: bcm5974: Add support for MacBookAir3
Edgar Hucek (1):
hwmon: (applesmc) Add MacBookAir3,1(3,2) support
Eric Paris (2):
SELinux: define permissions for DCB netlink messages
SELinux: do not compute transition labels on mountpoint labeled filesystems
Eric W. Biederman (1):
net: Fix ip link add netns oops
Felix Fietkau (2):
mac80211: fix a crash in ieee80211_beacon_get_tim on change_interface
mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
Greg Kroah-Hartman (2):
rt2x00: add device id for windy31 usb device Linux 2.6.36.4
Guy Martin (1):
parisc : Remove broken line wrapping handling pdc_iodc_print()
Haiyang Zhang (1):
staging: hv: Enable sending GARP packet after live migration
Hans-Christian Egtvedt (2):
ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
avr32: use syscall prototypes from asm-generic instead of arch
Henrik Rydberg (1):
hwmon: (applesmc) Relax the severity of device init failure
Hugh Dickins (1):
mm: fix migration hangs on anon_vma lock
Ian Abbott (1):
staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
Ionut Nicu (1):
USB: ti_usb: fix module removal
J. K. Cliburn (1):
atl1: fix oops when changing tx/rx ring params
James Bottomley (2):
fix medium error problems with some arrays which can cause data corruption
libsas: fix runaway error handler problem
Jan Glauber (1):
qdio: use proper QEBSM operand for SIGA-R and SIGA-S
Jean Delvare (2):
hwmon: (via686a) Initialize fan_div values
i2c: Unregister dummy devices last on adapter removal
Jean-Christophe PLAGNIOL-VILLARD (1):
USB: ftdi_sio: add ST Micro Connect Lite uart support
Jerome Glisse (1):
radeon/kms: fix dp displayport mode validation
Jiri Kosina (1):
Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13
Joerg Roedel (1):
KVM: MMU: Fix 32 bit legacy paging with NPT
Johannes Berg (1):
mac80211: add missing synchronize_rcu
Justin TerAvest (1):
cfq-iosched: Don't wait if queue already has requests.
KAMEZAWA Hiroyuki (1):
memcg: fix account leak at failure of memsw acconting
Kacper Kornet (1):
Fix prlimit64 for suid/sgid processes
Karsten Wiese (2):
ALSA: snd-usb-us122l: Fix MIDI output
ALSA: snd-usb-us122l: Fix missing NULL checks
Kashyap, Desai (7):
mpt2sas: fix Integrated Raid unsynced on shutdown problem
mpt2sas: Fix device removal handshake for zoned devices
mpt2sas: fix internal device reset for older firmware prior to MPI Rev K
mpt2sas: Fix the race between broadcast asyn event and scsi command completion
mpt2sas: Correct resizing calculation for max_queue_depth
mpt2sas: Kernel Panic during Large Topology discovery
mpt2sas: add missing initialization of scsih_cmds
Knut Petersen (1):
drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS
Ky Srinivasan (1):
Staging: hv: fix sysfs symlink on hv block device
Larry Finger (1):
staging: rt2870sta: Add ID for Linksys WUSB100v2
Lars-Peter Clausen (1):
jz4740-battery: Protect against concurrent battery readings
Libor Pechacek (1):
USB: serial: handle Data Carrier Detect changes
Luciano Coelho (1):
mac80211: use maximum number of AMPDU frames as default in BA RX
Luis R. Rodriguez (7):
ath9k: simplify hw reset locking
ath9k: move the PCU lock to the sc structure
ath9k: fix assumptions for idle calls on suspend/resume
ath9k: fix aphy / wiphy idle mismatch
ath9k_hw: disabled PAPRD for AR9003
cfg80211: pass the reg hint initiator to helpers
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
Marcin Slusarz (2):
watchdog: Fix sysctl consistency
watchdog: Don't change watchdog state on read of sysctl
Mark Brown (3):
ASoC: When disabling WM8994 FLL force a source selection
ASoC: Handle low measured DC offsets for wm_hubs devices
ASoC: Create an AIF1ADCDAT signal widget to match AIF2
Matthew Garrett (1):
tpm: Autodetect itpm devices
Mauro Carvalho Chehab (2):
radio-aimslab.c: Fix gcc 4.5+ bug
em28xx: Fix audio input for Terratec Grabby
Mel Gorman (1):
mm: page allocator: adjust the per-cpu counter threshold when memory is low
Michael Buesch (1):
ssb-pcmcia: Fix parsing of invariants tuples
Michael Williamson (1):
USB: ftdi_sio: Add VID=0x0647, PID=0x0100 for Acton Research spectrograph
Mike Frysinger (2):
ASoC: Blackfin AC97: fix build error after multi-component update
ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update
Mike Snitzer (2):
dm: dont take i_mutex to change device size
dm mpath: disable blk_abort_queue
Milton Miller (2):
mac80211: fix mesh forwarding when ratelimited too
virtio: remove virtio-pci root device
Márton Németh (1):
staging: usbip: remove double giveback of URB
NeilBrown (4):
md: fix regression with re-adding devices to arrays with no metadata
md: fix regression resulting in delays in clearing bits in a bitmap
md: Ensure no IO request to get md device before it is properly initialised.
md: Fix removal of extra drives when converting RAID6 to RAID5
Nick Holloway (1):
USB: Storage: Add unusual_devs entry for VTech Kidizoom
Nicolaus Colberg (1):
USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
Nitin Gupta (1):
staging: zram: fix data corruption issue
Paul Fox (1):
rtc-cmos: fix suspend/resume
Paul Mundt (1):
sh: Fix up legacy PTEA space attribute mapping.
Pavel Machek (1):
serial: unbreak billionton CF card
Pieter Maes (1):
USB: serial: Updated support for ICOM devices
Qiao Zhou (1):
ASoC: WM8994: fix wrong value in tristate function
Rafael J. Wysocki (1):
cpuidle: Make cpuidle_enable_device() call poll_idle_init()
Rajiv Andrade (1):
TPM: Long default timeout fix
Rajkumar Manoharan (3):
ath9k: fix beacon restart on channel change
ath9k_hw: do PA offset calibration only on longcal interval
ath9k_hw: Fix system hang when resuming from S3/S4
Randy Dunlap (1):
backlight: fix 88pm860x_bl macro collision
Raymond Yau (1):
ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu
Richard Schütz (2):
USB: usb-storage: unusual_devs update for Cypress ATACB
USB: usb-storage: unusual_devs update for TrekStor DataStation maxi g.u external hard drive enclosure
Ruben Smits (1):
staging: comedi: add support for newer jr3 1-channel pci board
Russell King (1):
ARM: initrd: disable initrd if passed address overlaps reserved region
Ryusuke Konishi (1):
nilfs2: fix crash after one superblock became unavailable
Sarah Sharp (2):
usb: Realloc xHCI structures after a hub is verified.
xhci: Use GFP_NOIO during device reset.
Shawn Guo (1):
net/fec: fix MMFR_OP type in fec_enet_mdio_write
Sonic Zhang (1):
mmc: bfin_sdh: fix alloc size for private data
Stanislaw Gruszka (1):
iwlagn: enable only rfkill interrupt when device is down
Stefan Berger (1):
tpm_tis: Use timeouts returned from TPM
Stefan Richter (1):
firewire: core: fix unstable I/O with Canon camcorder
Stephen Kitt (1):
agp: ensure GART has an address before enabling it
Steve Wise (1):
RDMA/cxgb4: Set the correct device physical function for iWARP connections
Sujith Manoharan (1):
ath9k_htc: Handle pending URBs properly
Suresh Siddha (2):
x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms x86, mm: avoid possible bogus tlb entries by clearing prev mm_cpumask after switching mm
Sven Neumann (1):
ds2760_battery: Fix calculation of time_to_empty_now
Takashi Iwai (1):
ALSA: hda - Fix memory leaks in conexant jack arrays
Tejun Heo (3):
PCI: pci-stub: ignore zero-length id parameters
ptrace: use safer wake up on ptrace_detach()
pata_mpc52xx: inherit from ata_bmdma_port_ops
Theodore Ts'o (1):
ext4: fix memory leak in ext4_free_branches
Thomas Taranowski (1):
rapidio: fix hang on RapidIO doorbell queue full condition
Tim Deegan (1):
fix jiffy calculations in calibrate_delay_direct to handle overflow
Timo Teräs (1):
staging: hv: fix netvsc sleeping while atomic
Timur Tabi (1):
powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
Trond Myklebust (1):
NFS: Fix an NFS client lockdep issue
Vasanthakumar Thiagarajan (2):
ath9k_hw: Fix XPABIAS level configuration for AR9003
ath9k: Fix bug in delimiter padding computation
Yin Kangkai (1):
USB: EHCI: fix scheduling while atomic during suspend
Yuanhan Liu (1):
drm/i915: fix calculation of eDP signal levels on Sandybridge
Zhang Rui (1):
xhci: Do not run xhci_cleanup_msix with irq disabled
Documentation/kernel-parameters.txt +1 -0
@@ -879,6 +879,7 @@ and is between 256 and 4096 characters. It is defined in the file controller i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX controllers + i8042.notimeout [HW] Ignore timeout condition signalled by conroller i8042.reset [HW] Reset the controller during init and cleanup i8042.unlock [HW] Unlock (ignore) the keylock
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 36 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION*
arch/arm/mm/init.c +6 -0
@@ -282,6 +282,12 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)memblock_reserve (__pa (_stext), _end - _stext);#endif #ifdef CONFIG_BLK_DEV_INITRD +if (phys_initrd_size && +memblock_is_region_reserved (phys_initrd_start, phys_initrd_size)) { +pr_err ("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region - disabling initrd\n" , + phys_initrd_start, phys_initrd_size); + phys_initrd_start = phys_initrd_size =0 ; + }if (phys_initrd_size) {memblock_reserve (phys_initrd_start, phys_initrd_size);
arch/avr32/include/asm/syscalls.h +0 -9
@@ -16,18 +16,9 @@#include <linux/signal.h> /* kernel/process.c */ -asmlinkage int sys_fork(struct pt_regs *); asmlinkage int sys_clone(unsigned long, unsigned long,unsigned long ,unsigned long ,struct pt_regs *); -asmlinkage int sys_vfork(struct pt_regs *); -asmlinkage int sys_execve(const char __user *, char __user *__user *, -char __user *__user *,struct pt_regs *); - -/* kernel/signal.c */ -asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *, -struct pt_regs *); -asmlinkage int sys_rt_sigreturn(struct pt_regs *);/* mm/cache.c */ asmlinkage int sys_cacheflush(int, void __user *, size_t);
arch/parisc/kernel/firmware.c +1 -12
@@ -1126,15 +1126,13 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)unsigned int i;unsigned long flags; -for (i =0 ; i < count && i <79 ;) { +for (i =0 ; i < count;) {switch (str[i]) {case '\n' : iodc_dbuf[i+0 ] ='\r' ; iodc_dbuf[i+1 ] ='\n' ; i +=2 ; goto print; -case '\b' :/* BS */ - i--;/* overwrite last */ default : iodc_dbuf[i] = str[i]; i++;
@@ -1142,15 +1140,6 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) } } -/* if we're at the end of line, and not already inserting a newline, -* insert one anyway. iodc console doesn't claim to support >79 char -* lines. don't account for this in the return value. -*/ -if (i ==79 && iodc_dbuf[i-1 ] !='\n' ) { - iodc_dbuf[i+0 ] ='\r' ; - iodc_dbuf[i+1 ] ='\n' ; - } - print:spin_lock_irqsave (&pdc_lock, flags); real32_call(PAGE0->mem_cons.iodc_io,
arch/powerpc/boot/dts/p1022ds.dts +2 -2
@@ -280,13 +280,13 @@ ranges = <0x0 0xc100 0x200>; cell-index = <1>; dma00: dma-channel@0 { - compatible = "fsl,eloplus-dma-channel"; + compatible = "fsl,ssi-dma-channel"; reg = <0x0 0x80>; cell-index = <0>; interrupts = <76 2>; }; dma01: dma-channel@80 { - compatible = "fsl,eloplus-dma-channel"; + compatible = "fsl,ssi-dma-channel"; reg = <0x80 0x80>; cell-index = <1>; interrupts = <77 2>;
arch/powerpc/kernel/cpu_setup_6xx.S +20 -20
@@ -18,7 +18,7 @@ #include <asm/mmu.h> _GLOBAL(__setup_cpu_603) - mflr r4 + mflr r5 BEGIN_MMU_FTR_SECTION li r10,0 mtspr SPRN_SPRG_603_LRU,r10 /* init SW LRU tracking */
@@ -27,60 +27,60 @@ BEGIN_FTR_SECTION bl __init_fpu_registers END_FTR_SECTION_IFCLR(CPU_FTR_FPU_UNAVAILABLE) bl setup_common_caches - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_604) - mflr r4 + mflr r5 bl setup_common_caches bl setup_604_hid0 - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_750) - mflr r4 + mflr r5 bl __init_fpu_registers bl setup_common_caches bl setup_750_7400_hid0 - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_750cx) - mflr r4 + mflr r5 bl __init_fpu_registers bl setup_common_caches bl setup_750_7400_hid0 bl setup_750cx - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_750fx) - mflr r4 + mflr r5 bl __init_fpu_registers bl setup_common_caches bl setup_750_7400_hid0 bl setup_750fx - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_7400) - mflr r4 + mflr r5 bl __init_fpu_registers bl setup_7400_workarounds bl setup_common_caches bl setup_750_7400_hid0 - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_7410) - mflr r4 + mflr r5 bl __init_fpu_registers bl setup_7410_workarounds bl setup_common_caches bl setup_750_7400_hid0 li r3,0 mtspr SPRN_L2CR2,r3 - mtlr r4 + mtlr r5 blr _GLOBAL(__setup_cpu_745x) - mflr r4 + mflr r5 bl setup_common_caches bl setup_745x_specifics - mtlr r4 + mtlr r5 blr /* Enable caches for 603's, 604, 750 & 7400 */
@@ -194,10 +194,10 @@ setup_750cx: cror 4*cr0+eq,4*cr0+eq,4*cr1+eq cror 4*cr0+eq,4*cr0+eq,4*cr2+eq bnelr - lwz r6,CPU_SPEC_FEATURES(r5) + lwz r6,CPU_SPEC_FEATURES(r4) li r7,CPU_FTR_CAN_NAP andc r6,r6,r7 - stw r6,CPU_SPEC_FEATURES(r5) + stw r6,CPU_SPEC_FEATURES(r4) blr /* 750fx specific
@@ -225,12 +225,12 @@ BEGIN_FTR_SECTION andis. r11,r11,L3CR_L3E@h beq 1f END_FTR_SECTION_IFSET(CPU_FTR_L3CR) - lwz r6,CPU_SPEC_FEATURES(r5) + lwz r6,CPU_SPEC_FEATURES(r4) andi. r0,r6,CPU_FTR_L3_DISABLE_NAP beq 1f li r7,CPU_FTR_CAN_NAP andc r6,r6,r7 - stw r6,CPU_SPEC_FEATURES(r5) + stw r6,CPU_SPEC_FEATURES(r4) 1: mfspr r11,SPRN_HID0
arch/powerpc/mm/numa.c +1 -1
@@ -181,7 +181,7 @@ static void unmap_cpu_from_node(unsigned long cpu)dbg ("removing cpu %lu from node %d\n" , cpu, node);if (cpumask_test_cpu (cpu, node_to_cpumask_map[node])) { -cpumask_set_cpu (cpu, node_to_cpumask_map[node]); +cpumask_clear_cpu (cpu, node_to_cpumask_map[node]); }else {printk (KERN_ERR "WARNING: cpu %lu not found in node %d\n" , cpu, node);
arch/powerpc/platforms/pseries/lpar.c +37 -0
@@ -680,6 +680,13 @@ EXPORT_SYMBOL(arch_free_page);/* NB: reg/unreg are called while guarded with the tracepoints_mutex */ extern long hcall_tracepoint_refcount; +/* +* Since the tracing code might execute hcalls we need to guard against +* recursion. One example of this are spinlocks calling H_YIELD on +* shared processor partitions. +*/ +static DEFINE_PER_CPU(unsigned int, hcall_trace_depth); +void hcall_tracepoint_regfunc (void ) { hcall_tracepoint_refcount++;
@@ -692,12 +699,42 @@ void hcall_tracepoint_unregfunc(void)void __trace_hcall_entry (unsigned long opcode,unsigned long *args) { +unsigned long flags; +unsigned int *depth; + +local_irq_save (flags); + + depth = &__get_cpu_var (hcall_trace_depth); + +if (*depth) + goto out; + + (*depth)++;trace_hcall_entry (opcode, args); + (*depth)--; + +out: +local_irq_restore (flags); }void __trace_hcall_exit (long opcode,unsigned long retval,unsigned long *retbuf) { +unsigned long flags; +unsigned int *depth; + +local_irq_save (flags); + + depth = &__get_cpu_var (hcall_trace_depth); + +if (*depth) + goto out; + + (*depth)++;trace_hcall_exit (opcode, retval, retbuf); + (*depth)--; + +out: +local_irq_restore (flags); }#endif
arch/powerpc/sysdev/fsl_rio.c +0 -1
@@ -954,7 +954,6 @@ fsl_rio_dbell_handler(int irq, void *dev_instance)if (dsr &DOORBELL_DSR_QFI ) {pr_info ("RIO: doorbell queue full\n" );out_be32 (&priv->msg_regs->dsr,DOORBELL_DSR_QFI ); - goto out; }/* XXX Need to check/dispatch until queue empty */
arch/sh/include/asm/io.h +9 -1
@@ -322,7 +322,15 @@ __ioremap_29bit(phys_addr_t offset, unsigned long size, pgprot_t prot)* mapping must be done by the PMB or by using page tables. */ if (likely (PXSEG (offset) <P3SEG &&PXSEG (last_addr) <P3SEG )) { -if (unlikely (pgprot_val (prot) & _PAGE_CACHABLE)) +u64 flags =pgprot_val (prot); + +/* +* Anything using the legacy PTEA space attributes needs +* to be kicked down to page table mappings. +*/ +if (unlikely (flags & _PAGE_PCC_MASK)) +return NULL ; +if (unlikely (flags & _PAGE_CACHABLE))return (void __iomem *)P1SEGADDR (offset);return (void __iomem *)P2SEGADDR (offset);
arch/sh/include/asm/pgtable_32.h +6 -1
@@ -76,6 +76,10 @@/* Wrapper for extended mode pgprot twiddling */ #define _PAGE_EXT (x) ((unsigned long long)(x) << 32) +#ifdef CONFIG_X2TLB +#define _PAGE_PCC_MASK 0x00000000/* No legacy PTEA support */ +#else +/* software: moves to PTEA.TC (Timing Control) */ #define _PAGE_PCC_AREA5 0x00000000/* use BSC registers for area5 */ #define _PAGE_PCC_AREA6 0x80000000/* use BSC registers for area6 */
@@ -89,7 +93,8 @@#define _PAGE_PCC_ATR8 0x60000000/* Attribute Memory space, 8 bit bus */ #define _PAGE_PCC_ATR16 0x60000001/* Attribute Memory space, 6 bit bus */ -#ifndef CONFIG_X2TLB +#define _PAGE_PCC_MASK 0xe0000001 +/* copy the ptea attributes */ static inline unsigned long copy_ptea_attributes (unsigned long x) {
arch/x86/include/asm/mmu_context.h +3 -2
@@ -36,8 +36,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,unsigned cpu =smp_processor_id ();if (likely (prev != next)) { -/* stop flush ipis for the previous mm */ -cpumask_clear_cpu (cpu,mm_cpumask (prev));#ifdef CONFIG_SMP percpu_write (cpu_tlbstate.state,TLBSTATE_OK );percpu_write (cpu_tlbstate.active_mm, next);
@@ -47,6 +45,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,/* Re-load page tables */ load_cr3 (next->pgd); +/* stop flush ipis for the previous mm */ +cpumask_clear_cpu (cpu,mm_cpumask (prev)); +/* * load the LDT, if the LDT is different: */
arch/x86/kernel/cpu/mtrr/main.c +9 -1
@@ -793,13 +793,21 @@ void set_mtrr_aps_delayed_init(void) }/* -* MTRR initialization for all AP's +* Delayed MTRR initialization for all AP's */ void mtrr_aps_init (void ) {if (!use_intel ())return ; +/* +* Check if someone has requested the delay of AP MTRR initialization, +* by doing set_mtrr_aps_delayed_init(), prior to this point. If not, +* then we are done. +*/ +if (!mtrr_aps_delayed_init) +return ; +set_mtrr (~0U ,0 ,0 ,0 ); mtrr_aps_delayed_init = false; }
arch/x86/kvm/i8259.c +2 -0
@@ -570,6 +570,8 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm) s->pics[1 ].elcr_mask =0xde ; s->pics[0 ].pics_state = s; s->pics[1 ].pics_state = s; + s->pics[0 ].isr_ack =0xff ; + s->pics[1 ].isr_ack =0xff ;/* * Initialize PIO device
arch/x86/kvm/mmu.c +7 -3
@@ -2254,6 +2254,10 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)return 0 ; } direct = !is_paging (vcpu); + +if (mmu_check_root (vcpu, root_gfn)) +return 1 ; +for (i =0 ; i <4 ; ++i) {hpa_t root = vcpu->arch.mmu.pae_root[i];
@@ -2265,13 +2269,13 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)continue ; } root_gfn = pdptr >>PAGE_SHIFT ; +if (mmu_check_root (vcpu, root_gfn)) +return 1 ; }else if (vcpu->arch.mmu.root_level ==0 ) root_gfn =0 ; -if (mmu_check_root (vcpu, root_gfn)) -return 1 ;if (tdp_enabled) { direct =1 ; - root_gfn = i <<30 ; + root_gfn = i << (30 -PAGE_SHIFT ); }spin_lock (&vcpu->kvm->mmu_lock);kvm_mmu_free_some_pages (vcpu);
block/cfq-iosched.c +4 -0
@@ -3402,6 +3402,10 @@ static bool cfq_should_wait_busy(struct cfq_data *cfqd, struct cfq_queue *cfqq) {struct cfq_io_context *cic = cfqd->active_cic; +/* If the queue already has requests, don't wait */ +if (!RB_EMPTY_ROOT (&cfqq->sort_list)) +return false; +/* If there are other queues in the group, don't wait */ if (cfqq->cfqg->nr_cfqq >1 )return false;
drivers/ata/pata_mpc52xx.c +1 -1
@@ -610,7 +610,7 @@ static struct scsi_host_template mpc52xx_ata_sht = { };static struct ata_port_operations mpc52xx_ata_port_ops = { - .inherits = &ata_sff_port_ops, + .inherits = &ata_bmdma_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, .set_dmamode = mpc52xx_ata_set_dmamode,
drivers/char/agp/intel-agp.c +16 -11
@@ -927,20 +927,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,dev_info (&pdev->dev,"Intel %s Chipset\n" , intel_agp_chipsets[i].name);/* -* If the device has not been properly setup, the following will catch -* the problem and should stop the system from crashing. -* 20030610 - [email protected] -*/ -if (pci_enable_device (pdev)) { -dev_err (&pdev->dev,"can't enable PCI device\n" ); -agp_put_bridge (bridge); -return -ENODEV ; - } - -/* * The following fixes the case where the BIOS has "forgotten" to * provide an address range for the GART. * 20030610 - [email protected] +* This happens before pci_enable_device() intentionally; +* calling pci_enable_device() before assigning the resource +* will result in the GART being disabled on machines with such +* BIOSs (the GART ends up with a BAR starting at 0, which +* conflicts a lot of other devices). */ r = &pdev->resource[0 ];if (!r->start && r->end) {
@@ -951,6 +945,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, } } +/* +* If the device has not been properly setup, the following will catch +* the problem and should stop the system from crashing. +* 20030610 - [email protected] +*/ +if (pci_enable_device (pdev)) { +dev_err (&pdev->dev,"can't enable PCI device\n" ); +agp_put_bridge (bridge); +return -ENODEV ; + } +/* Fill in the mode register */ if (cap_ptr) { pci_read_config_dword(pdev,
drivers/char/ipmi/ipmi_si_intf.c +2 -10
@@ -320,6 +320,7 @@ static int unload_when_empty = 1;static int add_smi (struct smi_info *smi);static int try_smi_init (struct smi_info *smi);static void cleanup_one_si (struct smi_info *to_clean); +static void cleanup_ipmi_si (void );static ATOMIC_NOTIFIER_HEAD (xaction_notifier_list);static int register_xaction_notifier (struct notifier_block *nb)
@@ -3436,16 +3437,7 @@ static __devinit int init_ipmi_si(void)mutex_lock (&smi_infos_lock);if (unload_when_empty &&list_empty (&smi_infos)) {mutex_unlock (&smi_infos_lock); -#ifdef CONFIG_PCI -if (pci_registered) -pci_unregister_driver (&ipmi_pci_driver); -#endif - -#ifdef CONFIG_PPC_OF -if (of_registered) -of_unregister_platform_driver (&ipmi_of_platform_driver); -#endif -driver_unregister (&ipmi_driver.driver); +cleanup_ipmi_si (); printk(KERN_WARNING PFX "Unable to find any System Interface(s)\n");return -ENODEV ;
drivers/char/tpm/tpm.c +22 -6
@@ -354,12 +354,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, tpm_protected_ordinal_duration[ordinal &TPM_PROTECTED_ORDINAL_MASK ]; -if (duration_idx !=TPM_UNDEFINED ) +if (duration_idx !=TPM_UNDEFINED ) { duration = chip->vendor.duration[duration_idx]; -if (duration <=0 ) +/* if duration is 0, it's because chip->vendor.duration wasn't */ +/* filled yet, so we set the lowest timeout just to give enough */ +/* time for tpm_get_timeouts() to succeed */ +return (duration <=0 ?HZ : duration); + }else return 2 *60 *HZ ; -else -return duration; }EXPORT_SYMBOL_GPL (tpm_calc_ordinal_duration);
@@ -565,9 +567,11 @@ duration:if (rc)return ; -if (be32_to_cpu (tpm_cmd.header.out.return_code) - !=3 *sizeof (u32)) +if (be32_to_cpu (tpm_cmd.header.out.return_code) !=0 || +be32_to_cpu (tpm_cmd.header.out.length) + !=sizeof (tpm_cmd.header.out) +sizeof (u32) +3 *sizeof (u32))return ; + duration_cap = &tpm_cmd.params.getcap_out.cap.duration; chip->vendor.duration[TPM_SHORT ] =usecs_to_jiffies (be32_to_cpu (duration_cap->tpm_short));
@@ -911,6 +915,18 @@ ssize_t tpm_show_caps_1_2(struct device * dev, }EXPORT_SYMBOL_GPL (tpm_show_caps_1_2); +ssize_t tpm_show_timeouts (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct tpm_chip *chip =dev_get_drvdata (dev); + +return sprintf (buf,"%d %d %d\n" , +jiffies_to_usecs (chip->vendor.duration[TPM_SHORT ]), +jiffies_to_usecs (chip->vendor.duration[TPM_MEDIUM ]), +jiffies_to_usecs (chip->vendor.duration[TPM_LONG ])); +} +EXPORT_SYMBOL_GPL (tpm_show_timeouts); +ssize_t tpm_store_cancel (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {
drivers/char/tpm/tpm.h +2 -0
@@ -56,6 +56,8 @@ extern ssize_t tpm_show_owned(struct device *, struct device_attribute *attr, char *);extern ssize_t tpm_show_temp_deactivated (struct device *,struct device_attribute *attr,char *); +extern ssize_t tpm_show_timeouts (struct device *, +struct device_attribute *attr,char *);struct tpm_chip ;
drivers/char/tpm/tpm_tis.c +27 -1
@@ -25,6 +25,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/wait.h> +#include <linux/acpi.h> #include "tpm.h" #define TPM_HEADER_SIZE 10
@@ -78,6 +79,26 @@ enum tis_defaults {static LIST_HEAD (tis_chips);static DEFINE_SPINLOCK (tis_lock); +#ifdef CONFIG_ACPI +static int is_itpm (struct pnp_dev *dev) +{ +struct acpi_device *acpi =pnp_acpi_device (dev); +struct acpi_hardware_id *id; + +list_for_each_entry (id, &acpi->pnp.ids, list) { +if (!strcmp ("INTC0102" , id->id)) +return 1 ; + } + +return 0 ; +} +#else +static int is_itpm (struct pnp_dev *dev) +{ +return 0 ; +} +#endif +static int check_locality (struct tpm_chip *chip,int l) { if ((ioread8(chip->vendor.iobase + TPM_ACCESS(l)) &
@@ -355,6 +376,7 @@ static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, NULL); static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL); static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); +static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);static struct attribute *tis_attrs[] = { &dev_attr_pubek.attr,
@@ -364,7 +386,8 @@ static struct attribute *tis_attrs[] = { &dev_attr_owned.attr, &dev_attr_temp_deactivated.attr, &dev_attr_caps.attr, - &dev_attr_cancel.attr, NULL, + &dev_attr_cancel.attr, + &dev_attr_timeouts.attr, NULL, }; static struct attribute_group tis_attr_grp = {
@@ -472,6 +495,9 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,"1.2 TPM (device-id 0x%X, rev-id %d)\n" , vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0))); +if (is_itpm (to_pnp_dev (dev))) + itpm =1 ; +if (itpm)dev_info (dev,"Intel iTPM workaround enabled\n" );
drivers/char/virtio_console.c +13 -2
@@ -1314,6 +1314,17 @@ static void control_work_handler(struct work_struct *work)spin_unlock (&portdev->cvq_lock); } +static void out_intr (struct virtqueue *vq) +{ +struct port *port; + + port =find_port_by_vq (vq->vdev->priv, vq); +if (!port) +return ; + +wake_up_interruptible (&port->waitqueue); +} +static void in_intr (struct virtqueue *vq) {struct port *port;
@@ -1430,7 +1441,7 @@ static int init_vqs(struct ports_device *portdev)*/ j =0 ; io_callbacks[j] = in_intr; - io_callbacks[j +1 ] =NULL ; + io_callbacks[j +1 ] = out_intr; io_names[j] ="input" ; io_names[j +1 ] ="output" ; j +=2 ;
@@ -1444,7 +1455,7 @@ static int init_vqs(struct ports_device *portdev)for (i =1 ; i < nr_ports; i++) { j +=2 ; io_callbacks[j] = in_intr; - io_callbacks[j +1 ] =NULL ; + io_callbacks[j +1 ] = out_intr; io_names[j] ="input" ; io_names[j +1 ] ="output" ; }
drivers/cpuidle/cpuidle.c +41 -41
106 lines not on this page · raw message
drivers/firewire/core-card.c +9 -2
@@ -75,6 +75,8 @@ static size_t config_rom_length = 1 + 4 + 1 + 1;#define BIB_IRMC ((1) << 31)#define NODE_CAPABILITIES 0x0c0083c0/* per IEEE 1394 clause 8.3.2.6.5.2 */ +#define CANON_OUI 0x000085 +static void generate_config_rom (struct fw_card *card,__be32 *config_rom) {struct fw_descriptor *desc;
@@ -284,6 +286,7 @@ static void bm_work(struct work_struct *work)bool root_device_is_running;bool root_device_is_cmc;bool irm_is_1394_1995_only; +bool keep_this_irm;spin_lock_irq (&card->lock);
@@ -305,6 +308,10 @@ static void bm_work(struct work_struct *work) irm_is_1394_1995_only = irm_device && irm_device->config_rom && (irm_device->config_rom[2 ] &0x000000f0 ) ==0 ; +/* Canon MV5i works unreliably if it is not root node. */ + keep_this_irm = irm_device && irm_device->config_rom && + irm_device->config_rom[3 ] >>8 ==CANON_OUI ; + root_id = root_node->node_id; irm_id = card->irm_node->node_id; local_id = card->local_node->node_id;
@@ -333,7 +340,7 @@ static void bm_work(struct work_struct *work) goto pick_me; } -if (irm_is_1394_1995_only) { +if (irm_is_1394_1995_only && !keep_this_irm) { new_root_id = local_id;fw_notify ("%s, making local node (%02x) root.\n" ,"IRM is not 1394a compliant" , new_root_id);
@@ -382,7 +389,7 @@ static void bm_work(struct work_struct *work)spin_lock_irq (&card->lock); -if (rcode !=RCODE_COMPLETE ) { +if (rcode !=RCODE_COMPLETE && !keep_this_irm) {/* * The lock request failed, maybe the IRM * isn't really IRM capable after all. Let's
drivers/gpu/drm/Kconfig +3 -0
@@ -97,7 +97,10 @@ config DRM_I830 config DRM_I915 tristate "i915 driver" depends on AGP_INTEL + # we need shmfs for the swappable backing store, and in particular + # the shmem_readpage() which depends upon tmpfs select SHMEM + select TMPFS select DRM_KMS_HELPER select FB_CFB_FILLRECT select FB_CFB_COPYAREA
drivers/gpu/drm/drm_crtc_helper.c +4 -1
@@ -649,6 +649,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) old_fb)) {DRM_ERROR ("failed to set mode on [CRTC:%d]\n" , set->crtc->base.id); + set->crtc->fb = old_fb; ret = -EINVAL ; goto fail; }
@@ -663,8 +664,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) set->crtc->fb = set->fb; ret = crtc_funcs->mode_set_base (set->crtc, set->x, set->y, old_fb); -if (ret !=0 ) +if (ret !=0 ) { + set->crtc->fb = old_fb; goto fail; + } }kfree (save_connectors);
drivers/gpu/drm/i915/i915_dma.c +8 -2
@@ -1419,9 +1419,15 @@ static int i915_load_modeset_init(struct drm_device *dev,if (ret)DRM_INFO ("failed to find VBIOS tables\n" ); -/* if we have > 1 VGA cards, then disable the radeon VGA resources */ +/* If we have > 1 VGA cards, then we need to arbitrate access +* to the common VGA resources. +* +* If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA), +* then we do not take part in VGA arbitration and the +* vga_client_register() fails with -ENODEV. +*/ ret =vga_client_register (dev->pdev, dev,NULL , i915_vga_set_decode); -if (ret) +if (ret && ret != -ENODEV ) goto cleanup_ringbuffer; ret = vga_switcheroo_register_client(dev->pdev,
drivers/gpu/drm/i915/i915_drv.c +9 -1
@@ -53,7 +53,7 @@ extern int intel_agp_enabled;#define INTEL_VGA_DEVICE (id, info) { \ .class = PCI_CLASS_DISPLAY_VGA << 8, \ - .class_mask = 0xffff00, \ + .class_mask = 0xff0000, \ .vendor = 0x8086, \ .device = id, \ .subvendor = PCI_ANY_ID, \
@@ -414,6 +414,14 @@ int i965_reset(struct drm_device *dev, u8 flags)static int __devinit i915_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +/* Only bind to function 0 of the device. Early generations +* used function 1 as a placeholder for multi-head. This causes +* us confusion instead, especially on the systems where both +* functions have the same PCI-ID! +*/ +if (PCI_FUNC (pdev->devfn)) +return -ENODEV ; +return drm_get_pci_dev (pdev, ent, &driver); }
drivers/gpu/drm/i915/i915_reg.h +5 -4
@@ -2967,10 +2967,11 @@#define EDP_LINK_TRAIN_600MV_3_5DB_SNB_A (0x01<<22)#define EDP_LINK_TRAIN_800MV_0DB_SNB_A (0x0<<22)/* SNB B-stepping */ -#define EDP_LINK_TRAIN_400MV_0DB_SNB_B (0x0<<22) -#define EDP_LINK_TRAIN_400MV_6DB_SNB_B (0x3a<<22) -#define EDP_LINK_TRAIN_600MV_3_5DB_SNB_B (0x39<<22) -#define EDP_LINK_TRAIN_800MV_0DB_SNB_B (0x38<<22) +#define EDP_LINK_TRAIN_400_600MV_0DB_SNB_B (0x0<<22) +#define EDP_LINK_TRAIN_400MV_3_5DB_SNB_B (0x1<<22) +#define EDP_LINK_TRAIN_400_600MV_6DB_SNB_B (0x3a<<22) +#define EDP_LINK_TRAIN_600_800MV_3_5DB_SNB_B (0x39<<22) +#define EDP_LINK_TRAIN_800_1200MV_0DB_SNB_B (0x38<<22)#define EDP_LINK_TRAIN_VOL_EMP_MASK_SNB (0x3f<<22)#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dp.c +16 -7
@@ -1093,18 +1093,27 @@ intel_dp_signal_levels(uint8_t train_set, int lane_count)static uint32_t intel_gen6_edp_signal_levels (uint8_t train_set) { -switch (train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |DP_TRAIN_PRE_EMPHASIS_MASK )) { +int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK | +DP_TRAIN_PRE_EMPHASIS_MASK ); +switch (signal_levels) {case DP_TRAIN_VOLTAGE_SWING_400 |DP_TRAIN_PRE_EMPHASIS_0 : -return EDP_LINK_TRAIN_400MV_0DB_SNB_B ; +case DP_TRAIN_VOLTAGE_SWING_600 |DP_TRAIN_PRE_EMPHASIS_0 : +return EDP_LINK_TRAIN_400_600MV_0DB_SNB_B ; +case DP_TRAIN_VOLTAGE_SWING_400 |DP_TRAIN_PRE_EMPHASIS_3_5 : +return EDP_LINK_TRAIN_400MV_3_5DB_SNB_B ;case DP_TRAIN_VOLTAGE_SWING_400 |DP_TRAIN_PRE_EMPHASIS_6 : -return EDP_LINK_TRAIN_400MV_6DB_SNB_B ; +case DP_TRAIN_VOLTAGE_SWING_600 |DP_TRAIN_PRE_EMPHASIS_6 : +return EDP_LINK_TRAIN_400_600MV_6DB_SNB_B ;case DP_TRAIN_VOLTAGE_SWING_600 |DP_TRAIN_PRE_EMPHASIS_3_5 : -return EDP_LINK_TRAIN_600MV_3_5DB_SNB_B ; +case DP_TRAIN_VOLTAGE_SWING_800 |DP_TRAIN_PRE_EMPHASIS_3_5 : +return EDP_LINK_TRAIN_600_800MV_3_5DB_SNB_B ;case DP_TRAIN_VOLTAGE_SWING_800 |DP_TRAIN_PRE_EMPHASIS_0 : -return EDP_LINK_TRAIN_800MV_0DB_SNB_B ; +case DP_TRAIN_VOLTAGE_SWING_1200 |DP_TRAIN_PRE_EMPHASIS_0 : +return EDP_LINK_TRAIN_800_1200MV_0DB_SNB_B ;default : -DRM_DEBUG_KMS ("Unsupported voltage swing/pre-emphasis level\n" ); -return EDP_LINK_TRAIN_400MV_0DB_SNB_B ; +DRM_DEBUG_KMS ("Unsupported voltage swing/pre-emphasis level:" +"0x%x\n" , signal_levels); +return EDP_LINK_TRAIN_400_600MV_0DB_SNB_B ; } }
drivers/gpu/drm/i915/intel_lvds.c +8 -0
@@ -701,6 +701,14 @@ static const struct dmi_system_id intel_no_lvds[] = { }, { .callback = intel_no_lvds_dmi_callback, + .ident = "AOpen i915GMm-HFS", + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"AOpen" ), + DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"), + }, + }, + { + .callback = intel_no_lvds_dmi_callback, .ident = "Aopen i945GTt-VFA", .matches = { DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"),
drivers/gpu/drm/radeon/atombios_dp.c +2 -2
@@ -187,9 +187,9 @@ static int dp_link_clock_for_mode_clock(u8 dpcd[DP_DPCD_SIZE], int mode_clock)int dp_mode_valid (u8 dpcd[DP_DPCD_SIZE ],int mode_clock) {int lanes =dp_lanes_for_mode_clock (dpcd, mode_clock); -int bw =dp_lanes_for_mode_clock (dpcd, mode_clock); +int dp_clock =dp_link_clock_for_mode_clock (dpcd, mode_clock); -if ((lanes ==0 ) || (bw ==0 )) +if ((lanes ==0 ) || (dp_clock ==0 ))return MODE_CLOCK_HIGH ;return MODE_OK ;
drivers/gpu/drm/radeon/radeon_atombios.c +24 -13
@@ -313,7 +313,6 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, uint16_t *line_mux, struct radeon_hpd *hpd) { - struct radeon_device *rdev = dev->dev_private;/* Asus M2A-VM HDMI board lists the DVI port as HDMI */ if ((dev->pdev->device == 0x791e) &&
@@ -388,6 +387,13 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, *line_mux =0x90 ; } +/* mac rv630, rv730, others */ +if ((supported_device ==ATOM_DEVICE_TV1_SUPPORT ) && + (*connector_type ==DRM_MODE_CONNECTOR_DVII )) { + *connector_type = DRM_MODE_CONNECTOR_9PinDIN; + *line_mux =CONNECTOR_7PIN_DIN_ENUM_ID1 ; + } +/* ASUS HD 3600 XT board lists the DVI port as HDMI */ if ((dev->pdev->device == 0x9598) && (dev->pdev->subsystem_vendor == 0x1043) &&
@@ -425,21 +431,23 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, } } -/* Acer laptop reports DVI-D as DVI-I and hpd pins reversed */ +/* Acer laptop (Acer TravelMate 5730G) has an HDMI port +* on the laptop and a DVI port on the docking station and +* both share the same encoder, hpd pin, and ddc line. +* So while the bios table is technically correct, +* we drop the DVI port here since xrandr has no concept of +* encoders and will try and drive both connectors +* with different crtcs which isn't possible on the hardware +* side and leaves no crtcs for LVDS or VGA. +*/ if ((dev->pdev->device ==0x95c4 ) && (dev->pdev->subsystem_vendor ==0x1025 ) && (dev->pdev->subsystem_device ==0x013c )) { -struct radeon_gpio_rec gpio; -if ((*connector_type ==DRM_MODE_CONNECTOR_DVII ) && (supported_device ==ATOM_DEVICE_DFP1_SUPPORT )) { - gpio =radeon_lookup_gpio (rdev,6 ); - *hpd =radeon_atom_get_hpd_info_from_gpio (rdev, &gpio); +/* actually it's a DVI-D port not DVI-I */ *connector_type =DRM_MODE_CONNECTOR_DVID ; - }else if ((*connector_type ==DRM_MODE_CONNECTOR_HDMIA ) && - (supported_device ==ATOM_DEVICE_DFP1_SUPPORT )) { - gpio =radeon_lookup_gpio (rdev,7 ); - *hpd =radeon_atom_get_hpd_info_from_gpio (rdev, &gpio); +return false; } }
@@ -2295,7 +2303,7 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE ;/* tell the bios not to handle mode switching */ - bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH |ATOM_S6_ACC_MODE ); + bios_6_scratch |=ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH ;if (rdev->family >=CHIP_R600 ) {WREG32 (R600_BIOS_2_SCRATCH , bios_2_scratch);
@@ -2346,10 +2354,13 @@ void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock)else bios_6_scratch =RREG32 (RADEON_BIOS_6_SCRATCH ); -if (lock) +if (lock) { bios_6_scratch |=ATOM_S6_CRITICAL_STATE ; -else + bios_6_scratch &= ~ATOM_S6_ACC_MODE ; + }else { bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE ; + bios_6_scratch |=ATOM_S6_ACC_MODE ; + }if (rdev->family >=CHIP_R600 )WREG32 (R600_BIOS_6_SCRATCH , bios_6_scratch);
drivers/gpu/drm/radeon/radeon_display.c +4 -0
@@ -629,6 +629,10 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll, *frac_fb_div_p = best_frac_feedback_div; *ref_div_p = best_ref_div; *post_div_p = best_post_div; +DRM_DEBUG_KMS ("%d %d, pll dividers - fb: %d.%d ref: %d, post %d\n" , + freq, best_freq /1000 , best_feedback_div, best_frac_feedback_div, + best_ref_div, best_post_div); + } static bool
drivers/gpu/vga/vgaarb.c +1 -1
@@ -636,7 +636,7 @@ int vga_client_register(struct pci_dev *pdev, void *cookie,void (*irq_set_state)(void *cookie,bool state), unsigned int (*set_vga_decode)(void *cookie, bool decode)) { - int ret = -1; + int ret = -ENODEV;struct vga_device *vgadev;unsigned long flags;
drivers/hwmon/applesmc.c +17 -31
101 lines not on this page · raw message
drivers/hwmon/lm63.c +47 -12
125 lines not on this page · raw message
drivers/hwmon/via686a.c +11 -3
@@ -687,6 +687,13 @@ static int __devexit via686a_remove(struct platform_device *pdev)return 0 ; } +static void via686a_update_fan_div (struct via686a_data *data) +{ +int reg =via686a_read_value (data,VIA686A_REG_FANDIV ); + data->fan_div[0 ] = (reg >>4 ) &0x03 ; + data->fan_div[1 ] = reg >>6 ; +} +static void __devinit via686a_init_device (struct via686a_data *data) {u8 reg;
@@ -700,6 +707,9 @@ static void __devinit via686a_init_device(struct via686a_data *data)via686a_write_value (data,VIA686A_REG_TEMP_MODE , (reg & ~VIA686A_TEMP_MODE_MASK ) |VIA686A_TEMP_MODE_CONTINUOUS ); + +/* Pre-read fan clock divisor values */ +via686a_update_fan_div (data); }static struct via686a_data *via686a_update_device (struct device *dev)
@@ -751,9 +761,7 @@ static struct via686a_data *via686a_update_device(struct device *dev) (via686a_read_value (data,VIA686A_REG_TEMP_LOW23 ) &0xc0 ) >>6 ; - i =via686a_read_value (data,VIA686A_REG_FANDIV ); - data->fan_div[0 ] = (i >>4 ) &0x03 ; - data->fan_div[1 ] = i >>6 ; +via686a_update_fan_div (data); data->alarms =via686a_read_value (data, VIA686A_REG_ALARM1) |
drivers/i2c/i2c-core.c +13 -1
@@ -1005,6 +1005,14 @@ static int i2c_do_del_adapter(struct i2c_driver *driver,static int __unregister_client (struct device *dev,void *dummy) {struct i2c_client *client =i2c_verify_client (dev); +if (client &&strcmp (client->name,"dummy" )) +i2c_unregister_device (client); +return 0 ; +} + +static int __unregister_dummy (struct device *dev,void *dummy) +{ +struct i2c_client *client =i2c_verify_client (dev);if (client)i2c_unregister_device (client);return 0 ;
@@ -1059,8 +1067,12 @@ int i2c_del_adapter(struct i2c_adapter *adap)mutex_unlock (&adap->userspace_clients_lock);/* Detach any active clients. This can't fail, thus we do not -checking the returned value. */ +* check the returned value. This is a two-pass process, because +* we can't remove the dummy devices during the first pass: they +* could have been instantiated by real devices wishing to clean +* them up properly, so we give them a chance to do that first. */ res =device_for_each_child (&adap->dev,NULL , __unregister_client); + res =device_for_each_child (&adap->dev,NULL , __unregister_dummy);#ifdef CONFIG_I2C_COMPAT class_compat_remove_link(i2c_adapter_compat_class, &adap->dev,
drivers/infiniband/hw/cxgb4/cm.c +1 -1
@@ -383,7 +383,7 @@ static void send_flowc(struct c4iw_ep *ep, struct sk_buff *skb) 16)) | FW_WR_FLOWID(ep->hwtid)); flowc->mnemval[0 ].mnemonic =FW_FLOWC_MNEM_PFNVFN ; - flowc->mnemval[0 ].val =cpu_to_be32 (0 ); + flowc->mnemval[0 ].val =cpu_to_be32 (PCI_FUNC (ep->com.dev->rdev.lldi.pdev->devfn) <<8 ); flowc->mnemval[1 ].mnemonic =FW_FLOWC_MNEM_CH ; flowc->mnemval[1 ].val =cpu_to_be32 (ep->tx_chan); flowc->mnemval[2 ].mnemonic =FW_FLOWC_MNEM_PORT ;
drivers/input/mouse/bcm5974.c +40 -0
@@ -55,6 +55,14 @@#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238 +/* MacbookAir3,2 (unibody), aka wellspring5 */ +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x023f +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0240 +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0241 +/* MacbookAir3,1 (unibody), aka wellspring4 */ +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242 +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243 +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244#define BCM5974_DEVICE (prod) { \ .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
@@ -80,6 +88,14 @@ static const struct usb_device_id bcm5974_table[] = {BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI ),BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING3_ISO ),BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING3_JIS ), +/* MacbookAir3,2 */ +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI ), +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING4_ISO ), +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING4_JIS ), +/* MacbookAir3,1 */ +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI ), +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO ), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS), /* Terminating entry */ {} };
@@ -234,6 +250,30 @@ static const struct bcm5974_config bcm5974_config_table[] = { { DIM_X, DIM_X / SN_COORD, -4460, 5166 }, { DIM_Y, DIM_Y / SN_COORD, -75, 6700 } }, + { +USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI , +USB_DEVICE_ID_APPLE_WELLSPRING4_ISO , +USB_DEVICE_ID_APPLE_WELLSPRING4_JIS , +HAS_INTEGRATED_BUTTON , +0x84 ,sizeof (struct bt_data ), +0x81 ,TYPE2 ,FINGER_TYPE2 ,FINGER_TYPE2 +SIZEOF_ALL_FINGERS , + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, + { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, + { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } + }, + { +USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI , +USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO , +USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS , +HAS_INTEGRATED_BUTTON , +0x84 ,sizeof (struct bt_data ), +0x81 ,TYPE2 ,FINGER_TYPE2 ,FINGER_TYPE2 +SIZEOF_ALL_FINGERS , + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, + { DIM_X, DIM_X / SN_COORD, -4616, 5112 }, + { DIM_Y, DIM_Y / SN_COORD, -142, 5234 } + }, {} };
drivers/input/serio/i8042-x86ia64io.h +21 -0
@@ -420,6 +420,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), }, }, + { + /* Dell Vostro V13 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), + }, + }, { } };
@@ -541,6 +548,17 @@ static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { };#endif +static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = { + { +/* Dell Vostro V13 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Vostro V13" ), + }, + }, + { } +}; +/* * Some Wistron based laptops need us to explicitly enable the 'Dritek * keyboard extension' to make their extra keys start generating scancodes.
@@ -893,6 +911,9 @@ static int __init i8042_platform_init(void)if (dmi_check_system (i8042_dmi_nomux_table)) i8042_nomux = true; +if (dmi_check_system (i8042_dmi_notimeout_table)) + i8042_notimeout = true; +if (dmi_check_system (i8042_dmi_dritek_table)) i8042_dritek = true;#endif /* CONFIG_X86 */
drivers/input/serio/i8042.c +5 -1
@@ -61,6 +61,10 @@ static bool i8042_noloop;module_param_named (noloop, i8042_noloop, bool,0 );MODULE_PARM_DESC (noloop,"Disable the AUX Loopback command while probing for the AUX port" ); +static bool i8042_notimeout; +module_param_named (notimeout, i8042_notimeout, bool,0 ); +MODULE_PARM_DESC (notimeout,"Ignore timeouts signalled by i8042" ); +#ifdef CONFIG_X86 static bool i8042_dritek;module_param_named (dritek, i8042_dritek, bool,0 );
@@ -503,7 +507,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id) }else { dfl = ((str &I8042_STR_PARITY ) ?SERIO_PARITY :0 ) | - ((str &I8042_STR_TIMEOUT ) ?SERIO_TIMEOUT :0 ); + ((str &I8042_STR_TIMEOUT && !i8042_notimeout) ?SERIO_TIMEOUT :0 ); port_no = (str &I8042_STR_AUXDATA ) ?I8042_AUX_PORT_NO :I8042_KBD_PORT_NO ;
drivers/md/dm-mpath.c +0 -12
@@ -33,7 +33,6 @@ struct pgpath {unsigned fail_count;/* Cumulative failure count */ struct dm_path path; -struct work_struct deactivate_path;struct work_struct activate_path; };
@@ -116,7 +115,6 @@ static struct workqueue_struct *kmultipathd, *kmpath_handlerd;static void process_queued_ios (struct work_struct *work);static void trigger_event (struct work_struct *work);static void activate_path (struct work_struct *work); -static void deactivate_path (struct work_struct *work);/*-----------------------------------------------
@@ -129,7 +127,6 @@ static struct pgpath *alloc_pgpath(void)if (pgpath) { pgpath->is_active =1 ; -INIT_WORK (&pgpath->deactivate_path, deactivate_path);INIT_WORK (&pgpath->activate_path, activate_path); }
@@ -141,14 +138,6 @@ static void free_pgpath(struct pgpath *pgpath)kfree (pgpath); } -static void deactivate_path (struct work_struct *work) -{ -struct pgpath *pgpath = - container_of(work, struct pgpath, deactivate_path); - -blk_abort_queue (pgpath->path.dev->bdev->bd_disk->queue); -} -static struct priority_group *alloc_priority_group (void ) {struct priority_group *pg;
@@ -995,7 +984,6 @@ static int fail_path(struct pgpath *pgpath) pgpath->path.dev->name, m->nr_valid_paths);schedule_work (&m->trigger_event); -queue_work (kmultipathd, &pgpath->deactivate_path); out:spin_unlock_irqrestore (&m->lock, flags);
drivers/md/dm.c +3 -2
@@ -2111,13 +2111,14 @@ static void event_callback(void *context)wake_up (&md->eventq); } +/* +* Protected by md->suspend_lock obtained by dm_swap_table(). +*/ static void __set_size (struct mapped_device *md,sector_t size) {set_capacity (md->disk, size); -mutex_lock (&md->bdev->bd_inode->i_mutex);i_size_write (md->bdev->bd_inode, (loff_t )size <<SECTOR_SHIFT ); -mutex_unlock (&md->bdev->bd_inode->i_mutex); }/*
drivers/md/md.c +19 -8
@@ -220,11 +220,14 @@ static int md_make_request(struct request_queue *q, struct bio *bio)mddev_t *mddev = q->queuedata;int rv;int cpu; +unsigned int sectors; -if (mddev ==NULL || mddev->pers ==NULL ) { +if (mddev ==NULL || mddev->pers ==NULL + || !mddev->ready) {bio_io_error (bio);return 0 ; } +smp_rmb ();/* Ensure implications of 'active' are visible */ rcu_read_lock ();if (mddev->suspended || mddev->barrier) {DEFINE_WAIT (__wait);
@@ -242,12 +245,16 @@ static int md_make_request(struct request_queue *q, struct bio *bio)atomic_inc (&mddev->active_io);rcu_read_unlock (); +/* +* save the sectors now since our bio can +* go away inside make_request +*/ + sectors =bio_sectors (bio); rv = mddev->pers->make_request (mddev, bio); cpu =part_stat_lock ();part_stat_inc (cpu, &mddev->gendisk->part0, ios[rw]); -part_stat_add (cpu, &mddev->gendisk->part0, sectors[rw], -bio_sectors (bio)); +part_stat_add (cpu, &mddev->gendisk->part0, sectors[rw], sectors);part_stat_unlock ();if (atomic_dec_and_test (&mddev->active_io) && mddev->suspended)
@@ -3109,7 +3116,7 @@ level_store(mddev_t *mddev, const char *buf, size_t len)char nm[20 ];if (rdev->raid_disk <0 )continue ; -if (rdev->new_raid_disk > mddev->raid_disks) +if (rdev->new_raid_disk >= mddev->raid_disks) rdev->new_raid_disk =-1 ;if (rdev->new_raid_disk == rdev->raid_disk)continue ;
@@ -4554,7 +4561,8 @@ int md_run(mddev_t *mddev) mddev->safemode_timer.data = (unsigned long ) mddev; mddev->safemode_delay = (200 *HZ )/1000 +1 ;/* 200 msec delay */ mddev->in_sync =1 ; - +smp_wmb (); + mddev->ready =1 ;list_for_each_entry (rdev, &mddev->disks, same_set)if (rdev->raid_disk >=0 ) {char nm[20 ];
@@ -4716,6 +4724,7 @@ EXPORT_SYMBOL_GPL(md_stop_writes);void md_stop (mddev_t *mddev) { + mddev->ready =0 ; mddev->pers->stop (mddev);if (mddev->pers->sync_request && mddev->to_remove ==NULL ) mddev->to_remove = &md_redundancy_group;
@@ -5150,9 +5159,10 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)/* set saved_raid_disk if appropriate */ if (!mddev->persistent) {if (info->state & (1 <<MD_DISK_SYNC ) && - info->raid_disk < mddev->raid_disks) + info->raid_disk < mddev->raid_disks) { rdev->raid_disk = info->raid_disk; -else +set_bit (In_sync, &rdev->flags); + }else rdev->raid_disk =-1 ; }else super_types[mddev->major_version].
@@ -6037,7 +6047,8 @@ static int md_thread(void * arg) || kthread_should_stop(), thread->timeout); -if (test_and_clear_bit (THREAD_WAKEUP , &thread->flags)) +clear_bit (THREAD_WAKEUP , &thread->flags); +if (!kthread_should_stop ()) thread->run (thread->mddev); }
drivers/md/md.h +2 -1
@@ -149,7 +149,8 @@ struct mddev_s* are happening, so run/ * takeover/stop are not safe */ - +int ready;/* See when safe to pass +* IO requests down */ struct gendisk *gendisk;struct kobject kobj;
drivers/media/radio/radio-aimslab.c +6 -17
@@ -31,7 +31,6 @@#include <linux/module.h> /* Modules */ #include <linux/init.h> /* Initdata */ #include <linux/ioport.h> /* request_region */ -#include <linux/delay.h> /* udelay */ #include <linux/videodev2.h> /* kernel radio structs */ #include <linux/version.h> /* for KERNEL_VERSION MACRO */ #include <linux/io.h> /* outb, outb_p */
@@ -71,27 +70,17 @@ static struct rtrack rtrack_card;/* local things */ -static void sleep_delay (long n) -{ -/* Sleep nicely for 'n' uS */ -int d = n /msecs_to_jiffies (1000 ); -if (!d) -udelay (n); -else -msleep (jiffies_to_msecs (d)); -} -static void rt_decvol (struct rtrack *rt) {outb (0x58 , rt->io);/* volume down + sigstr + on */ -sleep_delay (100000 ); +msleep (100 );outb (0xd8 , rt->io);/* volume steady + sigstr + on */ }static void rt_incvol (struct rtrack *rt) {outb (0x98 , rt->io);/* volume up + sigstr + on */ -sleep_delay (100000 ); +msleep (100 );outb (0xd8 , rt->io);/* volume steady + sigstr + on */ }
@@ -120,7 +109,7 @@ static int rt_setvol(struct rtrack *rt, int vol)if (vol ==0 ) {/* volume = 0 means mute the card */ outb (0x48 , rt->io);/* volume down but still "on" */ -sleep_delay (2000000 );/* make sure it's totally down */ +msleep (2000 );/* make sure it's totally down */ outb (0xd0 , rt->io);/* volume steady, off */ rt->curvol =0 ;/* track the volume state! */ mutex_unlock (&rt->lock);
@@ -155,7 +144,7 @@ static void send_0_byte(struct rtrack *rt)outb_p (128 +64 +16 +8 +1 , rt->io);/* on + wr-enable + data low */ outb_p (128 +64 +16 +8 +2 +1 , rt->io);/* clock */ } -sleep_delay (1000 ); +msleep (1 ); }static void send_1_byte (struct rtrack *rt)
@@ -169,7 +158,7 @@ static void send_1_byte(struct rtrack *rt)outb_p (128 +64 +16 +8 +4 +2 +1 , rt->io);/* clock */ } -sleep_delay (1000 ); +msleep (1 ); }static int rt_setfreq (struct rtrack *rt,unsigned long freq)
@@ -427,7 +416,7 @@ static int __init rtrack_init(void)/* this ensures that the volume is all the way down */ outb (0x48 , rt->io);/* volume down but still "on" */ -sleep_delay (2000000 );/* make sure it's totally down */ +msleep (2000 );/* make sure it's totally down */ outb (0xc0 , rt->io);/* steady volume, mute card */ return 0 ;
drivers/media/video/em28xx/em28xx-cards.c +2 -2
@@ -1621,11 +1621,11 @@ struct em28xx_board em28xx_boards[] = { .input = { { .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0, - .amux = EM28XX_AMUX_VIDEO2, + .amux = EM28XX_AMUX_LINE_IN, }, { .type = EM28XX_VMUX_SVIDEO, .vmux = SAA7115_SVIDEO3, - .amux = EM28XX_AMUX_VIDEO2, + .amux = EM28XX_AMUX_LINE_IN, } }, }, [EM2860_BOARD_TERRATEC_AV350] = {
drivers/mmc/host/bfin_sdh.c +1 -1
@@ -462,7 +462,7 @@ static int __devinit sdh_probe(struct platform_device *pdev) goto out; } - mmc =mmc_alloc_host (sizeof (*mmc), &pdev->dev); + mmc =mmc_alloc_host (sizeof (struct sdh_host ), &pdev->dev);if (!mmc) { ret = -ENOMEM ; goto out;
drivers/net/atlx/atl1.c +10 -0
@@ -3503,6 +3503,8 @@ static int atl1_set_ringparam(struct net_device *netdev,struct atl1_rfd_ring rfd_old, rfd_new;struct atl1_rrd_ring rrd_old, rrd_new;struct atl1_ring_header rhdr_old, rhdr_new; +struct atl1_smb smb; +struct atl1_cmb cmb;int err; tpd_old = adapter->tpd_ring;
@@ -3543,11 +3545,19 @@ static int atl1_set_ringparam(struct net_device *netdev, adapter->rrd_ring = rrd_old; adapter->tpd_ring = tpd_old; adapter->ring_header = rhdr_old; +/* +* Save SMB and CMB, since atl1_free_ring_resources +* will clear them. +*/ + smb = adapter->smb; + cmb = adapter->cmb;atl1_free_ring_resources (adapter); adapter->rfd_ring = rfd_new; adapter->rrd_ring = rrd_new; adapter->tpd_ring = tpd_new; adapter->ring_header = rhdr_new; + adapter->smb = smb; + adapter->cmb = cmb; err =atl1_up (adapter);if (err)
drivers/net/fec.c +2 -2
@@ -651,8 +651,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, fep->mii_timeout =0 ;init_completion (&fep->mdio_done); -/* start a read op */ -writel (FEC_MMFR_ST |FEC_MMFR_OP_READ | +/* start a write op */ +writel (FEC_MMFR_ST |FEC_MMFR_OP_WRITE |FEC_MMFR_PA (mii_id) |FEC_MMFR_RA (regnum) |FEC_MMFR_TA |FEC_MMFR_DATA (value), fep->hwp +FEC_MII_DATA );
drivers/net/ixgbe/ixgbe_main.c +9 -2
@@ -2651,9 +2651,16 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)int rx_buf_len;/* Decide whether to use packet split mode or not */ +/* On by default */ + adapter->flags |=IXGBE_FLAG_RX_PS_ENABLED ; +/* Do not use packet split if we're in SR-IOV Mode */ -if (!adapter->num_vfs) - adapter->flags |=IXGBE_FLAG_RX_PS_ENABLED ; +if (adapter->num_vfs) + adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED ; + +/* Disable packet split due to 82599 erratum #45 */ +if (hw->mac.type == ixgbe_mac_82599EB) + adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED ;/* Set the RX buffer length according to the mode */ if (adapter->flags &IXGBE_FLAG_RX_PS_ENABLED ) {
drivers/net/virtio_net.c +16 -11
@@ -446,6 +446,20 @@ static void skb_recv_done(struct virtqueue *rvq) } } +static void virtnet_napi_enable (struct virtnet_info *vi) +{ +napi_enable (&vi->napi); + +/* If all buffers were filled by other side before we napi_enabled, we +* won't get another interrupt, so process any outstanding packets +* now. virtnet_poll wants re-enable the queue, so we disable here. +* We synchronize against interrupts via NAPI_STATE_SCHED */ +if (napi_schedule_prep (&vi->napi)) { +virtqueue_disable_cb (vi->rvq); +__napi_schedule (&vi->napi); + } +} +static void refill_work (struct work_struct *work) {struct virtnet_info *vi;
@@ -454,7 +468,7 @@ static void refill_work(struct work_struct *work) vi = container_of(work, struct virtnet_info, refill.work);napi_disable (&vi->napi); still_empty = !try_fill_recv (vi,GFP_KERNEL ); -napi_enable (&vi->napi); +virtnet_napi_enable (vi);/* In theory, this can happen: if we don't get any buffers in * we will *never* try to fill again. */
@@ -638,16 +652,7 @@ static int virtnet_open(struct net_device *dev) {struct virtnet_info *vi =netdev_priv (dev); -napi_enable (&vi->napi); - -/* If all buffers were filled by other side before we napi_enabled, we -* won't get another interrupt, so process any outstanding packets -* now. virtnet_poll wants re-enable the queue, so we disable here. -* We synchronize against interrupts via NAPI_STATE_SCHED */ -if (napi_schedule_prep (&vi->napi)) { -virtqueue_disable_cb (vi->rvq); -__napi_schedule (&vi->napi); - } +virtnet_napi_enable (vi);return 0 ; }
drivers/net/wireless/ath/ath9k/ar9002_calib.c +5 -5
@@ -710,10 +710,6 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,/* Do NF cal only at longer intervals */ if (longcal || nfcal_pending) { -/* Do periodic PAOffset Cal */ -ar9002_hw_pa_cal (ah, false); -ar9002_hw_olc_temp_compensation (ah); -/* * Get the value from the previous NF cal and update * history buffer.
@@ -728,8 +724,12 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,ath9k_hw_loadnf (ah, ah->curchan); } -if (longcal) +if (longcal) {ath9k_hw_start_nfcal (ah, false); +/* Do periodic PAOffset Cal */ +ar9002_hw_pa_cal (ah, false); +ar9002_hw_olc_temp_compensation (ah); + } }return iscaldone;
drivers/net/wireless/ath/ath9k/ar9002_hw.c +1 -2
@@ -445,9 +445,8 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, }/* WAR for ASPM system hang */ -if (AR_SREV_9280 (ah) ||AR_SREV_9285 (ah) ||AR_SREV_9287 (ah)) { +if (AR_SREV_9285 (ah) ||AR_SREV_9287 (ah)) val |= (AR_WA_BIT6 |AR_WA_BIT7 ); - }if (AR_SREV_9285E_20 (ah)) val |=AR_WA_BIT23 ;
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +8 -6
@@ -22,12 +22,14 @@#define COMP_CKSUM_LEN 2#define AR_CH0_TOP (0x00016288) -#define AR_CH0_TOP_XPABIASLVL (0x3) +#define AR_CH0_TOP_XPABIASLVL (0x300)#define AR_CH0_TOP_XPABIASLVL_S (8)#define AR_CH0_THERM (0x00016290) -#define AR_CH0_THERM_SPARE (0x3f) -#define AR_CH0_THERM_SPARE_S (0) +#define AR_CH0_THERM_XPABIASLVL_MSB 0x3 +#define AR_CH0_THERM_XPABIASLVL_MSB_S 0 +#define AR_CH0_THERM_XPASHORT2GND 0x4 +#define AR_CH0_THERM_XPASHORT2GND_S 2#define AR_SWITCH_TABLE_COM_ALL (0xffff)#define AR_SWITCH_TABLE_COM_ALL_S (0)
@@ -995,9 +997,9 @@ static s32 ar9003_hw_xpa_bias_level_get(struct ath_hw *ah, bool is2ghz)static void ar9003_hw_xpa_bias_level_apply (struct ath_hw *ah,bool is2ghz) {int bias =ar9003_hw_xpa_bias_level_get (ah, is2ghz); -REG_RMW_FIELD (ah,AR_CH0_TOP ,AR_CH0_TOP_XPABIASLVL , (bias &0x3 )); -REG_RMW_FIELD (ah,AR_CH0_THERM ,AR_CH0_THERM_SPARE , - ((bias >>2 ) &0x3 )); +REG_RMW_FIELD (ah,AR_CH0_TOP ,AR_CH0_TOP_XPABIASLVL , bias); +REG_RMW_FIELD (ah,AR_CH0_THERM ,AR_CH0_THERM_XPABIASLVL_MSB , bias >>2 ); +REG_RMW_FIELD (ah,AR_CH0_THERM ,AR_CH0_THERM_XPASHORT2GND ,1 ); }static u32 ar9003_hw_ant_ctrl_common_get (struct ath_hw *ah,bool is2ghz)
drivers/net/wireless/ath/ath9k/ath9k.h +3 -4
@@ -177,8 +177,8 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,/* returns delimiter padding required given the packet length */ #define ATH_AGGR_GET_NDELIM (_len) \ - (((((_len) + ATH_AGGR_DELIM_SZ) < ATH_AGGR_MINPLEN) ? \ - (ATH_AGGR_MINPLEN - (_len) - ATH_AGGR_DELIM_SZ) : 0) >> 2) + (((_len) >= ATH_AGGR_MINPLEN) ? 0 : \ + DIV_ROUND_UP(ATH_AGGR_MINPLEN - (_len), ATH_AGGR_DELIM_SZ))#define BAW_WITHIN (_start, _bawsz, _seqno) \ ((((_seqno) - (_start)) & 4095) < (_bawsz))
@@ -312,7 +312,6 @@ struct ath_rx {u8 rxotherant;u32 *rxlink;unsigned int rxfilter; -spinlock_t pcu_lock;spinlock_t rxbuflock;struct list_head rxbuf;struct ath_descdma rxdma;
@@ -557,9 +556,9 @@ struct ath_softc {struct ath_hw *sc_ah;void __iomem *mem;int irq; -spinlock_t sc_resetlock;spinlock_t sc_serial_rw;spinlock_t sc_pm_lock; +spinlock_t sc_pcu_lock;struct mutex mutex;struct work_struct paprd_work;struct work_struct hw_check_work;
drivers/net/wireless/ath/ath9k/hif_usb.c +36 -4
@@ -144,16 +144,36 @@ static void hif_usb_tx_cb(struct urb *urb)case -ENODEV :case -ESHUTDOWN :/* -* The URB has been killed, free the SKBs -* and return. +* The URB has been killed, free the SKBs. */ ath9k_skb_queue_purge (hif_dev, &tx_buf->skb_queue); -return ; + +/* +* If the URBs are being flushed, no need to add this +* URB to the free list. +*/ +spin_lock (&hif_dev->tx.tx_lock); +if (hif_dev->tx.flags &HIF_USB_TX_FLUSH ) { +spin_unlock (&hif_dev->tx.tx_lock); +return ; + } +spin_unlock (&hif_dev->tx.tx_lock); + +/* +* In the stop() case, this URB has to be added to +* the free list. +*/ + goto add_free;default :break ; } -/* Check if TX has been stopped */ +/* +* Check if TX has been stopped, this is needed because +* this CB could have been invoked just after the TX lock +* was released in hif_stop() and kill_urb() hasn't been +* called yet. +*/ spin_lock (&hif_dev->tx.tx_lock);if (hif_dev->tx.flags &HIF_USB_TX_STOP ) {spin_unlock (&hif_dev->tx.tx_lock);
@@ -305,6 +325,7 @@ static void hif_usb_start(void *hif_handle, u8 pipe_id)static void hif_usb_stop (void *hif_handle,u8 pipe_id) {struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle; +struct tx_buf *tx_buf =NULL , *tx_buf_tmp =NULL ;unsigned long flags;spin_lock_irqsave (&hif_dev->tx.tx_lock, flags);
@@ -312,6 +333,12 @@ static void hif_usb_stop(void *hif_handle, u8 pipe_id) hif_dev->tx.tx_skb_cnt =0 ; hif_dev->tx.flags |=HIF_USB_TX_STOP ;spin_unlock_irqrestore (&hif_dev->tx.tx_lock, flags); + +/* The pending URBs have to be canceled. */ +list_for_each_entry_safe (tx_buf, tx_buf_tmp, + &hif_dev->tx.tx_pending, list) { +usb_kill_urb (tx_buf->urb); + } } static int hif_usb_send(void *hif_handle, u8 pipe_id, struct sk_buff *skb,
@@ -577,6 +604,7 @@ free:static void ath9k_hif_usb_dealloc_tx_urbs (struct hif_device_usb *hif_dev) {struct tx_buf *tx_buf =NULL , *tx_buf_tmp =NULL ; +unsigned long flags;list_for_each_entry_safe (tx_buf, tx_buf_tmp, &hif_dev->tx.tx_buf, list) {
@@ -587,6 +615,10 @@ static void ath9k_hif_usb_dealloc_tx_urbs(struct hif_device_usb *hif_dev)kfree (tx_buf); } +spin_lock_irqsave (&hif_dev->tx.tx_lock, flags); + hif_dev->tx.flags |=HIF_USB_TX_FLUSH ; +spin_unlock_irqrestore (&hif_dev->tx.tx_lock, flags); +list_for_each_entry_safe (tx_buf, tx_buf_tmp, &hif_dev->tx.tx_pending, list) {usb_kill_urb (tx_buf->urb);
drivers/net/wireless/ath/ath9k/hif_usb.h +1 -0
@@ -62,6 +62,7 @@ struct tx_buf { };#define HIF_USB_TX_STOP BIT(0) +#define HIF_USB_TX_FLUSH BIT(1)struct hif_usb_tx {u8 flags;
drivers/net/wireless/ath/ath9k/hw.c +5 -1
@@ -387,6 +387,9 @@ static void ath9k_hw_init_config(struct ath_hw *ah)else ah->config.ht_enable =0 ; +/* PAPRD needs some more work to be enabled */ + ah->config.paprd_disable =1 ; + ah->config.rx_intr_mitigation = true; ah->config.pcieSerDesWrite = true;
@@ -2264,7 +2267,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) pCap->rx_status_len =sizeof (struct ar9003_rxs ); pCap->tx_desc_len =sizeof (struct ar9003_txc ); pCap->txs_len =sizeof (struct ar9003_txs ); -if (ah->eep_ops->get_eeprom (ah,EEP_PAPRD )) +if (!ah->config.paprd_disable && + ah->eep_ops->get_eeprom (ah,EEP_PAPRD )) pCap->hw_caps |=ATH9K_HW_CAP_PAPRD ; }else { pCap->tx_desc_len =sizeof (struct ath_desc );
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -240,6 +240,7 @@ struct ath9k_ops_config {u32 pcie_waen;u8 analog_shiftreg;u8 ht_enable; +u8 paprd_disable;u32 ofdm_trig_low;u32 ofdm_trig_high;u32 cck_trig_high;
drivers/net/wireless/ath/ath9k/init.c +0 -1
@@ -574,7 +574,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, common->debug_mask = ath9k_debug;spin_lock_init (&sc->wiphy_lock); -spin_lock_init (&sc->sc_resetlock);spin_lock_init (&sc->sc_serial_rw);spin_lock_init (&sc->sc_pm_lock);mutex_init (&sc->mutex);
drivers/net/wireless/ath/ath9k/main.c +28 -36
208 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/pci.c +4 -0
@@ -290,6 +290,10 @@ static int ath_pci_resume(struct pci_dev *pdev) AR_GPIO_OUTPUT_MUX_AS_OUTPUT);ath9k_hw_set_gpio (sc->sc_ah, sc->sc_ah->led_pin,1 ); + sc->ps_idle = true; +ath9k_set_wiphy_idle (aphy, true); +ath_radio_disable (sc, hw); +return 0 ; }
drivers/net/wireless/ath/ath9k/recv.c +1 -1
@@ -308,7 +308,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)struct ath_buf *bf;int error =0 ; -spin_lock_init (&sc->rx.pcu_lock); +spin_lock_init (&sc->sc_pcu_lock); sc->sc_flags &= ~SC_OP_RXFLUSH ;spin_lock_init (&sc->rx.rxbuflock);
drivers/net/wireless/ath/ath9k/xmit.c +2 -2
@@ -1160,13 +1160,13 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)ath_print (common,ATH_DBG_FATAL ,"Failed to stop TX DMA. Resetting hardware!\n" ); -spin_lock_bh (&sc->sc_resetlock); +spin_lock_bh (&sc->sc_pcu_lock); r =ath9k_hw_reset (ah, sc->sc_ah->curchan, ah->caldata, false);if (r)ath_print (common,ATH_DBG_FATAL ,"Unable to reset hardware; reset status %d\n" , r); -spin_unlock_bh (&sc->sc_resetlock); +spin_unlock_bh (&sc->sc_pcu_lock); }for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) {
drivers/net/wireless/iwlwifi/iwl-agn.c +11 -4
@@ -1234,6 +1234,9 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)/* only Re-enable if diabled by irq */ if (test_bit (STATUS_INT_ENABLED , &priv->status))iwl_enable_interrupts (priv); +/* Re-enable RF_KILL if it occurred */ +else if (handled &CSR_INT_BIT_RF_KILL ) +iwl_enable_rfkill_int (priv);#ifdef CONFIG_IWLWIFI_DEBUG if (iwl_get_debug_level (priv) & (IWL_DL_ISR )) {
@@ -1449,6 +1452,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)/* only Re-enable if diabled by irq */ if (test_bit (STATUS_INT_ENABLED , &priv->status))iwl_enable_interrupts (priv); +/* Re-enable RF_KILL if it occurred */ +else if (handled &CSR_INT_BIT_RF_KILL ) +iwl_enable_rfkill_int (priv); }/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
@@ -3260,9 +3266,10 @@ static void iwl_mac_stop(struct ieee80211_hw *hw)flush_workqueue (priv->workqueue); -/* enable interrupts again in order to receive rfkill changes */ +/* User space software may expect getting rfkill changes +* even if interface is down */ iwl_write32 (priv,CSR_INT ,0xFFFFFFFF ); -iwl_enable_interrupts (priv); +iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); }
@@ -4103,14 +4110,14 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)* 8. Enable interrupts and read RFKILL state *********************************************/ -/* enable interrupts if needed: hw bug w/a */ +/* enable rfkill interrupt: hw bug w/a */ pci_read_config_word (priv->pci_dev,PCI_COMMAND , &pci_cmd);if (pci_cmd &PCI_COMMAND_INTX_DISABLE ) { pci_cmd &= ~PCI_COMMAND_INTX_DISABLE ;pci_write_config_word (priv->pci_dev,PCI_COMMAND , pci_cmd); } -iwl_enable_interrupts (priv); +iwl_enable_rfkill_int (priv);/* If platform's RF_KILL switch is NOT set to KILL */ if (iwl_read32 (priv,CSR_GP_CNTRL ) &CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW )
drivers/net/wireless/iwlwifi/iwl-helpers.h +6 -0
@@ -168,6 +168,12 @@ static inline void iwl_disable_interrupts(struct iwl_priv *priv)IWL_DEBUG_ISR (priv,"Disabled interrupts\n" ); } +static inline void iwl_enable_rfkill_int (struct iwl_priv *priv) +{ +IWL_DEBUG_ISR (priv,"Enabling rfkill interrupt\n" ); +iwl_write32 (priv,CSR_INT_MASK ,CSR_INT_BIT_RF_KILL ); +} +static inline void iwl_enable_interrupts (struct iwl_priv *priv) {IWL_DEBUG_ISR (priv,"Enabling interrupts\n" );
drivers/net/wireless/p54/txrx.c +1 -1
@@ -618,7 +618,7 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb,else *burst_possible = false; -if (info->flags &IEEE80211_TX_CTL_ASSIGN_SEQ ) +if (!(info->flags &IEEE80211_TX_CTL_ASSIGN_SEQ )) *flags |=P54_HDR_FLAG_DATA_OUT_SEQNR ;if (info->flags &IEEE80211_TX_CTL_PSPOLL_RESPONSE )
drivers/net/wireless/rt2x00/rt73usb.c +1 -0
@@ -2395,6 +2395,7 @@ static struct usb_device_id rt73usb_device_table[] = { { USB_DEVICE(0x04bb, 0x093d), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x148f, 0x2671), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x0812, 0x3101), USB_DEVICE_DATA(&rt73usb_ops) },/* Qcom */ { USB_DEVICE(0x18e8, 0x6196), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x18e8, 0x6229), USB_DEVICE_DATA(&rt73usb_ops) },
drivers/pci/pci-stub.c +3 -0
@@ -54,6 +54,9 @@ static int __init pci_stub_init(void) subdevice =PCI_ANY_ID , class=0 , class_mask=0 ;int fields; +if (!strlen (id)) +continue ; + fields =sscanf (id,"%x:%x:%x:%x:%x:%x" , &vendor, &device, &subvendor, &subdevice, &class, &class_mask);
drivers/power/ds2760_battery.c +1 -1
@@ -212,7 +212,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)if (di->rem_capacity >100 ) di->rem_capacity =100 ; -if (di->current_uA >=100L ) +if (di->current_uA <-100L ) di->life_sec = -((di->accum_current_uAh - di->empty_uAh) *36L ) / (di->current_uA /100L );else
drivers/power/jz4740-battery.c +7 -0
@@ -47,6 +47,8 @@ struct jz_battery {struct power_supply battery;struct delayed_work work; + +struct mutex lock; };static inline struct jz_battery *psy_to_jz_battery (struct power_supply *psy)
@@ -68,6 +70,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery)unsigned long val;long voltage; +mutex_lock (&battery->lock); +INIT_COMPLETION (battery->read_completion);enable_irq (battery->irq);
@@ -91,6 +95,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery) battery->cell->disable (battery->pdev);disable_irq (battery->irq); +mutex_unlock (&battery->lock); +return voltage; }
@@ -291,6 +297,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev) jz_battery->pdev = pdev;init_completion (&jz_battery->read_completion); +mutex_init (&jz_battery->lock);INIT_DELAYED_WORK (&jz_battery->work, jz_battery_work);
drivers/rtc/rtc-cmos.c +9 -7
@@ -36,6 +36,7 @@#include <linux/platform_device.h> #include <linux/mod_devicetable.h> #include <linux/log2.h> +#include <linux/pm.h> /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */ #include <asm-generic/rtc.h>
@@ -850,7 +851,7 @@ static void __exit cmos_do_remove(struct device *dev)#ifdef CONFIG_PM -static int cmos_suspend (struct device *dev,pm_message_t mesg) +static int cmos_suspend (struct device *dev) {struct cmos_rtc *cmos =dev_get_drvdata (dev);unsigned char tmp;
@@ -898,7 +899,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)*/ static inline int cmos_poweroff (struct device *dev) { -return cmos_suspend (dev,PMSG_HIBERNATE ); +return cmos_suspend (dev); }static int cmos_resume (struct device *dev)
@@ -945,9 +946,9 @@ static int cmos_resume(struct device *dev)return 0 ; } +static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume); +#else -#define cmos_suspend NULL -#define cmos_resume NULLstatic inline int cmos_poweroff (struct device *dev) {
@@ -1077,7 +1078,7 @@ static void __exit cmos_pnp_remove(struct pnp_dev *pnp)static int cmos_pnp_suspend (struct pnp_dev *pnp,pm_message_t mesg) { -return cmos_suspend (&pnp->dev, mesg); +return cmos_suspend (&pnp->dev); }static int cmos_pnp_resume (struct pnp_dev *pnp)
@@ -1157,8 +1158,9 @@ static struct platform_driver cmos_platform_driver = { .shutdown = cmos_platform_shutdown, .driver = { .name = (char *) driver_name, - .suspend = cmos_suspend, - .resume = cmos_resume, +#ifdef CONFIG_PM + .pm = &cmos_pm_ops, +#endif } };
drivers/s390/cio/qdio.h +6 -0
@@ -91,6 +91,12 @@ enum qdio_irq_states {#define AC1_SC_QEBSM_AVAILABLE 0x02/* available for subchannel */ #define AC1_SC_QEBSM_ENABLED 0x01/* enabled for subchannel */ +/* SIGA flags */ +#define QDIO_SIGA_WRITE 0x00 +#define QDIO_SIGA_READ 0x01 +#define QDIO_SIGA_SYNC 0x02 +#define QDIO_SIGA_QEBSM_FLAG 0x80 +#ifdef CONFIG_64BIT static inline int do_sqbs (u64 token,unsigned char state,int queue,int *start,int *count)
drivers/s390/cio/qdio_main.c +28 -15
93 lines not on this page · raw message
drivers/scsi/libsas/sas_scsi_host.c +1 -0
@@ -649,6 +649,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)spin_lock_irqsave (shost->host_lock, flags);list_splice_init (&shost->eh_cmd_q, &eh_work_q); + shost->host_eh_scheduled =0 ;spin_unlock_irqrestore (shost->host_lock, flags);SAS_DPRINTK ("Enter %s\n" , __func__);
drivers/scsi/mpt2sas/mpt2sas_base.c +19 -5
@@ -2057,9 +2057,9 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)/* adjust hba_queue_depth, reply_free_queue_depth, * and queue_size */ - ioc->hba_queue_depth -= queue_diff; - ioc->reply_free_queue_depth -= queue_diff; - queue_size -= queue_diff; + ioc->hba_queue_depth -= (queue_diff /2 ); + ioc->reply_free_queue_depth -= (queue_diff /2 ); + queue_size = facts->MaxReplyDescriptorPostQueueDepth; } ioc->reply_post_queue_depth = queue_size;
@@ -3662,6 +3662,11 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) ioc->scsih_cmds.status =MPT2_CMD_NOT_USED ;mutex_init (&ioc->scsih_cmds.mutex); +/* scsih internal command bits */ + ioc->scsih_cmds.reply =kzalloc (ioc->reply_sz,GFP_KERNEL ); + ioc->scsih_cmds.status =MPT2_CMD_NOT_USED ; +mutex_init (&ioc->scsih_cmds.mutex); +/* task management internal command bits */ ioc->tm_cmds.reply =kzalloc (ioc->reply_sz,GFP_KERNEL ); ioc->tm_cmds.status =MPT2_CMD_NOT_USED ;
@@ -3786,6 +3791,8 @@ mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc)static void _base_reset_handler (struct MPT2SAS_ADAPTER *ioc,int reset_phase) { +mpt2sas_scsih_reset_handler (ioc, reset_phase); +mpt2sas_ctl_reset_handler (ioc, reset_phase);switch (reset_phase) {case MPT2_IOC_PRE_RESET : dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
@@ -3816,8 +3823,6 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) "MPT2_IOC_DONE_RESET\n", ioc->name, __func__));break ; } -mpt2sas_scsih_reset_handler (ioc, reset_phase); -mpt2sas_ctl_reset_handler (ioc, reset_phase); }/**
@@ -3871,6 +3876,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag, {int r;unsigned long flags; +u8 pe_complete = ioc->wait_for_port_enable_to_complete;dtmprintk (ioc,printk (MPT2SAS_INFO_FMT "%s: enter\n" , ioc->name, __func__));
@@ -3913,6 +3919,14 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,if (r) goto out;_base_reset_handler (ioc,MPT2_IOC_AFTER_RESET ); + +/* If this hard reset is called while port enable is active, then +* there is no reason to call make_ioc_operational +*/ +if (pe_complete) { + r = -EFAULT ; + goto out; + } r =_base_make_ioc_operational (ioc, sleep_flag);if (!r)_base_reset_handler (ioc,MPT2_IOC_DONE_RESET );
drivers/scsi/mpt2sas/mpt2sas_scsih.c +52 -12
145 lines not on this page · raw message
drivers/scsi/sd.c +8 -1
@@ -1153,6 +1153,12 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)u64 end_lba =blk_rq_pos (scmd->request) + (scsi_bufflen (scmd) /512 );u64 bad_lba;int info_valid; +/* +* resid is optional but mostly filled in. When it's unused, +* its value is zero, so we assume the whole buffer transferred +*/ +unsigned int transferred =scsi_bufflen (scmd) -scsi_get_resid (scmd); +unsigned int good_bytes;if (scmd->request->cmd_type !=REQ_TYPE_FS )return 0 ;
@@ -1186,7 +1192,8 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)/* This computation should always be done in terms of * the resolution of the device's medium. */ -return (bad_lba - start_lba) * scmd->device->sector_size; + good_bytes = (bad_lba - start_lba) * scmd->device->sector_size; +return min (good_bytes, transferred); }/**
drivers/serial/8250.c +2 -1
@@ -241,7 +241,8 @@ static const struct serial8250_config uart_config[] = { .fifo_size = 128, .tx_loadsz = 128, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, - .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP, +/* UART_CAP_EFR breaks billionon CF bluetooth card. */ + .flags = UART_CAP_FIFO | UART_CAP_SLEEP, }, [PORT_16654] = { .name = "ST16654",
drivers/ssb/pcmcia.c +1 -1
@@ -734,7 +734,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,/* Fetch the vendor specific tuples. */ res =pcmcia_loop_tuple (bus->host_pcmcia,SSB_PCMCIA_CIS , - ssb_pcmcia_do_get_invariants, sprom); + ssb_pcmcia_do_get_invariants, iv);if ((res ==0 ) || (res == -ENOSPC ))return 0 ;
drivers/staging/comedi/drivers/jr3_pci.c +7 -0
@@ -54,6 +54,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci)#define PCI_VENDOR_ID_JR3 0x1762#define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111 +#define PCI_DEVICE_ID_JR3_1_CHANNEL_NEW 0x1111#define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112#define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113#define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114
@@ -73,6 +74,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { {PCI_VENDOR_ID_JR3 ,PCI_DEVICE_ID_JR3_1_CHANNEL , PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { +PCI_VENDOR_ID_JR3 ,PCI_DEVICE_ID_JR3_1_CHANNEL_NEW , + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_JR3 ,PCI_DEVICE_ID_JR3_2_CHANNEL , PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,
@@ -807,6 +810,10 @@ static int jr3_pci_attach(struct comedi_device *dev, devpriv->n_channels =1 ; }break ; +case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW :{ + devpriv->n_channels =1 ; + } +break ;case PCI_DEVICE_ID_JR3_2_CHANNEL :{ devpriv->n_channels =2 ; }
drivers/staging/comedi/drivers/ni_labpc.c +2 -1
@@ -572,7 +572,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,/* grab our IRQ */ if (irq) { isr_flags =0 ; -if (thisboard->bustype == pci_bustype) +if (thisboard->bustype == pci_bustype + || thisboard->bustype == pcmcia_bustype) isr_flags |=IRQF_SHARED ;if (request_irq (irq, labpc_interrupt, isr_flags, driver_labpc.driver_name, dev)) {
drivers/staging/hv/blkvsc_drv.c +1 -0
@@ -369,6 +369,7 @@ static int blkvsc_probe(struct device *device) blkdev->gd->first_minor =0 ; blkdev->gd->fops = &block_ops; blkdev->gd->private_data = blkdev; + blkdev->gd->driverfs_dev = &(blkdev->device_ctx->device);sprintf (blkdev->gd->disk_name,"hd%c" ,'a' + devnum);blkvsc_do_inquiry (blkdev);
drivers/staging/hv/netvsc.c +1 -1
@@ -1250,7 +1250,7 @@ static void NetVscOnChannelCallback(void *Context)/* ASSERT(device); */ packet =kzalloc (NETVSC_PACKET_SIZE *sizeof (unsigned char ), -GFP_KERNEL ); +GFP_ATOMIC );if (!packet)return ; buffer = packet;
drivers/staging/hv/netvsc_drv.c +1 -0
@@ -233,6 +233,7 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,if (status ==1 ) {netif_carrier_on (net);netif_wake_queue (net); +netif_notify_peers (net); }else {netif_carrier_off (net);netif_stop_queue (net);
drivers/staging/rt2860/chips/rt3090.c +2 -1
@@ -51,7 +51,8 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)if (IS_RT3090 (pAd)) {/* Init RF calibration */ /* Driver should toggle RF R30 bit7 before init RF registers */ -u32 RfReg =0 , data; +u8 RfReg; +u32 data;RT30xxReadRFRegister (pAd,RF_R30 , (u8 *)&RfReg); RfReg |=0x80 ;
drivers/staging/rt2860/chips/rt30xx.c +2 -2
@@ -53,7 +53,7 @@ struct rt_reg_pair RT30xx_RFRegTable[] = { , {RF_R06, 0x02} , - {RF_R07, 0x70} + {RF_R07, 0x60} , {RF_R09, 0x0F} ,
@@ -441,7 +441,7 @@ void RT30xxReverseRFSleepModeSetup(struct rt_rtmp_adapter *pAd)/* VCO_IC, RF R7 register Bit 4 & Bit 5 to 1 */ RT30xxReadRFRegister (pAd,RF_R07 , &RFValue); - RFValue |=0x30 ; + RFValue |=0x20 ;RT30xxWriteRFRegister (pAd,RF_R07 , RFValue);/* Idoh, RF R9 register Bit 1, Bit 2 & Bit 3 to 1 */
drivers/staging/rt2860/rt_main_dev.c +0 -2
@@ -483,8 +483,6 @@ struct net_device *RtmpPhyNetDevInit(struct rt_rtmp_adapter *pAd, net_dev->ml_priv = (void *)pAd; pAd->net_dev = net_dev; -netif_stop_queue (net_dev); -return net_dev; }
drivers/staging/rt2860/usb_main_dev.c +1 -0
@@ -106,6 +106,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x0411, 0x016f)}, /* MelCo.,Inc. WLI-UC-G301N */ {USB_DEVICE(0x1737, 0x0070)}, /* Linksys WUSB100 */ {USB_DEVICE(0x1737, 0x0071)}, /* Linksys WUSB600N */ + {USB_DEVICE(0x1737, 0x0078)}, /* Linksys WUSB100v2 */ {USB_DEVICE(0x0411, 0x00e8)}, /* Buffalo WLI-UC-G300N */ {USB_DEVICE(0x050d, 0x815c)}, /* Belkin F5D8053 */ {USB_DEVICE(0x100D, 0x9031)}, /* Motorola 2770 */
drivers/staging/usbip/vhci_hcd.c +0 -14
@@ -799,20 +799,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)spin_unlock_irqrestore (&vdev->priv_lock, flags2); } - -if (!vdev->ud.tcp_socket) { -/* tcp connection is closed */ -usbip_uinfo ("vhci_hcd: vhci_urb_dequeue() gives back urb %p\n" , - urb); - -usb_hcd_unlink_urb_from_ep (hcd, urb); - -spin_unlock_irqrestore (&the_controller->lock, flags); -usb_hcd_giveback_urb (vhci_to_hcd (the_controller), urb, - urb->status); -spin_lock_irqsave (&the_controller->lock, flags); - } -spin_unlock_irqrestore (&the_controller->lock, flags);usbip_dbg_vhci_hc ("leave\n" );
drivers/staging/zram/zram_drv.c +4 -0
@@ -235,6 +235,7 @@ static int zram_read(struct zram *zram, struct bio *bio)if (zram_test_flag (zram, index,ZRAM_ZERO )) {handle_zero_page (page); + index++;continue ; }
@@ -243,12 +244,14 @@ static int zram_read(struct zram *zram, struct bio *bio)pr_debug ("Read before write: sector=%lu, size=%u" , (ulong)(bio->bi_sector), bio->bi_size);/* Do nothing */ + index++;continue ; }/* Page is stored uncompressed since it's incompressible */ if (unlikely (zram_test_flag (zram, index,ZRAM_UNCOMPRESSED ))) {handle_uncompressed_page (zram, page, index); + index++;continue ; }
@@ -324,6 +327,7 @@ static int zram_write(struct zram *zram, struct bio *bio)mutex_unlock (&zram->lock);zram_stat_inc (&zram->stats.pages_zero);zram_set_flag (zram, index,ZRAM_ZERO ); + index++;continue ; }
drivers/usb/class/cdc-acm.c +1 -0
@@ -1607,6 +1607,7 @@ static const struct usb_device_id acm_ids[] = { { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */ { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */ { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */ + { NOKIA_PCSUITE_ACM_INFO(0x0302), }, /* Nokia N8 */ { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) *//* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
drivers/usb/core/hcd.c +1 -1
@@ -1945,7 +1945,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)dev_dbg (&rhdev->dev,"usb %s%s\n" , (msg.event &PM_EVENT_AUTO ?"auto-" :"" ),"resume" ); -clear_bit (HCD_FLAG_WAKEUP_PENDING , &hcd->flags);if (!hcd->driver->bus_resume)return -ENOENT ;if (hcd->state ==HC_STATE_RUNNING )
@@ -1953,6 +1952,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) hcd->state =HC_STATE_RESUMING ; status = hcd->driver->bus_resume (hcd); +clear_bit (HCD_FLAG_WAKEUP_PENDING , &hcd->flags);if (status ==0 ) {/* TRSMRCY = 10 msec */ msleep (10 );
drivers/usb/core/hub.c +26 -0
@@ -677,6 +677,8 @@ static void hub_init_func3(struct work_struct *ws);static void hub_activate (struct usb_hub *hub,enum hub_activation_type type) {struct usb_device *hdev = hub->hdev; +struct usb_hcd *hcd; +int ret;int port1;int status;bool need_debounce_delay = false;
@@ -715,6 +717,25 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)usb_autopm_get_interface_no_resume (to_usb_interface (hub->intfdev));return ;/* Continues at init2: below */ + }else if (type ==HUB_RESET_RESUME ) { +/* The internal host controller state for the hub device +* may be gone after a host power loss on system resume. +* Update the device's info so the HW knows it's a hub. +*/ + hcd =bus_to_hcd (hdev->bus); +if (hcd->driver->update_hub_device) { + ret = hcd->driver->update_hub_device (hcd, hdev, + &hub->tt,GFP_NOIO ); +if (ret <0 ) { +dev_err (hub->intfdev,"Host not " +"accepting hub info " +"update.\n" ); +dev_err (hub->intfdev,"LS/FS devices " +"and hubs may not work " +"under this hub\n." ); + } + } +hub_power_on (hub, true); }else {hub_power_on (hub, true); }
@@ -2722,6 +2743,11 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, udev->ttport = hdev->ttport; }else if (udev->speed !=USB_SPEED_HIGH && hdev->speed ==USB_SPEED_HIGH ) { +if (!hub->tt.hub) { +dev_err (&udev->dev,"parent hub has no TT\n" ); + retval = -EINVAL ; + goto fail; + } udev->tt = &hub->tt; udev->ttport = port1; }
drivers/usb/gadget/printer.c +9 -10
@@ -131,31 +131,31 @@ static struct printer_dev usb_printer_gadget;* parameters are in UTF-8 (superset of ASCII's 7 bit characters). */ -static ushort __initdata idVendor; +static ushort idVendor;module_param (idVendor, ushort,S_IRUGO );MODULE_PARM_DESC (idVendor,"USB Vendor ID" ); -static ushort __initdata idProduct; +static ushort idProduct;module_param (idProduct, ushort,S_IRUGO );MODULE_PARM_DESC (idProduct,"USB Product ID" ); -static ushort __initdata bcdDevice; +static ushort bcdDevice;module_param (bcdDevice, ushort,S_IRUGO );MODULE_PARM_DESC (bcdDevice,"USB Device version (BCD)" ); -static char *__initdata iManufacturer; +static char *iManufacturer;module_param (iManufacturer, charp,S_IRUGO );MODULE_PARM_DESC (iManufacturer,"USB Manufacturer string" ); -static char *__initdata iProduct; +static char *iProduct;module_param (iProduct, charp,S_IRUGO );MODULE_PARM_DESC (iProduct,"USB Product string" ); -static char *__initdata iSerialNum; +static char *iSerialNum;module_param (iSerialNum, charp,S_IRUGO );MODULE_PARM_DESC (iSerialNum,"1" ); -static char *__initdata iPNPstring; +static char *iPNPstring;module_param (iPNPstring, charp,S_IRUGO );MODULE_PARM_DESC (iPNPstring,"MFG:linux;MDL:g_printer;CLS:PRINTER;SN:1;" );
@@ -1596,13 +1596,12 @@ cleanup(void)int status;mutex_lock (&usb_printer_gadget.lock_printer_io); -class_destroy (usb_gadget_class); -unregister_chrdev_region (g_printer_devno,2 ); - status =usb_gadget_unregister_driver (&printer_driver);if (status)ERROR (dev,"usb_gadget_unregister_driver %x\n" , status); +unregister_chrdev_region (g_printer_devno,2 ); +class_destroy (usb_gadget_class);mutex_unlock (&usb_printer_gadget.lock_printer_io); }module_exit (cleanup);
drivers/usb/host/ehci-au1xxx.c +1 -1
@@ -227,8 +227,8 @@ static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)* mark HW unaccessible. The PM and USB cores make sure that * the root hub is either suspended or stopped. */ -spin_lock_irqsave (&ehci->lock, flags);ehci_prepare_ports_for_controller_suspend (ehci,device_may_wakeup (dev)); +spin_lock_irqsave (&ehci->lock, flags);ehci_writel (ehci,0 , &ehci->regs->intr_enable); (void )ehci_readl (ehci, &ehci->regs->intr_enable);
drivers/usb/host/ehci-hcd.c +20 -7
@@ -114,6 +114,9 @@ MODULE_PARM_DESC(hird, "host initiated resume duration, +1 for each 75us\n");#define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT) +/* for ASPM quirk of ISOC on AMD SB800 */ +static struct pci_dev *amd_nb_dev; +/*-------------------------------------------------------------------------*/ #include "ehci.h"
@@ -514,6 +517,11 @@ static void ehci_stop (struct usb_hcd *hcd)spin_unlock_irq (&ehci->lock);ehci_mem_cleanup (ehci); +if (amd_nb_dev) { +pci_dev_put (amd_nb_dev); + amd_nb_dev =NULL ; + } +#ifdef EHCI_STATS ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n", ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim,
@@ -549,6 +557,8 @@ static int ehci_init(struct usb_hcd *hcd) ehci->iaa_watchdog.function = ehci_iaa_watchdog; ehci->iaa_watchdog.data = (unsigned long ) ehci;
Lines of this file are not shown. View the raw message.
drivers/usb/host/ehci-pci.c +40 -1
41 lines not on this page · raw message
drivers/usb/host/ehci-sched.c +79 -0
79 lines not on this page · raw message
mm/migrate.c +19 -29
48 lines not on this page · raw message
mm/vmstat.c +67 -1
68 lines not on this page · raw message
sound/usb/usx2y/us122l.c +20 -21
41 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.