1. 02 May, 2013 18 commits
    • Wei Liu's avatar
      xen-netback: remove redundent parameter in netbk_count_requests · ac69c26e
      Wei Liu authored
      Tracking down from the caller, first_idx is always equal to vif->tx.req_cons.
      Remove it to avoid confusion.
      Suggested-by: default avatarJan Beulich <jbeulich@suse.com>
      Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
      Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac69c26e
    • Somnath Kotur's avatar
      be2net: Fix to fail probe if MSI-X enable fails for a VF · c2bba3df
      Somnath Kotur authored
      As per SPEC, INTx mode is not supported on VFs. So if enable_msix fails,
      then just fail probe. Also bail out of be_open if irq_register fails.
      Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c2bba3df
    • Somnath Kotur's avatar
      be2net: avoid napi_disable() when it has not been enabled · 04d3d624
      Somnath Kotur authored
      When RQ creation fails in be_open(), driver jumps to be_close() where
      napi_disable() is done without a prior napi_enable(); leading to a hang.
      This change is needed as there is no way to see if napi is enable/disabled.
      Signed-off-by: default avatarKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04d3d624
    • Somnath Kotur's avatar
      be2net: Fix firmware download for Lancer · 701962d0
      Somnath Kotur authored
      Increasing the timeout value of write_object command to 60 seconds as
      30 second timeout was found to be not enough for the command to complete.
      Signed-off-by: default avatarKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      701962d0
    • Ajit Khaparde's avatar
      be2net: Fix to receive Multicast Packets when Promiscuous mode is enabled on certain devices · c5dae588
      Ajit Khaparde authored
      When a user requests Promiscuous mode on SkyHawk-R devices,
      the FW enables Desparate Promiscuous mode.
      Due to this, we need to explicitly enable Multicast Promiscuous mode
      so that Multicast packets are received as well.
      
      This patch fixes that.
      Signed-off-by: default avatarAjit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c5dae588
    • Ajit Khaparde's avatar
      be2net: Fix to show tx priority pause counter in ethtool -S · b5adffc4
      Ajit Khaparde authored
      The tx priority pause count is available with the driver.
      But we were not showing it.
      This change should fix it and display it in ethtool stats.
      Signed-off-by: default avatarAjit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b5adffc4
    • Ajit Khaparde's avatar
      be2net: Fix to use 32-bit stats to report rx_drops_no_fragment · a6c578ef
      Ajit Khaparde authored
      Only BE devices provide 16-bit counter for rx_drops_no_fragment.
      All other devices provide a 32-bit counter for this stat.
      Use the 32-bit value where available.
      Signed-off-by: default avatarAjit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a6c578ef
    • Ajit Khaparde's avatar
      be2net: Fix to use version 2 of cq_create for SkyHawk-R devices · bbdc42f8
      Ajit Khaparde authored
      SkyHawk-R devices should use v2 of cq_create command.
      BE3/BE2 devices can use version 0 of the command to create a CQ.
      Signed-off-by: default avatarAjit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bbdc42f8
    • Bjørn Mork's avatar
      b29d3145
    • Patrick McHardy's avatar
    • Linus Torvalds's avatar
      Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 99c6bcf4
      Linus Torvalds authored
      Pull ARM SoC multiplatform updates from Olof Johansson:
       "More multiplatform enablement for ARM platforms.  The ones converted
        in this branch are:
      
         - bcm2835
         - cns3xxx
         - sirf
         - nomadik
         - msx
         - spear
         - tegra
         - ux500
      
        We're getting close to having most of them converted!
      
        One of the larger platforms remaining is Samsung Exynos, and there are
        a bunch of supporting patches in this merge window for it.  There was
        a patch in this branch to a early version of multiplatform conversion,
        but it ended up being reverted due to need of more bake time.  The
        revert commit is part of the branch since it would have required
        rebasing multiple dependent branches and they were stable by then"
      
      * tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms
        clocksource: nomadik-mtu: fix up clocksource/timer
        Revert "ARM: exynos: enable multiplatform support"
        ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
        ARM: exynos: enable multiplatform support
        rtc: s3c: make header file local
        mtd: onenand/samsung: make regs-onenand.h file local
        thermal/exynos: remove unnecessary header inclusions
        mmc: sdhci-s3c: remove platform dependencies
        ARM: samsung: move mfc device definition to s5p-dev-mfc.c
        ARM: exynos: move debug-macro.S to include/debug/
        ARM: exynos: prepare for sparse IRQ
        ARM: exynos: introduce EXYNOS_ATAGS symbol
        ARM: tegra: build assembly files with -march=armv7-a
        ARM: Push selects for TWD/SCU into machine entries
        ARM: ux500: build hotplug.o for ARMv7-a
        ARM: ux500: move to multiplatform
        ARM: ux500: make remaining headers local
        ARM: ux500: make irqs.h local to platform
        ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
        ...
      99c6bcf4
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 97b1007a
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "This branch contains part 1 of the platform updates for 3.10.  Among
        the highlights:
      
         - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
         - New support for CSR SiRFatlas6 SoCs
         - A handful of updates for NVidia T114 (a.k.a. Tegra 4)
         - A bunch of updates for the shmobile platforms
         - A handful of updates for davinci
         - A few updates for Qualcomm MSM
         - Plus a handful of other patches, defconfig updates, etc."
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
        ARM: tegra: pm: fix build error w/o PM_SLEEP
        ARM: davinci: ensure global variables are declared
        ARM: davinci: sram.c: fix incorrect type in assignment
        ARM: davinci: da8xx dt: make file local symbols static
        ARM: davinci: da8xx: add remoteproc support
        ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
        ARM: socfpga: Add clock entries into device tree
        ARM: socfpga: Enable soft reset
        ARM: EXYNOS: replace cpumask by the corresponding macro
        ARM: EXYNOS: handle properly the return values
        ARM: EXYNOS: factor out the idle states
        ARM: OMAP4: Enable fix for Cortex-A9 erratas
        ARM: OMAP2+: Export SoC information to userspace
        ARM: OMAP2+: SoC name and revision unification
        ARM: OMAP2+: Move common part of late init into common function
        ARM: tegra: pm: remove duplicated include from pm.c
        ARM: davinci: da850: override mmc DT node device name
        ARM: davinci: da850: add mmc DT entries
        mmc: davinci_mmc: add DT support
        ARM: SAMSUNG: check processor type before cache restoration in resume
        ...
      97b1007a
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfab34aa
      Linus Torvalds authored
      Pull ARM SoC device-tree updates from Olof Johansson:
       "Part 1 of device-tree updates for 3.10.  The bulk of the churn in this
        branch is due to i.MX moving from C-defined pin control over to device
        tree, which is a one-time conversion that will allow greater
        flexibility down the road.
      
        Besides that, there's PCI-e bindings for Marvell mvebu platforms and a
        handful of cleanups to tegra due to the new include file functionality
        of the device tree compiler"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (113 commits)
        arm: mvebu: PCIe Device Tree informations for Armada XP GP
        arm: mvebu: PCIe Device Tree informations for Armada 370 DB
        arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
        arm: mvebu: PCIe Device Tree informations for Armada XP DB
        arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
        arm: mvebu: add PCIe Device Tree informations for Armada XP
        arm: mvebu: add PCIe Device Tree informations for Armada 370
        ARM: sunxi: unify osc24M_fixed and osc24M
        arm: vt8500: Add SDHC support to WM8505 DT
        ARM: dts: Add a 64 bits version of the skeleton device tree
        ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
        ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
        ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
        ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
        ARM: dts: imx6dl-wandboard: Add USB Host support
        ARM: dts: imx51 cpu node
        ARM: dts: Add missing imx27-phytec-phycore dtb target
        ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
        ARM: i.MX51: Add PATA support
        ARM: dts: Add initial support for Wandboard Dual-Lite
        ...
      dfab34aa
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a7726350
      Linus Torvalds authored
      Pull ARM SoC cleanup from Olof Johansson:
       "Here is a collection of cleanup patches.  Among the pieces that stand
        out are:
      
         - The deletion of h720x platforms
         - Split of at91 non-dt platforms to their own Kconfig file to keep
           them separate
         - General cleanups and refactoring of i.MX and MXS platforms
         - Some restructuring of clock tables for OMAP
         - Convertion of PMC driver for Tegra to dt-only
         - Some renames of sunxi -> sun4i (Allwinner A10)
         - ... plus a bunch of other stuff that I haven't mentioned"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
        ARM: i.MX: remove unused ARCH_* configs
        ARM i.MX53: remove platform ahci support
        ARM: sunxi: Rework the restart code
        irqchip: sunxi: Rename sunxi to sun4i
        irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
        clocksource: sunxi: Rename sunxi to sun4i
        clocksource: sunxi: make use of CLKSRC_OF
        clocksource: sunxi: Cleanup the timer code
        ARM: at91: remove trailing semicolon from macros
        ARM: at91/setup: fix trivial typos
        ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
        ARM: EXYNOS: change the name of USB ohci header
        ARM: SAMSUNG: Remove unnecessary code for dma
        ARM: S3C24XX: Remove unused GPIO drive strength register definitions
        ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
        ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
        ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
        ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
        ...
      a7726350
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4d26aa30
      Linus Torvalds authored
      Pull ARM SoC non-critical fixes from Olof Johansson:
       "Here is a collection of fixes (and some intermixed cleanups) that were
        considered less important and thus not included in the later parts of
        the 3.9-rc cycle.
      
        It's a bit all over the map, contents wise.  A series of ux500 fixes
        and cleanups, a bunch of various fixes for OMAP and tegra, and some
        for Freescale i.MX and even Qualcomm MSM.
      
        Note that there's also a patch on this branch to globally turn off
        -Wmaybe-uninitialized when building with -Os.  It's been posted
        several times by Arnd and no dissent was raised, but nobody seemed
        interested to pick it up.  So here it is, as the topmost patch."
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        Turn off -Wmaybe-uninitialized when building with -Os
        ARM: orion5x: include linux/cpu.h
        ARM: tegra: call cpu_do_idle from C code
        ARM: u300: fix ages old copy/paste bug
        ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7
        ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled
        ARM: tegra: fix relocation truncated error when THUMB2_KERNEL enabled
        ARM: tegra: fix build error when THUMB2_KERNEL enabled
        ARM: msm: Fix uncompess.h tx underrun check
        ARM: vexpress: Remove A9 PMU compatible values for non-A9 platforms
        ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: mach-imx: mach-imx6q: Fix sparse warnings
        ARM: mach-imx: src: Include "common.h
        ARM: mach-imx: gpc: Include "common.h"
        ARM: mach-imx: avic: Staticize *avic_base
        ARM: mach-imx: tzic: Staticize *tzic_base
        ARM: mach-imx: clk: Include "clk.h"
        ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
        ...
      4d26aa30
    • Al Viro's avatar
      ipc_schedule_free() can do vfree() directly now · 600fe975
      Al Viro authored
      Commit 32fcfd40 ("make vfree() safe to call from interrupt
      contexts") made it safe to do vfree directly from the RCU callback,
      which allows us to simplify ipc/util.c a lot by getting rid of the
      differences between vmalloc/kmalloc memory.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      600fe975
    • David Miller's avatar
      net: Restore NETIF_F_* bit ordering. · 4ada8db3
      David Miller authored
      Commit 8ad227ff ("net: vlan: add 802.1ad support") added some new
      NETIF_F_* features bits, but it added them in the middle of existing
      values.
      
      Userland depends upon the flag bits via the per-netdevice 'flags' sysfs
      file.
      
      So restore the previous ordering by adding the new flags at the end.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4ada8db3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 20b4fb48
      Linus Torvalds authored
      Pull VFS updates from Al Viro,
      
      Misc cleanups all over the place, mainly wrt /proc interfaces (switch
      create_proc_entry to proc_create(), get rid of the deprecated
      create_proc_read_entry() in favor of using proc_create_data() and
      seq_file etc).
      
      7kloc removed.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
        don't bother with deferred freeing of fdtables
        proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
        proc: Make the PROC_I() and PDE() macros internal to procfs
        proc: Supply a function to remove a proc entry by PDE
        take cgroup_open() and cpuset_open() to fs/proc/base.c
        ppc: Clean up scanlog
        ppc: Clean up rtas_flash driver somewhat
        hostap: proc: Use remove_proc_subtree()
        drm: proc: Use remove_proc_subtree()
        drm: proc: Use minor->index to label things, not PDE->name
        drm: Constify drm_proc_list[]
        zoran: Don't print proc_dir_entry data in debug
        reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
        proc: Supply an accessor for getting the data from a PDE's parent
        airo: Use remove_proc_subtree()
        rtl8192u: Don't need to save device proc dir PDE
        rtl8187se: Use a dir under /proc/net/r8180/
        proc: Add proc_mkdir_data()
        proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
        proc: Move PDE_NET() to fs/proc/proc_net.c
        ...
      20b4fb48
  2. 01 May, 2013 22 commits