On 21 December 2016 at 12:19, Thomas Gleixner <[email protected]> wrote: > Even if both drivers are compiled in only one instance can run on a given > system depending on the available tracer cell.
>From a HW point of view both ETM 3x and 4x can be found on the same system but that wouldn't be practical. As such, Acked-by: Mathieu Poirier <[email protected]> > > So having seperate hotplug states for them is pointless. > > Signed-off-by: Thomas Gleixner <[email protected]> > Cc: Mathieu Poirier <[email protected]> > --- > drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++-- > include/linux/cpuhotplug.h | 1 - > 2 files changed, 2 insertions(+), 3 deletions(-) > > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -986,7 +986,7 @@ static int etm4_probe(struct amba_device > dev_err(dev, "ETM arch init failed\n"); > > if (!etm4_count++) { > - cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING, > + cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING, > "arm/coresight4:starting", > etm4_starting_cpu, etm4_dying_cpu); > ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, > @@ -1037,7 +1037,7 @@ static int etm4_probe(struct amba_device > > err_arch_supported: > if (--etm4_count == 0) { > - cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING); > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > if (hp_online) > cpuhp_remove_state_nocalls(hp_online); > } > --- a/include/linux/cpuhotplug.h > +++ b/include/linux/cpuhotplug.h > @@ -119,7 +119,6 @@ enum cpuhp_state { > CPUHP_AP_DUMMY_TIMER_STARTING, > CPUHP_AP_ARM_XEN_STARTING, > CPUHP_AP_ARM_CORESIGHT_STARTING, > - CPUHP_AP_ARM_CORESIGHT4_STARTING, > CPUHP_AP_ARM64_ISNDEP_STARTING, > CPUHP_AP_SMPCFD_DYING, > CPUHP_AP_X86_TBOOT_DYING, > >
