15 Aug, 2011
8 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: flush journal completely before releasing metadata inodes -
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: don't try to be smart in the hpd handler
drm/radeon: re-POST the asic on Apple hardware when booted via EFI
drm/radeon: Allow panel preferred EDID to override BIOS native mode
drm/radeon/kms: make some watermark messages debug only
drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos
drm/radeon/kms: don't enable connectors that are off in the hotplug handler -
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: Do not set cifs/ntfs acl using a file handle (try #4)
[CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Specify a module license
regmap: Fix bulk reads -
Attempting to try and turn off disconnected display hw in the
hotput handler lead to more problems than it helped. For
now just register an event and only attempt the do something
interesting with DP. Other connectors are just too problematic:
- Some systems have an HPD pin assigned to LVDS, but it's rarely
if ever connected properly and we don't really care about hpd
events on LVDS anyway since it's always connected.
- The HPD pin is wired up correctly for eDP, but we don't really
have to do anything since the events since it's always connected.
- Some HPD pins fire more than once when you connect/disconnect
- etc.Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=39882Signed-off-by: Alex Deucher
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
Commit db64fe02258f ("mm: rewrite vmap layer") introduced code that does
address calculations under the assumption that VMAP_BLOCK_SIZE is a
power of two. However, this might not be true if CONFIG_NR_CPUS is not
set to a power of two.Wrong vmap_block index/offset values could lead to memory corruption.
However, this has never been observed in practice (or never been
diagnosed correctly); what caught this was the BUG_ON in vb_alloc() that
checks for inconsistent vmap_block indices.To fix this, ensure that VMAP_BLOCK_SIZE always is a power of two.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=31572
Reported-by: Pavel Kysilka
Reported-by: Matias A. Fonzo
Signed-off-by: Clemens Ladisch
Signed-off-by: Stefan Richter
Cc: Nick Piggin
Cc: Jeremy Fitzhardinge
Cc: Krzysztof Helt
Cc: Andrew Morton
Cc: 2.6.28+
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: remove unused "ddr" parameter in struct mmc_ios
mmc: dw_mmc: Fix DDR mode support.
mmc: core: use defined R1_STATE_PRG macro for card status
mmc: sdhci: use f_max instead of host->clock for timeouts
mmc: sdhci: move timeout_clk calculation farther down
mmc: sdhci: check host->clock before using it as a denominator
mmc: Revert "mmc: sdhci: Fix SDHCI_QUIRK_TIMEOUT_USES_SDCLK"
mmc: tmio: eliminate unused variable 'mmc' warning
mmc: esdhc-imx: fix card interrupt loss on freescale eSDHC
mmc: sdhci-s3c: Fix build for header change
mmc: dw_mmc: Fix mask in IDMAC_SET_BUFFER1_SIZE macro
mmc: cb710: fix possible pci_dev leak in cb710_pci_configure()
mmc: core: Detect eMMC v4.5 ext_csd entries
mmc: mmc_test: avoid stalled file in debugfs
mmc: sdhci-s3c: add BROKEN_ADMA_ZEROLEN_DESC quirk
mmc: sdhci: pxav3: controller needs 32 bit ADMA addressing
mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish
14 Aug, 2011
27 commits
-
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (ibmaem) add missing kfree
hwmon: (pmbus/lm25066) Ignore byte writes to non-zero pages
hwmon: (pmbus) Virtualize pmbus_write_byte -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Fix compile warning in wm8750.c
ASoC: omap: Update e-mail address of Jarkko Nikula
ASoC: SAMSUNG: Add I2S0 internal dma driver
ASoC: Terminate WM8750 SPI device ID table
ASoC: Add missing break in WM8994 probe
ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc
ALSA: azt3328 - adjust error handling code to include debugging code
ALSA: hda - Add CONFIG_SND_HDA_POWER_SAVE to stac_vrefout_set()
ALSA: usb-audio - Add quirk for BOSS Micro BR-80
ASoC: Fix typo in wm8750 spi_ids
ASoC: Fix warning in Speyside WM8962
ASoC: Fix SPI driver binding for WM8987
ASoC: Fix binding of WM8750 on Jive
ASoC: WM8903: Free IRQ on device removal
ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module
ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS -
Remove the name of Sergey Kostyliov as maintainer of befs.
In the MAINTAINERS file, befs is orphaned.Signed-off-by: Marcos Souza
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Change resource URL to new git tree -
(http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git).Signed-off-by: Ralf Thielow
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Add a documentation file describing the usage of Ramoops
Signed-off-by: Sergiu Iordache
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Add better Thunderbird information.
Add Thunderbird Registry instructions to:
Enable UTF8 & Preformat mode
Disable HTML modeSigned-off-by: Paul McQuade
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
General cleanups to kernel-parameters.txt:
- add missing $ARCH that are being used/referenced
- alphabetize the parameter restrictions list
- spell "IA-64" as listed in arch/ia64/Kconfig instead of "IA64"
- remove trailing whitespace
- use hyphen in 32-bit etc.Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Usually kernel parameters are documented in kernel-parameters.txt
but user_debug is only documented in the Kconfig. Document the
option and point to the Kconfig help text for more info.Signed-off-by: Stephen Boyd
Cc: Russell King
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Dropping LSD (Linux Source Driver) since it hasn't been available
for a long time.Signed-off-by: Luis de Bethencourt
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Fixed a spelling error.
Signed-off-by: Zac Storer
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
"mmc: dw_mmc: Fix DDR mode support" removed the last user.
Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
Host driver can't get a hint of DDR mode through ios->ddr flag anymore.
ios->timing is currently used to inform DDR mode as a substitute.
And capability of MMC_CAP_MMC_HIGHSPEED is added for DDR support.Signed-off-by: Seungwon Jeon
Acked-by: Will Newton
Signed-off-by: Chris Ball -
Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
When timeout_clk is calculated the host->clock could be zero.
So, instead of host->clock the calculation now uses mmc->f_max.Signed-off-by: Andy Shevchenko
Cc: Mark Brown
Signed-off-by: Chris Ball -
This moves the calculation below the assignment of mmc->f_max, which
we need for calculating timeout_clk in the next patch in this series.Signed-off-by: Andy Shevchenko
Signed-off-by: Chris Ball -
Sometimes host->clock could be zero which is a legal situation. This
patch checks host->clock before usage as a denominator when timeout is
calculated. A similar patch is applied for mmc core (see commit e9b8684,
"mmc: fix division by zero in MMC core").Without this patch, the execution of the sdhci_calc_timeout could end up
with a backtrace:[ 4.014319] divide error: 0000 [#1] PREEMPT SMP
[ 4.014352] Modules linked in: g_ether
[ 4.014376]
[ 4.014393] Pid: 33, comm: kworker/u:2 Not tainted 3.0.0+ #646
[ 4.014421] EIP: 0060:[] EFLAGS: 00010046 CPU: 1
[ 4.014449] EIP is at sdhci_calc_timeout+0x2e/0x100
[ 4.014468] EAX: 00000000 EBX: f5930fc8 ECX: 00000000 EDX: 00000000
[ 4.014488] ESI: f5291de8 EDI: f5291db8 EBP: f5291c6c ESP: f5291c50
[ 4.014508] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 4.014529] Process kworker/u:2 (pid: 33, ti=f5290000 task=f53065a0 task.ti=f5290000)
[ 4.014546] Stack:
[ 4.014557] 00000082 c1054fdd f5291c78 04000000 f5930fc8 f5291de8 f5291db8 f5291cac
[ 4.014611] c12fab7c c107a98b f5291c88 c13b6d3f f593109c f5882000 f5291cac c1054fdd
[ 4.014663] 00000000 00000000 f5882000 00000082 f5930fc8 f5291db8 0000000a f5291ccc
[ 4.014716] Call Trace:
[ 4.014743] [] ? mod_timer+0x11d/0x380
[ 4.014770] [] sdhci_prepare_data+0x2c/0x3a0
[ 4.014798] [] ? trace_hardirqs_off+0xb/0x10
[ 4.014827] [] ? _raw_spin_unlock_irqrestore+0x2f/0x60
[ 4.014854] [] ? mod_timer+0x11d/0x380
[ 4.014880] [] sdhci_send_command+0xdb/0x210
[ 4.014906] [] sdhci_request+0xc3/0x150
[ 4.014932] [] mmc_start_request+0xda/0x200
[ 4.014960] [] ? __raw_spin_lock_init+0x32/0x60
[ 4.014989] [] ? __init_waitqueue_head+0x35/0x50
[ 4.015015] [] mmc_wait_for_req+0x7b/0x90
[ 4.015045] [] mmc_send_cxd_data+0xf7/0x130
[ 4.015076] [] ? mmc_erase+0x140/0x140
[ 4.015102] [] mmc_send_ext_csd+0x1d/0x20
[ 4.015125] [] mmc_get_ext_csd+0x70/0x140
[ 4.015151] [] mmc_compare_ext_csds+0x28/0x190
[ 4.015176] [] mmc_init_card+0x24f/0x650
[ 4.015201] [] ? _raw_spin_unlock_irqrestore+0x4d/0x60
[ 4.015226] [] ? trace_hardirqs_on_caller+0x11c/0x160
[ 4.015255] [] mmc_attach_mmc+0xa4/0x190
[ 4.015282] [] mmc_rescan+0x210/0x240
[ 4.015311] [] process_one_work+0x176/0x550
[ 4.015336] [] ? process_one_work+0xfa/0x550
[ 4.015360] [] ? mmc_init_erase+0x140/0x140
[ 4.015385] [] worker_thread+0x12a/0x2c0
[ 4.015410] [] ? manage_workers.clone.18+0x100/0x100
[ 4.015437] [] kthread+0x74/0x80
[ 4.015463] [] ? __init_kthread_worker+0x60/0x60
[ 4.015490] [] kernel_thread_helper+0x6/0xd
[ 4.015507] Code: 57 89 d7 56 53 89 c3 83 ec 10 8b 40 04 8b 72 28 f6 c4 10 89 45 f0 0f 85 91 00 00 00 85 f6 0f 84 c1 00 00 00 8b 4e 04 31 d2 89 c8 73 58 ba d3 4d 62 10 89 c1 8b 06 f7 e2 c1 ea 06 01 d1 f7 45
[ 4.015829] EIP: [] sdhci_calc_timeout+0x2e/0x100 SS:ESP 0068:f5291c50Reported-by: Alexander Shishkin
Signed-off-by: Andy Shevchenko
Signed-off-by: Chris Ball -
This reverts commit 4b01681c7764, which introduced a new potential
divide by zero in the process of fixing one. The subsequent commits
attempt to fix the issue properly.Signed-off-by: Chris Ball
-
Fix below compile warning:
CC drivers/mmc/host/tmio_mmc.o
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_suspend':
drivers/mmc/host/tmio_mmc.c:30: warning: unused variable 'mmc'
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_resume':
drivers/mmc/host/tmio_mmc.c:45: warning: unused variable 'mmc'Signed-off-by: Axel Lin
Acked-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Apply a workaround for the imx eSDHC controller to avoid missing
card interrupts. This makes SDIO work.Signed-off-by: Tony Lin
Signed-off-by: Chris Ball -
A header change has removed an implicit inclusion of module.h, breaking
the build due to the use of THIS_MODULE. Fix that.Signed-off-by: Mark Brown
Signed-off-by: Chris Ball -
The mask used inside this macro was assuming Buffer_Size1's [BS1's]
width to be 14 bits, it is actually 13 bits. Modify masks used in
IDMAC_SET_BUFFER1_SIZE such that they use only 13 bits instead of
current 14.Signed-off-by: Shashidhar Hiremath
Acked-by: Will Newton
Signed-off-by: Chris Ball -
Reported-by: Julia Lawall
Signed-off-by: Michał Mirosław
Signed-off-by: Chris Ball -
The eMMC v4.5 Spec is released now:
EXT_CSD_REV Extended CSD Revision
255-7 Reserved
6 Revision 1.6 (for MMC v4.5)
5 Revision 1.5 (for MMV v4.41)
...Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
During card removal and inserting cycle the test file in the debugfs could be
stalled until the host driver removes it. Let's keep the file in the linked
list and destroy it when card is removed.Signed-off-by: Andy Shevchenko
Acked-by: Per Forlin
Signed-off-by: Chris Ball -
Samsung SoCs need to set BROKEN_ADMA_ZEROLEN_DESC.
(If ADMA operation is more than 65535, maybe set by zero.)Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
Enable the quirk.
(Best used in conjunction with patch downgrading ADMA to SDMA when
transfer is not aligned.)Signed-off-by: Philip Rakity
Acked-by: Zhangfei Gao
Signed-off-by: Chris Ball -
Currently, the retuning timer for retuning mode 1 will be deleted in
function sdhci_tasklet_finish after a mmc request done, which will make
retuning timing never trigger again. This patch fixed this problem.Signed-off-by: Aaron Lu
Reviewed-by: Philip Rakity
Signed-off-by: Chris Ball
13 Aug, 2011
5 commits
-
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
dt: add empty of_get_property for non-dt -
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (30 commits)
USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
USB: Serial: Add device ID for Sierra Wireless MC8305
USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G
usb/host/pci-quirks.c: correct annotation of `ehci_dmi_nohandoff_table'
USB: option driver: add PID for Vodafone-Huawei K4511
USB: option driver: add PID for Vodafone-Huawei K4510
USB: option driver: add PID for Vodafone-Huawei K3771
USB: option driver: add PID for Vodafone-Huawei K3770
usb: serial: ftdi_sio.c: For the FT232H FTDI_SIO_SET_BAUDRATE_REQUEST, index needs to be shifted too
usb/isp1760: Added missing call to usb_hcd_check_unlink_urb() during unlink
USB: EHCI: Fix test mode sequence
USB: ftdi_sio: fix minor typo in get_ftdi_divisor
USB: at91_udc: include linux/prefetch.h explicitly
USB: usb-storage: unusual_devs entry for ARM V2M motherboard.
usb/ehci-mxc: add missing inclusion of mach/hardware.h
USB: assign instead of equal in usbtmc.c
usb: renesas_usbhs: fixup usbhsg_for_each_uep 1st pos
usb: renesas_usbhs: fix DMA build by including dma-mapping.h
usb: gadget: net2272 - Correct includes
usb: musb: fix oops on musb_gadget_pullup
... -
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
zcache: Fix build error when sysfs is not defined
zcache: Use div_u64 for 64-bit division
staging:rts_pstor: fix thread synchronization flow
drivers:staging:solo6x10:add the missed slab.h
staging: zcache: include module.h for MODULE_LICENSE
drivers/staging/hv/blkvsc_drv.c: eliminate NULL pointer dereference
Staging: Add clk API note to nvec/TODO
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: adjust array index
staging: more missing slab.h inclusions
drivers/staging/solo6x10/p2m.c needs slab.h
drivers/staging/solo6x10/core.c needs slab.h
drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h
drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error
Staging: iio: add some unlocks to raw_read() functions
staging: ft1000_proc needs asm/io.h for inw/outw on sparc
staging: rtl8192u: declare MODULE_FIRMWARE
gma500: Fix clashes with DRM updates
staging: zcache: module is GPL
staging: fix zcache building -
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
x86-64: Rework vsyscall emulation and add vsyscall= parameter
x86-64: Wire up getcpu syscall
x86: Remove unnecessary compile flag tweaks for vsyscall code
x86-64: Add vsyscall:emulate_vsyscall trace event
x86-64: Add user_64bit_mode paravirt op
x86-64, xen: Enable the vvar mapping
x86-64: Work around gold bug 13023
x86-64: Move the "user" vsyscall segment out of the data segment.
x86-64: Pad vDSO to a page boundary -
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: replace xfs_buf_geterror() with bp->b_error
xfs: Check the return value of xfs_buf_read() for NULL
"xfs: fix error handling for synchronous writes" revisited
xfs: set cursor in xfs_ail_splice() even when AIL was empty
xfs: Remove the macro XFS_BUFTARG_NAME
xfs: Remove the macro XFS_BUF_TARGET
xfs: Remove the macro XFS_BUF_SET_TARGET
Replace the macro XFS_BUF_ISPINNED with helper xfs_buf_ispinned
xfs: Remove the macro XFS_BUF_SET_PTR
xfs: Remove the macro XFS_BUF_PTR
xfs: Remove macro XFS_BUF_SET_START
xfs: Remove macro XFS_BUF_HOLD
xfs: Remove macro XFS_BUF_BUSY and family
xfs: Remove the macro XFS_BUF_ERROR and family
xfs: Remove the macro XFS_BUF_BFLAGS