From bac33eaebf62d88e91f5c18b46b8428452bed13f Mon Sep 17 00:00:00 2001 From: Maulik Shah Date: Mon, 5 Jul 2021 23:06:00 +0530 Subject: [PATCH] ANDROID: irqchip: gic-v3: Move struct gic_chip_data to header Struct gic_chip_data definition is not visible to vendor modules however its passed as parameter to trace_android_vh_gic_resume(). Move struct gic_chip_data definition to gic-v3 header so that vendor hook can access member variables. Bug: 192660047 Fixes: cb99d1b88c76 ("ANDROID: gic: change gic resume vendor hook para") Change-Id: I4d1f4adb5b6cb932876650feacb69950d0d686bc Signed-off-by: Maulik Shah --- drivers/irqchip/irq-gic-v3.c | 14 -------------- include/linux/irqchip/arm-gic-v3.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 579baf6559af..0fbc02fa6459 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -50,20 +50,6 @@ struct redist_region { bool single_redist; }; -struct gic_chip_data { - struct fwnode_handle *fwnode; - void __iomem *dist_base; - struct redist_region *redist_regions; - struct rdists rdists; - struct irq_domain *domain; - u64 redist_stride; - u32 nr_redist_regions; - u64 flags; - bool has_rss; - unsigned int ppi_nr; - struct partition_desc **ppi_descs; -}; - static struct gic_chip_data gic_data __read_mostly; static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key); diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index ffb0a87055b1..43348c487c8e 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -693,6 +693,20 @@ int its_init(struct fwnode_handle *handle, struct rdists *rdists, struct irq_domain *domain); int mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent); +struct gic_chip_data { + struct fwnode_handle *fwnode; + void __iomem *dist_base; + struct redist_region *redist_regions; + struct rdists rdists; + struct irq_domain *domain; + u64 redist_stride; + u32 nr_redist_regions; + u64 flags; + bool has_rss; + unsigned int ppi_nr; + struct partition_desc **ppi_descs; +}; + static inline bool gic_enable_sre(void) { u32 val;