Skip to content
Commits on Oct 5, 2011
  1. @torvalds

    Linux 3.1-rc9

    torvalds committed Oct 4, 2011
Commits on Oct 4, 2011
  1. @torvalds

    Merge git://github.com/davem330/net

    torvalds committed Oct 4, 2011
    * 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
  2. @torvalds

    Merge branch 'fix/asoc' of git://github.com/tiwai/sound

    torvalds committed Oct 4, 2011
    * '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
  3. @torvalds

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds committed Oct 4, 2011
    * '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
  4. @torvalds

    Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

    torvalds committed Oct 4, 2011
    * '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
  5. @torvalds

    PCI: Disable MPS configuration by default

    Jon Mason committed with torvalds Oct 3, 2011
    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. drm/radeon/kms: fix channel_remap setup (v2)

    Alex Deucher committed with Dave Airlie Oct 4, 2011
    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>
  7. spi-topcliff-pch: Fix overrun issue

    Tomoya MORINAGA committed with Grant Likely Sep 6, 2011
    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>
  8. spi-topcliff-pch: Add recovery processing in case FIFO overrun error …

    Tomoya MORINAGA committed with Grant Likely Sep 6, 2011
    …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>
  9. spi-topcliff-pch: Fix CPU read complete condition issue

    Tomoya MORINAGA committed with Grant Likely Sep 6, 2011
    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>
  10. spi-topcliff-pch: Fix SSN Control issue

    Tomoya MORINAGA committed with Grant Likely Sep 6, 2011
    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>
  11. spi-topcliff-pch: add tx-memory clear after complete transmitting

    Tomoya MORINAGA committed with Grant Likely Sep 6, 2011
    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>
  12. @tiwai @torvalds

    lis3: fix regression of HP DriveGuard with 8bit chip

    tiwai committed with torvalds Oct 3, 2011
    Commit 2a7fade ("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>
Commits on Oct 3, 2011
  1. @torvalds

    Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

    torvalds committed Oct 3, 2011
    * 'hwmon-for-linus' of git://github.com/groeck/linux:
      hwmon: (coretemp) Avoid leaving around dangling pointer
      hwmon: (coretemp) Fixup platform device ID change
  2. @torvalds

    Merge git://github.com/davem330/ide

    torvalds committed Oct 3, 2011
    * git://github.com/davem330/ide:
      ide-disk: Fix request requeuing
  3. @torvalds

    Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

    torvalds committed Oct 3, 2011
    * 'btrfs-3.0' of git://github.com/chrismason/linux:
      Btrfs: force a page fault if we have a shorty copy on a page boundary
  4. @davem330

    ide-disk: Fix request requeuing

    Borislav Petkov committed with davem330 Oct 3, 2011
    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>
  5. @davem330

    pch_gbe: Fixed the issue on which a network freezes

    Toshiharu Okada committed with davem330 Sep 25, 2011
    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. @davem330

    pch_gbe: Fixed the issue on which PC was frozen when link was downed.

    Toshiharu Okada committed with davem330 Sep 25, 2011
    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>
  7. @wdebruij @davem330

    make PACKET_STATISTICS getsockopt report consistently between ring an…

    wdebruij committed with davem330 Sep 30, 2011
    …d 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>
  8. @dvrabel @davem330

    net: xen-netback: correctly restart Tx after a VM restore/migrate

    dvrabel committed with davem330 Sep 30, 2011
    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 4710304 (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>
  9. @gospo @davem330

    bonding: properly stop queuing work when requested

    gospo committed with davem330 Sep 23, 2011
    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>
  10. drm/radeon: Set cursor x/y to 0 when x/yorigin > 0.

    Michel Dänzer committed with Dave Airlie Sep 30, 2011
    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>
  11. drm/radeon: Update AVIVO cursor coordinate origin before x/yorigin ca…

    Michel Dänzer committed with Dave Airlie Sep 30, 2011
    …lculation.
    
    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>
  12. drm/radeon: Simplify cursor x/yorigin calculation.

    Michel Dänzer committed with Dave Airlie Sep 30, 2011
    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>
  13. @nmiell

    drm/radeon/kms: fix cursor image off-by-one error

    nmiell committed with Dave Airlie Sep 29, 2011
    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>
  14. drm/radeon/kms: Fix logic error in DP HPD handler

    Alex Deucher committed with Dave Airlie Oct 3, 2011
    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>
  15. drm/radeon/kms: add retry limits for native DP aux defer

    Alex Deucher committed with Dave Airlie Oct 3, 2011
    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>
  16. drm/radeon/kms: fix regression in DP aux defer handling

    Alex Deucher committed with Dave Airlie Oct 3, 2011
    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>
  17. @torvalds

    Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6

    torvalds committed Oct 2, 2011
    * 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
      mfd: Fix generic irq chip ack function name for jz4740-adc
  18. @torvalds

    Merge branch 'for-linus' of git://github.com/tiwai/sound

    torvalds committed Oct 2, 2011
    * 'for-linus' of git://github.com/tiwai/sound:
      ALSA: hda - Fix a regression of the position-buffer check
Commits on Oct 2, 2011
  1. @arndb @broonie

    ASoC: omap_mcpdm_remove cannot be __devexit

    arndb committed with broonie Oct 2, 2011
    omap_mcpdm_remove is used from asoc_mcpdm_probe, which is an
    initcall, and must not be discarded when HOTPLUG is disabled.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  2. @AxelLin @broonie

    ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC

    AxelLin committed with broonie Oct 2, 2011
    Current code set update bits for WM8753_LDAC and WM8753_RDAC twice,
    but missed setting update bits for WM8753_LADC and WM8753_RADC.
    
    I think it is a copy-paste bug in commit 776065
    "ASoC: codecs: wm8753: Fix register cache incoherency".
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
  3. @arndb @broonie

    ASoC: use a valid device for dev_err() in Zylonite

    arndb committed with broonie Oct 1, 2011
    A recent conversion has introduced references to &pdev->dev, which does
    not actually exist in all the contexts it's used in.
    
    Replace this with card->dev where necessary, in order to let
    the driver build again.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
  4. @torvalds

    Merge branch 'perf-urgent-for-linus' of git://tesla.tglx.de/git/linux…

    torvalds committed Oct 1, 2011
    …-2.6-tip
    
    * 'perf-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
      perf tools: Fix raw sample reading
Something went wrong with that request. Please try again.