Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5a25524 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

irqchip: s3c24xx: make interrupt handling independent of irq_domain structure 



Keep a pointer to the corresponding s3c_irq_data struct as irq_chip_data.
This removes the need to fetch the intc struct from the irq_domains
host_data, thus making it independent of the underlying irq_domain
structure.

Also keep the real register offset of the interrupt in the s3c_irq_data
struct to make it independent of the hwirq structure in the irq_domain

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 658dc8fb

drivers/irqchip/irq-s3c24xx.c

+15 −10
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


struct s3c_irq_data {

	unsigned int type;

	unsigned long offset;

	unsigned long parent_irq;



	/* data gets filled during init */
@@ -79,15 +80,15 @@ static struct s3c_irq_intc *s3c_intc[3]; 


static void s3c_irq_mask(struct irq_data *data)

{

	struct s3c_irq_intc *intc = data->domain->host_data;

	struct s3c_irq_data *irq_data = irq_data_get_irq_chip_data(data);

	struct s3c_irq_intc *intc = irq_data->intc;

	struct s3c_irq_intc *parent_intc = intc->parent;

	struct s3c_irq_data *irq_data = &intc->irqs[data->hwirq];

	struct s3c_irq_data *parent_data;

	unsigned long mask;

	unsigned int irqno;



	mask = __raw_readl(intc->reg_mask);

	mask |= (1UL << data->hwirq);

	mask |= (1UL << irq_data->offset);

	__raw_writel(mask, intc->reg_mask);



	if (parent_intc) {
@@ -104,14 +105,14 @@ static void s3c_irq_mask(struct irq_data *data) 


static void s3c_irq_unmask(struct irq_data *data)

{

	struct s3c_irq_intc *intc = data->domain->host_data;

	struct s3c_irq_data *irq_data = irq_data_get_irq_chip_data(data);

	struct s3c_irq_intc *intc = irq_data->intc;

	struct s3c_irq_intc *parent_intc = intc->parent;

	struct s3c_irq_data *irq_data = &intc->irqs[data->hwirq];

	unsigned long mask;

	unsigned int irqno;



	mask = __raw_readl(intc->reg_mask);

	mask &= ~(1UL << data->hwirq);

	mask &= ~(1UL << irq_data->offset);

	__raw_writel(mask, intc->reg_mask);



	if (parent_intc) {
@@ -123,8 +124,9 @@ static void s3c_irq_unmask(struct irq_data *data) 


static inline void s3c_irq_ack(struct irq_data *data)

{

	struct s3c_irq_intc *intc = data->domain->host_data;

	unsigned long bitval = 1UL << data->hwirq;

	struct s3c_irq_data *irq_data = irq_data_get_irq_chip_data(data);

	struct s3c_irq_intc *intc = irq_data->intc;

	unsigned long bitval = 1UL << irq_data->offset;



	__raw_writel(bitval, intc->reg_pending);

	if (intc->reg_intpnd)
@@ -291,8 +293,7 @@ static struct irq_chip s3c_irq_eint0t4 = { 
static void s3c_irq_demux(unsigned int irq, struct irq_desc *desc)

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct s3c_irq_intc *intc = desc->irq_data.domain->host_data;

	struct s3c_irq_data *irq_data = &intc->irqs[desc->irq_data.hwirq];

	struct s3c_irq_data *irq_data = irq_desc_get_chip_data(desc);

	struct s3c_irq_intc *sub_intc = irq_data->sub_intc;

	unsigned long src;

	unsigned long msk;
@@ -406,6 +407,7 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq, 


	/* attach controller pointer to irq_data */

	irq_data->intc = intc;

	irq_data->offset = hw;



	parent_intc = intc->parent;
@@ -444,6 +446,9 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq, 
		pr_err("irq-s3c24xx: unsupported irqtype %d\n", irq_data->type);

		return -EINVAL;

	}



	irq_set_chip_data(virq, irq_data);



	set_irq_flags(virq, IRQF_VALID);



	if (parent_intc && irq_data->type != S3C_IRQTYPE_NONE) {