| Message ID | 20210721090706.21523-5-james.clark@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support ETE decoding | expand |
On Wed, Jul 21, 2021 at 10:07:03AM +0100, James Clark wrote: > OpenCSD v1.1.1 has a bug fix for the installation of the ETE decoder > headers. This also means that including headers separately for each > decoder is unnecessary so remove these. > > Signed-off-by: James Clark <james.clark@arm.com> IIUC, only the later patches in this patch set are dependent on OpenCSD v1.1.1. After I checked OpenCSD latest header, this change LGTM: Reviewed-by: Leo Yan <leo.yan@linaro.org> > --- > tools/build/feature/test-libopencsd.c | 4 ++-- > tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 -- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c > index 52c790b0317b..eb6303ff446e 100644 > --- a/tools/build/feature/test-libopencsd.c > +++ b/tools/build/feature/test-libopencsd.c > @@ -4,9 +4,9 @@ > /* > * Check OpenCSD library version is sufficient to provide required features > */ > -#define OCSD_MIN_VER ((1 << 16) | (0 << 8) | (0)) > +#define OCSD_MIN_VER ((1 << 16) | (1 << 8) | (1)) > #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) > -#error "OpenCSD >= 1.0.0 is required" > +#error "OpenCSD >= 1.1.1 is required" > #endif > > int main(void) > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index 5972a8afcc6b..60147c908425 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -13,8 +13,6 @@ > #include <linux/zalloc.h> > #include <stdlib.h> > #include <opencsd/c_api/opencsd_c_api.h> > -#include <opencsd/etmv4/trc_pkt_types_etmv4.h> > -#include <opencsd/ocsd_if_types.h> > > #include "cs-etm.h" > #include "cs-etm-decoder.h" > -- > 2.28.0 >
diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c index 52c790b0317b..eb6303ff446e 100644 --- a/tools/build/feature/test-libopencsd.c +++ b/tools/build/feature/test-libopencsd.c @@ -4,9 +4,9 @@ /* * Check OpenCSD library version is sufficient to provide required features */ -#define OCSD_MIN_VER ((1 << 16) | (0 << 8) | (0)) +#define OCSD_MIN_VER ((1 << 16) | (1 << 8) | (1)) #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) -#error "OpenCSD >= 1.0.0 is required" +#error "OpenCSD >= 1.1.1 is required" #endif int main(void) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index 5972a8afcc6b..60147c908425 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -13,8 +13,6 @@ #include <linux/zalloc.h> #include <stdlib.h> #include <opencsd/c_api/opencsd_c_api.h> -#include <opencsd/etmv4/trc_pkt_types_etmv4.h> -#include <opencsd/ocsd_if_types.h> #include "cs-etm.h" #include "cs-etm-decoder.h"
OpenCSD v1.1.1 has a bug fix for the installation of the ETE decoder headers. This also means that including headers separately for each decoder is unnecessary so remove these. Signed-off-by: James Clark <james.clark@arm.com> --- tools/build/feature/test-libopencsd.c | 4 ++-- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)