| Message ID | 20181025070027.26823-1-stewart@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Quieten 'warnings' now that SIO is disabled | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | master/apply_patch Successfully applied |
| snowpatch_ozlabs/make_check | success | Test make_check on branch master |
Stewart Smith <stewart@linux.ibm.com> writes: > Signed-off-by: Stewart Smith <stewart@linux.ibm.com> > --- > core/pci-quirk.c | 3 ++- > platforms/astbmc/common.c | 11 +++++++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) Merged to master as of 9b9be42009e12d4fd9f90b806a091591cd6c4966
On Fri, 26 Oct 2018, at 09:53, Stewart Smith wrote: > Stewart Smith <stewart@linux.ibm.com> writes: > > Signed-off-by: Stewart Smith <stewart@linux.ibm.com> > > --- > > core/pci-quirk.c | 3 ++- > > platforms/astbmc/common.c | 11 +++++++++-- > > 2 files changed, 11 insertions(+), 3 deletions(-) > > Merged to master as of 9b9be42009e12d4fd9f90b806a091591cd6c4966 Man, 17 hour opportunity to send an Acked-by and I missed it. Thanks for fixing that. Andrew > > -- > Stewart Smith > OPAL Architect, IBM. >
diff --git a/core/pci-quirk.c b/core/pci-quirk.c index 3a8583633d8a..1007e9621d71 100644 --- a/core/pci-quirk.c +++ b/core/pci-quirk.c @@ -34,7 +34,8 @@ static void quirk_astbmc_vga(struct phb *phb __unused, mcr_scu_mpll = ast_ahb_readl(MCR_SCU_MPLL); mcr_scu_strap = ast_ahb_readl(MCR_SCU_STRAP); } else { - prlog(PR_WARNING, "Assumed platform default parameters for %s\n", + /* Previously we would warn, now SIO disabled by design */ + prlog(PR_INFO, "Assumed platform default parameters for %s\n", __func__); revision = bmc_platform->hw->scu_revision_id; mcr_configuration = bmc_platform->hw->mcr_configuration; diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 10aed3f72901..64eba9a41e2c 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -413,8 +413,15 @@ void astbmc_early_init(void) prerror("PLAT: AST IO initialisation failed!\n"); ast_setup_sio_mbox(MBOX_IO_BASE, MBOX_LPC_IRQ); - } else - prlog(PR_WARNING, "PLAT: AST SIO unavailable!\n"); + } else { + /* + * This may or may not be an error depending on if we set up + * hiomap or not. In the old days it *was* an error, but now + * with the way we configure the BMC hardware, this is actually + * the not error case. + */ + prlog(PR_INFO, "PLAT: AST SIO unavailable!\n"); + } /* Setup UART and use it as console */ uart_init();
Signed-off-by: Stewart Smith <stewart@linux.ibm.com> --- core/pci-quirk.c | 3 ++- platforms/astbmc/common.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)