| Message ID | 20181218215944.2444-3-mike.leach@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Update AMBA driver for enhanced component ID spec. | expand |
On 18/12/2018 21:59, Mike Leach wrote: > Updates the ID register tables to contain a UCI entry for the A35 ETM > device to allow correct matching of driver in the amba bus code. > > Signed-off-by: Mike Leach <mike.leach@linaro.org> > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > drivers/hwtracing/coresight/coresight-etm4x.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c > index 53e2fb6e86f6..2fb8054e43ab 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -1073,12 +1073,28 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > .mask = 0x000fffff, \ > } > > +static struct amba_cs_uci_id uci_id_etm4[] = { > + { > + /* ETMv4 UCI data */ > + .devarch = 0x47704a13, > + .devarch_mask = 0xfff0ffff, > + .devtype = 0x00000013, > + } > +}; > + > +#define ETM4x_AMBA_UCI_ID(pid) \ > + { \ > + .id = pid, \ > + .mask = 0x000fffff, \ > + .data = uci_id_etm4, \ > + } > + > static const struct amba_id etm4_ids[] = { > ETM4x_AMBA_ID(0x000bb95d), /* Cortex-A53 */ > ETM4x_AMBA_ID(0x000bb95e), /* Cortex-A57 */ > ETM4x_AMBA_ID(0x000bb95a), /* Cortex-A72 */ > ETM4x_AMBA_ID(0x000bb959), /* Cortex-A73 */ > - ETM4x_AMBA_ID(0x000bb9da), /* Cortex-A35 */ > + ETM4x_AMBA_UCI_ID(0x000bb9da), /* Cortex-A35 */ > {}, > }; > > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 53e2fb6e86f6..2fb8054e43ab 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1073,12 +1073,28 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) .mask = 0x000fffff, \ } +static struct amba_cs_uci_id uci_id_etm4[] = { + { + /* ETMv4 UCI data */ + .devarch = 0x47704a13, + .devarch_mask = 0xfff0ffff, + .devtype = 0x00000013, + } +}; + +#define ETM4x_AMBA_UCI_ID(pid) \ + { \ + .id = pid, \ + .mask = 0x000fffff, \ + .data = uci_id_etm4, \ + } + static const struct amba_id etm4_ids[] = { ETM4x_AMBA_ID(0x000bb95d), /* Cortex-A53 */ ETM4x_AMBA_ID(0x000bb95e), /* Cortex-A57 */ ETM4x_AMBA_ID(0x000bb95a), /* Cortex-A72 */ ETM4x_AMBA_ID(0x000bb959), /* Cortex-A73 */ - ETM4x_AMBA_ID(0x000bb9da), /* Cortex-A35 */ + ETM4x_AMBA_UCI_ID(0x000bb9da), /* Cortex-A35 */ {}, };