Commit be1f16ba authored by Linus Torvalds's avatar Linus Torvalds

Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "More MIPS fixes for 4.14:

   - Loongson 1: Set the default number of RX and TX queues to
     accomodate for recent changes of stmmac driver.

   - BPF: Fix uninitialised target compiler error.

   - Fix cmpxchg on 32 bit signed ints for 64 bit kernels with
     !kernel_uses_llsc

   - Fix generic-board-config.sh for builds using O=

   - Remove pr_err() calls from fpu_emu() for a case which is not a
     kernel error"

* '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: math-emu: Remove pr_err() calls from fpu_emu()
  MIPS: Fix generic-board-config.sh for builds using O=
  MIPS: Fix cmpxchg on 32b signed ints for 64b kernel with !kernel_uses_llsc
  MIPS: loongson1: set default number of rx and tx queues for stmmac
  MIPS: bpf: Fix uninitialised target compiler error
parents 9aa0d2dd ca8eb05b
...@@ -155,14 +155,16 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, ...@@ -155,14 +155,16 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
return __cmpxchg_small(ptr, old, new, size); return __cmpxchg_small(ptr, old, new, size);
case 4: case 4:
return __cmpxchg_asm("ll", "sc", (volatile u32 *)ptr, old, new); return __cmpxchg_asm("ll", "sc", (volatile u32 *)ptr,
(u32)old, new);
case 8: case 8:
/* lld/scd are only available for MIPS64 */ /* lld/scd are only available for MIPS64 */
if (!IS_ENABLED(CONFIG_64BIT)) if (!IS_ENABLED(CONFIG_64BIT))
return __cmpxchg_called_with_bad_pointer(); return __cmpxchg_called_with_bad_pointer();
return __cmpxchg_asm("lld", "scd", (volatile u64 *)ptr, old, new); return __cmpxchg_asm("lld", "scd", (volatile u64 *)ptr,
(u64)old, new);
default: default:
return __cmpxchg_called_with_bad_pointer(); return __cmpxchg_called_with_bad_pointer();
......
...@@ -183,18 +183,20 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) ...@@ -183,18 +183,20 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv)
} }
static struct plat_stmmacenet_data ls1x_eth0_pdata = { static struct plat_stmmacenet_data ls1x_eth0_pdata = {
.bus_id = 0, .bus_id = 0,
.phy_addr = -1, .phy_addr = -1,
#if defined(CONFIG_LOONGSON1_LS1B) #if defined(CONFIG_LOONGSON1_LS1B)
.interface = PHY_INTERFACE_MODE_MII, .interface = PHY_INTERFACE_MODE_MII,
#elif defined(CONFIG_LOONGSON1_LS1C) #elif defined(CONFIG_LOONGSON1_LS1C)
.interface = PHY_INTERFACE_MODE_RMII, .interface = PHY_INTERFACE_MODE_RMII,
#endif #endif
.mdio_bus_data = &ls1x_mdio_bus_data, .mdio_bus_data = &ls1x_mdio_bus_data,
.dma_cfg = &ls1x_eth_dma_cfg, .dma_cfg = &ls1x_eth_dma_cfg,
.has_gmac = 1, .has_gmac = 1,
.tx_coe = 1, .tx_coe = 1,
.init = ls1x_eth_mux_init, .rx_queues_to_use = 1,
.tx_queues_to_use = 1,
.init = ls1x_eth_mux_init,
}; };
static struct resource ls1x_eth0_resources[] = { static struct resource ls1x_eth0_resources[] = {
...@@ -222,14 +224,16 @@ struct platform_device ls1x_eth0_pdev = { ...@@ -222,14 +224,16 @@ struct platform_device ls1x_eth0_pdev = {
#ifdef CONFIG_LOONGSON1_LS1B #ifdef CONFIG_LOONGSON1_LS1B
static struct plat_stmmacenet_data ls1x_eth1_pdata = { static struct plat_stmmacenet_data ls1x_eth1_pdata = {
.bus_id = 1, .bus_id = 1,
.phy_addr = -1, .phy_addr = -1,
.interface = PHY_INTERFACE_MODE_MII, .interface = PHY_INTERFACE_MODE_MII,
.mdio_bus_data = &ls1x_mdio_bus_data, .mdio_bus_data = &ls1x_mdio_bus_data,
.dma_cfg = &ls1x_eth_dma_cfg, .dma_cfg = &ls1x_eth_dma_cfg,
.has_gmac = 1, .has_gmac = 1,
.tx_coe = 1, .tx_coe = 1,
.init = ls1x_eth_mux_init, .rx_queues_to_use = 1,
.tx_queues_to_use = 1,
.init = ls1x_eth_mux_init,
}; };
static struct resource ls1x_eth1_resources[] = { static struct resource ls1x_eth1_resources[] = {
......
...@@ -2558,7 +2558,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2558,7 +2558,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
break; break;
default: default:
/* Reserved R6 ops */ /* Reserved R6 ops */
pr_err("Reserved MIPS R6 CMP.condn.S operation\n");
return SIGILL; return SIGILL;
} }
} }
...@@ -2719,7 +2718,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2719,7 +2718,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
break; break;
default: default:
/* Reserved R6 ops */ /* Reserved R6 ops */
pr_err("Reserved MIPS R6 CMP.condn.D operation\n");
return SIGILL; return SIGILL;
} }
} }
......
...@@ -667,7 +667,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, ...@@ -667,7 +667,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
{ {
int src, dst, r, td, ts, mem_off, b_off; int src, dst, r, td, ts, mem_off, b_off;
bool need_swap, did_move, cmp_eq; bool need_swap, did_move, cmp_eq;
unsigned int target; unsigned int target = 0;
u64 t64; u64 t64;
s64 t64s; s64 t64s;
int bpf_op = BPF_OP(insn->code); int bpf_op = BPF_OP(insn->code);
......
...@@ -30,8 +30,6 @@ cfg="$4" ...@@ -30,8 +30,6 @@ cfg="$4"
boards_origin="$5" boards_origin="$5"
shift 5 shift 5
cd "${srctree}"
# Only print Skipping... lines if the user explicitly specified BOARDS=. In the # Only print Skipping... lines if the user explicitly specified BOARDS=. In the
# general case it only serves to obscure the useful output about what actually # general case it only serves to obscure the useful output about what actually
# was included. # was included.
...@@ -48,7 +46,7 @@ environment*) ...@@ -48,7 +46,7 @@ environment*)
esac esac
for board in $@; do for board in $@; do
board_cfg="arch/mips/configs/generic/board-${board}.config" board_cfg="${srctree}/arch/mips/configs/generic/board-${board}.config"
if [ ! -f "${board_cfg}" ]; then if [ ! -f "${board_cfg}" ]; then
echo "WARNING: Board config '${board_cfg}' not found" echo "WARNING: Board config '${board_cfg}' not found"
continue continue
...@@ -84,7 +82,7 @@ for board in $@; do ...@@ -84,7 +82,7 @@ for board in $@; do
done || continue done || continue
# Merge this board config fragment into our final config file # Merge this board config fragment into our final config file
./scripts/kconfig/merge_config.sh \ ${srctree}/scripts/kconfig/merge_config.sh \
-m -O ${objtree} ${cfg} ${board_cfg} \ -m -O ${objtree} ${cfg} ${board_cfg} \
| grep -Ev '^(#|Using)' | grep -Ev '^(#|Using)'
done done
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment