[Bug 1885718] [NEW] qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found duplicate branches for 'if' and 'else'

[Bug 1885718] [NEW] qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found duplicate branches for 'if' and 'else'

[dcb]

Public bug reported:

Source code is

    if (other_tc == other->current_tc) {
        tccause = other->CP0_Cause;
    } else {
        tccause = other->CP0_Cause;
    }

** Affects: qemu
     Importance: Undecided
         Status: New

-- 
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1885718

Title:
  qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found
  duplicate branches for 'if' and 'else'

Status in QEMU:
  New

Bug description:
  Source code is

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1885718/+subscriptions

[Bug 1885718] Re: qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found duplicate branches for 'if' and 'else'

[Aleksandar Markovic]

*** This bug is a duplicate of bug 1856706 ***
    https://bugs.launchpad.net/bugs/1856706

Thank you for reporting this!

Believe it or not, this has been a know issue to us for a while. We
contacted the original contributor, and he says he can't recall what he
actually meant when he wrote the segment. We left it as is until he
remembers. However, this seems not likely to happen, and probably we
will issue a fix soon. In any case, it is good that you reported it,
many thanks!

-- 
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1885718

Title:
  qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found
  duplicate branches for 'if' and 'else'

Status in QEMU:
  New

Bug description:
  Source code is

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1885718/+subscriptions

[Bug 1885718] Re: qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found duplicate branches for 'if' and 'else'

[Philippe Mathieu-Daudé]

*** This bug is a duplicate of bug 1856706 ***
    https://bugs.launchpad.net/bugs/1856706

You already reported that 6 months ago:
https://bugs.launchpad.net/qemu/+bug/1856706

** This bug has been marked a duplicate of bug 1856706
   target/mips/op_helper.c:971:duplicated branches ?

-- 
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1885718

Title:
  qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found
  duplicate branches for 'if' and 'else'

Status in QEMU:
  New

Bug description:
  Source code is

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1885718/+subscriptions

[PATCH 0/5] MIPS patches queue for 5.1 soft freeze

[Philippe Mathieu-Daudé]

This series contains the current MIPS patch queue:
- Remove unused/unbuilt device (unfortunately the machine won't be
  merged in time for the 5.1 release)
- Trivial fix for LP bug #1885718
- Urgent removal of inactive maintainers
- Huacai Chen and Jiaxun Yang designated as new maintainers

If nothing new appears, I plan to send the pull request during the
week-end.

Regards,

Phil.

Aleksandar Markovic (4):
  target/mips: Remove identical if/else branches
  MAINTAINERS: Adjust MIPS maintainership (remove Aurelien Jarno)
  MAINTAINERS: Adjust MIPS maintainership (remove Paul Burton)
  MAINTAINERS: Adjust MIPS maintainership (Add Huacai Chen & Jiaxun
    Yang)

Philippe Mathieu-Daudé (1):
  Revert "hw/intc: Add Loongson LIOINTC support"

 hw/intc/loongson_liointc.c | 242 -------------------------------------
 target/mips/cp0_helper.c   |   9 +-
 MAINTAINERS                |  12 +-
 hw/intc/Kconfig            |   3 -
 hw/intc/Makefile.objs      |   1 -
 5 files changed, 6 insertions(+), 261 deletions(-)
 delete mode 100644 hw/intc/loongson_liointc.c

Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Paul Burton <paulburton@kernel.org>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Yunqiang Su <ysu@wavecomp.com>

-- 
2.21.3

[PATCH 1/5] Revert "hw/intc: Add Loongson LIOINTC support"

[Philippe Mathieu-Daudé]

Aleksandar Markovic said the "[Loongson-3 virtual platforms]
machine, for multiple reasons, will not be accepted in 5.1." [*].

As this file file is not buildable/testable neither, remove it
from the repository. Re-introducing it later with the rest of the
machine will be as easy as reverting this very commit.

This reverts commit c012e0b1f9121f3d8d2315af4dfd63084ea23faa.

[*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718416.html

Cc: Huacai Chen <chenhc@lemote.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reported-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/intc/loongson_liointc.c | 242 -------------------------------------
 MAINTAINERS                |   1 -
 hw/intc/Kconfig            |   3 -
 hw/intc/Makefile.objs      |   1 -
 4 files changed, 247 deletions(-)
 delete mode 100644 hw/intc/loongson_liointc.c

diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c
deleted file mode 100644
index 23ca51cc2e..0000000000
--- a/hw/intc/loongson_liointc.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * QEMU Loongson Local I/O interrupt controler.
- *
- * Copyright (c) 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "qemu/osdep.h"
-#include "hw/sysbus.h"
-#include "qemu/module.h"
-#include "hw/irq.h"
-#include "hw/qdev-properties.h"
-
-#define D(x)
-
-#define NUM_IRQS                32
-
-#define NUM_CORES               4
-#define NUM_IPS                 4
-#define NUM_PARENTS             (NUM_CORES * NUM_IPS)
-#define PARENT_COREx_IPy(x, y)  (NUM_IPS * x + y)
-
-#define R_MAPPER_START          0x0
-#define R_MAPPER_END            0x20
-#define R_ISR                   R_MAPPER_END
-#define R_IEN                   0x24
-#define R_IEN_SET               0x28
-#define R_IEN_CLR               0x2c
-#define R_PERCORE_ISR(x)        (0x40 + 0x8 * x)
-#define R_END                   0x64
-
-#define TYPE_LOONGSON_LIOINTC "loongson.liointc"
-#define LOONGSON_LIOINTC(obj) \
-        OBJECT_CHECK(struct loongson_liointc, (obj), TYPE_LOONGSON_LIOINTC)
-
-struct loongson_liointc {
-    SysBusDevice parent_obj;
-
-    MemoryRegion mmio;
-    qemu_irq parent_irq[NUM_PARENTS];
-
-    uint8_t mapper[NUM_IRQS]; /* 0:3 for core, 4:7 for IP */
-    uint32_t isr;
-    uint32_t ien;
-    uint32_t per_core_isr[NUM_CORES];
-
-    /* state of the interrupt input pins */
-    uint32_t pin_state;
-    bool parent_state[NUM_PARENTS];
-};
-
-static void update_irq(struct loongson_liointc *p)
-{
-    uint32_t irq, core, ip;
-    uint32_t per_ip_isr[NUM_IPS] = {0};
-
-    /* level triggered interrupt */
-    p->isr = p->pin_state;
-
-    /* Clear disabled IRQs */
-    p->isr &= p->ien;
-
-    /* Clear per_core_isr */
-    for (core = 0; core < NUM_CORES; core++) {
-        p->per_core_isr[core] = 0;
-    }
-
-    /* Update per_core_isr and per_ip_isr */
-    for (irq = 0; irq < NUM_IRQS; irq++) {
-        if (!(p->isr & (1 << irq))) {
-            continue;
-        }
-
-        for (core = 0; core < NUM_CORES; core++) {
-            if ((p->mapper[irq] & (1 << core))) {
-                p->per_core_isr[core] |= (1 << irq);
-            }
-        }
-
-        for (ip = 0; ip < NUM_IPS; ip++) {
-            if ((p->mapper[irq] & (1 << (ip + 4)))) {
-                per_ip_isr[ip] |= (1 << irq);
-            }
-        }
-    }
-
-    /* Emit IRQ to parent! */
-    for (core = 0; core < NUM_CORES; core++) {
-        for (ip = 0; ip < NUM_IPS; ip++) {
-            int parent = PARENT_COREx_IPy(core, ip);
-            if (p->parent_state[parent] !=
-                (!!p->per_core_isr[core] && !!per_ip_isr[ip])) {
-                p->parent_state[parent] = !p->parent_state[parent];
-                qemu_set_irq(p->parent_irq[parent], p->parent_state[parent]);
-            }
-        }
-    }
-}
-
-static uint64_t
-liointc_read(void *opaque, hwaddr addr, unsigned int size)
-{
-    struct loongson_liointc *p = opaque;
-    uint32_t r = 0;
-
-    /* Mapper is 1 byte */
-    if (size == 1 && addr < R_MAPPER_END) {
-        r = p->mapper[addr];
-        goto out;
-    }
-
-    /* Rest is 4 byte */
-    if (size != 4 || (addr % 4)) {
-        goto out;
-    }
-
-    if (addr >= R_PERCORE_ISR(0) &&
-        addr < R_PERCORE_ISR(NUM_CORES)) {
-        int core = (addr - R_PERCORE_ISR(0)) / 4;
-        r = p->per_core_isr[core];
-        goto out;
-    }
-
-    switch (addr) {
-    case R_ISR:
-        r = p->isr;
-        break;
-    case R_IEN:
-        r = p->ien;
-        break;
-    default:
-        break;
-    }
-
-out:
-    D(qemu_log("%s: size=%d addr=%lx val=%x\n", __func__, size, addr, r));
-    return r;
-}
-
-static void
-liointc_write(void *opaque, hwaddr addr,
-          uint64_t val64, unsigned int size)
-{
-    struct loongson_liointc *p = opaque;
-    uint32_t value = val64;
-
-    D(qemu_log("%s: size=%d, addr=%lx val=%x\n", __func__, size, addr, value));
-
-    /* Mapper is 1 byte */
-    if (size == 1 && addr < R_MAPPER_END) {
-        p->mapper[addr] = value;
-        goto out;
-    }
-
-    /* Rest is 4 byte */
-    if (size != 4 || (addr % 4)) {
-        goto out;
-    }
-
-    if (addr >= R_PERCORE_ISR(0) &&
-        addr < R_PERCORE_ISR(NUM_CORES)) {
-        int core = (addr - R_PERCORE_ISR(0)) / 4;
-        p->per_core_isr[core] = value;
-        goto out;
-    }
-
-    switch (addr) {
-    case R_IEN_SET:
-        p->ien |= value;
-        break;
-    case R_IEN_CLR:
-        p->ien &= ~value;
-        break;
-    default:
-        break;
-    }
-
-out:
-    update_irq(p);
-}
-
-static const MemoryRegionOps pic_ops = {
-    .read = liointc_read,
-    .write = liointc_write,
-    .endianness = DEVICE_NATIVE_ENDIAN,
-    .valid = {
-        .min_access_size = 1,
-        .max_access_size = 4
-    }
-};
-
-static void irq_handler(void *opaque, int irq, int level)
-{
-    struct loongson_liointc *p = opaque;
-
-    p->pin_state &= ~(1 << irq);
-    p->pin_state |= level << irq;
-    update_irq(p);
-}
-
-static void loongson_liointc_init(Object *obj)
-{
-    struct loongson_liointc *p = LOONGSON_LIOINTC(obj);
-    int i;
-
-    qdev_init_gpio_in(DEVICE(obj), irq_handler, 32);
-
-    for (i = 0; i < NUM_PARENTS; i++) {
-        sysbus_init_irq(SYS_BUS_DEVICE(obj), &p->parent_irq[i]);
-    }
-
-    memory_region_init_io(&p->mmio, obj, &pic_ops, p,
-                         "loongson.liointc", R_END);
-    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &p->mmio);
-}
-
-static const TypeInfo loongson_liointc_info = {
-    .name          = TYPE_LOONGSON_LIOINTC,
-    .parent        = TYPE_SYS_BUS_DEVICE,
-    .instance_size = sizeof(struct loongson_liointc),
-    .instance_init = loongson_liointc_init,
-};
-
-static void loongson_liointc_register_types(void)
-{
-    type_register_static(&loongson_liointc_info);
-}
-
-type_init(loongson_liointc_register_types)
diff --git a/MAINTAINERS b/MAINTAINERS
index dec252f38b..f463b83d7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1100,7 +1100,6 @@ Loongson-3 virtual platforms
 M: Huacai Chen <chenhc@lemote.com>
 R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 S: Maintained
-F: hw/intc/loongson_liointc.c
 
 Boston
 M: Paul Burton <pburton@wavecomp.com>
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 2ae1e89497..f562342bab 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -64,6 +64,3 @@ config OMPIC
 
 config RX_ICU
     bool
-
-config LOONGSON_LIOINTC
-    bool
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index 3ac2b40fbb..a4202636d4 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -51,4 +51,3 @@ obj-$(CONFIG_MIPS_CPS) += mips_gic.o
 obj-$(CONFIG_NIOS2) += nios2_iic.o
 obj-$(CONFIG_OMPIC) += ompic.o
 obj-$(CONFIG_IBEX) += ibex_plic.o
-obj-$(CONFIG_LOONGSON_LIOINTC) += loongson_liointc.o
-- 
2.21.3

[PATCH 2/5] target/mips: Remove identical if/else branches

[Philippe Mathieu-Daudé]

From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

Remove the segment:

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

Original contributor can't remember what was his intention.

Fixes: 5a25ce9487 ("mips: Hook in more reg accesses via mttr/mftr")
Buglink: https://bugs.launchpad.net/qemu/+bug/1885718
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-2-aleksandar.qemu.devel@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Bug 1885718 <1885718@bugs.launchpad.net>

 target/mips/cp0_helper.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c
index bbf12e4a97..de64add038 100644
--- a/target/mips/cp0_helper.c
+++ b/target/mips/cp0_helper.c
@@ -375,16 +375,9 @@ target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
 target_ulong helper_mftc0_cause(CPUMIPSState *env)
 {
     int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-    int32_t tccause;
     CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc);
 
-    if (other_tc == other->current_tc) {
-        tccause = other->CP0_Cause;
-    } else {
-        tccause = other->CP0_Cause;
-    }
-
-    return tccause;
+    return other->CP0_Cause;
 }
 
 target_ulong helper_mftc0_status(CPUMIPSState *env)
-- 
2.21.3

[Bug 1885718] [PATCH 2/5] target/mips: Remove identical if/else branches

[Philippe Mathieu-Daudé]

*** This bug is a duplicate of bug 1856706 ***
    https://bugs.launchpad.net/bugs/1856706

From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

Remove the segment:

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

Original contributor can't remember what was his intention.

Fixes: 5a25ce9487 ("mips: Hook in more reg accesses via mttr/mftr")
Buglink: https://bugs.launchpad.net/qemu/+bug/1885718
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-2-aleksandar.qemu.devel@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Bug 1885718 <1885718@bugs.launchpad.net>

 target/mips/cp0_helper.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c
index bbf12e4a97..de64add038 100644
--- a/target/mips/cp0_helper.c
+++ b/target/mips/cp0_helper.c
@@ -375,16 +375,9 @@ target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
 target_ulong helper_mftc0_cause(CPUMIPSState *env)
 {
     int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-    int32_t tccause;
     CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc);
 
-    if (other_tc == other->current_tc) {
-        tccause = other->CP0_Cause;
-    } else {
-        tccause = other->CP0_Cause;
-    }
-
-    return tccause;
+    return other->CP0_Cause;
 }
 
 target_ulong helper_mftc0_status(CPUMIPSState *env)
-- 
2.21.3

-- 
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1885718

Title:
  qemu/target/mips/op_helper.c:943:5: style:inconclusive: Found
  duplicate branches for 'if' and 'else'

Status in QEMU:
  New

Bug description:
  Source code is

      if (other_tc == other->current_tc) {
          tccause = other->CP0_Cause;
      } else {
          tccause = other->CP0_Cause;
      }

To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1885718/+subscriptions

[PATCH 3/5] MAINTAINERS: Adjust MIPS maintainership (remove Aurelien Jarno)

[Philippe Mathieu-Daudé]

From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

Aurelien Jarno removed for not being present.

Aleksandar Markovic comment:

  A polite email was sent [less than 12 hours ago (Peter Maydell
  was Cc:ed and can confirm)] to him with question whether he
  intend to actively participate, but there was no response.

Aurelien Jarno response [*]:

  QEMU used to be a fun ride, but it happens that interactions are
  now hurtful, especially on the MIPS side. It's time for me to
  leave this community and say goodbye.

[*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718781.html

Acked-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
[PMD: Split patch in 3, added Aurelien response]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stefan Weil <sw@weilnetz.de>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Cc: Lichao Liu <liulichao@loongson.cn>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: James Hogan <jhogan@kernel.org>
Cc: Paul Burton <paulburton@kernel.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: John Crispin <john@phrozen.org>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Adrian Bunk <bunk@debian.org>
Cc: Yunqiang Su <ysu@wavecomp.com>
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
Cc: Mirko Vogt <mirko-openwrt@nanl.de>
Cc: Paul Wise <pabs@debian.org>
Cc: Mart Raudsepp <leio@gentoo.org>
Cc: Chris Wedgwood <cw@f00f.org>
Cc: Maciej W. Rozycki <macro@wdc.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Ulises Vitulli <dererk@debian.org>
Cc: BALATON Zoltan <balaton@eik.bme.hu>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

 MAINTAINERS | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f463b83d7a..53404a746e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -213,7 +213,6 @@ F: disas/microblaze.c
 
 MIPS TCG CPUs
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
-R: Aurelien Jarno <aurelien@aurel32.net>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: target/mips/
@@ -1061,7 +1060,6 @@ F: hw/dma/rc4030.c
 Malta
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
 M: Philippe Mathieu-Daudé <f4bug@amsat.org>
-R: Aurelien Jarno <aurelien@aurel32.net>
 S: Maintained
 F: hw/isa/piix4.c
 F: hw/acpi/piix4.c
@@ -1080,7 +1078,6 @@ F: hw/net/mipsnet.c
 
 R4000
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
-R: Aurelien Jarno <aurelien@aurel32.net>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Obsolete
 F: hw/mips/r4k.c
@@ -2676,7 +2673,6 @@ F: disas/i386.c
 
 MIPS TCG target
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
-R: Aurelien Jarno <aurelien@aurel32.net>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: tcg/mips/
-- 
2.21.3

[PATCH 4/5] MAINTAINERS: Adjust MIPS maintainership (remove Paul Burton)

[Philippe Mathieu-Daudé]

From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

Paul Burton removed for not being present.

Aleksandar Markovic comment:

  A polite email was sent [2 days ago] to him with question
  whether he intend to actively participate, but there was no
  response.

Paul Burton response [*]:

  It was 2 days ago, not 2 months :)
  I'm fine with being removed though - I no longer have access
  to modern MIPS CPUs or Boston hardware, and wouldn't currently
  have time to spend on them if I did.

Aleksandar Rikalo becomes the new maintainer of the Boston board.

[*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718739.html

Cc: Paul Burton <paulburton@kernel.org>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Acked-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
[PMD: Split patch in 3, added Paul response]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
This patch still requires Ack-by from Aleksandar Rikalo

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stefan Weil <sw@weilnetz.de>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Cc: Lichao Liu <liulichao@loongson.cn>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: James Hogan <jhogan@kernel.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: John Crispin <john@phrozen.org>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Adrian Bunk <bunk@debian.org>
Cc: Yunqiang Su <ysu@wavecomp.com>
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
Cc: Mirko Vogt <mirko-openwrt@nanl.de>
Cc: Paul Wise <pabs@debian.org>
Cc: Mart Raudsepp <leio@gentoo.org>
Cc: Chris Wedgwood <cw@f00f.org>
Cc: Maciej W. Rozycki <macro@wdc.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 53404a746e..64f54c553c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1099,8 +1099,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 S: Maintained
 
 Boston
-M: Paul Burton <pburton@wavecomp.com>
-R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
+M: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: hw/core/loader-fit.c
 F: hw/mips/boston.c
-- 
2.21.3

[PATCH 5/5] MAINTAINERS: Adjust MIPS maintainership (Add Huacai Chen & Jiaxun Yang)

[Philippe Mathieu-Daudé]

From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

Huacai Chen steps in as new energy [1].

Aurelien Jarno comment [2]:

  It happens that I known Huacai Chen from the time he was
  upstreaming the Loongson 3 support to the kernel, I have been
  testing and reviewing his patches. I also know Jiaxun Yang from
  the #debian-mips IRC channel. I know that they are both very
  competent and have a good knowledge of the open source world.
  I therefore agree that they are good additions to maintain and/or
  review the MIPS part of QEMU.

[1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718434.html
[2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718738.html

Cc: Huacai Chen <chenhc@lemote.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
PMD: [Split patch in 3, added Aurelien comment]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Aurelien comment is probably worth an Acked-by tag.

Cc: Yunqiang Su <ysu@wavecomp.com>
Cc: Lichao Liu <liulichao@loongson.cn>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

 MAINTAINERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 64f54c553c..8155525077 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -213,6 +213,7 @@ F: disas/microblaze.c
 
 MIPS TCG CPUs
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
+R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: target/mips/
@@ -375,6 +376,7 @@ S: Maintained
 F: target/arm/kvm.c
 
 MIPS KVM CPUs
+M: Huacai Chen <chenhc@lemote.com>
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
 S: Odd Fixes
 F: target/mips/kvm.c
@@ -2672,6 +2674,8 @@ F: disas/i386.c
 
 MIPS TCG target
 M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
+R: Huacai Chen <chenhc@lemote.com>
+R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: tcg/mips/
-- 
2.21.3

Re: [PATCH 5/5] MAINTAINERS: Adjust MIPS maintainership (Add Huacai Chen & Jiaxun Yang)

[Jiaxun Yang]

在 2020/7/2 下午9:37, Philippe Mathieu-Daudé 写道:
> From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
>
> Huacai Chen steps in as new energy [1].
>
> Aurelien Jarno comment [2]:
>
>    It happens that I known Huacai Chen from the time he was
>    upstreaming the Loongson 3 support to the kernel, I have been
>    testing and reviewing his patches. I also know Jiaxun Yang from
>    the #debian-mips IRC channel. I know that they are both very
>    competent and have a good knowledge of the open source world.
>    I therefore agree that they are good additions to maintain and/or
>    review the MIPS part of QEMU.
>
> [1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718434.html
> [2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718738.html
>
> Cc: Huacai Chen <chenhc@lemote.com>
> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
> PMD: [Split patch in 3, added Aurelien comment]
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com>

I can help with reviewing relevant patches .

Thanks.

> ---
> Aurelien comment is probably worth an Acked-by tag.
>
> Cc: Yunqiang Su <ysu@wavecomp.com>

+ Yunqiang's Debian mailbox as he no longer works for MIPS/Wave but 
still working on Debian/MIPS.

> Cc: Lichao Liu <liulichao@loongson.cn>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
>
>   MAINTAINERS | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 64f54c553c..8155525077 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -213,6 +213,7 @@ F: disas/microblaze.c
>   
>   MIPS TCG CPUs
>   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> +R: Jiaxun Yang <jiaxun.yang@flygoat.com>
>   R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
>   S: Maintained
>   F: target/mips/
> @@ -375,6 +376,7 @@ S: Maintained
>   F: target/arm/kvm.c
>   
>   MIPS KVM CPUs
> +M: Huacai Chen <chenhc@lemote.com>
>   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
>   S: Odd Fixes
>   F: target/mips/kvm.c
> @@ -2672,6 +2674,8 @@ F: disas/i386.c
>   
>   MIPS TCG target
>   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> +R: Huacai Chen <chenhc@lemote.com>
> +R: Jiaxun Yang <jiaxun.yang@flygoat.com>
>   R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
>   S: Maintained
>   F: tcg/mips/

Re: [PATCH 5/5] MAINTAINERS: Adjust MIPS maintainership (Add Huacai Chen & Jiaxun Yang)

[chen huacai]

Acked-by: Huacai Chen <chenhc@lemote.com>

On Thu, Jul 2, 2020 at 10:23 PM Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
>
>
> 在 2020/7/2 下午9:37, Philippe Mathieu-Daudé 写道:
> > From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> >
> > Huacai Chen steps in as new energy [1].
> >
> > Aurelien Jarno comment [2]:
> >
> >    It happens that I known Huacai Chen from the time he was
> >    upstreaming the Loongson 3 support to the kernel, I have been
> >    testing and reviewing his patches. I also know Jiaxun Yang from
> >    the #debian-mips IRC channel. I know that they are both very
> >    competent and have a good knowledge of the open source world.
> >    I therefore agree that they are good additions to maintain and/or
> >    review the MIPS part of QEMU.
> >
> > [1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718434.html
> > [2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718738.html
> >
> > Cc: Huacai Chen <chenhc@lemote.com>
> > Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> > Cc: Aurelien Jarno <aurelien@aurel32.net>
> > Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> > Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
> > PMD: [Split patch in 3, added Aurelien comment]
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
>
> I can help with reviewing relevant patches .
>
> Thanks.
>
> > ---
> > Aurelien comment is probably worth an Acked-by tag.
> >
> > Cc: Yunqiang Su <ysu@wavecomp.com>
>
> + Yunqiang's Debian mailbox as he no longer works for MIPS/Wave but
> still working on Debian/MIPS.
>
> > Cc: Lichao Liu <liulichao@loongson.cn>
> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> > Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> >
> >   MAINTAINERS | 4 ++++
> >   1 file changed, 4 insertions(+)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 64f54c553c..8155525077 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -213,6 +213,7 @@ F: disas/microblaze.c
> >
> >   MIPS TCG CPUs
> >   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> > +R: Jiaxun Yang <jiaxun.yang@flygoat.com>
> >   R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> >   S: Maintained
> >   F: target/mips/
> > @@ -375,6 +376,7 @@ S: Maintained
> >   F: target/arm/kvm.c
> >
> >   MIPS KVM CPUs
> > +M: Huacai Chen <chenhc@lemote.com>
> >   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> >   S: Odd Fixes
> >   F: target/mips/kvm.c
> > @@ -2672,6 +2674,8 @@ F: disas/i386.c
> >
> >   MIPS TCG target
> >   M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> > +R: Huacai Chen <chenhc@lemote.com>
> > +R: Jiaxun Yang <jiaxun.yang@flygoat.com>
> >   R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> >   S: Maintained
> >   F: tcg/mips/
>


-- 
Huacai Chen

Re: [PATCH 4/5] MAINTAINERS: Adjust MIPS maintainership (remove Paul Burton)

[Philippe Mathieu-Daudé]

On 7/2/20 3:37 PM, Philippe Mathieu-Daudé wrote:
> From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> 
> Paul Burton removed for not being present.
> 
> Aleksandar Markovic comment:
> 
>   A polite email was sent [2 days ago] to him with question
>   whether he intend to actively participate, but there was no
>   response.
> 
> Paul Burton response [*]:
> 
>   It was 2 days ago, not 2 months :)
>   I'm fine with being removed though - I no longer have access
>   to modern MIPS CPUs or Boston hardware, and wouldn't currently
>   have time to spend on them if I did.
> 
> Aleksandar Rikalo becomes the new maintainer of the Boston board.
> 
> [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718739.html
> 
> Cc: Paul Burton <paulburton@kernel.org>
> Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> Acked-by: Paul Burton <paulburton@kernel.org>
> Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
> [PMD: Split patch in 3, added Paul response]
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> This patch still requires Ack-by from Aleksandar Rikalo

I can not merge this without Aleksandar Rikalo approval,
so I'm taking it out for 5.1.

> diff --git a/MAINTAINERS b/MAINTAINERS
> index 53404a746e..64f54c553c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1099,8 +1099,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com>
>  S: Maintained
>  
>  Boston
> -M: Paul Burton <pburton@wavecomp.com>
> -R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> +M: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
>  S: Maintained
>  F: hw/core/loader-fit.c
>  F: hw/mips/boston.c
>