| Message ID | 20210825152721.2818305-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] Enable dt_sysinfo test for Power only | expand |
On 2021-08-25 9:27 a.m., Rob Herring wrote: > The dt_sysinfo test is pretty specific to certain Power systems and > wouldn't scale to more DT based systems, so just enable it for Power > only. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > src/devicetree/dt_sysinfo/dt_sysinfo.c | 4 ++++ > src/lib/include/fwts.h | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/src/devicetree/dt_sysinfo/dt_sysinfo.c b/src/devicetree/dt_sysinfo/dt_sysinfo.c > index 7c3fae6f33f8..8d8380555837 100644 > --- a/src/devicetree/dt_sysinfo/dt_sysinfo.c > +++ b/src/devicetree/dt_sysinfo/dt_sysinfo.c > @@ -26,6 +26,8 @@ > > #include "fwts.h" > > +#ifdef FWTS_ARCH_PPC > + > static const char op_powernv[] = "ibm,powernv"; > static const char opal_firmware[] = "/ibm,opal/firmware"; > static const char platform_firmware[] = "/ibm,firmware-versions"; > @@ -380,3 +382,5 @@ static fwts_framework_ops dt_sysinfo_ops = { > > FWTS_REGISTER_FEATURES("dt_sysinfo", &dt_sysinfo_ops, FWTS_TEST_ANYTIME, > FWTS_FLAG_BATCH, FWTS_FW_FEATURE_DEVICETREE); > + > +#endif > diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h > index c118b82d372a..551a4e092246 100644 > --- a/src/lib/include/fwts.h > +++ b/src/lib/include/fwts.h > @@ -114,6 +114,7 @@ > #endif > > #if defined(__PPC64__) > +#define FWTS_ARCH_PPC 1 > #undef FWTS_HAS_ACPI > #undef FWTS_HAS_UEFI > #define FWTS_USE_DEVMEM 1 > Acked-by: Alex Hung <alex.hung@canonical.com>
On 8/25/21 11:27 PM, Rob Herring wrote: > The dt_sysinfo test is pretty specific to certain Power systems and > wouldn't scale to more DT based systems, so just enable it for Power > only. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > src/devicetree/dt_sysinfo/dt_sysinfo.c | 4 ++++ > src/lib/include/fwts.h | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/src/devicetree/dt_sysinfo/dt_sysinfo.c b/src/devicetree/dt_sysinfo/dt_sysinfo.c > index 7c3fae6f33f8..8d8380555837 100644 > --- a/src/devicetree/dt_sysinfo/dt_sysinfo.c > +++ b/src/devicetree/dt_sysinfo/dt_sysinfo.c > @@ -26,6 +26,8 @@ > > #include "fwts.h" > > +#ifdef FWTS_ARCH_PPC > + > static const char op_powernv[] = "ibm,powernv"; > static const char opal_firmware[] = "/ibm,opal/firmware"; > static const char platform_firmware[] = "/ibm,firmware-versions"; > @@ -380,3 +382,5 @@ static fwts_framework_ops dt_sysinfo_ops = { > > FWTS_REGISTER_FEATURES("dt_sysinfo", &dt_sysinfo_ops, FWTS_TEST_ANYTIME, > FWTS_FLAG_BATCH, FWTS_FW_FEATURE_DEVICETREE); > + > +#endif > diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h > index c118b82d372a..551a4e092246 100644 > --- a/src/lib/include/fwts.h > +++ b/src/lib/include/fwts.h > @@ -114,6 +114,7 @@ > #endif > > #if defined(__PPC64__) > +#define FWTS_ARCH_PPC 1 > #undef FWTS_HAS_ACPI > #undef FWTS_HAS_UEFI > #define FWTS_USE_DEVMEM 1 > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/devicetree/dt_sysinfo/dt_sysinfo.c b/src/devicetree/dt_sysinfo/dt_sysinfo.c index 7c3fae6f33f8..8d8380555837 100644 --- a/src/devicetree/dt_sysinfo/dt_sysinfo.c +++ b/src/devicetree/dt_sysinfo/dt_sysinfo.c @@ -26,6 +26,8 @@ #include "fwts.h" +#ifdef FWTS_ARCH_PPC + static const char op_powernv[] = "ibm,powernv"; static const char opal_firmware[] = "/ibm,opal/firmware"; static const char platform_firmware[] = "/ibm,firmware-versions"; @@ -380,3 +382,5 @@ static fwts_framework_ops dt_sysinfo_ops = { FWTS_REGISTER_FEATURES("dt_sysinfo", &dt_sysinfo_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH, FWTS_FW_FEATURE_DEVICETREE); + +#endif diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h index c118b82d372a..551a4e092246 100644 --- a/src/lib/include/fwts.h +++ b/src/lib/include/fwts.h @@ -114,6 +114,7 @@ #endif #if defined(__PPC64__) +#define FWTS_ARCH_PPC 1 #undef FWTS_HAS_ACPI #undef FWTS_HAS_UEFI #define FWTS_USE_DEVMEM 1
The dt_sysinfo test is pretty specific to certain Power systems and wouldn't scale to more DT based systems, so just enable it for Power only. Signed-off-by: Rob Herring <robh@kernel.org> --- src/devicetree/dt_sysinfo/dt_sysinfo.c | 4 ++++ src/lib/include/fwts.h | 1 + 2 files changed, 5 insertions(+)