| Message ID | 20200430030544.234289-6-amitay@ozlabs.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Reorganization of device trees | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch master (6c10b68bf774a9fe21affd5ef0b40084cd49800d) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
What's the difference between this and the bmc-kernel backend? I guess just that you use the sbefifo for pib access in the bmc-sbefifo case? - Alistair On Thursday, 30 April 2020 1:05:38 PM AEST Amitay Isaacs wrote: > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > --- > Makefile.am | 2 +- > p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 | 0 > libpdbg/dtb.c | 4 ++-- > 3 files changed, 3 insertions(+), 3 deletions(-) > rename p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 (100%) > > diff --git a/Makefile.am b/Makefile.am > index 4b53c80..64f3e0b 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -80,7 +80,7 @@ endif > DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > - p9-sbefifo.dts \ > + bmc-sbefifo.dts \ > p8-host.dts p9-host.dts p8.dts > > DT_sources = $(DT:.dts=.dtb.S) p9.dtb.S > diff --git a/p9-sbefifo.dts.m4 b/bmc-sbefifo.dts.m4 > similarity index 100% > rename from p9-sbefifo.dts.m4 > rename to bmc-sbefifo.dts.m4 > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > index 6a9fc73..5013d96 100644 > --- a/libpdbg/dtb.c > +++ b/libpdbg/dtb.c > @@ -43,7 +43,7 @@ > #include "p9-host.dt.h" > #include "p8-cronus.dt.h" > #include "bmc-cronus.dt.h" > -#include "p9-sbefifo.dt.h" > +#include "bmc-sbefifo.dt.h" > > #include "p8.dt.h" > #include "p9.dt.h" > @@ -431,7 +431,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) > > if (!strcmp(pdbg_backend_option, "p9")) { > if (!dtb->backend.fdt) > - dtb->backend.fdt = &_binary_p9_sbefifo_dtb_o_start; > + dtb->backend.fdt = &_binary_bmc_sbefifo_dtb_o_start; > if (!dtb->system.fdt) > dtb->system.fdt = &_binary_p9_dtb_o_start; > } else {
On Wed, 2020-05-06 at 10:47 +1000, Alistair Popple wrote: > What's the difference between this and the bmc-kernel backend? I > guess just > that you use the sbefifo for pib access in the bmc-sbefifo case? > Yes. All accesses (except cfam) are via sbefifo. > - Alistair > > On Thursday, 30 April 2020 1:05:38 PM AEST Amitay Isaacs wrote: > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > > --- > > Makefile.am | 2 +- > > p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 | 0 > > libpdbg/dtb.c | 4 ++-- > > 3 files changed, 3 insertions(+), 3 deletions(-) > > rename p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 (100%) > > > > diff --git a/Makefile.am b/Makefile.am > > index 4b53c80..64f3e0b 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -80,7 +80,7 @@ endif > > DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > > - p9-sbefifo.dts \ > > + bmc-sbefifo.dts \ > > p8-host.dts p9-host.dts p8.dts > > > > DT_sources = $(DT:.dts=.dtb.S) p9.dtb.S > > diff --git a/p9-sbefifo.dts.m4 b/bmc-sbefifo.dts.m4 > > similarity index 100% > > rename from p9-sbefifo.dts.m4 > > rename to bmc-sbefifo.dts.m4 > > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > > index 6a9fc73..5013d96 100644 > > --- a/libpdbg/dtb.c > > +++ b/libpdbg/dtb.c > > @@ -43,7 +43,7 @@ > > #include "p9-host.dt.h" > > #include "p8-cronus.dt.h" > > #include "bmc-cronus.dt.h" > > -#include "p9-sbefifo.dt.h" > > +#include "bmc-sbefifo.dt.h" > > > > #include "p8.dt.h" > > #include "p9.dt.h" > > @@ -431,7 +431,7 @@ struct pdbg_dtb *pdbg_default_dtb(void > > *system_fdt) > > > > if (!strcmp(pdbg_backend_option, "p9")) { > > if (!dtb->backend.fdt) > > - dtb->backend.fdt = > > &_binary_p9_sbefifo_dtb_o_start; > > + dtb->backend.fdt = > > &_binary_bmc_sbefifo_dtb_o_start; > > if (!dtb->system.fdt) > > dtb->system.fdt = > > &_binary_p9_dtb_o_start; > > } else { > > > Amitay.
Sounds good. Reviewed-by: Alistair Popple <alistair@popple.id.au> On Wednesday, 6 May 2020 10:48:14 AM AEST Amitay Isaacs wrote: > On Wed, 2020-05-06 at 10:47 +1000, Alistair Popple wrote: > > What's the difference between this and the bmc-kernel backend? I > > guess just > > that you use the sbefifo for pib access in the bmc-sbefifo case? > > Yes. All accesses (except cfam) are via sbefifo. > > > - Alistair > > > > On Thursday, 30 April 2020 1:05:38 PM AEST Amitay Isaacs wrote: > > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > > > --- > > > > > > Makefile.am | 2 +- > > > p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 | 0 > > > libpdbg/dtb.c | 4 ++-- > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > rename p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 (100%) > > > > > > diff --git a/Makefile.am b/Makefile.am > > > index 4b53c80..64f3e0b 100644 > > > --- a/Makefile.am > > > +++ b/Makefile.am > > > @@ -80,7 +80,7 @@ endif > > > > > > DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > > > > > > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > > > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > > > > > > - p9-sbefifo.dts \ > > > + bmc-sbefifo.dts \ > > > > > > p8-host.dts p9-host.dts p8.dts > > > > > > DT_sources = $(DT:.dts=.dtb.S) p9.dtb.S > > > > > > diff --git a/p9-sbefifo.dts.m4 b/bmc-sbefifo.dts.m4 > > > similarity index 100% > > > rename from p9-sbefifo.dts.m4 > > > rename to bmc-sbefifo.dts.m4 > > > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > > > index 6a9fc73..5013d96 100644 > > > --- a/libpdbg/dtb.c > > > +++ b/libpdbg/dtb.c > > > @@ -43,7 +43,7 @@ > > > > > > #include "p9-host.dt.h" > > > #include "p8-cronus.dt.h" > > > #include "bmc-cronus.dt.h" > > > > > > -#include "p9-sbefifo.dt.h" > > > +#include "bmc-sbefifo.dt.h" > > > > > > #include "p8.dt.h" > > > #include "p9.dt.h" > > > > > > @@ -431,7 +431,7 @@ struct pdbg_dtb *pdbg_default_dtb(void > > > *system_fdt) > > > > > > if (!strcmp(pdbg_backend_option, "p9")) { > > > > > > if (!dtb->backend.fdt) > > > > > > - dtb->backend.fdt = > > > &_binary_p9_sbefifo_dtb_o_start; > > > + dtb->backend.fdt = > > > &_binary_bmc_sbefifo_dtb_o_start; > > > > > > if (!dtb->system.fdt) > > > > > > dtb->system.fdt = > > > > > > &_binary_p9_dtb_o_start; > > > > > > } else { > > Amitay.
diff --git a/Makefile.am b/Makefile.am index 4b53c80..64f3e0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ endif DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ p8-fsi.dts p8-i2c.dts p8-kernel.dts \ p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ - p9-sbefifo.dts \ + bmc-sbefifo.dts \ p8-host.dts p9-host.dts p8.dts DT_sources = $(DT:.dts=.dtb.S) p9.dtb.S diff --git a/p9-sbefifo.dts.m4 b/bmc-sbefifo.dts.m4 similarity index 100% rename from p9-sbefifo.dts.m4 rename to bmc-sbefifo.dts.m4 diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c index 6a9fc73..5013d96 100644 --- a/libpdbg/dtb.c +++ b/libpdbg/dtb.c @@ -43,7 +43,7 @@ #include "p9-host.dt.h" #include "p8-cronus.dt.h" #include "bmc-cronus.dt.h" -#include "p9-sbefifo.dt.h" +#include "bmc-sbefifo.dt.h" #include "p8.dt.h" #include "p9.dt.h" @@ -431,7 +431,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) if (!strcmp(pdbg_backend_option, "p9")) { if (!dtb->backend.fdt) - dtb->backend.fdt = &_binary_p9_sbefifo_dtb_o_start; + dtb->backend.fdt = &_binary_bmc_sbefifo_dtb_o_start; if (!dtb->system.fdt) dtb->system.fdt = &_binary_p9_dtb_o_start; } else {
Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> --- Makefile.am | 2 +- p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 | 0 libpdbg/dtb.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename p9-sbefifo.dts.m4 => bmc-sbefifo.dts.m4 (100%)