diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2019-01-11 15:03:35 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-02-18 22:12:37 -0600 |
| commit | fd0950488f7f2c34e921888f69e76d75498078f2 (patch) | |
| tree | 88ab224819b0c5bd1b20f02d5f07d6fc1f117a4a /hw/phb3.c | |
| parent | 639f67285c2cf2ca122638d2c7469da81236b365 (diff) | |
| download | skiboot-fd0950488f7f2c34e921888f69e76d75498078f2.zip skiboot-fd0950488f7f2c34e921888f69e76d75498078f2.tar.gz skiboot-fd0950488f7f2c34e921888f69e76d75498078f2.tar.bz2 | |
opal: Deprecate reading the PHB status
The OPAL_PCI_EEH_FREEZE_STATUS call takes a bunch of parameters, one of
them is @phb_status. It is defined as __be64* and always NULL in
the current Linux upstream but if anyone ever decides to read that status,
then the PHB3's handler will assume it is struct OpalIoPhb3ErrorData*
(which is a lot bigger than 8 bytes) and zero it causing the stack
corruption; p7ioc-phb has the same issue.
This removes @phb_status from all eeh_freeze_status() hooks and moves
the error message from PHB4 to the affected OPAL handlers.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-By: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'hw/phb3.c')
| -rw-r--r-- | hw/phb3.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -2718,8 +2718,7 @@ static struct pci_slot *phb3_slot_create(struct phb *phb) static int64_t phb3_eeh_freeze_status(struct phb *phb, uint64_t pe_number, uint8_t *freeze_state, uint16_t *pci_error_type, - uint16_t *severity, - uint64_t *phb_status) + uint16_t *severity) { struct phb3 *p = phb_to_phb3(phb); uint64_t peev_bit = PPC_BIT(pe_number & 0x3f); @@ -2744,7 +2743,7 @@ static int64_t phb3_eeh_freeze_status(struct phb *phb, uint64_t pe_number, *pci_error_type = OPAL_EEH_PHB_ERROR; if (severity) *severity = OPAL_EEH_SEV_PHB_FENCED; - goto bail; + return OPAL_SUCCESS; } /* Check the PEEV */ @@ -2770,11 +2769,6 @@ static int64_t phb3_eeh_freeze_status(struct phb *phb, uint64_t pe_number, if (pestb & IODA2_PESTB_DMA_STOPPED) *freeze_state |= OPAL_EEH_STOPPED_DMA_FREEZE; -bail: - if (phb_status) - phb3_read_phb_status(p, - (struct OpalIoPhb3ErrorData *)phb_status); - return OPAL_SUCCESS; } |