diff options
| author | Vaibhav Jain <vaibhav@linux.vnet.ibm.com> | 2018-03-01 13:44:55 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-01 20:17:54 -0600 |
| commit | 53c4553dd76788d1a7ff50e956f9802be406324a (patch) | |
| tree | 6a665797feca948768a1807ba0974657a05404da | |
| parent | 9972229b6b11503ac6419b4f2d3c6e0a7e15bfca (diff) | |
| download | blackbird-skiboot-53c4553dd76788d1a7ff50e956f9802be406324a.tar.gz blackbird-skiboot-53c4553dd76788d1a7ff50e956f9802be406324a.zip | |
capp: Disable fast-reboot when capp is enabled
Ref[1] enables fast-reboot by default for POWER9. Presently
fast-reboot for CAPP is not yet supported. Hence this patch disables
fast-reboot in case the CAPP is enabled after reboot until its
support is merged.
References: [1] https://patchwork.ozlabs.org/patch/878879/
Suggested-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | hw/phb4.c | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -3993,7 +3993,7 @@ static int64_t phb4_set_capi_mode(struct phb *phb, uint64_t mode, { struct phb4 *p = phb_to_phb4(phb); struct proc_chip *chip = get_chip(p->chip_id); - uint64_t reg; + uint64_t reg, ret; uint32_t offset; @@ -4017,33 +4017,33 @@ static int64_t phb4_set_capi_mode(struct phb *phb, uint64_t mode, } switch (mode) { - case OPAL_PHB_CAPI_MODE_PCIE: - return OPAL_UNSUPPORTED; - case OPAL_PHB_CAPI_MODE_CAPI: - return enable_capi_mode(p, pe_number, CAPI_DMA_TVT0, + ret = enable_capi_mode(p, pe_number, CAPI_DMA_TVT0, CAPP_MAX_STQ_ENGINES | CAPP_MIN_DMA_READ_ENGINES); - - case OPAL_PHB_CAPI_MODE_DMA: - /* shouldn't be called, enabled by default on p9 */ - return OPAL_UNSUPPORTED; - + break; case OPAL_PHB_CAPI_MODE_DMA_TVT1: - return enable_capi_mode(p, pe_number, CAPI_DMA_TVT1, + ret = enable_capi_mode(p, pe_number, CAPI_DMA_TVT1, CAPP_MIN_STQ_ENGINES | CAPP_MAX_DMA_READ_ENGINES); - - case OPAL_PHB_CAPI_MODE_SNOOP_OFF: - /* shouldn't be called */ - return OPAL_UNSUPPORTED; - + break; case OPAL_PHB_CAPI_MODE_SNOOP_ON: - /* nothing to do */ - return OPAL_SUCCESS; + /* nothing to do P9 if CAPP is alreay enabled */ + ret = OPAL_SUCCESS; + break; + + case OPAL_PHB_CAPI_MODE_PCIE: /* shouldn't be called on p9*/ + case OPAL_PHB_CAPI_MODE_DMA: /* Enabled by default on p9 */ + case OPAL_PHB_CAPI_MODE_SNOOP_OFF: /* shouldn't be called on p9*/ + default: + ret = OPAL_UNSUPPORTED; } - return OPAL_UNSUPPORTED; + /* If CAPP enabled then disable fast-reboot for now */ + if (ret == OPAL_SUCCESS) + disable_fast_reboot("CAPP being enabled"); + + return ret; } static void phb4_p2p_set_initiator(struct phb4 *p, uint16_t pe_number) |
