| Message ID | 20170210034433.1858-1-mikey@neuling.org |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Feb 10, 2017 at 2:44 PM, Michael Neuling <mikey@neuling.org> wrote: > +----------------------------------------------------------------------+ > |ooooooooooooooooooooooooo=+++:++++::::~:::::::+==ooooooooooooooooooooo| > |oooooooooooooooooooooo+++++++++++++:+:~...:++++:+==ooooooooooooooooooo| > |oooooooooooooooooooo++++=++==+++::~~~~ .~~+++++++=oooooooooooooooooo| > |oooooooooooooooooo+:++====+++::~..~~~~... .~:++++++++=oooooooooooooooo| > |oooooooooooooooo=::++=+=++++:~~~:::::~~.. ~:++++++=++=ooooooooooooooo| > |ooooooooooooooo=::+++++:++:::::+++:::~.....:++:+++++=++=oooooooooooooo| > |oooooooooooooo+~::+:+:::::~::+++++++:~~:++::+++::++++===oooooooooooooo| > |ooooooooooooo=:~:::::~:::::++++=+=+:::++++++:+++::++++====oooooooooooo| > |ooooooooooooo:~::~::~~:::::++=+=++::+=++++++:++=:::++++===oooooooooooo| > |oooooooooooo:~~~~~~~~~~:::+:++=+:++++++=+=+++++++:::+=+====ooooooooooo| > |ooooooooooo+~~~~~~~~:~~:::++++::+=+++==+++++:::=+::::+=+===ooooooooooo| > |oooooooooo=~~~:~~~~~~.~~:::++::++++++++++++++:++++::::+++==ooooooooooo| > |oooooooooo:~.~~~~~.~..~~::::::+++++++++++++++:::++:::::=====oooooooooo| > |ooooooooo+~..~:~....~.~~~~~~~~:+++++++::~~~~~::::++::::+==+=oooooo====| > |oooooooo+~~.~:~~.~..~~::~... .~::+:+::~. ..~::::~::++=:+=o=o=====o| > |ooooooo=~~..~:~~~ ~::~. .~~~:+++::~~:. .. .~:::~~~++=:+===oooooo=| > |o=o==o=::~.~:::~~ :::+:~~~~~:::+:+=++:::::~~~:+++::~..:+=::+=====o==o| > |=======~~.~::::: .~:++++++:::++++++++++++:++++++++:. .:++::+=o=======| > |==o====~~~~~:::. .:::++++=+=+++:+++++++=+=+++++++: .~~+=:::=========| > |ooo=oo=:~~~:~:: ..~~~:::+++++++++=+=++++++=++++:+:..~~~:+:~:===o=o=oo| > |=o===o+:~~::~:.. ....~~~::+++++:~~:++::::++:+:+::+: .:::++~:+=ooooooo| > |o=ooo=+:.::~~~. ... .~~~:::::+:::~~~:::++++::::::: ~::::=:~+=o=ooooo| > |ooo=o+++:~~~~... .. .~~~::::+++++++++++++:::++:::: ~+:+:+~~:+o=oo=o=| > |o=o=++==:~~..~. . ~~~:::::~~~:~~~~~:~~:::+::::~ .:::::+~.:+=o==o=o| > |=o=+====:~..... ~~~:::+:::~:::::::+++:::::~ .+:~:++.~~+=oooooo| > |====o==++:~.~~~... .~~~~:::+::::::+:+:+::::. :+:::+:.~:+=======| > |o=====+=+=+~~~~... .~~:::::++++++++:+:::~ . .::++::~:::+==o====| > |o==oo+=+=o=:::~~. .~..~~:++:++++++::~~..~...::+++++::+++=====o=| > |=o====o=o=++::~. .~~~...~::::::::~...~~~~.~:+++++++++++==o==o=| > |oo===oo=o=+:~~.... ~~~:~~~..........~~:::~~..:+++++++++===oooo=o| > |=o===oo=+::~~~.. ~~~::~~~~~~~~~~~~:~~::~~~~~+++++++++====ooooo| > |====++::~....... .. ~~:::~::::::~~~~~~~:~::::~.. .=+++=+=+====o=oo=| > |==+:~~........ .. ...~:::::::::::::::~~::::::::~. .~+==++=++o===o=oo| > |oo+.. ~~~~~:~::+::::::::::::::::::::::::~. ~:~~:=++=+==+==oooo| > |=+:~~. .~~~:+::::+++:+::++::+:+:+:++:++:++:::~..+:.~::++++++++++==:| > +----------------------------------------------------------------------+ > > Signed-off-by: Michael Neuling <mikey@neuling.org> What are you doing here? This is just unprofessional. Enthusiastically-NAKed-by: Oliver O'Halloran <oohall@gmail.com> > --- > platforms/astbmc/Makefile.inc | 3 ++- > platforms/astbmc/witherspoon.c | 56 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 58 insertions(+), 1 deletion(-) > create mode 100644 platforms/astbmc/witherspoon.c > > diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc > index 9affb5dede..37d1b129bf 100644 > --- a/platforms/astbmc/Makefile.inc > +++ b/platforms/astbmc/Makefile.inc > @@ -1,6 +1,7 @@ > SUBDIRS += $(PLATDIR)/astbmc > > -ASTBMC_OBJS = palmetto.o habanero.o firestone.o p8dtu.o garrison.o barreleye.o pnor.o common.o slots.o zaius.o > +ASTBMC_OBJS = palmetto.o habanero.o firestone.o p8dtu.o garrison.o barreleye.o > +ASTBMC_OBJS += pnor.o common.o slots.o zaius.o witherspoon.o > ASTBMC = $(PLATDIR)/astbmc/built-in.o > $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%) > > diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c > new file mode 100644 > index 0000000000..70a42cedf3 > --- /dev/null > +++ b/platforms/astbmc/witherspoon.c > @@ -0,0 +1,56 @@ > +/* Copyright 2017 IBM Corp. > + * > + * 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" > + > +static bool witherspoon_probe(void) > +{ > + if (!dt_node_is_compatible(dt_root, "ibm,witherspoon")) > + return false; > + > + /* Lot of common early inits here */ > + astbmc_early_init(); > + psi_set_external_irq_policy(EXTERNAL_IRQ_POLICY_LINUX); I think this can be removed. As far as I can tell this only affects psi_p8_irq_attributes() which shouldn't be called on P9. I sent a fixup a while ago for Zaius, but I think it's somewhere far down the patch queue. > + > + /* Setup UART for direct use by Linux */ > + uart_set_console_policy(UART_CONSOLE_OS); > + > + return true; > +} > + > +DECLARE_PLATFORM(witherspoon_platform) = { > + .name = "Witherspoon", > + .probe = witherspoon_probe, > + .init = astbmc_init, > + .start_preload_resource = flash_start_preload_resource, > + .resource_loaded = flash_resource_loaded, > + .bmc = NULL, /* FIXME: Add 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 = ipmi_wdt_final_reset, > + .terminate = ipmi_terminate, > +}; > -- > 2.9.3 > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
On Fri, 2017-02-10 at 16:44 +1100, Oliver O'Halloran wrote: > On Fri, Feb 10, 2017 at 2:44 PM, Michael Neuling <mikey@neuling.org> wrote: > > +----------------------------------------------------------------------+ > > > ooooooooooooooooooooooooo=+++:++++::::~:::::::+==ooooooooooooooooooooo| > > > oooooooooooooooooooooo+++++++++++++:+:~...:++++:+==ooooooooooooooooooo| > > > oooooooooooooooooooo++++=++==+++::~~~~ .~~+++++++=oooooooooooooooooo| > > > oooooooooooooooooo+:++====+++::~..~~~~... .~:++++++++=oooooooooooooooo| > > > oooooooooooooooo=::++=+=++++:~~~:::::~~.. ~:++++++=++=ooooooooooooooo| > > > ooooooooooooooo=::+++++:++:::::+++:::~.....:++:+++++=++=oooooooooooooo| > > > oooooooooooooo+~::+:+:::::~::+++++++:~~:++::+++::++++===oooooooooooooo| > > > ooooooooooooo=:~:::::~:::::++++=+=+:::++++++:+++::++++====oooooooooooo| > > > ooooooooooooo:~::~::~~:::::++=+=++::+=++++++:++=:::++++===oooooooooooo| > > > oooooooooooo:~~~~~~~~~~:::+:++=+:++++++=+=+++++++:::+=+====ooooooooooo| > > > ooooooooooo+~~~~~~~~:~~:::++++::+=+++==+++++:::=+::::+=+===ooooooooooo| > > > oooooooooo=~~~:~~~~~~.~~:::++::++++++++++++++:++++::::+++==ooooooooooo| > > > oooooooooo:~.~~~~~.~..~~::::::+++++++++++++++:::++:::::=====oooooooooo| > > > ooooooooo+~..~:~....~.~~~~~~~~:+++++++::~~~~~::::++::::+==+=oooooo====| > > > oooooooo+~~.~:~~.~..~~::~... .~::+:+::~. ..~::::~::++=:+=o=o=====o| > > > ooooooo=~~..~:~~~ ~::~. .~~~:+++::~~:. .. .~:::~~~++=:+===oooooo=| > > > o=o==o=::~.~:::~~ :::+:~~~~~:::+:+=++:::::~~~:+++::~..:+=::+=====o==o| > > > =======~~.~::::: .~:++++++:::++++++++++++:++++++++:. .:++::+=o=======| > > > ==o====~~~~~:::. .:::++++=+=+++:+++++++=+=+++++++: .~~+=:::=========| > > > ooo=oo=:~~~:~:: ..~~~:::+++++++++=+=++++++=++++:+:..~~~:+:~:===o=o=oo| > > > =o===o+:~~::~:.. ....~~~::+++++:~~:++::::++:+:+::+: .:::++~:+=ooooooo| > > > o=ooo=+:.::~~~. ... .~~~:::::+:::~~~:::++++::::::: ~::::=:~+=o=ooooo| > > > ooo=o+++:~~~~... .. .~~~::::+++++++++++++:::++:::: ~+:+:+~~:+o=oo=o=| > > > o=o=++==:~~..~. . ~~~:::::~~~:~~~~~:~~:::+::::~ .:::::+~.:+=o==o=o| > > > =o=+====:~..... ~~~:::+:::~:::::::+++:::::~ .+:~:++.~~+=oooooo| > > > ====o==++:~.~~~... .~~~~:::+::::::+:+:+::::. :+:::+:.~:+=======| > > > o=====+=+=+~~~~... .~~:::::++++++++:+:::~ . .::++::~:::+==o====| > > > o==oo+=+=o=:::~~. .~..~~:++:++++++::~~..~...::+++++::+++=====o=| > > > =o====o=o=++::~. .~~~...~::::::::~...~~~~.~:+++++++++++==o==o=| > > > oo===oo=o=+:~~.... ~~~:~~~..........~~:::~~..:+++++++++===oooo=o| > > > =o===oo=+::~~~.. ~~~::~~~~~~~~~~~~:~~::~~~~~+++++++++====ooooo| > > > ====++::~....... .. ~~:::~::::::~~~~~~~:~::::~.. .=+++=+=+====o=oo=| > > > ==+:~~........ .. ...~:::::::::::::::~~::::::::~. .~+==++=++o===o=oo| > > > oo+.. ~~~~~:~::+::::::::::::::::::::::::~. ~:~~:=++=+==+==oooo| > > > =+:~~. .~~~:+::::+++:+::++::+:+:+:++:++:++:::~..+:.~::++++++++++==:| > > > > +----------------------------------------------------------------------+ > > > > Signed-off-by: Michael Neuling <mikey@neuling.org> > > What are you doing here? This is just unprofessional. > > Enthusiastically-NAKed-by: Oliver O'Halloran <oohall@gmail.com> :-) > > + psi_set_external_irq_policy(EXTERNAL_IRQ_POLICY_LINUX); > > I think this can be removed. As far as I can tell this only affects > psi_p8_irq_attributes() which shouldn't be called on P9. I sent a > fixup a while ago for Zaius, but I think it's somewhere far down the > patch queue. OK thanks. I've Acked your zaius patch to help pull it up the patch queue. I'll repost this. Mikey
diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc index 9affb5dede..37d1b129bf 100644 --- a/platforms/astbmc/Makefile.inc +++ b/platforms/astbmc/Makefile.inc @@ -1,6 +1,7 @@ SUBDIRS += $(PLATDIR)/astbmc -ASTBMC_OBJS = palmetto.o habanero.o firestone.o p8dtu.o garrison.o barreleye.o pnor.o common.o slots.o zaius.o +ASTBMC_OBJS = palmetto.o habanero.o firestone.o p8dtu.o garrison.o barreleye.o +ASTBMC_OBJS += pnor.o common.o slots.o zaius.o witherspoon.o ASTBMC = $(PLATDIR)/astbmc/built-in.o $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%) diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c new file mode 100644 index 0000000000..70a42cedf3 --- /dev/null +++ b/platforms/astbmc/witherspoon.c @@ -0,0 +1,56 @@ +/* Copyright 2017 IBM Corp. + * + * 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" + +static bool witherspoon_probe(void) +{ + if (!dt_node_is_compatible(dt_root, "ibm,witherspoon")) + return false; + + /* Lot of common early inits here */ + astbmc_early_init(); + psi_set_external_irq_policy(EXTERNAL_IRQ_POLICY_LINUX); + + /* Setup UART for direct use by Linux */ + uart_set_console_policy(UART_CONSOLE_OS); + + return true; +} + +DECLARE_PLATFORM(witherspoon_platform) = { + .name = "Witherspoon", + .probe = witherspoon_probe, + .init = astbmc_init, + .start_preload_resource = flash_start_preload_resource, + .resource_loaded = flash_resource_loaded, + .bmc = NULL, /* FIXME: Add 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 = ipmi_wdt_final_reset, + .terminate = ipmi_terminate, +};
+----------------------------------------------------------------------+ |ooooooooooooooooooooooooo=+++:++++::::~:::::::+==ooooooooooooooooooooo| |oooooooooooooooooooooo+++++++++++++:+:~...:++++:+==ooooooooooooooooooo| |oooooooooooooooooooo++++=++==+++::~~~~ .~~+++++++=oooooooooooooooooo| |oooooooooooooooooo+:++====+++::~..~~~~... .~:++++++++=oooooooooooooooo| |oooooooooooooooo=::++=+=++++:~~~:::::~~.. ~:++++++=++=ooooooooooooooo| |ooooooooooooooo=::+++++:++:::::+++:::~.....:++:+++++=++=oooooooooooooo| |oooooooooooooo+~::+:+:::::~::+++++++:~~:++::+++::++++===oooooooooooooo| |ooooooooooooo=:~:::::~:::::++++=+=+:::++++++:+++::++++====oooooooooooo| |ooooooooooooo:~::~::~~:::::++=+=++::+=++++++:++=:::++++===oooooooooooo| |oooooooooooo:~~~~~~~~~~:::+:++=+:++++++=+=+++++++:::+=+====ooooooooooo| |ooooooooooo+~~~~~~~~:~~:::++++::+=+++==+++++:::=+::::+=+===ooooooooooo| |oooooooooo=~~~:~~~~~~.~~:::++::++++++++++++++:++++::::+++==ooooooooooo| |oooooooooo:~.~~~~~.~..~~::::::+++++++++++++++:::++:::::=====oooooooooo| |ooooooooo+~..~:~....~.~~~~~~~~:+++++++::~~~~~::::++::::+==+=oooooo====| |oooooooo+~~.~:~~.~..~~::~... .~::+:+::~. ..~::::~::++=:+=o=o=====o| |ooooooo=~~..~:~~~ ~::~. .~~~:+++::~~:. .. .~:::~~~++=:+===oooooo=| |o=o==o=::~.~:::~~ :::+:~~~~~:::+:+=++:::::~~~:+++::~..:+=::+=====o==o| |=======~~.~::::: .~:++++++:::++++++++++++:++++++++:. .:++::+=o=======| |==o====~~~~~:::. .:::++++=+=+++:+++++++=+=+++++++: .~~+=:::=========| |ooo=oo=:~~~:~:: ..~~~:::+++++++++=+=++++++=++++:+:..~~~:+:~:===o=o=oo| |=o===o+:~~::~:.. ....~~~::+++++:~~:++::::++:+:+::+: .:::++~:+=ooooooo| |o=ooo=+:.::~~~. ... .~~~:::::+:::~~~:::++++::::::: ~::::=:~+=o=ooooo| |ooo=o+++:~~~~... .. .~~~::::+++++++++++++:::++:::: ~+:+:+~~:+o=oo=o=| |o=o=++==:~~..~. . ~~~:::::~~~:~~~~~:~~:::+::::~ .:::::+~.:+=o==o=o| |=o=+====:~..... ~~~:::+:::~:::::::+++:::::~ .+:~:++.~~+=oooooo| |====o==++:~.~~~... .~~~~:::+::::::+:+:+::::. :+:::+:.~:+=======| |o=====+=+=+~~~~... .~~:::::++++++++:+:::~ . .::++::~:::+==o====| |o==oo+=+=o=:::~~. .~..~~:++:++++++::~~..~...::+++++::+++=====o=| |=o====o=o=++::~. .~~~...~::::::::~...~~~~.~:+++++++++++==o==o=| |oo===oo=o=+:~~.... ~~~:~~~..........~~:::~~..:+++++++++===oooo=o| |=o===oo=+::~~~.. ~~~::~~~~~~~~~~~~:~~::~~~~~+++++++++====ooooo| |====++::~....... .. ~~:::~::::::~~~~~~~:~::::~.. .=+++=+=+====o=oo=| |==+:~~........ .. ...~:::::::::::::::~~::::::::~. .~+==++=++o===o=oo| |oo+.. ~~~~~:~::+::::::::::::::::::::::::~. ~:~~:=++=+==+==oooo| |=+:~~. .~~~:+::::+++:+::++::+:+:+:++:++:++:::~..+:.~::++++++++++==:| +----------------------------------------------------------------------+ Signed-off-by: Michael Neuling <mikey@neuling.org> --- platforms/astbmc/Makefile.inc | 3 ++- platforms/astbmc/witherspoon.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 platforms/astbmc/witherspoon.c