* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32
@ 2018-01-08 12:48 Arnd Bergmann
2018-01-08 12:56 ` Yury Norov
2018-01-08 14:56 ` Suzuki K Poulose
0 siblings, 2 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-01-08 12:48 UTC (permalink / raw)
To: linux-arm-kernel
The bitmap_from_u32array() interface got replaced in a global
change, but the arm_dsu_pmu driver adds another instance,
resulting in a build failure:
drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu':
drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration]
This changes the new instance accordingly.
Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array")
Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
The global change is currently in linux-mm, so it should be
possible to just fold this patch into it, without causing
extra work.
---
drivers/perf/arm_dsu_pmu.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 37c0526c93d5..e2700888a7d9 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu)
return;
cpmceid[0] = __dsu_pmu_read_pmceid(0);
cpmceid[1] = __dsu_pmu_read_pmceid(1);
- bitmap_from_u32array(dsu_pmu->cpmceid_bitmap,
- DSU_PMU_MAX_COMMON_EVENTS,
- cpmceid,
- ARRAY_SIZE(cpmceid));
+ bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid,
+ DSU_PMU_MAX_COMMON_EVENTS);
}
static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu)
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 2018-01-08 12:48 [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 Arnd Bergmann @ 2018-01-08 12:56 ` Yury Norov 2018-01-08 14:56 ` Suzuki K Poulose 1 sibling, 0 replies; 6+ messages in thread From: Yury Norov @ 2018-01-08 12:56 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 08, 2018 at 01:48:31PM +0100, Arnd Bergmann wrote: > The bitmap_from_u32array() interface got replaced in a global > change, but the arm_dsu_pmu driver adds another instance, > resulting in a build failure: > > drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu': > drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration] > > This changes the new instance accordingly. > > Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array") > Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > The global change is currently in linux-mm, so it should be > possible to just fold this patch into it, without causing > extra work. > --- > drivers/perf/arm_dsu_pmu.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c > index 37c0526c93d5..e2700888a7d9 100644 > --- a/drivers/perf/arm_dsu_pmu.c > +++ b/drivers/perf/arm_dsu_pmu.c > @@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu) > return; > cpmceid[0] = __dsu_pmu_read_pmceid(0); > cpmceid[1] = __dsu_pmu_read_pmceid(1); > - bitmap_from_u32array(dsu_pmu->cpmceid_bitmap, > - DSU_PMU_MAX_COMMON_EVENTS, > - cpmceid, > - ARRAY_SIZE(cpmceid)); > + bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid, > + DSU_PMU_MAX_COMMON_EVENTS); > } > > static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu) Thanks Arnd, Acked-by: Yury Norov <ynorov@caviumnetworks.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 2018-01-08 12:48 [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 Arnd Bergmann 2018-01-08 12:56 ` Yury Norov @ 2018-01-08 14:56 ` Suzuki K Poulose 2018-01-08 15:15 ` Will Deacon 1 sibling, 1 reply; 6+ messages in thread From: Suzuki K Poulose @ 2018-01-08 14:56 UTC (permalink / raw) To: linux-arm-kernel On 08/01/18 12:48, Arnd Bergmann wrote: > The bitmap_from_u32array() interface got replaced in a global > change, but the arm_dsu_pmu driver adds another instance, > resulting in a build failure: > > drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu': > drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration] > > This changes the new instance accordingly. > > Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array") > Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > The global change is currently in linux-mm, so it should be > possible to just fold this patch into it, without causing > extra work. > --- > drivers/perf/arm_dsu_pmu.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c > index 37c0526c93d5..e2700888a7d9 100644 > --- a/drivers/perf/arm_dsu_pmu.c > +++ b/drivers/perf/arm_dsu_pmu.c > @@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu) > return; > cpmceid[0] = __dsu_pmu_read_pmceid(0); > cpmceid[1] = __dsu_pmu_read_pmceid(1); > - bitmap_from_u32array(dsu_pmu->cpmceid_bitmap, > - DSU_PMU_MAX_COMMON_EVENTS, > - cpmceid, > - ARRAY_SIZE(cpmceid)); > + bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid, > + DSU_PMU_MAX_COMMON_EVENTS); > } > > static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu) > Arnd, Thanks for fixing this. FWIW, Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 2018-01-08 14:56 ` Suzuki K Poulose @ 2018-01-08 15:15 ` Will Deacon 2018-01-08 15:32 ` Yury Norov 0 siblings, 1 reply; 6+ messages in thread From: Will Deacon @ 2018-01-08 15:15 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 08, 2018 at 02:56:24PM +0000, Suzuki K Poulose wrote: > On 08/01/18 12:48, Arnd Bergmann wrote: > >The bitmap_from_u32array() interface got replaced in a global > >change, but the arm_dsu_pmu driver adds another instance, > >resulting in a build failure: > > > >drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu': > >drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration] > > > >This changes the new instance accordingly. > > > >Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array") > >Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support") > >Signed-off-by: Arnd Bergmann <arnd@arndb.de> > >--- > >The global change is currently in linux-mm, so it should be > >possible to just fold this patch into it, without causing > >extra work. > >--- > > drivers/perf/arm_dsu_pmu.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > >diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c > >index 37c0526c93d5..e2700888a7d9 100644 > >--- a/drivers/perf/arm_dsu_pmu.c > >+++ b/drivers/perf/arm_dsu_pmu.c > >@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu) > > return; > > cpmceid[0] = __dsu_pmu_read_pmceid(0); > > cpmceid[1] = __dsu_pmu_read_pmceid(1); > >- bitmap_from_u32array(dsu_pmu->cpmceid_bitmap, > >- DSU_PMU_MAX_COMMON_EVENTS, > >- cpmceid, > >- ARRAY_SIZE(cpmceid)); > >+ bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid, > >+ DSU_PMU_MAX_COMMON_EVENTS); > > } > > static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu) > > > > Arnd, > > Thanks for fixing this. FWIW, > > Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com> Hmm, what's the best way to get this upstream? The PMU driver is likely to be queued via arm64 soon, but this fixup doesn't apply there. Will ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 2018-01-08 15:15 ` Will Deacon @ 2018-01-08 15:32 ` Yury Norov 2018-01-08 15:34 ` Will Deacon 0 siblings, 1 reply; 6+ messages in thread From: Yury Norov @ 2018-01-08 15:32 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 08, 2018 at 03:15:47PM +0000, Will Deacon wrote: > On Mon, Jan 08, 2018 at 02:56:24PM +0000, Suzuki K Poulose wrote: > > On 08/01/18 12:48, Arnd Bergmann wrote: > > >The bitmap_from_u32array() interface got replaced in a global > > >change, but the arm_dsu_pmu driver adds another instance, > > >resulting in a build failure: > > > > > >drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu': > > >drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration] > > > > > >This changes the new instance accordingly. > > > > > >Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array") > > >Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support") > > >Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > >--- > > >The global change is currently in linux-mm, so it should be > > >possible to just fold this patch into it, without causing > > >extra work. > > >--- > > > drivers/perf/arm_dsu_pmu.c | 6 ++---- > > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > > >diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c > > >index 37c0526c93d5..e2700888a7d9 100644 > > >--- a/drivers/perf/arm_dsu_pmu.c > > >+++ b/drivers/perf/arm_dsu_pmu.c > > >@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu) > > > return; > > > cpmceid[0] = __dsu_pmu_read_pmceid(0); > > > cpmceid[1] = __dsu_pmu_read_pmceid(1); > > >- bitmap_from_u32array(dsu_pmu->cpmceid_bitmap, > > >- DSU_PMU_MAX_COMMON_EVENTS, > > >- cpmceid, > > >- ARRAY_SIZE(cpmceid)); > > >+ bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid, > > >+ DSU_PMU_MAX_COMMON_EVENTS); > > > } > > > static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu) > > > > > > > Arnd, > > > > Thanks for fixing this. FWIW, > > > > Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > Hmm, what's the best way to get this upstream? The PMU driver is likely to > be queued via arm64 soon, but this fixup doesn't apply there. Hi Will, If driver will be merged in linux-next prior to my rework, I can resend it with this patch melded. Is it OK for you? Yury ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 2018-01-08 15:32 ` Yury Norov @ 2018-01-08 15:34 ` Will Deacon 0 siblings, 0 replies; 6+ messages in thread From: Will Deacon @ 2018-01-08 15:34 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 08, 2018 at 06:32:25PM +0300, Yury Norov wrote: > On Mon, Jan 08, 2018 at 03:15:47PM +0000, Will Deacon wrote: > > On Mon, Jan 08, 2018 at 02:56:24PM +0000, Suzuki K Poulose wrote: > > > On 08/01/18 12:48, Arnd Bergmann wrote: > > > >The bitmap_from_u32array() interface got replaced in a global > > > >change, but the arm_dsu_pmu driver adds another instance, > > > >resulting in a build failure: > > > > > > > >drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu': > > > >drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? [-Werror=implicit-function-declaration] > > > > > > > >This changes the new instance accordingly. > > > > > > > >Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array") > > > >Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support") > > > >Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > >--- > > > >The global change is currently in linux-mm, so it should be > > > >possible to just fold this patch into it, without causing > > > >extra work. > > > >--- > > > > drivers/perf/arm_dsu_pmu.c | 6 ++---- > > > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > > > > >diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c > > > >index 37c0526c93d5..e2700888a7d9 100644 > > > >--- a/drivers/perf/arm_dsu_pmu.c > > > >+++ b/drivers/perf/arm_dsu_pmu.c > > > >@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu) > > > > return; > > > > cpmceid[0] = __dsu_pmu_read_pmceid(0); > > > > cpmceid[1] = __dsu_pmu_read_pmceid(1); > > > >- bitmap_from_u32array(dsu_pmu->cpmceid_bitmap, > > > >- DSU_PMU_MAX_COMMON_EVENTS, > > > >- cpmceid, > > > >- ARRAY_SIZE(cpmceid)); > > > >+ bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid, > > > >+ DSU_PMU_MAX_COMMON_EVENTS); > > > > } > > > > static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu) > > > > > > > > > > Arnd, > > > > > > Thanks for fixing this. FWIW, > > > > > > Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > > > Hmm, what's the best way to get this upstream? The PMU driver is likely to > > be queued via arm64 soon, but this fixup doesn't apply there. > > Hi Will, > > If driver will be merged in linux-next prior to my rework, I can resend > it with this patch melded. Is it OK for you? Sure, as long as the arm64 pull hits mainline before the tree carrying your rework (which probably makes sense for changes like this anyway). Will ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-01-08 15:34 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-01-08 12:48 [PATCH] perf: arm_dsu_pmu: convert to bitmap_from_arr32 Arnd Bergmann 2018-01-08 12:56 ` Yury Norov 2018-01-08 14:56 ` Suzuki K Poulose 2018-01-08 15:15 ` Will Deacon 2018-01-08 15:32 ` Yury Norov 2018-01-08 15:34 ` Will Deacon
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).