mips: allow compiling out CONFIG_MIPS_ITU

[PATCH] mips: allow compiling out CONFIG_MIPS_ITU

Posted by Paolo Bonzini 10 months ago

itu_reconfigure() is referenced from TCG, provide a stub if needed.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/mips/mips_itu-stub.c | 26 ++++++++++++++++++++++++++
 hw/mips/meson.build     |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 hw/mips/mips_itu-stub.c

diff --git a/hw/mips/mips_itu-stub.c b/hw/mips/mips_itu-stub.c
new file mode 100644
index 00000000000..4cc82b8461f
--- /dev/null
+++ b/hw/mips/mips_itu-stub.c
@@ -0,0 +1,26 @@
+/*
+ * Inter-Thread Communication Unit emulation.
+ *
+ * Copyright (c) 2016 Imagination Technologies
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/misc/mips_itu.h"
+
+void itc_reconfigure(MIPSITUState *tag)
+{
+    abort();
+}
diff --git a/hw/mips/meson.build b/hw/mips/meson.build
index f06d88f3430..2b1b96147a6 100644
--- a/hw/mips/meson.build
+++ b/hw/mips/meson.build
@@ -4,6 +4,7 @@ mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c'))
 mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c', 'loongson3_virt.c'))
 mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c'))
 mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
+mips_ss.add(when: 'CONFIG_MIPS_ITU', if_false: files('mips_itu-stub.c'))
 
 if 'CONFIG_TCG' in config_all_accel
 mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
-- 
2.43.0

Re: [PATCH] mips: allow compiling out CONFIG_MIPS_ITU

Posted by Philippe Mathieu-Daudé 10 months ago

Hi Paolo,

On 29/1/24 13:13, Paolo Bonzini wrote:
> itu_reconfigure() is referenced from TCG, provide a stub if needed.

s/itu_reconfigure/itc_reconfigure/

What are you trying to achieve?

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   hw/mips/mips_itu-stub.c | 26 ++++++++++++++++++++++++++
>   hw/mips/meson.build     |  1 +
>   2 files changed, 27 insertions(+)
>   create mode 100644 hw/mips/mips_itu-stub.c
> 
> diff --git a/hw/mips/mips_itu-stub.c b/hw/mips/mips_itu-stub.c
> new file mode 100644
> index 00000000000..4cc82b8461f
> --- /dev/null
> +++ b/hw/mips/mips_itu-stub.c
> @@ -0,0 +1,26 @@
> +/*
> + * Inter-Thread Communication Unit emulation.
> + *
> + * Copyright (c) 2016 Imagination Technologies
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library 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
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/misc/mips_itu.h"
> +
> +void itc_reconfigure(MIPSITUState *tag)
> +{
> +    abort();
> +}
> diff --git a/hw/mips/meson.build b/hw/mips/meson.build
> index f06d88f3430..2b1b96147a6 100644
> --- a/hw/mips/meson.build
> +++ b/hw/mips/meson.build
> @@ -4,6 +4,7 @@ mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c'))
>   mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c', 'loongson3_virt.c'))
>   mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c'))
>   mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
> +mips_ss.add(when: 'CONFIG_MIPS_ITU', if_false: files('mips_itu-stub.c'))
>   
>   if 'CONFIG_TCG' in config_all_accel
>   mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))

Re: [PATCH] mips: allow compiling out CONFIG_MIPS_ITU

Posted by Paolo Bonzini 10 months ago

On Mon, Jan 29, 2024 at 2:30 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> Hi Paolo,
>
> On 29/1/24 13:13, Paolo Bonzini wrote:
> > itu_reconfigure() is referenced from TCG, provide a stub if needed.
>
> s/itu_reconfigure/itc_reconfigure/
>
> What are you trying to achieve?

I'm trying to build all MIPS boards one by one (to clean up
configs/devices/mips*).

Paolo

Re: [PATCH] mips: allow compiling out CONFIG_MIPS_ITU

Posted by Paolo Bonzini 9 months, 4 weeks ago

Il lun 29 gen 2024, 14:31 Paolo Bonzini <pbonzini@redhat.com> ha scritto:

> On Mon, Jan 29, 2024 at 2:30 PM Philippe Mathieu-Daudé
> <philmd@linaro.org> wrote:
> >
> > Hi Paolo,
> >
> > On 29/1/24 13:13, Paolo Bonzini wrote:
> > > itu_reconfigure() is referenced from TCG, provide a stub if needed.
> >
> > s/itu_reconfigure/itc_reconfigure/
> >
> > What are you trying to achieve?
>
> I'm trying to build all MIPS boards one by one (to clean up
> configs/devices/mips*).
>

Is this okay? It's not *required* in order to clean up
configs/devices/mips*, but it's still a bug.

Paolo


> Paolo
>