diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2015-06-15 10:00:14 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-06-19 15:12:57 +1000 |
commit | 35b433b79bb41f2cdb45e18ea1d20d326fefb344 (patch) | |
tree | b029d8bb3476d29bc2dcc3de7ce7f691eba61cf3 /platforms/astbmc/common.c | |
parent | a921764eed0a38670cacc47fa3aa9d5e87e1ab6b (diff) | |
download | blackbird-skiboot-35b433b79bb41f2cdb45e18ea1d20d326fefb344.tar.gz blackbird-skiboot-35b433b79bb41f2cdb45e18ea1d20d326fefb344.zip |
Support for Naples LPC serial interrupts
This adds support for the HW SerIRQ deserializer of the P8 LPC
bridge which is properly wired up on Naples. It also adds support
for detecting and reporting LPC error interrupts on all P8s.
On most platforms (Rhesus is the exception here due to the way it
lets Linux handle the UART interrupts directly), we modify the
device-tree to properly represent the LPC controller as a cascaded
interrupt-controller and the "interrupts" property of LPC devices
to contain the actual LPC interrupt number for the device.
We add a mechanism for drivers to register specific LPC interrupts,
and a "workaround" for pre-Naples P8 which platforms can use to call
all of them for when the external FPGA based deserializer is used.
There's also a callback on LPC resets which isn't used yet, we need
a bit more work on the general LPC error handling, but it can be
done a separate patches.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'platforms/astbmc/common.c')
-rw-r--r-- | platforms/astbmc/common.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index c89af63c..50341d61 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -25,6 +25,7 @@ #include <ipmi.h> #include <bt.h> #include <errorlog.h> +#include <lpc.h> #include "astbmc.h" @@ -38,10 +39,9 @@ #define BT_IO_COUNT 3 #define BT_LPC_IRQ 10 -void astbmc_ext_irq(unsigned int chip_id __unused) +void astbmc_ext_irq_serirq_cpld(unsigned int chip_id) { - uart_irq(); - bt_irq(); + lpc_all_interrupts(chip_id); } static void astbmc_ipmi_error(struct ipmi_msg *msg) @@ -180,6 +180,9 @@ static void astbmc_fixup_dt_bt(struct dt_node *lpc) /* Mark it as reserved to avoid Linux trying to claim it */ dt_add_property_strings(bt, "status", "reserved"); + + dt_add_property_cells(bt, "interrupts", BT_LPC_IRQ); + dt_add_property_cells(bt, "interrupt-parent", lpc->phandle); } static void astbmc_fixup_dt_uart(struct dt_node *lpc) @@ -222,14 +225,9 @@ static void astbmc_fixup_dt_uart(struct dt_node *lpc) */ dt_add_property_strings(uart, "device_type", "serial"); - /* - * Add interrupt. This simulates coming from HostBoot which - * does not know our interrupt numbering scheme. Instead, it - * just tells us which chip the interrupt is wired to, it will - * be the PSI "host error" interrupt of that chip. For now we - * assume the same chip as the LPC bus is on. - */ - dt_add_property_cells(uart, "ibm,irq-chip-id", dt_get_chip_id(lpc)); + /* Add interrupt */ + dt_add_property_cells(uart, "interrupts", UART_LPC_IRQ); + dt_add_property_cells(uart, "interrupt-parent", lpc->phandle); } static void del_compatible(struct dt_node *node) |