Skip to content
  1. Aug 03, 2011
  2. Aug 02, 2011
  3. Aug 01, 2011
  4. Jul 29, 2011
  5. Jul 28, 2011
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 55f9c40f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        n2_crypto: Attach on Niagara-T3.
        n2rng: Attach on Niagara-T3.
        sparc: Detect and handle UltraSPARC-T3 cpu types.
        sparc: Don't do expensive hypervisor PCR write unless necessary.
        sparc: Add T3 sun4v cpu type and hypervisor group defines.
        sparc: Don't leave sparc_pmu_type NULL on sun4v.
      55f9c40f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d5eab915
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits)
        tg3: Remove 5719 jumbo frames and TSO blocks
        tg3: Break larger frags into 4k chunks for 5719
        tg3: Add tx BD budgeting code
        tg3: Consolidate code that calls tg3_tx_set_bd()
        tg3: Add partial fragment unmapping code
        tg3: Generalize tg3_skb_error_unmap()
        tg3: Remove short DMA check for 1st fragment
        tg3: Simplify tx bd assignments
        tg3: Reintroduce tg3_tx_ring_info
        ASIX: Use only 11 bits of header for data size
        ASIX: Simplify condition in rx_fixup()
        Fix cdc-phonet build
        bonding: reduce noise during init
        bonding: fix string comparison errors
        net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared
        net: add IFF_SKB_TX_SHARED flag to priv_flags
        net: sock_sendmsg_nosec() is static
        forcedeth: fix vlans
        gianfar: fix bug caused by 87c288c6
        gro: Only reset frag0 when skb can be pulled
        ...
      d5eab915
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 6140333d
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md: (75 commits)
        md/raid10: handle further errors during fix_read_error better.
        md/raid10: Handle read errors during recovery better.
        md/raid10: simplify read error handling during recovery.
        md/raid10: record bad blocks due to write errors during resync/recovery.
        md/raid10:  attempt to fix read errors during resync/check
        md/raid10:  Handle write errors by updating badblock log.
        md/raid10: clear bad-block record when write succeeds.
        md/raid10: avoid writing to known bad blocks on known bad drives.
        md/raid10 record bad blocks as needed during recovery.
        md/raid10: avoid reading known bad blocks during resync/recovery.
        md/raid10 - avoid reading from known bad blocks - part 3
        md/raid10: avoid reading from known bad blocks - part 2
        md/raid10: avoid reading from known bad blocks - part 1
        md/raid10: Split handle_read_error out from raid10d.
        md/raid10: simplify/reindent some loops.
        md/raid5: Clear bad blocks on successful write.
        md/raid5.  Don't write to known bad block on doubtful devices.
        md/raid5: write errors should be recorded as bad blocks if possible.
        md/raid5: use bad-block log to improve handling of uncorrectable read errors.
        md/raid5: avoid reading from known bad blocks.
        ...
      6140333d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 6f56c218
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        sound: oss: rename local change_bits to avoid powerpc bitsops.h definition
        ALSA: hda - Fix duplicated DAC assignments for Realtek
        ALSA: asihpi - off by one in asihpi_hpi_ioctl()
        ALSA: hda - Fix Oops with Realtek quirks with NULL adc_nids
        ALSA: asihpi - bug fix pa use before init.
        ALSA: hda - Add support for vref-out based mute LED control on IDT codecs
      6f56c218
    • David S. Miller's avatar
      n2_crypto: Attach on Niagara-T3. · eb7caf35
      David S. Miller authored
      
      
      A small modification was necessary since in the machine description
      for 'n2cp' and 'ncp' nodes, there no longer is an 'intr' property.
      
      That's OK because this property was always nothing more than an
      array of integers '1' ... 'nr_inos + 1' so we can just compute it
      in-place.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eb7caf35
    • David S. Miller's avatar
      n2rng: Attach on Niagara-T3. · 24f14669
      David S. Miller authored
      
      
      And stop referring to Victoria Falls, as the attribute we're
      talking about is whether the rng is multi-unit capable which
      applies to several chip variants now.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      24f14669
    • Matt Carlson's avatar
      tg3: Remove 5719 jumbo frames and TSO blocks · a0512944
      Matt Carlson authored
      
      
      The A0 revision of this chip is the only device that requires these
      features to be disabled.
      
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a0512944
    • Matt Carlson's avatar
      tg3: Break larger frags into 4k chunks for 5719 · e31aa987
      Matt Carlson authored
      
      
      The 5719 has bug where RDMAs larger than 4k can cause problems.  This
      patch works around the problem by dividing larger DMA requests into
      something the hardware can handle.
      
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e31aa987
    • Matt Carlson's avatar
      tg3: Add tx BD budgeting code · 84b67b27
      Matt Carlson authored
      
      
      As the driver breaks large skb fragments into smaller submissions to the
      hardware, there is a new danger that BDs might get exhausted before all
      fragments have been mapped.  This patch adds code to make sure tx BDs
      aren't oversubscribed and flag the condition if it happens.
      
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      84b67b27
    • Matt Carlson's avatar
      tg3: Consolidate code that calls tg3_tx_set_bd() · d1a3b737
      Matt Carlson authored
      
      
      This patch consolidates all code that populates tx BDs into a single
      routine.  Setting tx BDs needs to be more carefully controlled to see if
      workarounds need to be applied.
      
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1a3b737
    • Matt Carlson's avatar
      tg3: Add partial fragment unmapping code · e01ee14d
      Matt Carlson authored
      
      
      The following patches are going to break skb fragments into smaller
      sizes.  This patch attempts to make the change easier to digest by only
      addressing the skb teardown portion.
      
      The patch modifies the driver to skip over any BDs that have a flag set
      that indicates the BD isn't the beginning of an skb fragment.  Such BDs
      were a result of segmentation and do not need a pci_unmap_page() call.
      
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e01ee14d