[Skiboot] [PATCH 1/6] Copy and convert Romulus descriptors to Talos

[Oliver]

On Sat, Apr 27, 2019 at 3:05 AM Timothy Pearson
<tpearson at raptorengineering.com> wrote:
>
> Talos II has some hardware differences from Romulus, therefore
> we cannot guarantee Talos II == Romulus in skiboot.  Copy and
> slightly modify the Romulus files for Talos II.
>
> Signed-off-by: Timothy Pearson <tpearson at raptorengineering.com>
> ---
>  platforms/astbmc/Makefile.inc |  3 +-
>  platforms/astbmc/talos.c      | 86 +++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 88 insertions(+), 1 deletion(-)
>  create mode 100644 platforms/astbmc/talos.c
>
> diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
> index d76cd251..b95ef542 100644
> --- a/platforms/astbmc/Makefile.inc
> +++ b/platforms/astbmc/Makefile.inc
> @@ -4,7 +4,8 @@ ASTBMC_OBJS = pnor.o common.o slots.o \
>               palmetto.o habanero.o firestone.o \
>               p8dtu.o p8dnu.o \
>               garrison.o barreleye.o \
> -             witherspoon.o zaius.o romulus.o p9dsu.o vesnin.o
> +             witherspoon.o zaius.o romulus.o p9dsu.o vesnin.o \
> +             talos.o
>
>  ASTBMC = $(PLATDIR)/astbmc/built-in.a
>  $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%)
> diff --git a/platforms/astbmc/talos.c b/platforms/astbmc/talos.c
> new file mode 100644
> index 00000000..0dea87ef
> --- /dev/null
> +++ b/platforms/astbmc/talos.c
> @@ -0,0 +1,86 @@
> +/* Copyright 2017 IBM Corp.
> + * Copyright 2018-2019 Raptor Engineering, LLC
> + *
> + * Licensed under the Apache License, Version 2.0 (the "License");
> + * you may not use this file except in compliance with the License.
> + * You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> + * implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +
> +#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(talos_cpu1_slot1, "CPU1 Slot1 (8x)");
> +ST_PLUGGABLE(talos_cpu1_slot2, "CPU1 Slot2 (16x)");
> +
> +ST_PLUGGABLE(talos_cpu2_slot1, "CPU2 Slot1 (16x)");
> +ST_PLUGGABLE(talos_cpu2_slot2, "CPU2 Slot2 (16x)");
> +ST_PLUGGABLE(talos_cpu2_slot3, "CPU2 Slot3 (8x)");
> +
> +ST_BUILTIN_DEV(talos_builtin_raid, "Builtin SAS");
> +ST_BUILTIN_DEV(talos_builtin_usb, "Builtin USB");
> +ST_BUILTIN_DEV(talos_builtin_ethernet, "Builtin Ethernet");
> +ST_BUILTIN_DEV(talos_builtin_bmc, "BMC");
> +
> +static const struct slot_table_entry talos_phb_table[] = {
> +       ST_PHB_ENTRY(0, 0, talos_cpu1_slot2),
> +       ST_PHB_ENTRY(0, 1, talos_cpu1_slot1),
> +
> +       ST_PHB_ENTRY(0, 2, talos_builtin_raid),
> +       ST_PHB_ENTRY(0, 3, talos_builtin_usb),
> +       ST_PHB_ENTRY(0, 4, talos_builtin_ethernet),
> +       ST_PHB_ENTRY(0, 5, talos_builtin_bmc),
> +

> +       ST_PHB_ENTRY(8, 0, talos_cpu2_slot2), // might be swapped with 3
> +       ST_PHB_ENTRY(8, 1, talos_cpu2_slot3), // might be PHB1 or 2
> +       ST_PHB_ENTRY(8, 3, talos_cpu2_slot1),

Can you clear those comments up?

> +
> +       { .etype = st_end },
> +};
> +
> +static bool talos_probe(void)
> +{
> +       if (!dt_node_is_compatible(dt_root, "rcs,talos"))
> +               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(talos_phb_table);
> +
> +       return true;
> +}
> +
> +DECLARE_PLATFORM(talos) = {
> +       .name                   = "Talos",
> +       .probe                  = talos_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,
> +};
> --
> 2.11.0
>
> _______________________________________________
> Skiboot mailing list
> Skiboot at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/skiboot