Skip to content

Commit

Permalink
hw/phb4: Fix references to PHB3
Browse files Browse the repository at this point in the history
Currently most of the functionality of phb4_lsi_attributes() is disabled
when we have #defined DISABLE_ERR_INTS. This is the default behaviour
and #undefing the constant results in skiboot not compiling because the
code was not updated when it was copied across from PHB3. This patch
fixes the problem by changing the names to the phb4 versions.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
oohal authored and stewartsmith committed May 1, 2019
1 parent 0f492a9 commit 98a1ae1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hw/phb4.c
Original file line number Diff line number Diff line change
Expand Up @@ -5522,10 +5522,10 @@ static uint64_t phb4_lsi_attributes(struct irq_source *is __unused,
uint32_t isn __unused)
{
#ifndef DISABLE_ERR_INTS
struct phb3 *p = is->data;
struct phb4 *p = is->data;
uint32_t idx = isn - p->base_lsi;

if (idx == PHB3_LSI_PCIE_INF || idx == PHB3_LSI_PCIE_ER)
if (idx == PHB4_LSI_PCIE_INF || idx == PHB4_LSI_PCIE_ER)
return IRQ_ATTR_TARGET_OPAL | IRQ_ATTR_TARGET_RARE | IRQ_ATTR_TYPE_LSI;
#endif
return IRQ_ATTR_TARGET_LINUX;
Expand Down

0 comments on commit 98a1ae1

Please sign in to comment.