mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
irqchip/irq-mvebu-icu: Remove platform MSI leftovers
All related domains provide MSI parent functionality, so the fallback code to the original platform MSI implementation is not longer required. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de> Signed-off-by: Shivamurthy Shastri <shivamurthy.shastri@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240623142235.881677325@linutronix.de
This commit is contained in:
Thomas Gleixner
parent
fbdf14e90c
commit
ce44d1ff46
@ -129,196 +129,6 @@ static void mvebu_icu_init(struct mvebu_icu *icu,
|
||||
writel_relaxed(msg[1].address_lo, icu->base + subset->offset_clr_al);
|
||||
}
|
||||
|
||||
/* Start of area to be removed once all parent chips provide MSI parent */
|
||||
|
||||
struct mvebu_icu_irq_data {
|
||||
struct mvebu_icu *icu;
|
||||
unsigned int icu_group;
|
||||
unsigned int type;
|
||||
};
|
||||
|
||||
static void mvebu_icu_write_msg(struct msi_desc *desc, struct msi_msg *msg)
|
||||
{
|
||||
struct irq_data *d = irq_get_irq_data(desc->irq);
|
||||
struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(d->domain);
|
||||
struct mvebu_icu_irq_data *icu_irqd = d->chip_data;
|
||||
struct mvebu_icu *icu = icu_irqd->icu;
|
||||
unsigned int icu_int;
|
||||
|
||||
if (msg->address_lo || msg->address_hi) {
|
||||
/* One off initialization per domain */
|
||||
mvebu_icu_init(icu, msi_data, msg);
|
||||
/* Configure the ICU with irq number & type */
|
||||
icu_int = msg->data | ICU_INT_ENABLE;
|
||||
if (icu_irqd->type & IRQ_TYPE_EDGE_RISING)
|
||||
icu_int |= ICU_IS_EDGE;
|
||||
icu_int |= icu_irqd->icu_group << ICU_GROUP_SHIFT;
|
||||
} else {
|
||||
/* De-configure the ICU */
|
||||
icu_int = 0;
|
||||
}
|
||||
|
||||
writel_relaxed(icu_int, icu->base + ICU_INT_CFG(d->hwirq));
|
||||
|
||||
/*
|
||||
* The SATA unit has 2 ports, and a dedicated ICU entry per
|
||||
* port. The ahci sata driver supports only one irq interrupt
|
||||
* per SATA unit. To solve this conflict, we configure the 2
|
||||
* SATA wired interrupts in the south bridge into 1 GIC
|
||||
* interrupt in the north bridge. Even if only a single port
|
||||
* is enabled, if sata node is enabled, both interrupts are
|
||||
* configured (regardless of which port is actually in use).
|
||||
*/
|
||||
if (d->hwirq == ICU_SATA0_ICU_ID || d->hwirq == ICU_SATA1_ICU_ID) {
|
||||
writel_relaxed(icu_int,
|
||||
icu->base + ICU_INT_CFG(ICU_SATA0_ICU_ID));
|
||||
writel_relaxed(icu_int,
|
||||
icu->base + ICU_INT_CFG(ICU_SATA1_ICU_ID));
|
||||
}
|
||||
}
|
||||
|
||||
static struct irq_chip mvebu_icu_nsr_chip = {
|
||||
.name = "ICU-NSR",
|
||||
.irq_mask = irq_chip_mask_parent,
|
||||
.irq_unmask = irq_chip_unmask_parent,
|
||||
.irq_eoi = irq_chip_eoi_parent,
|
||||
.irq_set_type = irq_chip_set_type_parent,
|
||||
.irq_set_affinity = irq_chip_set_affinity_parent,
|
||||
};
|
||||
|
||||
static struct irq_chip mvebu_icu_sei_chip = {
|
||||
.name = "ICU-SEI",
|
||||
.irq_ack = irq_chip_ack_parent,
|
||||
.irq_mask = irq_chip_mask_parent,
|
||||
.irq_unmask = irq_chip_unmask_parent,
|
||||
.irq_set_type = irq_chip_set_type_parent,
|
||||
.irq_set_affinity = irq_chip_set_affinity_parent,
|
||||
};
|
||||
|
||||
static int
|
||||
mvebu_icu_irq_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec,
|
||||
unsigned long *hwirq, unsigned int *type)
|
||||
{
|
||||
unsigned int param_count = static_branch_unlikely(&legacy_bindings) ? 3 : 2;
|
||||
struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(d);
|
||||
struct mvebu_icu *icu = msi_data->icu;
|
||||
|
||||
/* Check the count of the parameters in dt */
|
||||
if (WARN_ON(fwspec->param_count != param_count)) {
|
||||
dev_err(icu->dev, "wrong ICU parameter count %d\n",
|
||||
fwspec->param_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (static_branch_unlikely(&legacy_bindings)) {
|
||||
*hwirq = fwspec->param[1];
|
||||
*type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;
|
||||
if (fwspec->param[0] != ICU_GRP_NSR) {
|
||||
dev_err(icu->dev, "wrong ICU group type %x\n",
|
||||
fwspec->param[0]);
|
||||
return -EINVAL;
|
||||
}
|
||||
} else {
|
||||
*hwirq = fwspec->param[0];
|
||||
*type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
|
||||
|
||||
/*
|
||||
* The ICU receives level interrupts. While the NSR are also
|
||||
* level interrupts, SEI are edge interrupts. Force the type
|
||||
* here in this case. Please note that this makes the interrupt
|
||||
* handling unreliable.
|
||||
*/
|
||||
if (msi_data->subset_data->icu_group == ICU_GRP_SEI)
|
||||
*type = IRQ_TYPE_EDGE_RISING;
|
||||
}
|
||||
|
||||
if (*hwirq >= ICU_MAX_IRQS) {
|
||||
dev_err(icu->dev, "invalid interrupt number %ld\n", *hwirq);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
|
||||
unsigned int nr_irqs, void *args)
|
||||
{
|
||||
int err;
|
||||
unsigned long hwirq;
|
||||
struct irq_fwspec *fwspec = args;
|
||||
struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(domain);
|
||||
struct mvebu_icu *icu = msi_data->icu;
|
||||
struct mvebu_icu_irq_data *icu_irqd;
|
||||
struct irq_chip *chip = &mvebu_icu_nsr_chip;
|
||||
|
||||
icu_irqd = kmalloc(sizeof(*icu_irqd), GFP_KERNEL);
|
||||
if (!icu_irqd)
|
||||
return -ENOMEM;
|
||||
|
||||
err = mvebu_icu_irq_domain_translate(domain, fwspec, &hwirq,
|
||||
&icu_irqd->type);
|
||||
if (err) {
|
||||
dev_err(icu->dev, "failed to translate ICU parameters\n");
|
||||
goto free_irqd;
|
||||
}
|
||||
|
||||
if (static_branch_unlikely(&legacy_bindings))
|
||||
icu_irqd->icu_group = fwspec->param[0];
|
||||
else
|
||||
icu_irqd->icu_group = msi_data->subset_data->icu_group;
|
||||
icu_irqd->icu = icu;
|
||||
|
||||
err = platform_msi_device_domain_alloc(domain, virq, nr_irqs);
|
||||
if (err) {
|
||||
dev_err(icu->dev, "failed to allocate ICU interrupt in parent domain\n");
|
||||
goto free_irqd;
|
||||
}
|
||||
|
||||
/* Make sure there is no interrupt left pending by the firmware */
|
||||
err = irq_set_irqchip_state(virq, IRQCHIP_STATE_PENDING, false);
|
||||
if (err)
|
||||
goto free_msi;
|
||||
|
||||
if (icu_irqd->icu_group == ICU_GRP_SEI)
|
||||
chip = &mvebu_icu_sei_chip;
|
||||
|
||||
err = irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
|
||||
chip, icu_irqd);
|
||||
if (err) {
|
||||
dev_err(icu->dev, "failed to set the data to IRQ domain\n");
|
||||
goto free_msi;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
free_msi:
|
||||
platform_msi_device_domain_free(domain, virq, nr_irqs);
|
||||
free_irqd:
|
||||
kfree(icu_irqd);
|
||||
return err;
|
||||
}
|
||||
|
||||
static void
|
||||
mvebu_icu_irq_domain_free(struct irq_domain *domain, unsigned int virq,
|
||||
unsigned int nr_irqs)
|
||||
{
|
||||
struct irq_data *d = irq_get_irq_data(virq);
|
||||
struct mvebu_icu_irq_data *icu_irqd = d->chip_data;
|
||||
|
||||
kfree(icu_irqd);
|
||||
|
||||
platform_msi_device_domain_free(domain, virq, nr_irqs);
|
||||
}
|
||||
|
||||
static const struct irq_domain_ops mvebu_icu_domain_ops = {
|
||||
.translate = mvebu_icu_irq_domain_translate,
|
||||
.alloc = mvebu_icu_irq_domain_alloc,
|
||||
.free = mvebu_icu_irq_domain_free,
|
||||
};
|
||||
|
||||
/* End of removal area */
|
||||
|
||||
static int mvebu_icu_msi_init(struct irq_domain *domain, struct msi_domain_info *info,
|
||||
unsigned int virq, irq_hw_number_t hwirq, msi_alloc_info_t *arg)
|
||||
{
|
||||
@ -448,9 +258,10 @@ static const struct of_device_id mvebu_icu_subset_of_match[] = {
|
||||
|
||||
static int mvebu_icu_subset_probe(struct platform_device *pdev)
|
||||
{
|
||||
const struct msi_domain_template *tmpl;
|
||||
struct mvebu_icu_msi_data *msi_data;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct irq_domain *irq_domain;
|
||||
bool sei;
|
||||
|
||||
msi_data = devm_kzalloc(dev, sizeof(*msi_data), GFP_KERNEL);
|
||||
if (!msi_data)
|
||||
@ -471,22 +282,11 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev)
|
||||
if (!irq_domain_get_of_node(dev->msi.domain))
|
||||
return -ENODEV;
|
||||
|
||||
if (irq_domain_is_msi_parent(dev->msi.domain)) {
|
||||
bool sei = msi_data->subset_data->icu_group == ICU_GRP_SEI;
|
||||
const struct msi_domain_template *tmpl;
|
||||
sei = msi_data->subset_data->icu_group == ICU_GRP_SEI;
|
||||
tmpl = sei ? &mvebu_icu_sei_msi_template : &mvebu_icu_nsr_msi_template;
|
||||
|
||||
tmpl = sei ? &mvebu_icu_sei_msi_template : &mvebu_icu_nsr_msi_template;
|
||||
|
||||
if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, tmpl,
|
||||
ICU_MAX_IRQS, NULL, msi_data))
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
irq_domain = platform_msi_create_device_tree_domain(dev, ICU_MAX_IRQS,
|
||||
mvebu_icu_write_msg,
|
||||
&mvebu_icu_domain_ops,
|
||||
msi_data);
|
||||
if (!irq_domain) {
|
||||
if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, tmpl,
|
||||
ICU_MAX_IRQS, NULL, msi_data)) {
|
||||
dev_err(dev, "Failed to create ICU MSI domain\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user