Skip to content

Commit

Permalink
ppc46 iSeries: Make some generic irq code compile for iSeries
Browse files Browse the repository at this point in the history
In order to call finish_device_tree() on iSeries we need to define
virt_irq_create_mapping(). We also need to set ppc64_interrupt_controller to
something other than zero. If we want to do interrupt setup via the device
tree on iSeries this code will need some serious work, but it's harmless to
have it there as long as the nodes in the iSeries device tree don't cause
it to be invoked.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
  • Loading branch information
Michael Ellerman authored and Stephen Rothwell committed Sep 23, 2005
1 parent 9f49758 commit ba293ff
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
13 changes: 13 additions & 0 deletions arch/ppc64/kernel/iSeries_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,3 +351,16 @@ int __init iSeries_allocate_IRQ(HvBusNumber busNumber,
irq_desc[virtirq].handler = &iSeries_IRQ_handler;
return virtirq;
}

int virt_irq_create_mapping(unsigned int real_irq)
{
BUG(); /* Don't call this on iSeries, yet */

return 0;
}

void virt_irq_init(void)
{
return;
}

2 changes: 2 additions & 0 deletions arch/ppc64/kernel/iSeries_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ static void __init iSeries_init_early(void)

ppcdbg_initialize();

ppc64_interrupt_controller = IC_ISERIES;

#if defined(CONFIG_BLK_DEV_INITRD)
/*
* If the init RAM disk has been configured and there is
Expand Down
1 change: 1 addition & 0 deletions include/asm-ppc64/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
#define IC_OPEN_PIC 1
#define IC_PPC_XIC 2
#define IC_BPA_IIC 3
#define IC_ISERIES 4

#define XGLUE(a,b) a##b
#define GLUE(a,b) XGLUE(a,b)
Expand Down

0 comments on commit ba293ff

Please sign in to comment.