include: hw: remove ibex_plic.h

[PATCH v1] include: hw: remove ibex_plic.h

Posted by Alistair Francis 2 years, 3 months ago

From: Wilfred Mallawa <wilfred.mallawa@wdc.com>

This patch removes the left-over/unused `ibex_plic.h` file. Previously
used by opentitan, which now follows the RISC-V standard and uses the
SiFivePlicState.

Fixes: 434e7e021 ("hw/intc: Remove the Ibex PLIC")
Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
---
 include/hw/intc/ibex_plic.h | 67 -------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 include/hw/intc/ibex_plic.h

diff --git a/include/hw/intc/ibex_plic.h b/include/hw/intc/ibex_plic.h
deleted file mode 100644
index d596436e06..0000000000
--- a/include/hw/intc/ibex_plic.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * QEMU RISC-V lowRISC Ibex PLIC
- *
- * Copyright (c) 2020 Western Digital
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2 or later, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef HW_IBEX_PLIC_H
-#define HW_IBEX_PLIC_H
-
-#include "hw/sysbus.h"
-#include "qom/object.h"
-
-#define TYPE_IBEX_PLIC "ibex-plic"
-OBJECT_DECLARE_SIMPLE_TYPE(IbexPlicState, IBEX_PLIC)
-
-struct IbexPlicState {
-    /*< private >*/
-    SysBusDevice parent_obj;
-
-    /*< public >*/
-    MemoryRegion mmio;
-
-    uint32_t *pending;
-    uint32_t *hidden_pending;
-    uint32_t *claimed;
-    uint32_t *source;
-    uint32_t *priority;
-    uint32_t *enable;
-    uint32_t threshold;
-    uint32_t claim;
-
-    /* config */
-    uint32_t num_cpus;
-    uint32_t num_sources;
-
-    uint32_t pending_base;
-    uint32_t pending_num;
-
-    uint32_t source_base;
-    uint32_t source_num;
-
-    uint32_t priority_base;
-    uint32_t priority_num;
-
-    uint32_t enable_base;
-    uint32_t enable_num;
-
-    uint32_t threshold_base;
-
-    uint32_t claim_base;
-
-    qemu_irq *external_irqs;
-};
-
-#endif /* HW_IBEX_PLIC_H */
-- 
2.34.1

Re: [PATCH v1] include: hw: remove ibex_plic.h

Posted by Alistair Francis 2 years, 3 months ago

On Fri, Jan 21, 2022 at 3:50 PM Alistair Francis
<alistair.francis@opensource.wdc.com> wrote:
>
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
>
> This patch removes the left-over/unused `ibex_plic.h` file. Previously
> used by opentitan, which now follows the RISC-V standard and uses the
> SiFivePlicState.
>
> Fixes: 434e7e021 ("hw/intc: Remove the Ibex PLIC")
> Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  include/hw/intc/ibex_plic.h | 67 -------------------------------------
>  1 file changed, 67 deletions(-)
>  delete mode 100644 include/hw/intc/ibex_plic.h
>
> diff --git a/include/hw/intc/ibex_plic.h b/include/hw/intc/ibex_plic.h
> deleted file mode 100644
> index d596436e06..0000000000
> --- a/include/hw/intc/ibex_plic.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/*
> - * QEMU RISC-V lowRISC Ibex PLIC
> - *
> - * Copyright (c) 2020 Western Digital
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU General Public License,
> - * version 2 or later, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope 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 <http://www.gnu.org/licenses/>.
> - */
> -
> -#ifndef HW_IBEX_PLIC_H
> -#define HW_IBEX_PLIC_H
> -
> -#include "hw/sysbus.h"
> -#include "qom/object.h"
> -
> -#define TYPE_IBEX_PLIC "ibex-plic"
> -OBJECT_DECLARE_SIMPLE_TYPE(IbexPlicState, IBEX_PLIC)
> -
> -struct IbexPlicState {
> -    /*< private >*/
> -    SysBusDevice parent_obj;
> -
> -    /*< public >*/
> -    MemoryRegion mmio;
> -
> -    uint32_t *pending;
> -    uint32_t *hidden_pending;
> -    uint32_t *claimed;
> -    uint32_t *source;
> -    uint32_t *priority;
> -    uint32_t *enable;
> -    uint32_t threshold;
> -    uint32_t claim;
> -
> -    /* config */
> -    uint32_t num_cpus;
> -    uint32_t num_sources;
> -
> -    uint32_t pending_base;
> -    uint32_t pending_num;
> -
> -    uint32_t source_base;
> -    uint32_t source_num;
> -
> -    uint32_t priority_base;
> -    uint32_t priority_num;
> -
> -    uint32_t enable_base;
> -    uint32_t enable_num;
> -
> -    uint32_t threshold_base;
> -
> -    uint32_t claim_base;
> -
> -    qemu_irq *external_irqs;
> -};
> -
> -#endif /* HW_IBEX_PLIC_H */
> --
> 2.34.1
>

Re: [PATCH v1] include: hw: remove ibex_plic.h

Posted by Philippe Mathieu-Daudé via 2 years, 3 months ago

On 1/21/22 06:50, Alistair Francis wrote:
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
> 
> This patch removes the left-over/unused `ibex_plic.h` file. Previously
> used by opentitan, which now follows the RISC-V standard and uses the
> SiFivePlicState.
> 
> Fixes: 434e7e021 ("hw/intc: Remove the Ibex PLIC")
> Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
> ---
>  include/hw/intc/ibex_plic.h | 67 -------------------------------------
>  1 file changed, 67 deletions(-)
>  delete mode 100644 include/hw/intc/ibex_plic.h

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH v1] include: hw: remove ibex_plic.h

Posted by Alistair Francis 2 years, 2 months ago

On Fri, Jan 21, 2022 at 3:50 PM Alistair Francis
<alistair.francis@opensource.wdc.com> wrote:
>
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
>
> This patch removes the left-over/unused `ibex_plic.h` file. Previously
> used by opentitan, which now follows the RISC-V standard and uses the
> SiFivePlicState.
>
> Fixes: 434e7e021 ("hw/intc: Remove the Ibex PLIC")
> Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  include/hw/intc/ibex_plic.h | 67 -------------------------------------
>  1 file changed, 67 deletions(-)
>  delete mode 100644 include/hw/intc/ibex_plic.h
>
> diff --git a/include/hw/intc/ibex_plic.h b/include/hw/intc/ibex_plic.h
> deleted file mode 100644
> index d596436e06..0000000000
> --- a/include/hw/intc/ibex_plic.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/*
> - * QEMU RISC-V lowRISC Ibex PLIC
> - *
> - * Copyright (c) 2020 Western Digital
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU General Public License,
> - * version 2 or later, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope 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 <http://www.gnu.org/licenses/>.
> - */
> -
> -#ifndef HW_IBEX_PLIC_H
> -#define HW_IBEX_PLIC_H
> -
> -#include "hw/sysbus.h"
> -#include "qom/object.h"
> -
> -#define TYPE_IBEX_PLIC "ibex-plic"
> -OBJECT_DECLARE_SIMPLE_TYPE(IbexPlicState, IBEX_PLIC)
> -
> -struct IbexPlicState {
> -    /*< private >*/
> -    SysBusDevice parent_obj;
> -
> -    /*< public >*/
> -    MemoryRegion mmio;
> -
> -    uint32_t *pending;
> -    uint32_t *hidden_pending;
> -    uint32_t *claimed;
> -    uint32_t *source;
> -    uint32_t *priority;
> -    uint32_t *enable;
> -    uint32_t threshold;
> -    uint32_t claim;
> -
> -    /* config */
> -    uint32_t num_cpus;
> -    uint32_t num_sources;
> -
> -    uint32_t pending_base;
> -    uint32_t pending_num;
> -
> -    uint32_t source_base;
> -    uint32_t source_num;
> -
> -    uint32_t priority_base;
> -    uint32_t priority_num;
> -
> -    uint32_t enable_base;
> -    uint32_t enable_num;
> -
> -    uint32_t threshold_base;
> -
> -    uint32_t claim_base;
> -
> -    qemu_irq *external_irqs;
> -};
> -
> -#endif /* HW_IBEX_PLIC_H */
> --
> 2.34.1
>