mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
fsl-mc: Remove legacy MSI implementation
Get rid of most of the fsl_mc MSI infrastructure, which is now replaced by common code. Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com> Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com> # LX2160ARDB, LS2088ARDB Tested-by: Sascha Bischoff <sascha.bischoff@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Acked-by: Thomas Gleixner <tglx@kernel.org> Link: https://lore.kernel.org/r/20260224100936.3752303-6-maz@kernel.org Signed-off-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
This commit is contained in:
Marc Zyngier
Christophe Leroy (CS GROUP)
parent
4a958e47c2
commit
14b1cbcc6c
|
|
@ -15,53 +15,16 @@
|
|||
|
||||
#include "fsl-mc-private.h"
|
||||
|
||||
#ifdef GENERIC_MSI_DOMAIN_OPS
|
||||
/*
|
||||
* Generate a unique ID identifying the interrupt (only used within the MSI
|
||||
* irqdomain. Combine the icid with the interrupt index.
|
||||
*/
|
||||
static irq_hw_number_t fsl_mc_domain_calc_hwirq(struct fsl_mc_device *dev,
|
||||
struct msi_desc *desc)
|
||||
static void fsl_mc_write_msi_msg(struct msi_desc *msi_desc, struct msi_msg *msg)
|
||||
{
|
||||
/*
|
||||
* Make the base hwirq value for ICID*10000 so it is readable
|
||||
* as a decimal value in /proc/interrupts.
|
||||
*/
|
||||
return (irq_hw_number_t)(desc->msi_index + (dev->icid * 10000));
|
||||
}
|
||||
|
||||
static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg,
|
||||
struct msi_desc *desc)
|
||||
{
|
||||
arg->desc = desc;
|
||||
arg->hwirq = fsl_mc_domain_calc_hwirq(to_fsl_mc_device(desc->dev),
|
||||
desc);
|
||||
}
|
||||
#else
|
||||
#define fsl_mc_msi_set_desc NULL
|
||||
#endif
|
||||
|
||||
static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info)
|
||||
{
|
||||
struct msi_domain_ops *ops = info->ops;
|
||||
|
||||
if (!ops)
|
||||
return;
|
||||
|
||||
/*
|
||||
* set_desc should not be set by the caller
|
||||
*/
|
||||
if (!ops->set_desc)
|
||||
ops->set_desc = fsl_mc_msi_set_desc;
|
||||
}
|
||||
|
||||
static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
|
||||
struct fsl_mc_device_irq *mc_dev_irq,
|
||||
struct msi_desc *msi_desc)
|
||||
{
|
||||
int error;
|
||||
struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev);
|
||||
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);
|
||||
struct fsl_mc_device_irq *mc_dev_irq = &mc_bus->irq_resources[msi_desc->msi_index];
|
||||
struct fsl_mc_device *owner_mc_dev = mc_dev_irq->mc_dev;
|
||||
struct dprc_irq_cfg irq_cfg;
|
||||
int error;
|
||||
|
||||
msi_desc->msg = *msg;
|
||||
|
||||
/*
|
||||
* msi_desc->msg.address is 0x0 when this function is invoked in
|
||||
|
|
@ -110,111 +73,6 @@ static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
|
|||
}
|
||||
}
|
||||
|
||||
static void fsl_mc_write_msi_msg(struct msi_desc *msi_desc, struct msi_msg *msg)
|
||||
{
|
||||
struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev);
|
||||
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);
|
||||
struct fsl_mc_device_irq *mc_dev_irq =
|
||||
&mc_bus->irq_resources[msi_desc->msi_index];
|
||||
|
||||
msi_desc->msg = *msg;
|
||||
|
||||
/*
|
||||
* Program the MSI (paddr, value) pair in the device:
|
||||
*/
|
||||
__fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq, msi_desc);
|
||||
}
|
||||
|
||||
/*
|
||||
* NOTE: This function is invoked with interrupts disabled
|
||||
*/
|
||||
static void fsl_mc_msi_write_msg(struct irq_data *irq_data,
|
||||
struct msi_msg *msg)
|
||||
{
|
||||
struct msi_desc *msi_desc = irq_data_get_msi_desc(irq_data);
|
||||
|
||||
fsl_mc_write_msi_msg(msi_desc, msg);
|
||||
}
|
||||
|
||||
static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info)
|
||||
{
|
||||
struct irq_chip *chip = info->chip;
|
||||
|
||||
if (!chip)
|
||||
return;
|
||||
|
||||
/*
|
||||
* irq_write_msi_msg should not be set by the caller
|
||||
*/
|
||||
if (!chip->irq_write_msi_msg)
|
||||
chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
|
||||
}
|
||||
|
||||
/**
|
||||
* fsl_mc_msi_create_irq_domain - Create a fsl-mc MSI interrupt domain
|
||||
* @fwnode: Optional firmware node of the interrupt controller
|
||||
* @info: MSI domain info
|
||||
* @parent: Parent irq domain
|
||||
*
|
||||
* Updates the domain and chip ops and creates a fsl-mc MSI
|
||||
* interrupt domain.
|
||||
*
|
||||
* Returns:
|
||||
* A domain pointer or NULL in case of failure.
|
||||
*/
|
||||
struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
|
||||
struct msi_domain_info *info,
|
||||
struct irq_domain *parent)
|
||||
{
|
||||
struct irq_domain *domain;
|
||||
|
||||
if (WARN_ON((info->flags & MSI_FLAG_LEVEL_CAPABLE)))
|
||||
info->flags &= ~MSI_FLAG_LEVEL_CAPABLE;
|
||||
if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS)
|
||||
fsl_mc_msi_update_dom_ops(info);
|
||||
if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)
|
||||
fsl_mc_msi_update_chip_ops(info);
|
||||
info->flags |= MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS | MSI_FLAG_FREE_MSI_DESCS;
|
||||
|
||||
domain = msi_create_irq_domain(fwnode, info, parent);
|
||||
if (domain)
|
||||
irq_domain_update_bus_token(domain, DOMAIN_BUS_FSL_MC_MSI);
|
||||
|
||||
return domain;
|
||||
}
|
||||
|
||||
struct irq_domain *fsl_mc_find_msi_domain(struct device *dev)
|
||||
{
|
||||
struct device *root_dprc_dev;
|
||||
struct device *bus_dev;
|
||||
struct irq_domain *msi_domain;
|
||||
struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
|
||||
|
||||
fsl_mc_get_root_dprc(dev, &root_dprc_dev);
|
||||
bus_dev = root_dprc_dev->parent;
|
||||
|
||||
if (bus_dev->of_node) {
|
||||
msi_domain = of_msi_map_get_device_domain(dev,
|
||||
mc_dev->icid,
|
||||
DOMAIN_BUS_FSL_MC_MSI);
|
||||
|
||||
/*
|
||||
* if the msi-map property is missing assume that all the
|
||||
* child containers inherit the domain from the parent
|
||||
*/
|
||||
if (!msi_domain)
|
||||
|
||||
msi_domain = of_msi_get_domain(bus_dev,
|
||||
bus_dev->of_node,
|
||||
DOMAIN_BUS_FSL_MC_MSI);
|
||||
} else {
|
||||
msi_domain = iort_get_device_domain(dev, mc_dev->icid,
|
||||
DOMAIN_BUS_FSL_MC_MSI);
|
||||
}
|
||||
|
||||
return msi_domain;
|
||||
}
|
||||
|
||||
struct irq_domain *fsl_mc_get_msi_parent(struct device *dev)
|
||||
{
|
||||
struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
|
||||
|
|
@ -232,18 +90,10 @@ struct irq_domain *fsl_mc_get_msi_parent(struct device *dev)
|
|||
int fsl_mc_msi_domain_alloc_irqs(struct device *dev, unsigned int irq_count)
|
||||
{
|
||||
int error = msi_setup_device_data(dev);
|
||||
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
/*
|
||||
* NOTE: Calling this function will trigger the invocation of the
|
||||
* its_fsl_mc_msi_prepare() callback
|
||||
*/
|
||||
if (!irq_domain_is_msi_parent(dev_get_msi_domain(dev)))
|
||||
error = msi_domain_alloc_irqs_range(dev, MSI_DEFAULT_DOMAIN, 0, irq_count - 1);
|
||||
else
|
||||
error = platform_device_msi_init_and_alloc_irqs(dev, irq_count, fsl_mc_write_msi_msg);
|
||||
error = platform_device_msi_init_and_alloc_irqs(dev, irq_count, fsl_mc_write_msi_msg);
|
||||
if (error)
|
||||
dev_err(dev, "Failed to allocate IRQs\n");
|
||||
return error;
|
||||
|
|
|
|||
|
|
@ -641,7 +641,6 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev,
|
|||
|
||||
void fsl_mc_msi_domain_free_irqs(struct device *dev);
|
||||
|
||||
struct irq_domain *fsl_mc_find_msi_domain(struct device *dev);
|
||||
struct irq_domain *fsl_mc_get_msi_parent(struct device *dev);
|
||||
|
||||
int __must_check fsl_create_mc_io(struct device *dev,
|
||||
|
|
|
|||
|
|
@ -51,12 +51,6 @@ config ARM_GIC_V3_ITS
|
|||
default ARM_GIC_V3
|
||||
select IRQ_MSI_IOMMU
|
||||
|
||||
config ARM_GIC_V3_ITS_FSL_MC
|
||||
bool
|
||||
depends on ARM_GIC_V3_ITS
|
||||
depends on FSL_MC_BUS
|
||||
default ARM_GIC_V3_ITS
|
||||
|
||||
config ARM_GIC_V5
|
||||
bool
|
||||
select IRQ_DOMAIN_HIERARCHY
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o
|
|||
obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o
|
||||
obj-$(CONFIG_ARM_GIC_ITS_PARENT) += irq-gic-its-msi-parent.o
|
||||
obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v4.o
|
||||
obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o
|
||||
obj-$(CONFIG_ARM_GIC_V5) += irq-gic-v5.o irq-gic-v5-irs.o irq-gic-v5-its.o \
|
||||
irq-gic-v5-iwb.o
|
||||
obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o
|
||||
|
|
|
|||
|
|
@ -1,168 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Freescale Management Complex (MC) bus driver MSI support
|
||||
*
|
||||
* Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
|
||||
* Author: German Rivera <German.Rivera@freescale.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/acpi_iort.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/msi.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
static struct irq_chip its_msi_irq_chip = {
|
||||
.name = "ITS-fMSI",
|
||||
.irq_mask = irq_chip_mask_parent,
|
||||
.irq_unmask = irq_chip_unmask_parent,
|
||||
.irq_eoi = irq_chip_eoi_parent,
|
||||
.irq_set_affinity = msi_domain_set_affinity
|
||||
};
|
||||
|
||||
static u32 fsl_mc_msi_domain_get_msi_id(struct irq_domain *domain,
|
||||
struct fsl_mc_device *mc_dev)
|
||||
{
|
||||
struct device_node *of_node;
|
||||
u32 out_id;
|
||||
|
||||
of_node = irq_domain_get_of_node(domain);
|
||||
out_id = of_node ? of_msi_xlate(&mc_dev->dev, &of_node, mc_dev->icid) :
|
||||
iort_msi_map_id(&mc_dev->dev, mc_dev->icid);
|
||||
|
||||
return out_id;
|
||||
}
|
||||
|
||||
static int its_fsl_mc_msi_prepare(struct irq_domain *msi_domain,
|
||||
struct device *dev,
|
||||
int nvec, msi_alloc_info_t *info)
|
||||
{
|
||||
struct fsl_mc_device *mc_bus_dev;
|
||||
struct msi_domain_info *msi_info;
|
||||
|
||||
if (!dev_is_fsl_mc(dev))
|
||||
return -EINVAL;
|
||||
|
||||
mc_bus_dev = to_fsl_mc_device(dev);
|
||||
if (!(mc_bus_dev->flags & FSL_MC_IS_DPRC))
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* Set the device Id to be passed to the GIC-ITS:
|
||||
*
|
||||
* NOTE: This device id corresponds to the IOMMU stream ID
|
||||
* associated with the DPRC object (ICID).
|
||||
*/
|
||||
info->scratchpad[0].ul = fsl_mc_msi_domain_get_msi_id(msi_domain,
|
||||
mc_bus_dev);
|
||||
msi_info = msi_get_domain_info(msi_domain->parent);
|
||||
|
||||
/* Allocate at least 32 MSIs, and always as a power of 2 */
|
||||
nvec = max_t(int, 32, roundup_pow_of_two(nvec));
|
||||
return msi_info->ops->msi_prepare(msi_domain->parent, dev, nvec, info);
|
||||
}
|
||||
|
||||
static struct msi_domain_ops its_fsl_mc_msi_ops __ro_after_init = {
|
||||
.msi_prepare = its_fsl_mc_msi_prepare,
|
||||
};
|
||||
|
||||
static struct msi_domain_info its_fsl_mc_msi_domain_info = {
|
||||
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
|
||||
.ops = &its_fsl_mc_msi_ops,
|
||||
.chip = &its_msi_irq_chip,
|
||||
};
|
||||
|
||||
static const struct of_device_id its_device_id[] = {
|
||||
{ .compatible = "arm,gic-v3-its", },
|
||||
{},
|
||||
};
|
||||
|
||||
static void __init its_fsl_mc_msi_init_one(struct fwnode_handle *handle,
|
||||
const char *name)
|
||||
{
|
||||
struct irq_domain *parent;
|
||||
struct irq_domain *mc_msi_domain;
|
||||
|
||||
parent = irq_find_matching_fwnode(handle, DOMAIN_BUS_NEXUS);
|
||||
if (!parent || !msi_get_domain_info(parent)) {
|
||||
pr_err("%s: unable to locate ITS domain\n", name);
|
||||
return;
|
||||
}
|
||||
|
||||
mc_msi_domain = fsl_mc_msi_create_irq_domain(handle,
|
||||
&its_fsl_mc_msi_domain_info,
|
||||
parent);
|
||||
if (!mc_msi_domain) {
|
||||
pr_err("%s: unable to create fsl-mc domain\n", name);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_info("fsl-mc MSI: %s domain created\n", name);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
static int __init
|
||||
its_fsl_mc_msi_parse_madt(union acpi_subtable_headers *header,
|
||||
const unsigned long end)
|
||||
{
|
||||
struct acpi_madt_generic_translator *its_entry;
|
||||
struct fwnode_handle *dom_handle;
|
||||
const char *node_name;
|
||||
int err = 0;
|
||||
|
||||
its_entry = (struct acpi_madt_generic_translator *)header;
|
||||
node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
|
||||
(long)its_entry->base_address);
|
||||
|
||||
dom_handle = iort_find_domain_token(its_entry->translation_id);
|
||||
if (!dom_handle) {
|
||||
pr_err("%s: Unable to locate ITS domain handle\n", node_name);
|
||||
err = -ENXIO;
|
||||
goto out;
|
||||
}
|
||||
|
||||
its_fsl_mc_msi_init_one(dom_handle, node_name);
|
||||
|
||||
out:
|
||||
kfree(node_name);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
static void __init its_fsl_mc_acpi_msi_init(void)
|
||||
{
|
||||
acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,
|
||||
its_fsl_mc_msi_parse_madt, 0);
|
||||
}
|
||||
#else
|
||||
static inline void its_fsl_mc_acpi_msi_init(void) { }
|
||||
#endif
|
||||
|
||||
static void __init its_fsl_mc_of_msi_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
||||
for (np = of_find_matching_node(NULL, its_device_id); np;
|
||||
np = of_find_matching_node(np, its_device_id)) {
|
||||
if (!of_device_is_available(np))
|
||||
continue;
|
||||
if (!of_property_read_bool(np, "msi-controller"))
|
||||
continue;
|
||||
|
||||
its_fsl_mc_msi_init_one(of_fwnode_handle(np),
|
||||
np->full_name);
|
||||
}
|
||||
}
|
||||
|
||||
static int __init its_fsl_mc_msi_init(void)
|
||||
{
|
||||
its_fsl_mc_of_msi_init();
|
||||
its_fsl_mc_acpi_msi_init();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
early_initcall(its_fsl_mc_msi_init);
|
||||
|
|
@ -425,10 +425,6 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
|
|||
|
||||
void fsl_mc_object_free(struct fsl_mc_device *mc_adev);
|
||||
|
||||
struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
|
||||
struct msi_domain_info *info,
|
||||
struct irq_domain *parent);
|
||||
|
||||
int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev);
|
||||
|
||||
void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ enum irq_domain_bus_token {
|
|||
DOMAIN_BUS_PLATFORM_MSI,
|
||||
DOMAIN_BUS_NEXUS,
|
||||
DOMAIN_BUS_IPI,
|
||||
DOMAIN_BUS_FSL_MC_MSI,
|
||||
DOMAIN_BUS_TI_SCI_INTA_MSI,
|
||||
DOMAIN_BUS_WAKEUP,
|
||||
DOMAIN_BUS_VMD_MSI,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user