Skip to content

Commit b4ead12

Browse files
Lorenzo PieralisiMarc Zyngier
authored andcommitted
irqchip/gic-v3: Rename GICv3 ITS MSI parent
The GICv5 ITS will reuse some GICv3 ITS MSI parent functions therefore it makes sense to keep the code functionality in a compilation unit shared by the two drivers. Rename the GICv3 ITS MSI parent file and update the related Kconfig/Makefile entries to pave the way for code sharing. Signed-off-by: Lorenzo Pieralisi <[email protected]> Reviewed-by: Marc Zyngier <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Zyngier <[email protected]>
1 parent cd0ec59 commit b4ead12

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

drivers/irqchip/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,14 @@ config ARM_GIC_V3
4141
select HAVE_ARM_SMCCC_DISCOVERY
4242
select IRQ_MSI_IOMMU
4343

44+
config ARM_GIC_ITS_PARENT
45+
bool
46+
4447
config ARM_GIC_V3_ITS
4548
bool
4649
select GENERIC_MSI_IRQ
4750
select IRQ_MSI_LIB
51+
select ARM_GIC_ITS_PARENT
4852
default ARM_GIC_V3
4953
select IRQ_MSI_IOMMU
5054

drivers/irqchip/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o
3333
obj-$(CONFIG_IRQ_MSI_LIB) += irq-msi-lib.o
3434
obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o
3535
obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o
36-
obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o
36+
obj-$(CONFIG_ARM_GIC_ITS_PARENT) += irq-gic-its-msi-parent.o
37+
obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v4.o
3738
obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o
3839
obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o
3940
obj-$(CONFIG_ARM_GIC_V5) += irq-gic-v5.o irq-gic-v5-irs.o

drivers/irqchip/irq-gic-common.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks,
2929
void gic_enable_of_quirks(const struct device_node *np,
3030
const struct gic_quirk *quirks, void *data);
3131

32-
extern const struct msi_parent_ops gic_v3_its_msi_parent_ops;
33-
3432
#define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0)
3533
#define RDIST_FLAGS_RD_TABLES_PREALLOCATED (1 << 1)
3634
#define RDIST_FLAGS_FORCE_NON_SHAREABLE (1 << 2)

drivers/irqchip/irq-gic-v3-its-msi-parent.c renamed to drivers/irqchip/irq-gic-its-msi-parent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/acpi_iort.h>
88
#include <linux/pci.h>
99

10-
#include "irq-gic-common.h"
10+
#include "irq-gic-its-msi-parent.h"
1111
#include <linux/irqchip/irq-msi-lib.h>
1212

1313
#define ITS_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
/*
3+
* Copyright (C) 2024 ARM Limited, All Rights Reserved.
4+
*/
5+
6+
#ifndef _IRQ_GIC_ITS_MSI_PARENT_H
7+
#define _IRQ_GIC_ITS_MSI_PARENT_H
8+
9+
extern const struct msi_parent_ops gic_v3_its_msi_parent_ops;
10+
11+
#endif /* _IRQ_GIC_ITS_MSI_PARENT_H */

drivers/irqchip/irq-gic-v3-its.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include <asm/exception.h>
4242

4343
#include "irq-gic-common.h"
44+
#include "irq-gic-its-msi-parent.h"
4445
#include <linux/irqchip/irq-msi-lib.h>
4546

4647
#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0)

0 commit comments

Comments
 (0)