Commit be1f16ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/mips/include/asm/cmpxchg.h

+4 −2
Original line number Diff line number Diff line
@@ -155,14 +155,16 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, 
		return __cmpxchg_small(ptr, old, new, size);



	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:

		/* lld/scd are only available for MIPS64 */

		if (!IS_ENABLED(CONFIG_64BIT))

			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:

		return __cmpxchg_called_with_bad_pointer();

arch/mips/loongson32/common/platform.c

+21 −17
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ static struct plat_stmmacenet_data ls1x_eth0_pdata = { 
	.dma_cfg		= &ls1x_eth_dma_cfg,

	.has_gmac		= 1,

	.tx_coe			= 1,

	.rx_queues_to_use	= 1,

	.tx_queues_to_use	= 1,

	.init			= ls1x_eth_mux_init,

};
@@ -229,6 +231,8 @@ static struct plat_stmmacenet_data ls1x_eth1_pdata = { 
	.dma_cfg		= &ls1x_eth_dma_cfg,

	.has_gmac		= 1,

	.tx_coe			= 1,

	.rx_queues_to_use	= 1,

	.tx_queues_to_use	= 1,

	.init			= ls1x_eth_mux_init,

};

arch/mips/math-emu/cp1emu.c

+0 −2
Original line number Diff line number Diff line
@@ -2558,7 +2558,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.S operation\n");

					return SIGILL;

				}

			}
@@ -2719,7 +2718,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.D operation\n");

					return SIGILL;

				}

			}

arch/mips/net/ebpf_jit.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	bool need_swap, did_move, cmp_eq;

	unsigned int target;

	unsigned int target = 0;

	u64 t64;

	s64 t64s;

	int bpf_op = BPF_OP(insn->code);

arch/mips/tools/generic-board-config.sh

+2 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ cfg="$4" 
boards_origin="$5"

shift 5



cd "${srctree}"



# 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

# was included.
@@ -48,7 +46,7 @@ environment*) 
esac



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

		echo "WARNING: Board config '${board_cfg}' not found"

		continue
@@ -84,7 +82,7 @@ for board in $@; do 
	done || continue



	# 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} \

		| grep -Ev '^(#|Using)'

done

CRA Git | Maintained and supported by SUSTech CRA and CCSE