On Wed, Oct 11, 2023 at 07:04:58PM +0800, Minda Chen wrote:
> Move the common data structures definition to head file for
nit: "to a header file so that these data structures"
> these data structure can be re-used.
>
> Signed-off-by: Minda Chen <minda.chen@xxxxxxxxxxxxxxxx>
Reviewed-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
Thanks,
Conor.
> ---
> .../pci/controller/plda/pcie-microchip-host.c | 20 ------------------
> drivers/pci/controller/plda/pcie-plda.h | 21 +++++++++++++++++++
> 2 files changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
> index 3dc4d4ca9d0c..261147a0a446 100644
> --- a/drivers/pci/controller/plda/pcie-microchip-host.c
> +++ b/drivers/pci/controller/plda/pcie-microchip-host.c
> @@ -21,9 +21,6 @@
> #include "../../pci.h"
> #include "pcie-plda.h"
>
> -/* Number of MSI IRQs */
> -#define PLDA_MAX_NUM_MSI_IRQS 32
> -
> /* PCIe Bridge Phy and Controller Phy offsets */
> #define MC_PCIE1_BRIDGE_ADDR 0x00008000u
> #define MC_PCIE1_CTRL_ADDR 0x0000a000u
> @@ -179,23 +176,6 @@ struct event_map {
> u32 event_bit;
> };
>
> -struct plda_msi {
> - struct mutex lock; /* Protect used bitmap */
> - struct irq_domain *msi_domain;
> - struct irq_domain *dev_domain;
> - u32 num_vectors;
> - u64 vector_phy;
> - DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
> -};
> -
> -struct plda_pcie_rp {
> - struct device *dev;
> - struct irq_domain *intx_domain;
> - struct irq_domain *event_domain;
> - raw_spinlock_t lock;
> - struct plda_msi msi;
> - void __iomem *bridge_addr;
> -};
>
> struct mc_pcie {
> struct plda_pcie_rp plda;
> diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
> index 727fc54312c9..363fcbbaf6ec 100644
> --- a/drivers/pci/controller/plda/pcie-plda.h
> +++ b/drivers/pci/controller/plda/pcie-plda.h
> @@ -6,6 +6,9 @@
> #ifndef _PCIE_PLDA_H
> #define _PCIE_PLDA_H
>
> +/* Number of MSI IRQs */
> +#define PLDA_MAX_NUM_MSI_IRQS 32
> +
> /* PCIe Bridge Phy Regs */
> #define PCIE_PCI_IRQ_DW0 0xa8
> #define MSIX_CAP_MASK BIT(31)
> @@ -99,4 +102,22 @@
> #define EVENT_PM_MSI_INT_SYS_ERR 12
> #define NUM_PLDA_EVENTS 13
>
> +struct plda_msi {
> + struct mutex lock; /* Protect used bitmap */
> + struct irq_domain *msi_domain;
> + struct irq_domain *dev_domain;
> + u32 num_vectors;
> + u64 vector_phy;
> + DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
> +};
> +
> +struct plda_pcie_rp {
> + struct device *dev;
> + struct irq_domain *intx_domain;
> + struct irq_domain *event_domain;
> + raw_spinlock_t lock;
> + struct plda_msi msi;
> + void __iomem *bridge_addr;
> +};
> +
> #endif
> --
> 2.17.1
>
Attachment:
signature.asc
Description: PGP signature
