1. 05 7月, 2013 2 次提交
  2. 01 7月, 2013 20 次提交
  3. 29 6月, 2013 1 次提交
  4. 22 6月, 2013 7 次提交
    • T
      MIPS: microMIPS: Fix POOL16C minor opcode enum · dfb033f0
      Tony Wu 提交于
      As pointed out by Maciej, POOL16C minor opcodes were mostly shifted
      by one bit. Correct those opcodes, and also add jraddiusp to the enum.
      Signed-off-by: NTony Wu <tung7970@gmail.com>
      Cc: Maciej W. Rozycki <macro@linux-mips.org>
      Acked-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: david.daney@cavium.com
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5527/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      dfb033f0
    • M
      MIPS: sibyte: Declare the cfe_write() buffer as constant · 39b6f3aa
      Markos Chandras 提交于
      The write() prototype expects a const char * as argument so declare
      it as such.
      
      Fixes the following build problem:
      
      arch/mips/sibyte/common/cfe_console.c:23:5: error: passing argument 2 of
      'cfe_write' discards 'const' qualifier from pointer target type [-Werror]
      arch/mips/sibyte/common/cfe_console.c:34:4: error: passing argument 2 of
      'cfe_write' makes pointer from integer without a cast [-Werror]
      Signed-off-by: NMarkos Chandras <markos.chandras@imgtec.com>
      Acked-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: sibyte-users@bitmover.com
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5485/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      39b6f3aa
    • D
      MIPS/OCTEON: Override default address space layout. · 9b1f812a
      David Daney 提交于
      OCTEON II cannot execute code in the default CAC_BASE space, so we
      supply a value (0x8000000000000000) that does work.
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5457/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      9b1f812a
    • S
      MIPS: malta: Remove software reset defines from generic header. · b72d9a4e
      Steven J. Hill 提交于
      Remove the software reset register and reset value definitions
      from the 'include/asm/mips-boards/generic.h' header file. Also
      clean up header and whitespace in platform file.
      Signed-off-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5456/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      b72d9a4e
    • R
      MIPS: IP27: Fix build errors with CONFIG_PCI disabled. · 73ec78b0
      Ralf Baechle 提交于
        LD      init/built-in.o
      arch/mips/built-in.o: In function `xtalk_probe_node':
      (.cpuinit.text+0x67c): undefined reference to `bridge_probe'
      arch/mips/built-in.o: In function `xtalk_probe_node':
      (.cpuinit.text+0x7d8): undefined reference to `bridge_probe'
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      73ec78b0
    • R
      MIPS: IP27: Fix build error with CONFIG_MAPPED_KERNEL · 28963b1e
      Ralf Baechle 提交于
      Some of the TLB bit definitions in <asm/pgtable-bits.h> have become rather
      complex and are no longer usable from assembler resulting in an
      explosion like this:
      
        AS      arch/mips/kernel/head.o
      arch/mips/kernel/head.S: Assembler messages:
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: Illegal operands `li $12,(((1<<((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1))|(1<<(((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1))|(5<<(((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1)+1)))>>6)'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: Illegal operands `li $12,(((1<<((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1))|(1<<(((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1))|(1<<((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1))|(5<<(((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1)+1)))>>6)'
      make[2]: *** [arch/mips/kernel/head.o] Error 1
      
      Since now MAPPED_KERNEL_SETUP_TLB is in platform-specific code it's safe
      to hardcode the TLB bits there.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      28963b1e
    • R
      MIPS: Move gas macro MAPPED_KERNEL_SETUP_TLB to IP27-specific code. · 23946ef1
      Ralf Baechle 提交于
      It's IP27-specific and can only cause trouble in head.S.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      23946ef1
  5. 18 6月, 2013 7 次提交
    • D
      MIPS: Octeon: Fix build error if CONFIG_BUG=n · 368b0625
      David Daney 提交于
        CC      init/do_mounts.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/linux/skbuff.h:33,
                       from include/linux/icmpv6.h:4,
                       from include/linux/ipv6.h:59,
                       from include/net/ipv6.h:16,
                       from include/linux/sunrpc/clnt.h:26,
                       from include/linux/nfs_fs.h:30,
                       from init/do_mounts.c:30:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: warning: no return statement in function returning non-void [-Wreturn-type]
        LD      init/mounts.o
        CC      init/init_task.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/linux/skbuff.h:33,
                       from include/linux/netfilter.h:5,
                       from include/net/netns/netfilter.h:5,
                       from include/net/net_namespace.h:20,
                       from include/linux/init_task.h:14,
                       from init/init_task.c:1:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: warning: no return statement in function returning non-void [-Wreturn-type]
        LD      init/built-in.o
        CC      arch/mips/cavium-octeon/setup.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/asm-generic/pci-dma-compat.h:7,
                       from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/pci.h:129,
                       from include/linux/pci.h:1451,
                       from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/octeon/pci-octeon.h:12,
                       from arch/mips/cavium-octeon/setup.c:41:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: error: no return statement in function returning non-void [-Werror=return-type]
      cc1: all warnings being treated as errors
      make[2]: *** [arch/mips/cavium-octeon/setup.o] Error 1
      make[1]: *** [arch/mips/cavium-octeon] Error 2
      make: *** [arch/mips] Error 2
      
      [ralf@linux-mips.org: while at it, also include <linux/bug.h> directly.]
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5519/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      368b0625
    • R
      c8d5c685
    • R
      cfceb5e2
    • R
      cfb9a4e7
    • R
      f746caa3
    • E
      net: add socket option for low latency polling · dafcc438
      Eliezer Tamir 提交于
      adds a socket option for low latency polling.
      This allows overriding the global sysctl value with a per-socket one.
      Unexport sysctl_net_ll_poll since for now it's not needed in modules.
      Signed-off-by: NEliezer Tamir <eliezer.tamir@linux.intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dafcc438
    • P
      MIPS: MSP71xx: Remove gpio drivers · b8061134
      Paul Bolle 提交于
      The PMC MSP71XX gpio drivers were added in v2.6.28, see commit
      9fa32c6b ("MIPS: PMC MSP71XX gpio drivers"). They are only built if
      CONFIG_HAVE_GPIO_LIB is set.
      
      But the Kconfig symbol HAVE_GPIO_LIB was already removed in v2.6.27, see
      commit 7444a72e ("gpiolib: allow user-selection"). So these drivers
      were never buildable. Perhaps no-one noticed because there are no in
      tree users of msp71xx_init_gpio() and msp71xx_init_gpio_extended().
      Anyhow, these drivers can safely be removed.
      Signed-off-by: NPaul Bolle <pebolle@tiscali.nl>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/5345/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      b8061134
  6. 14 6月, 2013 1 次提交
    • F
      bcm63xx_enet: add support Broadcom BCM6345 Ethernet · 3dc6475c
      Florian Fainelli 提交于
      This patch adds support for the Broadcom BCM6345 SoC Ethernet. BCM6345
      has a slightly different and older DMA engine which requires the
      following modifications:
      
      - the width of the DMA channels on BCM6345 is 64 bytes vs 16 bytes,
        which means that the helpers enet_dma{c,s} need to account for this
        channel width and we can no longer use macros
      
      - BCM6345 DMA engine does not have any internal SRAM for transfering
        buffers
      
      - BCM6345 buffer allocation and flow control is not per-channel but
        global (done in RSET_ENETDMA)
      
      - the DMA engine bits are right-shifted by 3 compared to other DMA
        generations
      
      - the DMA enable/interrupt masks are a little different (we need to
        enabled more bits for 6345)
      
      - some register have the same meaning but are offsetted in the ENET_DMAC
        space so a lookup table is required to return the proper offset
      
      The MAC itself is identical and requires no modifications to work.
      Signed-off-by: NFlorian Fainelli <florian@openwrt.org>
      Acked-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3dc6475c
  7. 13 6月, 2013 2 次提交