Commit f0d2ead9 authored Jul 13, 2017 by Peter Maydell

Merge remote-tracking branch 'remotes/yongbok/tags/mips-20170711' into staging



MIPS patches 2017-07-11

Changes:
* Fix MSA copy_[s|u]_df corner case of rd = 0
* Update malta to load the initrd at the end of the low memory

# gpg: Signature made Tue 11 Jul 2017 15:42:20 BST
# gpg:                using RSA key 0x2238EB86D5F797C2
# gpg: Good signature from "Yongbok Kim <yongbok.kim@imgtec.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8600 4CF5 3415 A5D9 4CFA  2B5C 2238 EB86 D5F7 97C2

* remotes/yongbok/tags/mips-20170711:
  mips/malta: load the initrd at the end of the low memory
  target/mips: fix msa copy_[s|u]_df rd = 0 corner case

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 6e2c4633 9768e2ab

hw/mips/mips_malta.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -841,8 +841,9 @@ static int64_t load_kernel (void)
		if (loaderparams.initrd_filename) {
		initrd_size = get_image_size (loaderparams.initrd_filename);
		if (initrd_size > 0) {
		initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK;
		if (initrd_offset + initrd_size > ram_size) {
		initrd_offset = (loaderparams.ram_low_size - initrd_size
		- ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK;
		if (kernel_high >= initrd_offset) {
		fprintf(stderr,
		"qemu: memory too small for initial ram disk '%s'\n",
		loaderparams.initrd_filename);

target/mips/translate.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -18712,10 +18712,14 @@ static void gen_msa_elm_df(CPUMIPSState env, DisasContext ctx, uint32_t df,
		#endif
		switch (MASK_MSA_ELM(ctx->opcode)) {
		case OPC_COPY_S_df:
		if (likely(wd != 0)) {
		gen_helper_msa_copy_s_df(cpu_env, tdf, twd, tws, tn);
		}
		break;
		case OPC_COPY_U_df:
		if (likely(wd != 0)) {
		gen_helper_msa_copy_u_df(cpu_env, tdf, twd, tws, tn);
		}
		break;
		case OPC_INSERT_df:
		gen_helper_msa_insert_df(cpu_env, tdf, twd, tws, tn);