sh: IPR IRQs irq_data conversion.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
0d338071f2
commit
8df3a615da
|
@ -24,25 +24,25 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/topology.h>
|
#include <linux/topology.h>
|
||||||
|
|
||||||
static inline struct ipr_desc *get_ipr_desc(unsigned int irq)
|
static inline struct ipr_desc *get_ipr_desc(struct irq_data *data)
|
||||||
{
|
{
|
||||||
struct irq_chip *chip = get_irq_chip(irq);
|
struct irq_chip *chip = irq_data_get_irq_chip(data);
|
||||||
return container_of(chip, struct ipr_desc, chip);
|
return container_of(chip, struct ipr_desc, chip);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void disable_ipr_irq(unsigned int irq)
|
static void disable_ipr_irq(struct irq_data *data)
|
||||||
{
|
{
|
||||||
struct ipr_data *p = get_irq_chip_data(irq);
|
struct ipr_data *p = irq_data_get_irq_chip_data(data);
|
||||||
unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
|
unsigned long addr = get_ipr_desc(data)->ipr_offsets[p->ipr_idx];
|
||||||
/* Set the priority in IPR to 0 */
|
/* Set the priority in IPR to 0 */
|
||||||
__raw_writew(__raw_readw(addr) & (0xffff ^ (0xf << p->shift)), addr);
|
__raw_writew(__raw_readw(addr) & (0xffff ^ (0xf << p->shift)), addr);
|
||||||
(void)__raw_readw(addr); /* Read back to flush write posting */
|
(void)__raw_readw(addr); /* Read back to flush write posting */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void enable_ipr_irq(unsigned int irq)
|
static void enable_ipr_irq(struct irq_data *data)
|
||||||
{
|
{
|
||||||
struct ipr_data *p = get_irq_chip_data(irq);
|
struct ipr_data *p = irq_data_get_irq_chip_data(data);
|
||||||
unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
|
unsigned long addr = get_ipr_desc(data)->ipr_offsets[p->ipr_idx];
|
||||||
/* Set priority in IPR back to original value */
|
/* Set priority in IPR back to original value */
|
||||||
__raw_writew(__raw_readw(addr) | (p->priority << p->shift), addr);
|
__raw_writew(__raw_readw(addr) | (p->priority << p->shift), addr);
|
||||||
}
|
}
|
||||||
|
@ -56,9 +56,8 @@ void register_ipr_controller(struct ipr_desc *desc)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
desc->chip.mask = disable_ipr_irq;
|
desc->chip.irq_mask = disable_ipr_irq;
|
||||||
desc->chip.unmask = enable_ipr_irq;
|
desc->chip.irq_unmask = enable_ipr_irq;
|
||||||
desc->chip.mask_ack = disable_ipr_irq;
|
|
||||||
|
|
||||||
for (i = 0; i < desc->nr_irqs; i++) {
|
for (i = 0; i < desc->nr_irqs; i++) {
|
||||||
struct ipr_data *p = desc->ipr_data + i;
|
struct ipr_data *p = desc->ipr_data + i;
|
||||||
|
@ -68,7 +67,7 @@ void register_ipr_controller(struct ipr_desc *desc)
|
||||||
BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
|
BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
|
||||||
|
|
||||||
res = irq_alloc_desc_at(p->irq, numa_node_id());
|
res = irq_alloc_desc_at(p->irq, numa_node_id());
|
||||||
if (unlikely(res != p->irq && res != -EEXIST))
|
if (unlikely(res != p->irq && res != -EEXIST)) {
|
||||||
printk(KERN_INFO "can not get irq_desc for %d\n",
|
printk(KERN_INFO "can not get irq_desc for %d\n",
|
||||||
p->irq);
|
p->irq);
|
||||||
continue;
|
continue;
|
||||||
|
@ -78,7 +77,7 @@ void register_ipr_controller(struct ipr_desc *desc)
|
||||||
set_irq_chip_and_handler_name(p->irq, &desc->chip,
|
set_irq_chip_and_handler_name(p->irq, &desc->chip,
|
||||||
handle_level_irq, "level");
|
handle_level_irq, "level");
|
||||||
set_irq_chip_data(p->irq, p);
|
set_irq_chip_data(p->irq, p);
|
||||||
disable_ipr_irq(p->irq);
|
disable_ipr_irq(irq_get_irq_data(p->irq));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(register_ipr_controller);
|
EXPORT_SYMBOL(register_ipr_controller);
|
||||||
|
|
Loading…
Reference in New Issue