07 Oct, 2011

1 commit

  • * git://github.com/davem330/net:
    net: fix typos in Documentation/networking/scaling.txt
    bridge: leave carrier on for empty bridge
    netfilter: Use proper rwlock init function
    tcp: properly update lost_cnt_hint during shifting
    tcp: properly handle md5sig_pool references
    macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode

    Linus Torvalds
     

06 Oct, 2011

4 commits


05 Oct, 2011

12 commits

  • This reverts commit 71c86ce59791bcd67af937bbea719a508079d7c2.
    The 21UX2 does have touchstrips, but they are in a somewhat-
    hidden location.

    Signed-off-by: Jason Gerecke
    Acked-by: Ping Cheng
    Signed-off-by: Dmitry Torokhov

    Jason Gerecke
     
  • Packets should always be forwarded to the lowerdev using dev_forward_skb.
    vlan->forward is for packets being forwarded directly to another macvlan/
    macvtap device (used for multicast in bridge mode).

    Reported-and-tested-by: Shlomo Pongratz
    Signed-off-by: David Ward
    Signed-off-by: David S. Miller

    David Ward
     
  • * 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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • 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
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Jon Mason
     
  • 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
    Reviewed-by: Michel Dänzer
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • 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
    Signed-off-by: Grant Likely

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

    Signed-off-by: Tomoya MORINAGA
    Signed-off-by: Grant Likely

    Tomoya MORINAGA
     
  • 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
    Signed-off-by: Grant Likely

    Tomoya MORINAGA
     
  • 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
    Signed-off-by: Grant Likely

    Tomoya MORINAGA
     
  • 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
    Signed-off-by: Grant Likely

    Tomoya MORINAGA
     

04 Oct, 2011

14 commits

  • 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
    Cc: Eric Piel
    Cc: Samu Onkalo
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

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

    Linus Torvalds
     
  • 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
    Cc: [ 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
    Signed-off-by: David S. Miller

    Borislav Petkov
     
  • 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
    Signed-off-by: David S. Miller

    Toshiharu Okada
     
  • 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
    Signed-off-by: David S. Miller

    Toshiharu Okada
     
  • 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
    Cc: Ian Campbell
    Acked-by: Ian Campbell
    Signed-off-by: David S. Miller

    David Vrabel
     
  • 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
    Reported-by: Liang Zheng
    Signed-off-by: David S. Miller

    Andy Gospodarek
     
  • Apart from the obvious cleanup, this should make the line

    cursor_end = x - xorigin + w;

    correct now.

    Signed-off-by: Michel Dänzer
    Reviewed-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Michel Dänzer
     
  • 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
    Cc: stable@kernel.org
    Reviewed-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Michel Dänzer
     
  • Signed-off-by: Michel Dänzer
    Reviewed-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Michel Dänzer
     
  • 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
    Reviewed-by: Michel Dänzer
    Reviewed-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Nicholas Miell
     
  • 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
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • 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

    Signed-off-by: Alex Deucher
    Cc: Brad Campbell
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • 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

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

    Signed-off-by: Alex Deucher
    Cc: Brad Campbell
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     

03 Oct, 2011

3 commits

  • * 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
    mfd: Fix generic irq chip ack function name for jz4740-adc

    Linus Torvalds
     
  • When a wide port is being utilized to a target, if one disables only one
    of the
    phys, we get an OS crash:

    BUG: unable to handle kernel NULL pointer dereference at
    0000000000000238
    IP: [] mutex_lock+0x21/0x50
    PGD 4103f5067 PUD 41dba9067 PMD 0
    Oops: 0002 [#1] SMP
    last sysfs file: /sys/bus/pci/slots/5/address
    CPU 0
    Modules linked in: pm8001(U) ses enclosure fuse nfsd exportfs autofs4
    ipmi_devintf ipmi_si ipmi_msghandler nfs lockd fscache nfs_acl
    auth_rpcgss 8021q fcoe libfcoe garp libfc scsi_transport_fc stp scsi_tgt
    llc sunrpc cpufreq_ondemand acpi_cpufreq freq_table ipv6 sr_mod cdrom
    dm_mirror dm_region_hash dm_log uinput sg i2c_i801 i2c_core iTCO_wdt
    iTCO_vendor_support e1000e mlx4_ib ib_mad ib_core mlx4_en mlx4_core ext3
    jbd mbcache sd_mod crc_t10dif usb_storage ata_generic pata_acpi ata_piix
    libsas(U) scsi_transport_sas dm_mod [last unloaded: pm8001]

    Modules linked in: pm8001(U) ses enclosure fuse nfsd exportfs autofs4
    ipmi_devintf ipmi_si ipmi_msghandler nfs lockd fscache nfs_acl
    auth_rpcgss 8021q fcoe libfcoe garp libfc scsi_transport_fc stp scsi_tgt
    llc sunrpc cpufreq_ondemand acpi_cpufreq freq_table ipv6 sr_mod cdrom
    dm_mirror dm_region_hash dm_log uinput sg i2c_i801 i2c_core iTCO_wdt
    iTCO_vendor_support e1000e mlx4_ib ib_mad ib_core mlx4_en mlx4_core ext3
    jbd mbcache sd_mod crc_t10dif usb_storage ata_generic pata_acpi ata_piix
    libsas(U) scsi_transport_sas dm_mod [last unloaded: pm8001]
    Pid: 5146, comm: scsi_wq_5 Not tainted
    2.6.32-71.29.1.el6.lustre.7.x86_64 #1 Storage Server
    RIP: 0010:[] []
    mutex_lock+0x21/0x50
    RSP: 0018:ffff8803e4e33d30 EFLAGS: 00010246
    RAX: 0000000000000000 RBX: 0000000000000238 RCX: 0000000000000000
    RDX: 0000000000000000 RSI: ffff8803e664c800 RDI: 0000000000000238
    RBP: ffff8803e4e33d40 R08: 0000000000000000 R09: 0000000000000000
    R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000
    R13: 0000000000000238 R14: ffff88041acb7200 R15: ffff88041c51ada0
    FS: 0000000000000000(0000) GS:ffff880028200000(0000)
    knlGS:0000000000000000
    CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
    CR2: 0000000000000238 CR3: 0000000410143000 CR4: 00000000000006f0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process scsi_wq_5 (pid: 5146, threadinfo ffff8803e4e32000, task
    ffff8803e4e294a0)
    Stack:
    ffff8803e664c800 0000000000000000 ffff8803e4e33d70 ffffffffa001f06e
    ffff8803e4e33d60 ffff88041c51ada0 ffff88041acb7200 ffff88041bc0aa00
    ffff8803e4e33d90 ffffffffa0032b6c 0000000000000014 ffff88041acb7200
    Call Trace:
    [] sas_port_delete_phy+0x2e/0xa0 [scsi_transport_sas]
    [] sas_unregister_devs_sas_addr+0xac/0xe0 [libsas]
    [] sas_ex_revalidate_domain+0x204/0x330 [libsas]
    [] ? sas_revalidate_domain+0x0/0x90 [libsas]
    [] sas_revalidate_domain+0x65/0x90 [libsas]
    [] worker_thread+0x170/0x2a0
    [] ? autoremove_wake_function+0x0/0x40
    [] ? worker_thread+0x0/0x2a0
    [] kthread+0x96/0xa0
    [] child_rip+0xa/0x20
    [] ? kthread+0x0/0xa0
    [] ? child_rip+0x0/0x20
    Code: ff ff 85 c0 75 ed eb d6 66 90 55 48 89 e5 48 83 ec 10 48 89 1c 24
    4c 89 64 24 08 0f 1f 44 00 00 48 89 fb e8 92 f4 ff ff 48 89 df ff
    0f 79 05 e8 25 00 00 00 65 48 8b 04 25 08 cc 00 00 48 2d
    RIP [] mutex_lock+0x21/0x50
    RSP
    CR2: 0000000000000238

    The following patch is admittedly a band-aid, and does not solve the
    root cause, but it still is a good candidate for hardening as a pointer
    check before reference.

    Signed-off-by: Mark Salyzyn
    Tested-by: Jack Wang
    Cc: stable@kernel.org
    Signed-off-by: James Bottomley

    Mark Salyzyn
     
  • I hit a crash in qla2x00_abort_all_cmds() if the qla2xxx module is
    unloaded right after it is loaded. I debugged this down to the abort
    handling improperly treating a command of type SRB_ADISC_CMD as if it
    had a bsg_job to complete when that command actually uses the iocb_cmd
    part of the union. (I guess to hit this one has to unload the module
    while the async FC initialization is still in progress)

    It seems we should only look for a bsg_job if type is SRB_ELS_CMD_RPT,
    SRB_ELS_CMD_HST or SRB_CT_CMD, so switch the test to make that explicit.

    Signed-off-by: Roland Dreier
    Acked-by: Chad Dupuis
    Cc: stable@kernel.org
    Signed-off-by: James Bottomley

    Roland Dreier
     

30 Sep, 2011

3 commits


29 Sep, 2011

3 commits

  • If request_irq fails, the ibmveth driver will overwrite
    the rc and end up returning a successful rc on its open
    function, resulting in an oops later when a packet gets
    sent and buffers are not allocated due to the failed open.

    Signed-off-by: Brian King
    Signed-off-by: David S. Miller

    Brian King
     
  • Fix EEH recovery on new P Series platform by
    requesting fundamental reset.

    Signed-off-by: Divy Le Ray
    Signed-off-by: David S. Miller

    Divy Le Ray
     
  • The driver has two warning messages that might be triggered
    by normal use cases. When they appear, the messages give the
    impression of a never ending series of errors.

    This commit changes them to debug messages instead.

    Signed-off-by: Richard Cochran
    Signed-off-by: David S. Miller

    Richard Cochran