linux-on-qualcomm-s-msm:alex-linux-xperia.git
6 years agoMake msm fb debugging less verbose
Alexander Tarasikov [Mon, 10 Oct 2011 18:25:45 +0000 (22:25 +0400)]
Make msm fb debugging less verbose

6 years agoFix possible infinite wait in smd probe
Alexander Tarasikov [Fri, 7 Oct 2011 20:54:42 +0000 (00:54 +0400)]
Fix possible infinite wait in smd probe

6 years agoMove wait for rpc ready check to avoid touching servers queue and use
Alexander Tarasikov [Fri, 7 Oct 2011 20:42:27 +0000 (00:42 +0400)]
Move wait for rpc ready check to avoid touching servers queue and use
schedule_work instead of queue_work to avoid waiting indefinitely on
initialization

6 years agoAdd USB for HTC Kovsky
Alexander Tarasikov [Fri, 7 Oct 2011 14:17:35 +0000 (18:17 +0400)]
Add USB for HTC Kovsky

6 years agoAdd MSM GPIOS for USB
Alexander Tarasikov [Fri, 7 Oct 2011 14:17:04 +0000 (18:17 +0400)]
Add MSM GPIOS for USB

6 years agoAdd callback for msm7k usb vbus
Alexander Tarasikov [Fri, 7 Oct 2011 14:16:47 +0000 (18:16 +0400)]
Add callback for msm7k usb vbus

6 years agoAdd a prelimimary version of msm72k hsusb driver
Alexander Tarasikov [Fri, 7 Oct 2011 14:06:00 +0000 (18:06 +0400)]
Add a prelimimary version of msm72k hsusb driver

6 years agoAdd iomap entry for NAND
Alexander Tarasikov [Fri, 7 Oct 2011 11:56:57 +0000 (15:56 +0400)]
Add iomap entry for NAND

6 years agoAdd NAND drivers for MSM. TODO: fix partition parsing
Alexander Tarasikov [Fri, 7 Oct 2011 11:55:48 +0000 (15:55 +0400)]
Add NAND drivers for MSM. TODO: fix partition parsing

6 years agoAdd HW3D for msm7200A
Alexander Tarasikov [Fri, 7 Oct 2011 11:50:44 +0000 (15:50 +0400)]
Add HW3D for msm7200A

6 years agoAdd wakelocks and NLS options to be able to mount and boot ANDROID
Alexander Tarasikov [Thu, 6 Oct 2011 23:46:08 +0000 (03:46 +0400)]
Add wakelocks and NLS options to be able to mount and boot ANDROID

6 years agoAdd WAKELOCK from ANDROID
Alexander Tarasikov [Thu, 6 Oct 2011 23:35:36 +0000 (03:35 +0400)]
Add WAKELOCK from ANDROID

6 years agoUpdate kovsky defconfig
Alexander Tarasikov [Thu, 6 Oct 2011 23:11:42 +0000 (03:11 +0400)]
Update kovsky defconfig

6 years agoEnable acoustic and keyled for Kovsky but do not enable the 35mm headset
Alexander Tarasikov [Thu, 6 Oct 2011 23:11:19 +0000 (03:11 +0400)]
Enable acoustic and keyled for Kovsky but do not enable the 35mm headset

6 years agoAdd 3.5MM headset driver
Alexander Tarasikov [Thu, 6 Oct 2011 23:04:40 +0000 (03:04 +0400)]
Add 3.5MM headset driver

6 years agoFully enable qdsp and sound on 5225
Alexander Tarasikov [Thu, 6 Oct 2011 22:58:16 +0000 (02:58 +0400)]
Fully enable qdsp and sound on 5225

6 years agoEnable ADSP on 5225
Alexander Tarasikov [Thu, 6 Oct 2011 22:55:59 +0000 (02:55 +0400)]
Enable ADSP on 5225

6 years agoFix RPC router and SMD probe issues
Alexander Tarasikov [Thu, 6 Oct 2011 22:55:34 +0000 (02:55 +0400)]
Fix RPC router and SMD probe issues

6 years agoDrop code for >6350 amss from qdsp5 since it is very likely to be broken
Alexander Tarasikov [Thu, 6 Oct 2011 22:19:45 +0000 (02:19 +0400)]
Drop code for >6350 amss from qdsp5 since it is very likely to be broken
and we don't have devices with such firmware

6 years agoAdd RPC kernel-side servers
Alexander Tarasikov [Thu, 6 Oct 2011 22:11:48 +0000 (02:11 +0400)]
Add RPC kernel-side servers

6 years agoEnable SMD on 5225
Alexander Tarasikov [Thu, 6 Oct 2011 22:11:29 +0000 (02:11 +0400)]
Enable SMD on 5225

6 years agoAdd a function for waiting till SMD channels are allocated
Alexander Tarasikov [Thu, 6 Oct 2011 22:07:38 +0000 (02:07 +0400)]
Add a function for waiting till SMD channels are allocated

6 years agoAdd msm_hw_reset_hook to reboot in case of ARM9 crash
Alexander Tarasikov [Thu, 6 Oct 2011 22:01:18 +0000 (02:01 +0400)]
Add msm_hw_reset_hook to reboot in case of ARM9 crash

6 years agoFix reset gpio owner to reboot msm7200a with DEX amss
Alexander Tarasikov [Thu, 6 Oct 2011 21:58:15 +0000 (01:58 +0400)]
Fix reset gpio owner to reboot msm7200a with DEX amss

6 years agoFix reboot and shutdown hooks for msm7200a and DEX
Alexander Tarasikov [Thu, 6 Oct 2011 21:54:19 +0000 (01:54 +0400)]
Fix reboot and shutdown hooks for msm7200a and DEX

6 years agoFix HTC Kovsky led names. The file with incorrect names was committed
Alexander Tarasikov [Thu, 6 Oct 2011 21:28:53 +0000 (01:28 +0400)]
Fix HTC Kovsky led names. The file with incorrect names was committed
from a testing branch

6 years agoEnable LEDs and wifi for HTC Kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 21:25:05 +0000 (01:25 +0400)]
Enable LEDs and wifi for HTC Kovsky

6 years agoComment out SMD until it is working
Alexander Tarasikov [Thu, 6 Oct 2011 21:13:50 +0000 (01:13 +0400)]
Comment out SMD until it is working

6 years agoEnable ds2746 and power management in defconfig and register i2c devices
Alexander Tarasikov [Thu, 6 Oct 2011 21:11:52 +0000 (01:11 +0400)]
Enable ds2746 and power management in defconfig and register i2c devices
for Kovsky

6 years agoFix a typo in msm sdcc gpio array initializer
Alexander Tarasikov [Thu, 6 Oct 2011 21:11:28 +0000 (01:11 +0400)]
Fix a typo in msm sdcc gpio array initializer

6 years agoAdd DS2746 battery gauge driver
Alexander Tarasikov [Thu, 6 Oct 2011 21:06:48 +0000 (01:06 +0400)]
Add DS2746 battery gauge driver

6 years agoclaim/release i2c gpio pins for msm7200a per driver request
Alexander Tarasikov [Thu, 6 Oct 2011 20:54:17 +0000 (00:54 +0400)]
claim/release i2c gpio pins for msm7200a per driver request

6 years agosilence pm debugging messages
Alexander Tarasikov [Thu, 6 Oct 2011 20:54:01 +0000 (00:54 +0400)]
silence pm debugging messages

6 years agoEnable vibrator for HTC Kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 20:53:10 +0000 (00:53 +0400)]
Enable vibrator for HTC Kovsky

6 years agoAdd dex vibrator timed output
Alexander Tarasikov [Thu, 6 Oct 2011 20:52:52 +0000 (00:52 +0400)]
Add dex vibrator timed output

6 years agoAdd QDSP5 media framework
Alexander Tarasikov [Thu, 6 Oct 2011 20:20:23 +0000 (00:20 +0400)]
Add QDSP5 media framework

6 years agoenable pmem for HTC Kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 20:20:00 +0000 (00:20 +0400)]
enable pmem for HTC Kovsky

6 years agoAdd pmem board driver for msm 7200a
Alexander Tarasikov [Thu, 6 Oct 2011 20:19:45 +0000 (00:19 +0400)]
Add pmem board driver for msm 7200a

6 years agoUpdate msm7200a defconfig
Alexander Tarasikov [Thu, 6 Oct 2011 20:15:52 +0000 (00:15 +0400)]
Update msm7200a defconfig

6 years agoEnable HTC Kovsky panel GPIO control
Alexander Tarasikov [Thu, 6 Oct 2011 20:06:33 +0000 (00:06 +0400)]
Enable HTC Kovsky panel GPIO control

6 years agoAdd ANDROID PMEM driver
Alexander Tarasikov [Thu, 6 Oct 2011 20:04:15 +0000 (00:04 +0400)]
Add ANDROID PMEM driver

6 years agoAdd ANDROID drivers
Alexander Tarasikov [Thu, 6 Oct 2011 20:00:12 +0000 (00:00 +0400)]
Add ANDROID drivers

6 years agoReset IMEM clock in late initcall
Alexander Tarasikov [Thu, 6 Oct 2011 19:51:15 +0000 (23:51 +0400)]
Reset IMEM clock in late initcall

6 years agoUpdate kernel config and fill platform data for HTC Kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 19:47:10 +0000 (23:47 +0400)]
Update kernel config and fill platform data for HTC Kovsky

6 years agoEnable GPIO control for msm7200a mmc for sdc1-sdc3
Alexander Tarasikov [Thu, 6 Oct 2011 19:46:31 +0000 (23:46 +0400)]
Enable GPIO control for msm7200a mmc for sdc1-sdc3

6 years agoAdd PM support for MSM7200A
Alexander Tarasikov [Thu, 6 Oct 2011 19:32:01 +0000 (23:32 +0400)]
Add PM support for MSM7200A

6 years agoadd microp keypad driver
Alexander Tarasikov [Thu, 6 Oct 2011 19:31:17 +0000 (23:31 +0400)]
add microp keypad driver

6 years agoadd microp-leds driver for htc kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 19:30:52 +0000 (23:30 +0400)]
add microp-leds driver for htc kovsky

6 years agoadd microp-ng driver
Alexander Tarasikov [Thu, 6 Oct 2011 19:30:27 +0000 (23:30 +0400)]
add microp-ng driver

6 years agoAdd I2C for msm7200A
Alexander Tarasikov [Thu, 6 Oct 2011 18:21:14 +0000 (22:21 +0400)]
Add I2C for msm7200A

6 years agoAdd I2C and ULPI pinmux settings for msm7200a
Alexander Tarasikov [Thu, 6 Oct 2011 18:14:29 +0000 (22:14 +0400)]
Add I2C and ULPI pinmux settings for msm7200a

6 years agoComment out smd stuff for now
Alexander Tarasikov [Thu, 6 Oct 2011 18:08:18 +0000 (22:08 +0400)]
Comment out smd stuff for now

6 years agoAdd touchscreen, rtc, sdcc to HTC Kovsky
Alexander Tarasikov [Thu, 6 Oct 2011 18:07:58 +0000 (22:07 +0400)]
Add touchscreen, rtc, sdcc to HTC Kovsky

6 years agoAdd msm7200a mmc driver. TODO: add gpio config
Alexander Tarasikov [Thu, 6 Oct 2011 18:06:12 +0000 (22:06 +0400)]
Add msm7200a mmc driver. TODO: add gpio config

6 years agoAdd init_card hook to msm_sdcc driver to allow to use broken cards like
Alexander Tarasikov [Sat, 20 Aug 2011 22:35:11 +0000 (02:35 +0400)]
Add init_card hook to msm_sdcc driver to allow to use broken cards like
wl1251

Conflicts:

arch/arm/mach-msm/include/mach/mmc.h

6 years agoFix a typo in msm_sdcc that caused a null pointer dereference
Alexander Tarasikov [Sat, 20 Aug 2011 21:38:10 +0000 (01:38 +0400)]
Fix a typo in msm_sdcc that caused a null pointer dereference

6 years agoUpdate wince gpio pinmux with mmc, hsuart and pcm
Alexander Tarasikov [Thu, 6 Oct 2011 17:51:39 +0000 (21:51 +0400)]
Update wince gpio pinmux with mmc, hsuart and pcm

6 years agoFix spinlock variable type for wince gpiomux
Alexander Tarasikov [Thu, 6 Oct 2011 17:26:59 +0000 (21:26 +0400)]
Fix spinlock variable type for wince gpiomux

6 years agoAdd gpiomux for wince devices
Alexander Tarasikov [Thu, 6 Oct 2011 17:25:52 +0000 (21:25 +0400)]
Add gpiomux for wince devices

6 years agoAdd macros to extract gpio config from msm tlmm bitfields
Alexander Tarasikov [Thu, 6 Oct 2011 17:24:24 +0000 (21:24 +0400)]
Add macros to extract gpio config from msm tlmm bitfields

6 years agoAdd more IO devices for msm7200a
Alexander Tarasikov [Thu, 6 Oct 2011 16:09:39 +0000 (20:09 +0400)]
Add more IO devices for msm7200a

6 years agoAdd MSM touchscreen driver
Alexander Tarasikov [Thu, 6 Oct 2011 16:08:52 +0000 (20:08 +0400)]
Add MSM touchscreen driver

6 years agoAdd RTC driver for HTC phones using DEX
Alexander Tarasikov [Thu, 6 Oct 2011 16:08:23 +0000 (20:08 +0400)]
Add RTC driver for HTC phones using DEX

6 years agoPort msm7200A irq handlers from 35
Alexander Tarasikov [Wed, 5 Oct 2011 22:41:13 +0000 (02:41 +0400)]
Port msm7200A irq handlers from 35

6 years agoAdd amss device to Kovsky
Alexander Tarasikov [Wed, 5 Oct 2011 22:26:14 +0000 (02:26 +0400)]
Add amss device to Kovsky

6 years agoAdd amss drivers for wince devices
Alexander Tarasikov [Wed, 5 Oct 2011 22:25:58 +0000 (02:25 +0400)]
Add amss drivers for wince devices

6 years agoAdd htc_acoustic for wince devices
Alexander Tarasikov [Wed, 5 Oct 2011 22:25:28 +0000 (02:25 +0400)]
Add htc_acoustic for wince devices

6 years agoAdd the amss rpc ids definitions
Alexander Tarasikov [Wed, 5 Oct 2011 22:25:04 +0000 (02:25 +0400)]
Add the amss rpc ids definitions

6 years agoAdd the SMD/RPC from 2.6.35.7 XDANDROID
Alexander Tarasikov [Wed, 5 Oct 2011 22:24:40 +0000 (02:24 +0400)]
Add the SMD/RPC from 2.6.35.7 XDANDROID

6 years agoFix msm7200a uart irq typos
Alexander Tarasikov [Wed, 5 Oct 2011 21:59:45 +0000 (01:59 +0400)]
Fix msm7200a uart irq typos

6 years agoMerge remote-tracking branch 'origin/master' into msm7200a-upstream
Alexander Tarasikov [Wed, 5 Oct 2011 21:52:41 +0000 (01:52 +0400)]
Merge remote-tracking branch 'origin/master' into msm7200a-upstream

6 years agoLinux 3.1-rc9
Linus Torvalds [Wed, 5 Oct 2011 01:11:50 +0000 (18:11 -0700)]
Linux 3.1-rc9

6 years agoMerge git://github.com/davem330/net
Linus Torvalds [Tue, 4 Oct 2011 17:37:06 +0000 (10:37 -0700)]
Merge git://github.com/davem330/net

* git://github.com/davem330/net:
  pch_gbe: Fixed the issue on which a network freezes
  pch_gbe: Fixed the issue on which PC was frozen when link was downed.
  make PACKET_STATISTICS getsockopt report consistently between ring and non-ring
  net: xen-netback: correctly restart Tx after a VM restore/migrate
  bonding: properly stop queuing work when requested
  can bcm: fix incomplete tx_setup fix
  RDSRDMA: Fix cleanup of rds_iw_mr_pool
  net: Documentation: Fix type of variables
  ibmveth: Fix oops on request_irq failure
  ipv6: nullify ipv6_ac_list and ipv6_fl_list when creating new socket
  cxgb4: Fix EEH on IBM P7IOC
  can bcm: fix tx_setup off-by-one errors
  MAINTAINERS: tehuti: Alexander Indenbaum's address bounces
  dp83640: reduce driver noise
  ptp: fix L2 event message recognition

6 years agoMerge branch 'fix/asoc' of git://github.com/tiwai/sound
Linus Torvalds [Tue, 4 Oct 2011 16:59:22 +0000 (09:59 -0700)]
Merge branch 'fix/asoc' of git://github.com/tiwai/sound

* 'fix/asoc' of git://github.com/tiwai/sound:
  ASoC: omap_mcpdm_remove cannot be __devexit
  ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC
  ASoC: use a valid device for dev_err() in Zylonite

6 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Tue, 4 Oct 2011 16:54:18 +0000 (09:54 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: fix channel_remap setup (v2)
  drm/radeon: Set cursor x/y to 0 when x/yorigin > 0.
  drm/radeon: Update AVIVO cursor coordinate origin before x/yorigin calculation.
  drm/radeon: Simplify cursor x/yorigin calculation.
  drm/radeon/kms: fix cursor image off-by-one error
  drm/radeon/kms: Fix logic error in DP HPD handler
  drm/radeon/kms: add retry limits for native DP aux defer
  drm/radeon/kms: fix regression in DP aux defer handling

6 years agoMerge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
Linus Torvalds [Tue, 4 Oct 2011 16:52:56 +0000 (09:52 -0700)]
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi-topcliff-pch: Fix overrun issue
  spi-topcliff-pch: Add recovery processing in case FIFO overrun error occurs
  spi-topcliff-pch: Fix CPU read complete condition issue
  spi-topcliff-pch: Fix SSN Control issue
  spi-topcliff-pch: add tx-memory clear after complete transmitting

6 years agoPCI: Disable MPS configuration by default
Jon Mason [Mon, 3 Oct 2011 14:50:20 +0000 (09:50 -0500)]
PCI: Disable MPS configuration by default

Add the ability to disable PCI-E MPS turning and using the BIOS
configured MPS defaults.  Due to the number of issues recently
discovered on some x86 chipsets, make this the default behavior.

Also, add the option for peer to peer DMA MPS configuration.  Peer to
peer DMA is outside the scope of this patch, but MPS configuration could
prevent it from working by having the MPS on one root port different
than the MPS on another.  To work around this, simply make the system
wide MPS the smallest possible value (128B).

Signed-off-by: Jon Mason <mason@myri.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
6 years agodrm/radeon/kms: fix channel_remap setup (v2)
Alex Deucher [Tue, 4 Oct 2011 14:46:34 +0000 (10:46 -0400)]
drm/radeon/kms: fix channel_remap setup (v2)

Most asics just use the hw default value which requires
no explicit programming.  For those that need a different
value, the vbios will program it properly.  As such,
there's no need to program these registers explicitly
in the driver.  Changing MC_SHARED_CHREMAP requires a reload
of all data in vram otherwise its contents will be scambled.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=40103

v2: drop now unused channel_remap functions.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agospi-topcliff-pch: Fix overrun issue
Tomoya MORINAGA [Tue, 6 Sep 2011 08:16:38 +0000 (17:16 +0900)]
spi-topcliff-pch: Fix overrun issue

We found that adding load, Rx data sometimes drops.(with DMA transfer mode)
The cause is that before starting Rx-DMA processing, Tx-DMA processing starts.
This causes FIFO overrun occurs.

This patch fixes the issue by modifying FIFO tx-threshold and DMA descriptor
size like below.

                      Current                   this patch
Rx-descriptor   4Byte+12Byte*341    -->    12Byte*340-4Byte-12Byte
Rx-threshold                   (Not modified)
Tx-descriptor   4Byte+12Byte*341    -->    16Byte-12Byte*340
Rx-threshold    12Byte              -->    2Byte

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
6 years agospi-topcliff-pch: Add recovery processing in case FIFO overrun error occurs
Tomoya MORINAGA [Tue, 6 Sep 2011 08:16:37 +0000 (17:16 +0900)]
spi-topcliff-pch: Add recovery processing in case FIFO overrun error occurs

Add recovery processing in case FIFO overrun error occurs with DMA transfer mode.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
6 years agospi-topcliff-pch: Fix CPU read complete condition issue
Tomoya MORINAGA [Tue, 6 Sep 2011 08:16:36 +0000 (17:16 +0900)]
spi-topcliff-pch: Fix CPU read complete condition issue

We found Rx data sometimes drops.(with non-DMA transfer mode)
The cause is read complete condition is not true.

This patch fixes the issue.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
6 years agospi-topcliff-pch: Fix SSN Control issue
Tomoya MORINAGA [Tue, 6 Sep 2011 08:16:35 +0000 (17:16 +0900)]
spi-topcliff-pch: Fix SSN Control issue

During processing 1 command/data series,
SSN should keep LOW.
However, currently, SSN becomes HIGH.
This patch fixes the issue.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
6 years agospi-topcliff-pch: add tx-memory clear after complete transmitting
Tomoya MORINAGA [Tue, 6 Sep 2011 08:16:34 +0000 (17:16 +0900)]
spi-topcliff-pch: add tx-memory clear after complete transmitting

Currently, in case of reading date from SPI flash,
command is sent twice.
The cause is that tx-memory clear processing is missing .
This patch adds the tx-momory clear processing.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
6 years agolis3: fix regression of HP DriveGuard with 8bit chip
Takashi Iwai [Tue, 4 Oct 2011 01:09:14 +0000 (18:09 -0700)]
lis3: fix regression of HP DriveGuard with 8bit chip

Commit 2a7fade7e03 ("hwmon: lis3: Power on corrections") caused a
regression on HP laptops with 8bit chip.  Writing CTRL2_BOOT_8B bit seems
clearing the BIOS setup, and no proper interrupt for DriveGuard will be
triggered any more.

Since the init code there is basically only for embedded devices, put a
pdata check so that the problematic initialization will be skipped for
hp_accel stuff.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Cc: Samu Onkalo <samu.p.onkalo@nokia.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
6 years agoMerge branch 'hwmon-for-linus' of git://github.com/groeck/linux
Linus Torvalds [Mon, 3 Oct 2011 19:54:56 +0000 (12:54 -0700)]
Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) Avoid leaving around dangling pointer
  hwmon: (coretemp) Fixup platform device ID change

6 years agoMerge git://github.com/davem330/ide
Linus Torvalds [Mon, 3 Oct 2011 19:53:43 +0000 (12:53 -0700)]
Merge git://github.com/davem330/ide

* git://github.com/davem330/ide:
  ide-disk: Fix request requeuing

6 years agoMerge branch 'btrfs-3.0' of git://github.com/chrismason/linux
Linus Torvalds [Mon, 3 Oct 2011 19:17:44 +0000 (12:17 -0700)]
Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

* 'btrfs-3.0' of git://github.com/chrismason/linux:
  Btrfs: force a page fault if we have a shorty copy on a page boundary

6 years agoide-disk: Fix request requeuing
Borislav Petkov [Mon, 3 Oct 2011 18:28:18 +0000 (14:28 -0400)]
ide-disk: Fix request requeuing

Simon Kirby reported that on his RAID setup with idedisk underneath
the box OOMs after a couple of days of runtime. Running with
CONFIG_DEBUG_KMEMLEAK pointed to idedisk_prep_fn() which unconditionally
allocates an ide_cmd struct. However, ide_requeue_and_plug() can be
called more than once per request, either from the request issue or the
IRQ handler path and do blk_peek_request() ends up in idedisk_prep_fn()
repeatedly, allocating a struct ide_cmd everytime and "forgetting" the
previous pointer.

Make sure the code reuses the old allocated chunk.

Reported-and-tested-by: Simon Kirby <sim@hostway.ca>
Cc: <stable@kernel.org> [ 39.x, 3.0.x ]
Link: http://marc.info/?l=linux-kernel&m=131667641517919
Link: http://lkml.kernel.org/r/20110922072643.GA27232@hostway.ca
Signed-off-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agopch_gbe: Fixed the issue on which a network freezes
Toshiharu Okada [Sun, 25 Sep 2011 21:27:43 +0000 (21:27 +0000)]
pch_gbe: Fixed the issue on which a network freezes

The pch_gbe driver has an issue which a network stops,
when receiving traffic is high.
In the case, The link down and up are necessary to return a network.

This patch fixed this issue.

Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agopch_gbe: Fixed the issue on which PC was frozen when link was downed.
Toshiharu Okada [Sun, 25 Sep 2011 21:27:42 +0000 (21:27 +0000)]
pch_gbe: Fixed the issue on which PC was frozen when link was downed.

When a link was downed during network use,
there is an issue on which PC freezes.

This patch fixed this issue.

Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agomake PACKET_STATISTICS getsockopt report consistently between ring and non-ring
Willem de Bruijn [Fri, 30 Sep 2011 10:38:28 +0000 (10:38 +0000)]
make PACKET_STATISTICS getsockopt report consistently between ring and non-ring

This is a minor change.

Up until kernel 2.6.32, getsockopt(fd, SOL_PACKET, PACKET_STATISTICS,
...) would return total and dropped packets since its last invocation. The
introduction of socket queue overflow reporting [1] changed drop
rate calculation in the normal packet socket path, but not when using a
packet ring. As a result, the getsockopt now returns different statistics
depending on the reception method used. With a ring, it still returns the
count since the last call, as counts are incremented in tpacket_rcv and
reset in getsockopt. Without a ring, it returns 0 if no drops occurred
since the last getsockopt and the total drops over the lifespan of
the socket otherwise. The culprit is this line in packet_rcv, executed
on a drop:

drop_n_acct:
        po->stats.tp_drops = atomic_inc_return(&sk->sk_drops);

As it shows, the new drop number it taken from the socket drop counter,
which is not reset at getsockopt. I put together a small example
that demonstrates the issue [2]. It runs for 10 seconds and overflows
the queue/ring on every odd second. The reported drop rates are:
ring: 16, 0, 16, 0, 16, ...
non-ring: 0, 15, 0, 30, 0, 46, 0, 60, 0 , 74.

Note how the even ring counts monotonically increase. Because the
getsockopt adds tp_drops to tp_packets, total counts are similarly
reported cumulatively. Long story short, reinstating the original code, as
the below patch does, fixes the issue at the cost of additional per-packet
cycles. Another solution that does not introduce per-packet overhead
is be to keep the current data path, record the value of sk_drops at
getsockopt() at call N in a new field in struct packetsock and subtract
that when reporting at call N+1. I'll be happy to code that, instead,
it's just more messy.

[1] http://patchwork.ozlabs.org/patch/35665/
[2] http://kernel.googlecode.com/files/test-packetsock-getstatistics.c

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agonet: xen-netback: correctly restart Tx after a VM restore/migrate
David Vrabel [Fri, 30 Sep 2011 06:37:51 +0000 (06:37 +0000)]
net: xen-netback: correctly restart Tx after a VM restore/migrate

If a VM is saved and restored (or migrated) the netback driver will no
longer process any Tx packets from the frontend.  xenvif_up() does not
schedule the processing of any pending Tx requests from the front end
because the carrier is off.  Without this initial kick the frontend
just adds Tx requests to the ring without raising an event (until the
ring is full).

This was caused by 47103041e91794acdbc6165da0ae288d844c820b (net:
xen-netback: convert to hw_features) which reordered the calls to
xenvif_up() and netif_carrier_on() in xenvif_connect().

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobonding: properly stop queuing work when requested
Andy Gospodarek [Fri, 23 Sep 2011 10:53:34 +0000 (10:53 +0000)]
bonding: properly stop queuing work when requested

During a test where a pair of bonding interfaces using ARP monitoring
were both brought up and torn down (with an rmmod) repeatedly, a panic
in the timer code was noticed.  I tracked this down and determined that
any of the bonding functions that ran as workqueue handlers and requeued
more work might not properly exit when the module was removed.

There was a flag protected by the bond lock called kill_timers that is
set when the interface goes down or the module is removed, but many of
the functions that monitor link status now unlock the bond lock to take
rtnl first.  There is a chance that another CPU running the rmmod could
get the lock and set kill_timers after the first check has passed.

This patch does not allow any function to queue work that will make
itself run unless kill_timers is not set.  I also noticed while doing
this work that bond_resend_igmp_join_requests did not have a check for
kill_timers, so I added the needed call there as well.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Reported-by: Liang Zheng <lzheng@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agodrm/radeon: Set cursor x/y to 0 when x/yorigin > 0.
Michel Dänzer [Fri, 30 Sep 2011 15:16:53 +0000 (17:16 +0200)]
drm/radeon: Set cursor x/y to 0 when x/yorigin > 0.

Apart from the obvious cleanup, this should make the line

cursor_end = x - xorigin + w;

correct now.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon: Update AVIVO cursor coordinate origin before x/yorigin calculation.
Michel Dänzer [Fri, 30 Sep 2011 15:16:52 +0000 (17:16 +0200)]
drm/radeon: Update AVIVO cursor coordinate origin before x/yorigin calculation.

Fixes cursor disappearing prematurely when moving off a top/left edge which
is not located at the desktop top/left edge.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Cc: stable@kernel.org
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon: Simplify cursor x/yorigin calculation.
Michel Dänzer [Fri, 30 Sep 2011 15:16:51 +0000 (17:16 +0200)]
drm/radeon: Simplify cursor x/yorigin calculation.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon/kms: fix cursor image off-by-one error
Nicholas Miell [Fri, 30 Sep 2011 02:07:14 +0000 (19:07 -0700)]
drm/radeon/kms: fix cursor image off-by-one error

The mouse cursor hotspot calculation when the cursor is partially off the
top or left side of the screen was off by one.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=41158

Signed-off-by: Nicholas Miell <nmiell@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon/kms: Fix logic error in DP HPD handler
Alex Deucher [Mon, 3 Oct 2011 12:37:33 +0000 (08:37 -0400)]
drm/radeon/kms: Fix logic error in DP HPD handler

Only disable the pipe if the monitor is physically
disconnected.  The previous logic also disabled the
pipe if the link was trained.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41248

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon/kms: add retry limits for native DP aux defer
Alex Deucher [Mon, 3 Oct 2011 13:13:46 +0000 (09:13 -0400)]
drm/radeon/kms: add retry limits for native DP aux defer

The previous code could potentially loop forever.  Limit
the number of DP aux defer retries to 4 for native aux
transactions, same as i2c over aux transactions.

Noticed by: Brad Campbell <lists2009@fnarfbargle.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Brad Campbell <lists2009@fnarfbargle.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
6 years agodrm/radeon/kms: fix regression in DP aux defer handling
Alex Deucher [Mon, 3 Oct 2011 13:13:45 +0000 (09:13 -0400)]
drm/radeon/kms: fix regression in DP aux defer handling

An incorrect ordering in the error checking code lead
to DP aux defer being skipped in the aux native write
path.  Move the bytes transferred check (ret == 0)
below the defer check.

Tracked down by: Brad Campbell <brad@fnarfbargle.com>

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41121

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Brad Campbell <brad@fnarfbargle.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>