The following commit has been merged into the irq/msi branch of tip:
Commit-ID: 0f18095871fc59c89a281caf6f18538cf9e50fbf
Gitweb: https://git.kernel.org/tip/0f18095871fc59c89a281caf6f18538cf9e50fbf
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Fri, 10 Dec 2021 23:19:17 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 16 Dec 2021 22:16:40 +01:00
soc: ti: ti_sci_inta_msi: Use msi_desc::msi_index
Use the common msi_index member and get rid of the pointless wrapper struct.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Jason Gunthorpe <jgg@xxxxxxxxxx>
Acked-by: Nishanth Menon <nm@xxxxxx>
Link: https://lore.kernel.org/r/20211210221814.540704224@xxxxxxxxxxxxx
---
drivers/irqchip/irq-ti-sci-inta.c | 2 +-
drivers/soc/ti/ti_sci_inta_msi.c | 6 +++---
include/linux/msi.h | 16 ++--------------
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index 8eba08d..5fdbb43 100644
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -595,7 +595,7 @@ static void ti_sci_inta_msi_set_desc(msi_alloc_info_t *arg,
struct platform_device *pdev = to_platform_device(desc->dev);
arg->desc = desc;
- arg->hwirq = TO_HWIRQ(pdev->id, desc->inta.dev_index);
+ arg->hwirq = TO_HWIRQ(pdev->id, desc->msi_index);
}
static struct msi_domain_ops ti_sci_inta_msi_ops = {
diff --git a/drivers/soc/ti/ti_sci_inta_msi.c b/drivers/soc/ti/ti_sci_inta_msi.c
index a89bcbc..9d23daa 100644
--- a/drivers/soc/ti/ti_sci_inta_msi.c
+++ b/drivers/soc/ti/ti_sci_inta_msi.c
@@ -84,7 +84,7 @@ static int ti_sci_inta_msi_alloc_descs(struct device *dev,
return -ENOMEM;
}
- msi_desc->inta.dev_index = res->desc[set].start + i;
+ msi_desc->msi_index = res->desc[set].start + i;
INIT_LIST_HEAD(&msi_desc->list);
list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
count++;
@@ -96,7 +96,7 @@ static int ti_sci_inta_msi_alloc_descs(struct device *dev,
return -ENOMEM;
}
- msi_desc->inta.dev_index = res->desc[set].start_sec + i;
+ msi_desc->msi_index = res->desc[set].start_sec + i;
INIT_LIST_HEAD(&msi_desc->list);
list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
count++;
@@ -154,7 +154,7 @@ unsigned int ti_sci_inta_msi_get_virq(struct device *dev, u32 dev_index)
struct msi_desc *desc;
for_each_msi_entry(desc, dev)
- if (desc->inta.dev_index == dev_index)
+ if (desc->msi_index == dev_index)
return desc->irq;
return -ENODEV;
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 25edf83..45ec5d0 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -107,14 +107,6 @@ struct pci_msi_desc {
};
/**
- * ti_sci_inta_msi_desc - TISCI based INTA specific msi descriptor data
- * @dev_index: TISCI device index
- */
-struct ti_sci_inta_msi_desc {
- u16 dev_index;
-};
-
-/**
* struct msi_desc - Descriptor structure for MSI based interrupts
* @list: List head for management
* @irq: The base interrupt number
@@ -128,8 +120,7 @@ struct ti_sci_inta_msi_desc {
* @write_msi_msg_data: Data parameter for the callback.
*
* @msi_index: Index of the msi descriptor
- * @pci: [PCI] PCI speficic msi descriptor data
- * @inta: [INTA] TISCI based INTA specific msi descriptor data
+ * @pci: PCI specific msi descriptor data
*/
struct msi_desc {
/* Shared device/bus type independent data */
@@ -147,10 +138,7 @@ struct msi_desc {
void *write_msi_msg_data;
u16 msi_index;
- union {
- struct pci_msi_desc pci;
- struct ti_sci_inta_msi_desc inta;
- };
+ struct pci_msi_desc pci;
};
/**
|