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

Commit d4201184 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Benjamin Herrenschmidt
Browse files

powerpc: sysdev/i8259 irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 37e16615

arch/powerpc/sysdev/i8259.c

+21 −21
Original line number Original line Diff line number Diff line
@@ -78,19 +78,19 @@ unsigned int i8259_irq(void) 
	return irq;

	return irq;

}

}





static void i8259_mask_and_ack_irq(unsigned int irq_nr)

static void i8259_mask_and_ack_irq(struct irq_data *d)

{

{

	unsigned long flags;

	unsigned long flags;





	raw_spin_lock_irqsave(&i8259_lock, flags);

	raw_spin_lock_irqsave(&i8259_lock, flags);

	if (irq_nr > 7) {

	if (d->irq > 7) {

		cached_A1 |= 1 << (irq_nr-8);

		cached_A1 |= 1 << (d->irq-8);

		inb(0xA1); 	/* DUMMY */

		inb(0xA1); 	/* DUMMY */

		outb(cached_A1, 0xA1);

		outb(cached_A1, 0xA1);

		outb(0x20, 0xA0);	/* Non-specific EOI */

		outb(0x20, 0xA0);	/* Non-specific EOI */

		outb(0x20, 0x20);	/* Non-specific EOI to cascade */

		outb(0x20, 0x20);	/* Non-specific EOI to cascade */

	} else {

	} else {

		cached_21 |= 1 << irq_nr;

		cached_21 |= 1 << d->irq;

		inb(0x21); 	/* DUMMY */

		inb(0x21); 	/* DUMMY */

		outb(cached_21, 0x21);

		outb(cached_21, 0x21);

		outb(0x20, 0x20);	/* Non-specific EOI */

		outb(0x20, 0x20);	/* Non-specific EOI */
@@ -104,42 +104,42 @@ static void i8259_set_irq_mask(int irq_nr) 
	outb(cached_21,0x21);

	outb(cached_21,0x21);

}

}





static void i8259_mask_irq(unsigned int irq_nr)

static void i8259_mask_irq(struct irq_data *d)

{

{

	unsigned long flags;

	unsigned long flags;





	pr_debug("i8259_mask_irq(%d)\n", irq_nr);

	pr_debug("i8259_mask_irq(%d)\n", d->irq);





	raw_spin_lock_irqsave(&i8259_lock, flags);

	raw_spin_lock_irqsave(&i8259_lock, flags);

	if (irq_nr < 8)

	if (d->irq < 8)

		cached_21 |= 1 << irq_nr;

		cached_21 |= 1 << d->irq;

	else

	else

		cached_A1 |= 1 << (irq_nr-8);

		cached_A1 |= 1 << (d->irq-8);

	i8259_set_irq_mask(irq_nr);

	i8259_set_irq_mask(d->irq);

	raw_spin_unlock_irqrestore(&i8259_lock, flags);

	raw_spin_unlock_irqrestore(&i8259_lock, flags);

}

}





static void i8259_unmask_irq(unsigned int irq_nr)

static void i8259_unmask_irq(struct irq_data *d)

{

{

	unsigned long flags;

	unsigned long flags;





	pr_debug("i8259_unmask_irq(%d)\n", irq_nr);

	pr_debug("i8259_unmask_irq(%d)\n", d->irq);





	raw_spin_lock_irqsave(&i8259_lock, flags);

	raw_spin_lock_irqsave(&i8259_lock, flags);

	if (irq_nr < 8)

	if (d->irq < 8)

		cached_21 &= ~(1 << irq_nr);

		cached_21 &= ~(1 << d->irq);

	else

	else

		cached_A1 &= ~(1 << (irq_nr-8));

		cached_A1 &= ~(1 << (d->irq-8));

	i8259_set_irq_mask(irq_nr);

	i8259_set_irq_mask(d->irq);

	raw_spin_unlock_irqrestore(&i8259_lock, flags);

	raw_spin_unlock_irqrestore(&i8259_lock, flags);

}

}





static struct irq_chip i8259_pic = {

static struct irq_chip i8259_pic = {

	.name		= "i8259",

	.name		= "i8259",

	.mask		= i8259_mask_irq,

	.irq_mask	= i8259_mask_irq,

	.disable	= i8259_mask_irq,

	.irq_disable	= i8259_mask_irq,

	.unmask		= i8259_unmask_irq,

	.irq_unmask	= i8259_unmask_irq,

	.mask_ack	= i8259_mask_and_ack_irq,

	.irq_mask_ack	= i8259_mask_and_ack_irq,

};

};





static struct resource pic1_iores = {

static struct resource pic1_iores = {
@@ -188,7 +188,7 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq, 
static void i8259_host_unmap(struct irq_host *h, unsigned int virq)

static void i8259_host_unmap(struct irq_host *h, unsigned int virq)

{

{

	/* Make sure irq is masked in hardware */

	/* Make sure irq is masked in hardware */

	i8259_mask_irq(virq);

	i8259_mask_irq(irq_get_irq_data(virq));





	/* remove chip and handler */

	/* remove chip and handler */

	set_irq_chip_and_handler(virq, NULL, NULL);

	set_irq_chip_and_handler(virq, NULL, NULL);