| Message ID | 20200923102143.17849-1-Lulu_Su@wistron.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] platform/mowgli: Add mowgli.c | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (d362ae4f4c521a7faffb1befe2fbba467f2c4d18) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On Wed, 23 Sep 2020 18:21:43 +0800 Lulu Su <Lulu_Su@wistron.com> wrote: > From: LuluTHSu <Lulu_Su@wistron.com> > > This is the initial version. > > Cc: skiboot-stable@lists.ozlabs.org > Cc: skiboot-stable@lists.ozlabs.org # skiboot-op940.x > Signed-off-by: LuluTHSu <Lulu_Su@wistron.com> > --- > platforms/astbmc/Makefile.inc | 5 ++-- > platforms/astbmc/mowgli.c | 66 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 69 insertions(+), 2 deletions(-) > create mode 100644 platforms/astbmc/mowgli.c > > diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc > index e0f8760..630be95 100644 > --- a/platforms/astbmc/Makefile.inc > +++ b/platforms/astbmc/Makefile.inc > @@ -5,9 +5,10 @@ ASTBMC_OBJS = pnor.o common.o slots.o \ > p8dtu.o p8dnu.o \ > garrison.o barreleye.o \ > witherspoon.o zaius.o romulus.o p9dsu.o \ > - vesnin.o nicole.o mihawk.o\ > + vesnin.o nicole.o mihawk.o mowgli.o\ missing space before the backslash > talos.o blackbird.o \ > - swift.o > + swift.o > + looks like you are adding a space and a newline here, please omit unnecessary changes Dan > > ASTBMC = $(PLATDIR)/astbmc/built-in.a > $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%) > diff --git a/platforms/astbmc/mowgli.c b/platforms/astbmc/mowgli.c > new file mode 100644 > index 0000000..b828cf2 > --- /dev/null > +++ b/platforms/astbmc/mowgli.c > @@ -0,0 +1,66 @@ > +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later > +/* Copyright 2020 Wistron Corp. > + * Copyright 2017-2019 IBM Corp. > + * > + */ > + > +#include <skiboot.h> > +#include <device.h> > +#include <console.h> > +#include <chip.h> > +#include <ipmi.h> > +#include <psi.h> > +#include <npu-regs.h> > + > +#include "astbmc.h" > + > +ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1 (16x)"); > +ST_PLUGGABLE(mowgli_slot2, "Pcie Slot2 (8x)"); > +ST_BUILTIN_DEV(mowgli_builtin_bmc, "BMC"); > +ST_PLUGGABLE(mowgli_slot3, "Pcie Slot3 (8x)"); > +ST_BUILTIN_DEV(mowgli_builtin_usb, "Builtin USB"); > + > + > +static const struct slot_table_entry mowgli_phb_table[] = { > + ST_PHB_ENTRY(0, 0, mowgli_slot1), > + ST_PHB_ENTRY(0, 1, mowgli_slot2), > + ST_PHB_ENTRY(0, 2, mowgli_builtin_bmc), > + ST_PHB_ENTRY(0, 3, mowgli_slot3), > + ST_PHB_ENTRY(0, 4, mowgli_builtin_usb), > + > + > + { .etype = st_end }, > +}; > + > +static bool mowgli_probe(void) > +{ > + if (!dt_node_is_compatible(dt_root, "ibm,mowgli")) > + return false; > + > + /* Lot of common early inits here */ > + astbmc_early_init(); > + > + /* Setup UART for use by OPAL (Linux hvc) */ > + uart_set_console_policy(UART_CONSOLE_OPAL); > + > + slot_table_init(mowgli_phb_table); > + > + return true; > +} > + > +DECLARE_PLATFORM(mowgli) = { > + .name = "Mowgli", > + .probe = mowgli_probe, > + .init = astbmc_init, > + .start_preload_resource = flash_start_preload_resource, > + .resource_loaded = flash_resource_loaded, > + .bmc = &bmc_plat_ast2500_openbmc, > + .pci_get_slot_info = slot_table_get_slot_info, > + .pci_probe_complete = check_all_slot_table, > + .cec_power_down = astbmc_ipmi_power_down, > + .cec_reboot = astbmc_ipmi_reboot, > + .elog_commit = ipmi_elog_commit, > + .exit = astbmc_exit, > + .terminate = ipmi_terminate, > + .op_display = op_display_lpc, > +}; > -- > 2.7.4 > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
Lulu, can you clean that up and re-send? Other than the observations below, I think this looks OK reviewed-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> There were a few op-test failures that I commented here: https://github.com/open-power/op-build/pull/3838 but they doesn't look like related to any of the below.. -Klaus On 9/23/2020 7:41 AM, Dan Horák wrote: > On Wed, 23 Sep 2020 18:21:43 +0800 > Lulu Su <Lulu_Su@wistron.com> wrote: > >> From: LuluTHSu <Lulu_Su@wistron.com> >> >> This is the initial version. >> >> Cc: skiboot-stable@lists.ozlabs.org >> Cc: skiboot-stable@lists.ozlabs.org # skiboot-op940.x >> Signed-off-by: LuluTHSu <Lulu_Su@wistron.com> >> --- >> platforms/astbmc/Makefile.inc | 5 ++-- >> platforms/astbmc/mowgli.c | 66 +++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 69 insertions(+), 2 deletions(-) >> create mode 100644 platforms/astbmc/mowgli.c >> >> diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc >> index e0f8760..630be95 100644 >> --- a/platforms/astbmc/Makefile.inc >> +++ b/platforms/astbmc/Makefile.inc >> @@ -5,9 +5,10 @@ ASTBMC_OBJS = pnor.o common.o slots.o \ >> p8dtu.o p8dnu.o \ >> garrison.o barreleye.o \ >> witherspoon.o zaius.o romulus.o p9dsu.o \ >> - vesnin.o nicole.o mihawk.o\ >> + vesnin.o nicole.o mihawk.o mowgli.o\ > > missing space before the backslash > >> talos.o blackbird.o \ >> - swift.o >> + swift.o >> + > > looks like you are adding a space and a newline here, please omit > unnecessary changes > > > Dan > >> >> ASTBMC = $(PLATDIR)/astbmc/built-in.a >> $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%) >> diff --git a/platforms/astbmc/mowgli.c b/platforms/astbmc/mowgli.c >> new file mode 100644 >> index 0000000..b828cf2 >> --- /dev/null >> +++ b/platforms/astbmc/mowgli.c >> @@ -0,0 +1,66 @@ >> +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later >> +/* Copyright 2020 Wistron Corp. >> + * Copyright 2017-2019 IBM Corp. >> + * >> + */ >> + >> +#include <skiboot.h> >> +#include <device.h> >> +#include <console.h> >> +#include <chip.h> >> +#include <ipmi.h> >> +#include <psi.h> >> +#include <npu-regs.h> >> + >> +#include "astbmc.h" >> + >> +ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1 (16x)"); >> +ST_PLUGGABLE(mowgli_slot2, "Pcie Slot2 (8x)"); >> +ST_BUILTIN_DEV(mowgli_builtin_bmc, "BMC"); >> +ST_PLUGGABLE(mowgli_slot3, "Pcie Slot3 (8x)"); >> +ST_BUILTIN_DEV(mowgli_builtin_usb, "Builtin USB"); >> + >> + >> +static const struct slot_table_entry mowgli_phb_table[] = { >> + ST_PHB_ENTRY(0, 0, mowgli_slot1), >> + ST_PHB_ENTRY(0, 1, mowgli_slot2), >> + ST_PHB_ENTRY(0, 2, mowgli_builtin_bmc), >> + ST_PHB_ENTRY(0, 3, mowgli_slot3), >> + ST_PHB_ENTRY(0, 4, mowgli_builtin_usb), >> + >> + >> + { .etype = st_end }, >> +}; >> + >> +static bool mowgli_probe(void) >> +{ >> + if (!dt_node_is_compatible(dt_root, "ibm,mowgli")) >> + return false; >> + >> + /* Lot of common early inits here */ >> + astbmc_early_init(); >> + >> + /* Setup UART for use by OPAL (Linux hvc) */ >> + uart_set_console_policy(UART_CONSOLE_OPAL); >> + >> + slot_table_init(mowgli_phb_table); >> + >> + return true; >> +} >> + >> +DECLARE_PLATFORM(mowgli) = { >> + .name = "Mowgli", >> + .probe = mowgli_probe, >> + .init = astbmc_init, >> + .start_preload_resource = flash_start_preload_resource, >> + .resource_loaded = flash_resource_loaded, >> + .bmc = &bmc_plat_ast2500_openbmc, >> + .pci_get_slot_info = slot_table_get_slot_info, >> + .pci_probe_complete = check_all_slot_table, >> + .cec_power_down = astbmc_ipmi_power_down, >> + .cec_reboot = astbmc_ipmi_reboot, >> + .elog_commit = ipmi_elog_commit, >> + .exit = astbmc_exit, >> + .terminate = ipmi_terminate, >> + .op_display = op_display_lpc, >> +}; >> -- >> 2.7.4 >> >> _______________________________________________ >> Skiboot mailing list >> Skiboot@lists.ozlabs.org >> https://lists.ozlabs.org/listinfo/skiboot > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot >
On Wed, Sep 30, 2020 at 1:21 AM Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> wrote: > > Lulu, > > can you clean that up and re-send? They already did...
diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc index e0f8760..630be95 100644 --- a/platforms/astbmc/Makefile.inc +++ b/platforms/astbmc/Makefile.inc @@ -5,9 +5,10 @@ ASTBMC_OBJS = pnor.o common.o slots.o \ p8dtu.o p8dnu.o \ garrison.o barreleye.o \ witherspoon.o zaius.o romulus.o p9dsu.o \ - vesnin.o nicole.o mihawk.o\ + vesnin.o nicole.o mihawk.o mowgli.o\ talos.o blackbird.o \ - swift.o + swift.o + ASTBMC = $(PLATDIR)/astbmc/built-in.a $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%) diff --git a/platforms/astbmc/mowgli.c b/platforms/astbmc/mowgli.c new file mode 100644 index 0000000..b828cf2 --- /dev/null +++ b/platforms/astbmc/mowgli.c @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later +/* Copyright 2020 Wistron Corp. + * Copyright 2017-2019 IBM Corp. + * + */ + +#include <skiboot.h> +#include <device.h> +#include <console.h> +#include <chip.h> +#include <ipmi.h> +#include <psi.h> +#include <npu-regs.h> + +#include "astbmc.h" + +ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1 (16x)"); +ST_PLUGGABLE(mowgli_slot2, "Pcie Slot2 (8x)"); +ST_BUILTIN_DEV(mowgli_builtin_bmc, "BMC"); +ST_PLUGGABLE(mowgli_slot3, "Pcie Slot3 (8x)"); +ST_BUILTIN_DEV(mowgli_builtin_usb, "Builtin USB"); + + +static const struct slot_table_entry mowgli_phb_table[] = { + ST_PHB_ENTRY(0, 0, mowgli_slot1), + ST_PHB_ENTRY(0, 1, mowgli_slot2), + ST_PHB_ENTRY(0, 2, mowgli_builtin_bmc), + ST_PHB_ENTRY(0, 3, mowgli_slot3), + ST_PHB_ENTRY(0, 4, mowgli_builtin_usb), + + + { .etype = st_end }, +}; + +static bool mowgli_probe(void) +{ + if (!dt_node_is_compatible(dt_root, "ibm,mowgli")) + return false; + + /* Lot of common early inits here */ + astbmc_early_init(); + + /* Setup UART for use by OPAL (Linux hvc) */ + uart_set_console_policy(UART_CONSOLE_OPAL); + + slot_table_init(mowgli_phb_table); + + return true; +} + +DECLARE_PLATFORM(mowgli) = { + .name = "Mowgli", + .probe = mowgli_probe, + .init = astbmc_init, + .start_preload_resource = flash_start_preload_resource, + .resource_loaded = flash_resource_loaded, + .bmc = &bmc_plat_ast2500_openbmc, + .pci_get_slot_info = slot_table_get_slot_info, + .pci_probe_complete = check_all_slot_table, + .cec_power_down = astbmc_ipmi_power_down, + .cec_reboot = astbmc_ipmi_reboot, + .elog_commit = ipmi_elog_commit, + .exit = astbmc_exit, + .terminate = ipmi_terminate, + .op_display = op_display_lpc, +};