From 56fddce83f163e5e90ea82bf78a8df3d990b0572 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 4 Nov 2024 20:10:06 -0800 Subject: lib: utils/irqchip: Move per-hart data from fdt_plic to plic The per-hart PLIC pointer is not really specific to FDT platforms. Move it into the main driver and drop the extra wrapper functions. Signed-off-by: Samuel Holland Reviewed-by: Anup Patel --- include/sbi_utils/irqchip/fdt_irqchip_plic.h | 19 ------------------- include/sbi_utils/irqchip/plic.h | 8 +++++--- 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 include/sbi_utils/irqchip/fdt_irqchip_plic.h (limited to 'include') diff --git a/include/sbi_utils/irqchip/fdt_irqchip_plic.h b/include/sbi_utils/irqchip/fdt_irqchip_plic.h deleted file mode 100644 index fe769993..00000000 --- a/include/sbi_utils/irqchip/fdt_irqchip_plic.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2022 Samuel Holland - */ - -#ifndef __IRQCHIP_FDT_IRQCHIP_PLIC_H__ -#define __IRQCHIP_FDT_IRQCHIP_PLIC_H__ - -#include -#include - -struct plic_data *fdt_plic_get(void); - -void fdt_plic_suspend(void); - -void fdt_plic_resume(void); - -#endif diff --git a/include/sbi_utils/irqchip/plic.h b/include/sbi_utils/irqchip/plic.h index 29fe60c1..5c638e14 100644 --- a/include/sbi_utils/irqchip/plic.h +++ b/include/sbi_utils/irqchip/plic.h @@ -36,11 +36,13 @@ struct plic_data { #define PLIC_IE_WORDS(__p) ((__p)->num_src / 32 + 1) -void plic_suspend(const struct plic_data *plic); +struct plic_data *plic_get(void); -void plic_resume(const struct plic_data *plic); +void plic_suspend(void); -int plic_warm_irqchip_init(const struct plic_data *plic); +void plic_resume(void); + +int plic_warm_irqchip_init(void); int plic_cold_irqchip_init(struct plic_data *plic); -- cgit v1.3.1