Doug / smarc-fsl-linux-kernel

19 Jul, 2011

5 commits

18 Jul, 2011

7 commits

17 Jul, 2011

1 commit

  • f71d26bb6   watchdog: hpwdt depends on PCI ... Browse Code »

    hpwdt is a PCI driver so it should depend on PCI.
    Fixes these build errors:

    drivers/watchdog/hpwdt.c:762: error: implicit declaration of function 'pci_iomap'
    drivers/watchdog/hpwdt.c:762: warning: assignment makes pointer from integer without a cast
    drivers/watchdog/hpwdt.c:797: error: implicit declaration of function 'pci_iounmap'

    Signed-off-by: Randy Dunlap
    Signed-off-by: Wim Van Sebroeck
    Cc: Thomas Mingarelli

    Randy Dunlap
     

16 Jul, 2011

5 commits

15 Jul, 2011

3 commits

  • 0d9b6e738   r6040: only disable RX interrupt if napi_schedule_prep is successful ... Browse Code »

    When receiving the first RX interrupt before the internal call
    to napi_schedule_prep is successful the RX interrupt gets disabled
    and is never enabled again as the poll function never gets executed.

    Signed-off-by: Michael Thalmeier
    Signed-off-by: David S. Miller

    Michael Thalmeier
     
  • 7e97bbba6   hwmon: (adm1275) Fix coefficients per datasheet revision B ... Browse Code »

    Coefficients to convert chip register values to voltage/current have been
    slightly changed in revision B of the chip datasheet. Update driver coefficients
    to match the coefficients in the datasheet.

    Signed-off-by: Guenter Roeck
    Acked-by: Jean Delvare

    Guenter Roeck
     
  • 62f2a3a48   net: remove NETIF_F_ALL_TX_OFFLOADS ... Browse Code »

    There is no software fallback implemented for SCTP or FCoE checksumming,
    and so it should not be passed on by software devices like bridge or bonding.

    For VLAN devices, this is different. First, the driver for underlying device
    should be prepared to get offloaded packets even when the feature is disabled
    (especially if it advertises it in vlan_features). Second, devices under
    VLANs do not get replaced without tearing down the VLAN first.

    This fixes a mess I accidentally introduced while converting bonding to
    ndo_fix_features.

    NETIF_F_SOFT_FEATURES are removed from BOND_VLAN_FEATURES because they
    are unused as of commit 712ae51afd.

    Signed-off-by: Michał Mirosław
    Signed-off-by: David S. Miller

    Michał Mirosław
     

14 Jul, 2011

10 commits

  • 7fb574a97   Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release Browse Code »
    Len Brown
     
  • 4d2b2956e   ACPI, APEI, HEST, Detect duplicated hardware error source ID ... Browse Code »

    The firmware on some machine will report duplicated hardware error
    source ID in HEST. This is considered a firmware bug. To provide
    better warning message, this patch adds duplicated hardware error
    source ID detecting and corresponding printk.

    This patch fixes #37412 on kernel bugzilla:
    https://bugzilla.kernel.org/show_bug.cgi?id=37412

    Reported-by: marconifabio@ubuntu-it.org
    Signed-off-by: Huang Ying
    Tested-by: Mathias
    Signed-off-by: Len Brown

    Huang Ying
     
  • 51414d410   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
    mmc: core: Bus width testing needs to handle suspend/resume

    Linus Torvalds
     
  • a1ad5ec7f   [media] tuner-core: fix a 2.6.39 regression with mt20xx ... Browse Code »

    As Simon reported, digital TV broke with mt20xx tuner due to
    commit ad020dc2fe9039628cf6cef42cd1b76531ee8411.

    The mt20xx tuner passes V4L2_TUNER_DIGITAL_TV to tuner core. However, the
    check_mode code now doesn't handle it well. Change the logic there to
    avoid the breakage, and fix a test for analog-only at g_tuner.

    Reported-by: Simon Arlott
    Tested-by: Simon Arlott
    Cc: stable@kernel.org
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • 2d1969312   [media] dvb_frontend: fix race condition in stopping/starting frontend ... Browse Code »

    Attached is a patch which addresses a race condition in the DVB core
    related to closing/reopening the DVB frontend device in quick
    succession. This is the reason that devices such as the HVR-1300,
    HVR-3000, and HVR-4000 have been failing to scan properly under MythTV
    and w_scan.

    The gory details of the race are described in the patch.

    Devin

    There is a race condition exhibited when channel scanners such as w_scan and
    MythTV quickly close and then reopen the frontend device node.

    Under normal conditions, the behavior is as follows:

    1. Application closes the device node
    2. DVB frontend ioctl calls dvb_frontend_release which sets
    fepriv->release_jiffies
    3. DVB frontend thread *eventually* calls dvb_frontend_is_exiting() which
    compares fepriv->release_jiffies, and shuts down the thread if timeout has
    expired
    4. Thread goes away
    5. Application opens frontend device
    6. DVB frontend ioctl() calls ts_bus_ctrl(1)
    7. DVB frontend ioctl() creates new frontend thread, which calls
    dvb_frontend_init(), which has demod driver init() routine setup initial
    register state for demod chip.
    8. Tuning request is issued.

    The race occurs when the application in step 5 performs the new open() call
    before the frontend thread is shutdown. In this case the ts_bus_ctrl() call
    is made, which strobes the RESET pin on the demodulator, but the
    dvb_frontend_init() function never gets called because the frontend thread
    hasn't gone away yet. As a result, the initial register config for the demod
    is *never* setup, causing subsequent tuning requests to fail.

    If there is time between the close and open (enough for the dvb frontend
    thread to be torn down), then in that case the new frontend thread is created
    and thus the dvb_frontend_init() function does get called.

    The fix is to set the flag which forces reinitialization if we did in fact
    call ts_bus_ctrl().

    This problem has been seen on the HVR-1300, HVR-3000, and HVR-4000, and is
    likely occuring on other designs as well where ts_bus_ctrl() actually strobes
    the reset pin on the demodulator.

    Note that this patch should supercede any patches submitted for the
    1300/3000/4000 which remove the code that removes GPIO code in
    cx8802_dvb_advise_acquire(), which have been circulating by users for some
    time now...

    Canonical tracking this issue in Launchpad 439163:

    Thanks to Jon Sayers from Hauppauge and Florent Audebert from Anevia S.A. for
    providing hardware to test/debug with.

    Signed-off-by: Devin Heitmueller
    Cc: Jon Sayers
    Cc: Florent Audebert
    Signed-off-by: Mauro Carvalho Chehab

    Devin Heitmueller
     
  • 42a741dcf   [media] media: fix radio-sf16fmr2 build when SND is not enabled ... Browse Code »

    When CONFIG_SND is not enabled, radio-sf16fmr2 build fails with:

    so make this driver depend on SND.

    Signed-off-by: Randy Dunlap
    Cc: Hans Verkuil
    Cc: Mauro Carvalho Chehab
    Cc: linux-media@vger.kernel.org
    Signed-off-by: Mauro Carvalho Chehab

    Randy Dunlap
     
  • c83549019   Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... Browse Code »

    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits
    agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
    drm/radeon/kms: fix typo in read_disabled vbios code
    drm/radeon/kms: use correct BUS_CNTL reg on rs600
    drm/radeon/kms: fix backend map typo on juniper
    drm/radeon/kms: fix regression in hotplug

    Linus Torvalds
     
  • 5d7d5d933   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    slip: fix wrong SLIP6 ifdef-endif placing
    natsemi: fix another dma-debug report
    sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
    net: Fix default in docs for tcp_orphan_retries.
    hso: fix a use after free condition
    net/natsemi: Fix module parameter permissions
    XFRM: Fix memory leak in xfrm_state_update
    sctp: Enforce retransmission limit during shutdown
    mac80211: fix TKIP replay vulnerability
    mac80211: fix ie memory allocation for scheduled scans
    ssb: fix init regression of hostmode PCI core
    rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M
    ath9k: Fix tx throughput drops for AR9003 chips with AES encryption
    carl9170: add NEC WL300NU-AG usbid
    cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
    ath5k: fix incorrect use of drvdata in PCI suspend/resume code
    ath5k: fix incorrect use of drvdata in sysfs code
    Bluetooth: Fix memory leak under page timeouts
    Bluetooth: Fix regression with incoming L2CAP connections
    Bluetooth: Fix hidp disconnect deadlocks and lost wakeup
    ...

    Linus Torvalds
     
  • f39b2dd9d   mmc: core: Bus width testing needs to handle suspend/resume ... Browse Code »

    On reading the ext_csd for the first time (in 1 bit mode), save the
    ext_csd information needed for bus width compare.

    On every pass we make re-reading the ext_csd, compare the data
    against the saved ext_csd data.

    This fixes a regression introduced in 3.0-rc1 by 08ee80cc397ac1a3
    ("mmc: core: eMMC bus width may not work on all platforms"), which
    incorrectly assumed we would be re-reading the ext_csd at resume-
    time.

    Signed-off-by: Philip Rakity
    Tested-by: Jaehoon Chung
    Signed-off-by: Chris Ball

    Philip Rakity
     
  • 07e49a7a3   ACPI: Fix lockdep false positives in acpi_power_off() ... Browse Code »

    All ACPICA locks are allocated by the same function,
    acpi_os_create_lock(), with the help of a local variable called
    "lock". Thus, when lockdep is enabled, it uses "lock" as the
    name of all those locks and regards them as instances of the same
    lock, which causes it to report possible locking problems with them
    when there aren't any.

    To work around this problem, define acpi_os_create_lock() as a macro
    and make it pass its argument to spin_lock_init(), so that lockdep
    uses it as the name of the new lock. Define this macron in a
    Linux-specific file, to minimize the resulting modifications of
    the OS-independent ACPICA parts.

    This change is based on an earlier patch from Andrea Righi and it
    addresses a regression from 2.6.39 tracked as
    https://bugzilla.kernel.org/show_bug.cgi?id=38152

    Signed-off-by: Rafael J. Wysocki
    Reported-and-tested-by: Borislav Petkov
    Tested-by: Andrea Righi
    Reviewed-by: Florian Mickler
    Signed-off-by: Len Brown

    Rafael J. Wysocki
     

13 Jul, 2011

7 commits

  • c61d0af91   drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits ... Browse Code »

    Compute drivers may change this, so make sure to emit it to
    avoid errors in bo blits.

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

    Signed-off-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • 780d7cc44   agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M ... Browse Code »

    Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
    relative to the GMCH specs, and confirmed that indeed one of his users
    with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.

    Signed-off-by: Chris Wilson
    Cc: Konstantin Belousov
    Cc: Daniel Vetter
    Acked-by: Daniel Vetter
    Signed-off-by: Dave Airlie

    Chris Wilson
     
  • 4756fc64e   [media] MEDIA: Fix non-ISA_DMA_API link failure of sound code ... Browse Code »

    sound/isa/es18xx.c: In function ‘snd_es18xx_playback1_prepare’:
    sound/isa/es18xx.c:501:9: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/es18xx.c: In function ‘snd_es18xx_playback_pointer’:
    sound/isa/es18xx.c:818:3: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[2]: *** [sound/isa/es18xx.o] Error 1
    sound/isa/sscape.c: In function ‘upload_dma_data’:
    sound/isa/sscape.c:481:3: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[2]: *** [sound/isa/sscape.o] Error 1
    sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_playback_prepare’:
    sound/isa/ad1816a/ad1816a_lib.c:244:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_playback_pointer’:
    sound/isa/ad1816a/ad1816a_lib.c:302:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    sound/isa/ad1816a/ad1816a_lib.c: In function ‘snd_ad1816a_free’:
    sound/isa/ad1816a/ad1816a_lib.c:544:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/ad1816a/ad1816a_lib.o] Error 1
    make[3]: Target `__build' not remade because of errors.
    make[2]: *** [sound/isa/ad1816a] Error 2
    sound/isa/es1688/es1688_lib.c: In function ‘snd_es1688_playback_prepare’:
    sound/isa/es1688/es1688_lib.c:417:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/es1688/es1688_lib.c: In function ‘snd_es1688_playback_pointer’:
    sound/isa/es1688/es1688_lib.c:509:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/es1688/es1688_lib.o] Error 1
    make[3]: Target `__build' not remade because of errors.
    make[2]: *** [sound/isa/es1688] Error 2
    sound/isa/gus/gus_dma.c: In function ‘snd_gf1_dma_program’:
    sound/isa/gus/gus_dma.c:79:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/gus/gus_dma.c: In function ‘snd_gf1_dma_done’:
    sound/isa/gus/gus_dma.c:177:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/gus/gus_dma.o] Error 1
    sound/isa/gus/gus_pcm.c: In function ‘snd_gf1_pcm_capture_prepare’:
    sound/isa/gus/gus_pcm.c:591:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/gus/gus_pcm.c: In function ‘snd_gf1_pcm_capture_pointer’:
    sound/isa/gus/gus_pcm.c:619:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/gus/gus_pcm.o] Error 1
    make[3]: Target `__build' not remade because of errors.
    make[2]: *** [sound/isa/gus] Error 2
    sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’:
    sound/isa/sb/sb16_csp.c:228:227: error: case label does not reduce to an integer constant
    make[3]: *** [sound/isa/sb/sb16_csp.o] Error 1
    sound/isa/sb/sb16_main.c: In function ‘snd_sb16_playback_prepare’:
    sound/isa/sb/sb16_main.c:276:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/sb/sb16_main.c: In function ‘snd_sb16_playback_pointer’:
    sound/isa/sb/sb16_main.c:456:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/sb/sb16_main.o] Error 1
    sound/isa/sb/sb8_main.c: In function ‘snd_sb8_playback_prepare’:
    sound/isa/sb/sb8_main.c:172:3: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/sb/sb8_main.c: In function ‘snd_sb8_playback_pointer’:
    sound/isa/sb/sb8_main.c:425:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/sb/sb8_main.o] Error 1
    make[3]: Target `__build' not remade because of errors.
    make[2]: *** [sound/isa/sb] Error 2
    sound/isa/wss/wss_lib.c: In function ‘snd_wss_playback_prepare’:
    sound/isa/wss/wss_lib.c:1025:2: error: implicit declaration of function ‘snd_dma_program’ [-Werror=implicit-function-declaration]
    sound/isa/wss/wss_lib.c: In function ‘snd_wss_playback_pointer’:
    sound/isa/wss/wss_lib.c:1160:2: error: implicit declaration of function ‘snd_dma_pointer’ [-Werror=implicit-function-declaration]
    sound/isa/wss/wss_lib.c: In function ‘snd_wss_free’:
    sound/isa/wss/wss_lib.c:1695:3: error: implicit declaration of function ‘snd_dma_disable’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[3]: *** [sound/isa/wss/wss_lib.o] Error 1
    warning: (RADIO_MIROPCM20) selects SND_ISA which has unmet direct dependencies (SOUND && !M68K && SND && ISA && ISA_DMA_API)

    A build with ISA && ISA_DMA && !ISA_DMA_API results in:
    CC sound/isa/es18xx.o
    CC sound/isa/sscape.o
    CC sound/isa/ad1816a/ad1816a_lib.o
    CC sound/isa/es1688/es1688_lib.o
    CC sound/isa/gus/gus_dma.o
    CC sound/isa/gus/gus_pcm.o
    CC sound/isa/sb/sb16_csp.o
    CC sound/isa/sb/sb16_main.o
    CC sound/isa/sb/sb8_main.o
    CC sound/isa/wss/wss_lib.o

    The root cause for this is hidden in this Kconfig warning:

    Adding a dependency on ISA_DMA_API to RADIO_MIROPCM20 fixes these issues.

    Signed-off-by: Ralf Baechle
    Acked-by: Takashi Iwai
    Signed-off-by: Mauro Carvalho Chehab

    Ralf Baechle
     
  • 8d86e5f91   Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    powerpc/mm: Fix memory_block_size_bytes() for non-pseries
    mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header

    Linus Torvalds
     
  • d93a881dd   Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting
    ARM: pxa/raumfeld: fix device name for codec ak4104
    ARM: pxa/raumfeld: display initialisation fixes
    ARM: pxa/raumfeld: adapt to upcoming hardware change
    ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace
    genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
    arm: mach-vt8500: add forgotten irq_data conversion
    ARM: pxa168: correct nand pmu setting
    ARM: pxa910: correct nand pmu setting
    ARM: pxa: fix PGSR register address calculation

    Linus Torvalds
     
  • d1ca1a004   Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 ... Browse Code »

    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
    drm/i915/ringbuffer: Idling requires waiting for the ring to be empty
    Revert "drm/i915: enable rc6 by default"
    drm/i915: Clean up i915_driver_load failure path
    drm/i915: Enable GPU reset on Ivybridge.
    drm/i915/dp: manage sink power state if possible
    drm/i915/dp: consolidate AUX retry code
    drm/i915/dp: remove DPMS mode tracking from DP
    drm/i915/dp: try to read receiver capabilities 3 times when detecting
    drm/i915/dp: read more receiver capability bits on hotplug
    drm/i915/dp: use DP DPCD defines when looking at DPCD values
    drm/i915/dp: retry link status read 3 times on failure

    Linus Torvalds
     
  • a94919ead   drm/i915/ringbuffer: Idling requires waiting for the ring to be empty ... Browse Code »

    ...which is measured by the size and not the amount of space remaining.

    Waiting upon size-8, did one of two things. In the common case with more
    than 8 bytes available to write into the ring, it would return
    immediately. Otherwise, it would timeout given the impossible condition
    of waiting for more space than is available in the ring, leading to
    warnings such as:

    [drm:intel_cleanup_ring_buffer] *ERROR* failed to quiesce render ring
    whilst cleaning up: -16

    Signed-off-by: Chris Wilson
    Reviewed-by: Eric Anholt
    Signed-off-by: Keith Packard

    Chris Wilson
     

12 Jul, 2011

2 commits

  • 05bd42688   Revert "drm/i915: enable rc6 by default" ... Browse Code »

    This reverts commit a51f7a66fb5e4af5ec4286baef940d06594b59d2.

    We still have a few Ironlake and Sandybridge machines which fail when
    RC6 is enabled. Better luck next release?

    Signed-off-by: Keith Packard

    Keith Packard
     
  • a7b85d2aa   drm/i915: Clean up i915_driver_load failure path ... Browse Code »

    i915_driver_load adds a write-combining MTRR region for the GTT
    aperture to improve memory speeds through the aperture. If
    i915_driver_load fails after this, it would not have cleaned up the
    MTRR. This shouldn't cause any problems, except for consuming an MTRR
    register. Still, it's best to clean up completely in the failure path,
    which is easily done by calling mtrr_del if the mtrr was successfully
    allocated.

    i915_driver_load calls i915_gem_load which register
    i915_gem_inactive_shrink. If i915_driver_load fails after calling
    i915_gem_load, the shrinker will be left registered. When called, it
    will access freed memory and crash. The fix is to unregister the shrinker in the
    failure path using code duplicated from i915_driver_unload.

    i915_driver_load also has some incorrect gotos in the error cleanup
    paths:

    * After failing to initialize the GTT (which cannot happen, btw,
    intel_gtt_get returns a fixed (non-NULL) value), it tries to
    free the uninitialized WC IO mapping. Fixed this by changing the
    target from out_iomapfree to out_rmmap

    Signed-off-by: Keith Packard
    Tested-by: Lin Ming

    Keith Packard