mirror of https://github.com/torvalds/linux.git
irqchip/renesas-rzg2l: Add support for RZ/Five SoC
The IX45 block has additional mask registers (NMSK/IMSK/TMSK) compared to the RZ/G2L (family) SoC. A new rzfive_irqc_chip irq_chip is introduced for RZ/Five, where function pointers for irq_[un]mask() and irq_[dis|en]able() handle the ([un]masking of the interrupts. The irq_chip pointer is now passed as an init callback and stored in the priv pointer to differentiate between RZ/G2L and RZ/Five. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20240604173710.534132-3-prabhakar.mahadev-lad.rj@bp.renesas.com
This commit is contained in:
parent
372487b295
commit
d011c022ef
|
|
@ -37,6 +37,8 @@
|
|||
#define TSSEL_SHIFT(n) (8 * (n))
|
||||
#define TSSEL_MASK GENMASK(7, 0)
|
||||
#define IRQ_MASK 0x3
|
||||
#define IMSK 0x10010
|
||||
#define TMSK 0x10020
|
||||
|
||||
#define TSSR_OFFSET(n) ((n) % 4)
|
||||
#define TSSR_INDEX(n) ((n) / 4)
|
||||
|
|
@ -69,12 +71,14 @@ struct rzg2l_irqc_reg_cache {
|
|||
/**
|
||||
* struct rzg2l_irqc_priv - IRQ controller private data structure
|
||||
* @base: Controller's base address
|
||||
* @irqchip: Pointer to struct irq_chip
|
||||
* @fwspec: IRQ firmware specific data
|
||||
* @lock: Lock to serialize access to hardware registers
|
||||
* @cache: Registers cache for suspend/resume
|
||||
*/
|
||||
static struct rzg2l_irqc_priv {
|
||||
void __iomem *base;
|
||||
const struct irq_chip *irqchip;
|
||||
struct irq_fwspec fwspec[IRQC_NUM_IRQ];
|
||||
raw_spinlock_t lock;
|
||||
struct rzg2l_irqc_reg_cache cache;
|
||||
|
|
@ -138,6 +142,111 @@ static void rzg2l_irqc_eoi(struct irq_data *d)
|
|||
irq_chip_eoi_parent(d);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_mask_irq_interrupt(struct rzg2l_irqc_priv *priv,
|
||||
unsigned int hwirq)
|
||||
{
|
||||
u32 bit = BIT(hwirq - IRQC_IRQ_START);
|
||||
|
||||
writel_relaxed(readl_relaxed(priv->base + IMSK) | bit, priv->base + IMSK);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_unmask_irq_interrupt(struct rzg2l_irqc_priv *priv,
|
||||
unsigned int hwirq)
|
||||
{
|
||||
u32 bit = BIT(hwirq - IRQC_IRQ_START);
|
||||
|
||||
writel_relaxed(readl_relaxed(priv->base + IMSK) & ~bit, priv->base + IMSK);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_mask_tint_interrupt(struct rzg2l_irqc_priv *priv,
|
||||
unsigned int hwirq)
|
||||
{
|
||||
u32 bit = BIT(hwirq - IRQC_TINT_START);
|
||||
|
||||
writel_relaxed(readl_relaxed(priv->base + TMSK) | bit, priv->base + TMSK);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_unmask_tint_interrupt(struct rzg2l_irqc_priv *priv,
|
||||
unsigned int hwirq)
|
||||
{
|
||||
u32 bit = BIT(hwirq - IRQC_TINT_START);
|
||||
|
||||
writel_relaxed(readl_relaxed(priv->base + TMSK) & ~bit, priv->base + TMSK);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_mask(struct irq_data *d)
|
||||
{
|
||||
struct rzg2l_irqc_priv *priv = irq_data_to_priv(d);
|
||||
unsigned int hwirq = irqd_to_hwirq(d);
|
||||
|
||||
raw_spin_lock(&priv->lock);
|
||||
if (hwirq >= IRQC_IRQ_START && hwirq <= IRQC_IRQ_COUNT)
|
||||
rzfive_irqc_mask_irq_interrupt(priv, hwirq);
|
||||
else if (hwirq >= IRQC_TINT_START && hwirq < IRQC_NUM_IRQ)
|
||||
rzfive_irqc_mask_tint_interrupt(priv, hwirq);
|
||||
raw_spin_unlock(&priv->lock);
|
||||
irq_chip_mask_parent(d);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_unmask(struct irq_data *d)
|
||||
{
|
||||
struct rzg2l_irqc_priv *priv = irq_data_to_priv(d);
|
||||
unsigned int hwirq = irqd_to_hwirq(d);
|
||||
|
||||
raw_spin_lock(&priv->lock);
|
||||
if (hwirq >= IRQC_IRQ_START && hwirq <= IRQC_IRQ_COUNT)
|
||||
rzfive_irqc_unmask_irq_interrupt(priv, hwirq);
|
||||
else if (hwirq >= IRQC_TINT_START && hwirq < IRQC_NUM_IRQ)
|
||||
rzfive_irqc_unmask_tint_interrupt(priv, hwirq);
|
||||
raw_spin_unlock(&priv->lock);
|
||||
irq_chip_unmask_parent(d);
|
||||
}
|
||||
|
||||
static void rzfive_tint_irq_endisable(struct irq_data *d, bool enable)
|
||||
{
|
||||
struct rzg2l_irqc_priv *priv = irq_data_to_priv(d);
|
||||
unsigned int hwirq = irqd_to_hwirq(d);
|
||||
|
||||
if (hwirq >= IRQC_TINT_START && hwirq < IRQC_NUM_IRQ) {
|
||||
u32 offset = hwirq - IRQC_TINT_START;
|
||||
u32 tssr_offset = TSSR_OFFSET(offset);
|
||||
u8 tssr_index = TSSR_INDEX(offset);
|
||||
u32 reg;
|
||||
|
||||
raw_spin_lock(&priv->lock);
|
||||
if (enable)
|
||||
rzfive_irqc_unmask_tint_interrupt(priv, hwirq);
|
||||
else
|
||||
rzfive_irqc_mask_tint_interrupt(priv, hwirq);
|
||||
reg = readl_relaxed(priv->base + TSSR(tssr_index));
|
||||
if (enable)
|
||||
reg |= TIEN << TSSEL_SHIFT(tssr_offset);
|
||||
else
|
||||
reg &= ~(TIEN << TSSEL_SHIFT(tssr_offset));
|
||||
writel_relaxed(reg, priv->base + TSSR(tssr_index));
|
||||
raw_spin_unlock(&priv->lock);
|
||||
} else {
|
||||
raw_spin_lock(&priv->lock);
|
||||
if (enable)
|
||||
rzfive_irqc_unmask_irq_interrupt(priv, hwirq);
|
||||
else
|
||||
rzfive_irqc_mask_irq_interrupt(priv, hwirq);
|
||||
raw_spin_unlock(&priv->lock);
|
||||
}
|
||||
}
|
||||
|
||||
static void rzfive_irqc_irq_disable(struct irq_data *d)
|
||||
{
|
||||
irq_chip_disable_parent(d);
|
||||
rzfive_tint_irq_endisable(d, false);
|
||||
}
|
||||
|
||||
static void rzfive_irqc_irq_enable(struct irq_data *d)
|
||||
{
|
||||
rzfive_tint_irq_endisable(d, true);
|
||||
irq_chip_enable_parent(d);
|
||||
}
|
||||
|
||||
static void rzg2l_tint_irq_endisable(struct irq_data *d, bool enable)
|
||||
{
|
||||
unsigned int hw_irq = irqd_to_hwirq(d);
|
||||
|
|
@ -321,7 +430,7 @@ static struct syscore_ops rzg2l_irqc_syscore_ops = {
|
|||
.resume = rzg2l_irqc_irq_resume,
|
||||
};
|
||||
|
||||
static const struct irq_chip irqc_chip = {
|
||||
static const struct irq_chip rzg2l_irqc_chip = {
|
||||
.name = "rzg2l-irqc",
|
||||
.irq_eoi = rzg2l_irqc_eoi,
|
||||
.irq_mask = irq_chip_mask_parent,
|
||||
|
|
@ -338,6 +447,23 @@ static const struct irq_chip irqc_chip = {
|
|||
IRQCHIP_SKIP_SET_WAKE,
|
||||
};
|
||||
|
||||
static const struct irq_chip rzfive_irqc_chip = {
|
||||
.name = "rzfive-irqc",
|
||||
.irq_eoi = rzg2l_irqc_eoi,
|
||||
.irq_mask = rzfive_irqc_mask,
|
||||
.irq_unmask = rzfive_irqc_unmask,
|
||||
.irq_disable = rzfive_irqc_irq_disable,
|
||||
.irq_enable = rzfive_irqc_irq_enable,
|
||||
.irq_get_irqchip_state = irq_chip_get_parent_state,
|
||||
.irq_set_irqchip_state = irq_chip_set_parent_state,
|
||||
.irq_retrigger = irq_chip_retrigger_hierarchy,
|
||||
.irq_set_type = rzg2l_irqc_set_type,
|
||||
.irq_set_affinity = irq_chip_set_affinity_parent,
|
||||
.flags = IRQCHIP_MASK_ON_SUSPEND |
|
||||
IRQCHIP_SET_TYPE_MASKED |
|
||||
IRQCHIP_SKIP_SET_WAKE,
|
||||
};
|
||||
|
||||
static int rzg2l_irqc_alloc(struct irq_domain *domain, unsigned int virq,
|
||||
unsigned int nr_irqs, void *arg)
|
||||
{
|
||||
|
|
@ -369,7 +495,7 @@ static int rzg2l_irqc_alloc(struct irq_domain *domain, unsigned int virq,
|
|||
if (hwirq > (IRQC_NUM_IRQ - 1))
|
||||
return -EINVAL;
|
||||
|
||||
ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, &irqc_chip,
|
||||
ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, priv->irqchip,
|
||||
(void *)(uintptr_t)tint);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -401,7 +527,8 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irqc_priv *priv,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
|
||||
static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *parent,
|
||||
const struct irq_chip *irq_chip)
|
||||
{
|
||||
struct irq_domain *irq_domain, *parent_domain;
|
||||
struct platform_device *pdev;
|
||||
|
|
@ -422,6 +549,8 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
|
|||
if (!rzg2l_irqc_data)
|
||||
return -ENOMEM;
|
||||
|
||||
rzg2l_irqc_data->irqchip = irq_chip;
|
||||
|
||||
rzg2l_irqc_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
|
||||
if (IS_ERR(rzg2l_irqc_data->base))
|
||||
return PTR_ERR(rzg2l_irqc_data->base);
|
||||
|
|
@ -472,8 +601,21 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __init rzg2l_irqc_init(struct device_node *node,
|
||||
struct device_node *parent)
|
||||
{
|
||||
return rzg2l_irqc_common_init(node, parent, &rzg2l_irqc_chip);
|
||||
}
|
||||
|
||||
static int __init rzfive_irqc_init(struct device_node *node,
|
||||
struct device_node *parent)
|
||||
{
|
||||
return rzg2l_irqc_common_init(node, parent, &rzfive_irqc_chip);
|
||||
}
|
||||
|
||||
IRQCHIP_PLATFORM_DRIVER_BEGIN(rzg2l_irqc)
|
||||
IRQCHIP_MATCH("renesas,rzg2l-irqc", rzg2l_irqc_init)
|
||||
IRQCHIP_MATCH("renesas,r9a07g043f-irqc", rzfive_irqc_init)
|
||||
IRQCHIP_PLATFORM_DRIVER_END(rzg2l_irqc)
|
||||
MODULE_AUTHOR("Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>");
|
||||
MODULE_DESCRIPTION("Renesas RZ/G2L IRQC Driver");
|
||||
|
|
|
|||
Loading…
Reference in New Issue