* [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 13:51 ` Conor Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor Dooley @ 2022-08-12 13:51 UTC (permalink / raw)
To: Palmer Dabbelt, Palmer Dabbelt
Cc: Atish Patra, Anup Patel, Will Deacon, Mark Rutland,
Paul Walmsley, Albert Ou, linux-riscv, linux-arm-kernel,
linux-kernel, Conor Dooley
Building riscv/for-next produces following error:
drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
union sbi_pmu_ctr_info {
^
arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
union sbi_pmu_ctr_info {
This appears to have been caused by a merge conflict resolution between
riscv/for-next & riscv/fixes, causing the struct define not being
properly moved to its header.
Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
drivers/perf/riscv_pmu_sbi.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index e7c6fecbf061..6f6681bbfd36 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
NULL,
};
-union sbi_pmu_ctr_info {
- unsigned long value;
- struct {
- unsigned long csr:12;
- unsigned long width:6;
-#if __riscv_xlen == 32
- unsigned long reserved:13;
-#else
- unsigned long reserved:45;
-#endif
- unsigned long type:1;
- };
-};
-
/*
* RISC-V doesn't have hetergenous harts yet. This need to be part of
* per_cpu in case of harts with different pmu counters
--
2.36.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 13:51 ` Conor Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor Dooley @ 2022-08-12 13:51 UTC (permalink / raw)
To: Palmer Dabbelt, Palmer Dabbelt
Cc: Atish Patra, Anup Patel, Will Deacon, Mark Rutland,
Paul Walmsley, Albert Ou, linux-riscv, linux-arm-kernel,
linux-kernel, Conor Dooley
Building riscv/for-next produces following error:
drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
union sbi_pmu_ctr_info {
^
arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
union sbi_pmu_ctr_info {
This appears to have been caused by a merge conflict resolution between
riscv/for-next & riscv/fixes, causing the struct define not being
properly moved to its header.
Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
drivers/perf/riscv_pmu_sbi.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index e7c6fecbf061..6f6681bbfd36 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
NULL,
};
-union sbi_pmu_ctr_info {
- unsigned long value;
- struct {
- unsigned long csr:12;
- unsigned long width:6;
-#if __riscv_xlen == 32
- unsigned long reserved:13;
-#else
- unsigned long reserved:45;
-#endif
- unsigned long type:1;
- };
-};
-
/*
* RISC-V doesn't have hetergenous harts yet. This need to be part of
* per_cpu in case of harts with different pmu counters
--
2.36.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 13:51 ` Conor Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor Dooley @ 2022-08-12 13:51 UTC (permalink / raw)
To: Palmer Dabbelt, Palmer Dabbelt
Cc: Atish Patra, Anup Patel, Will Deacon, Mark Rutland,
Paul Walmsley, Albert Ou, linux-riscv, linux-arm-kernel,
linux-kernel, Conor Dooley
Building riscv/for-next produces following error:
drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
union sbi_pmu_ctr_info {
^
arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
union sbi_pmu_ctr_info {
This appears to have been caused by a merge conflict resolution between
riscv/for-next & riscv/fixes, causing the struct define not being
properly moved to its header.
Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
drivers/perf/riscv_pmu_sbi.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index e7c6fecbf061..6f6681bbfd36 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
NULL,
};
-union sbi_pmu_ctr_info {
- unsigned long value;
- struct {
- unsigned long csr:12;
- unsigned long width:6;
-#if __riscv_xlen == 32
- unsigned long reserved:13;
-#else
- unsigned long reserved:45;
-#endif
- unsigned long type:1;
- };
-};
-
/*
* RISC-V doesn't have hetergenous harts yet. This need to be part of
* per_cpu in case of harts with different pmu counters
--
2.36.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
2022-08-12 13:51 ` Conor Dooley
(?)
@ 2022-08-12 14:13 ` Jessica Clarke
-1 siblings, 0 replies; 15+ messages in thread
From: Jessica Clarke @ 2022-08-12 14:13 UTC (permalink / raw)
To: Conor Dooley
Cc: Palmer Dabbelt, Palmer Dabbelt, Atish Patra, Anup Patel,
Will Deacon, Mark Rutland, Paul Walmsley, Albert Ou, linux-riscv,
linux-arm-kernel, linux-kernel
On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>
> Building riscv/for-next produces following error:
> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
> union sbi_pmu_ctr_info {
> ^
> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
> union sbi_pmu_ctr_info {
>
> This appears to have been caused by a merge conflict resolution between
> riscv/for-next & riscv/fixes, causing the struct define not being
union, not struct
Jess
> properly moved to its header.
>
> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> drivers/perf/riscv_pmu_sbi.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index e7c6fecbf061..6f6681bbfd36 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
> NULL,
> };
>
> -union sbi_pmu_ctr_info {
> - unsigned long value;
> - struct {
> - unsigned long csr:12;
> - unsigned long width:6;
> -#if __riscv_xlen == 32
> - unsigned long reserved:13;
> -#else
> - unsigned long reserved:45;
> -#endif
> - unsigned long type:1;
> - };
> -};
> -
> /*
> * RISC-V doesn't have hetergenous harts yet. This need to be part of
> * per_cpu in case of harts with different pmu counters
> --
> 2.36.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 14:13 ` Jessica Clarke
0 siblings, 0 replies; 15+ messages in thread
From: Jessica Clarke @ 2022-08-12 14:13 UTC (permalink / raw)
To: Conor Dooley
Cc: Palmer Dabbelt, Palmer Dabbelt, Atish Patra, Anup Patel,
Will Deacon, Mark Rutland, Paul Walmsley, Albert Ou, linux-riscv,
linux-arm-kernel, linux-kernel
On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>
> Building riscv/for-next produces following error:
> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
> union sbi_pmu_ctr_info {
> ^
> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
> union sbi_pmu_ctr_info {
>
> This appears to have been caused by a merge conflict resolution between
> riscv/for-next & riscv/fixes, causing the struct define not being
union, not struct
Jess
> properly moved to its header.
>
> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> drivers/perf/riscv_pmu_sbi.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index e7c6fecbf061..6f6681bbfd36 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
> NULL,
> };
>
> -union sbi_pmu_ctr_info {
> - unsigned long value;
> - struct {
> - unsigned long csr:12;
> - unsigned long width:6;
> -#if __riscv_xlen == 32
> - unsigned long reserved:13;
> -#else
> - unsigned long reserved:45;
> -#endif
> - unsigned long type:1;
> - };
> -};
> -
> /*
> * RISC-V doesn't have hetergenous harts yet. This need to be part of
> * per_cpu in case of harts with different pmu counters
> --
> 2.36.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 14:13 ` Jessica Clarke
0 siblings, 0 replies; 15+ messages in thread
From: Jessica Clarke @ 2022-08-12 14:13 UTC (permalink / raw)
To: Conor Dooley
Cc: Palmer Dabbelt, Palmer Dabbelt, Atish Patra, Anup Patel,
Will Deacon, Mark Rutland, Paul Walmsley, Albert Ou, linux-riscv,
linux-arm-kernel, linux-kernel
On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>
> Building riscv/for-next produces following error:
> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
> union sbi_pmu_ctr_info {
> ^
> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
> union sbi_pmu_ctr_info {
>
> This appears to have been caused by a merge conflict resolution between
> riscv/for-next & riscv/fixes, causing the struct define not being
union, not struct
Jess
> properly moved to its header.
>
> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> drivers/perf/riscv_pmu_sbi.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index e7c6fecbf061..6f6681bbfd36 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
> NULL,
> };
>
> -union sbi_pmu_ctr_info {
> - unsigned long value;
> - struct {
> - unsigned long csr:12;
> - unsigned long width:6;
> -#if __riscv_xlen == 32
> - unsigned long reserved:13;
> -#else
> - unsigned long reserved:45;
> -#endif
> - unsigned long type:1;
> - };
> -};
> -
> /*
> * RISC-V doesn't have hetergenous harts yet. This need to be part of
> * per_cpu in case of harts with different pmu counters
> --
> 2.36.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
2022-08-12 14:13 ` Jessica Clarke
(?)
@ 2022-08-12 14:19 ` Conor.Dooley
-1 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 14:19 UTC (permalink / raw)
To: jrtc27
Cc: palmer, palmer, atishp, anup, will, mark.rutland, paul.walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 15:13, Jessica Clarke wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>
>> Building riscv/for-next produces following error:
>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>> union sbi_pmu_ctr_info {
>> ^
>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>> union sbi_pmu_ctr_info {
>>
>> This appears to have been caused by a merge conflict resolution between
>> riscv/for-next & riscv/fixes, causing the struct define not being
>
> union, not struct
autopilot, thanks :)
>
> Jess
>
>> properly moved to its header.
>>
>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>> ---
>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>> 1 file changed, 14 deletions(-)
>>
>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>> index e7c6fecbf061..6f6681bbfd36 100644
>> --- a/drivers/perf/riscv_pmu_sbi.c
>> +++ b/drivers/perf/riscv_pmu_sbi.c
>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>> NULL,
>> };
>>
>> -union sbi_pmu_ctr_info {
>> - unsigned long value;
>> - struct {
>> - unsigned long csr:12;
>> - unsigned long width:6;
>> -#if __riscv_xlen == 32
>> - unsigned long reserved:13;
>> -#else
>> - unsigned long reserved:45;
>> -#endif
>> - unsigned long type:1;
>> - };
>> -};
>> -
>> /*
>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>> * per_cpu in case of harts with different pmu counters
>> --
>> 2.36.1
>>
>>
>> _______________________________________________
>> linux-riscv mailing list
>> linux-riscv@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 14:19 ` Conor.Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 14:19 UTC (permalink / raw)
To: jrtc27
Cc: palmer, palmer, atishp, anup, will, mark.rutland, paul.walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 15:13, Jessica Clarke wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>
>> Building riscv/for-next produces following error:
>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>> union sbi_pmu_ctr_info {
>> ^
>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>> union sbi_pmu_ctr_info {
>>
>> This appears to have been caused by a merge conflict resolution between
>> riscv/for-next & riscv/fixes, causing the struct define not being
>
> union, not struct
autopilot, thanks :)
>
> Jess
>
>> properly moved to its header.
>>
>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>> ---
>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>> 1 file changed, 14 deletions(-)
>>
>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>> index e7c6fecbf061..6f6681bbfd36 100644
>> --- a/drivers/perf/riscv_pmu_sbi.c
>> +++ b/drivers/perf/riscv_pmu_sbi.c
>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>> NULL,
>> };
>>
>> -union sbi_pmu_ctr_info {
>> - unsigned long value;
>> - struct {
>> - unsigned long csr:12;
>> - unsigned long width:6;
>> -#if __riscv_xlen == 32
>> - unsigned long reserved:13;
>> -#else
>> - unsigned long reserved:45;
>> -#endif
>> - unsigned long type:1;
>> - };
>> -};
>> -
>> /*
>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>> * per_cpu in case of harts with different pmu counters
>> --
>> 2.36.1
>>
>>
>> _______________________________________________
>> linux-riscv mailing list
>> linux-riscv@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 14:19 ` Conor.Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 14:19 UTC (permalink / raw)
To: jrtc27
Cc: palmer, palmer, atishp, anup, will, mark.rutland, paul.walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 15:13, Jessica Clarke wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>
>> Building riscv/for-next produces following error:
>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>> union sbi_pmu_ctr_info {
>> ^
>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>> union sbi_pmu_ctr_info {
>>
>> This appears to have been caused by a merge conflict resolution between
>> riscv/for-next & riscv/fixes, causing the struct define not being
>
> union, not struct
autopilot, thanks :)
>
> Jess
>
>> properly moved to its header.
>>
>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>> ---
>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>> 1 file changed, 14 deletions(-)
>>
>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>> index e7c6fecbf061..6f6681bbfd36 100644
>> --- a/drivers/perf/riscv_pmu_sbi.c
>> +++ b/drivers/perf/riscv_pmu_sbi.c
>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>> NULL,
>> };
>>
>> -union sbi_pmu_ctr_info {
>> - unsigned long value;
>> - struct {
>> - unsigned long csr:12;
>> - unsigned long width:6;
>> -#if __riscv_xlen == 32
>> - unsigned long reserved:13;
>> -#else
>> - unsigned long reserved:45;
>> -#endif
>> - unsigned long type:1;
>> - };
>> -};
>> -
>> /*
>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>> * per_cpu in case of harts with different pmu counters
>> --
>> 2.36.1
>>
>>
>> _______________________________________________
>> linux-riscv mailing list
>> linux-riscv@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
2022-08-12 14:19 ` Conor.Dooley
(?)
@ 2022-08-12 22:33 ` Palmer Dabbelt
-1 siblings, 0 replies; 15+ messages in thread
From: Palmer Dabbelt @ 2022-08-12 22:33 UTC (permalink / raw)
To: Conor.Dooley
Cc: jrtc27, atishp, anup, Will Deacon, mark.rutland, Paul Walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
> On 12/08/2022 15:13, Jessica Clarke wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>
>>> Building riscv/for-next produces following error:
>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>> union sbi_pmu_ctr_info {
>>> ^
>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>> union sbi_pmu_ctr_info {
>>>
>>> This appears to have been caused by a merge conflict resolution between
>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>
>> union, not struct
>
> autopilot, thanks :)
>
>>
>> Jess
>>
>>> properly moved to its header.
>>>
>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>> ---
>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>> 1 file changed, 14 deletions(-)
>>>
>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>> index e7c6fecbf061..6f6681bbfd36 100644
>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>> NULL,
>>> };
>>>
>>> -union sbi_pmu_ctr_info {
>>> - unsigned long value;
>>> - struct {
>>> - unsigned long csr:12;
>>> - unsigned long width:6;
>>> -#if __riscv_xlen == 32
>>> - unsigned long reserved:13;
>>> -#else
>>> - unsigned long reserved:45;
>>> -#endif
>>> - unsigned long type:1;
>>> - };
>>> -};
>>> -
>>> /*
>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>> * per_cpu in case of harts with different pmu counters
Atish just poked me about this as I was tagging my PR, I squashed it in.
I don't see a message on lore, not sure if something went off the rails
or if it's just in the outbox on my box at home.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 22:33 ` Palmer Dabbelt
0 siblings, 0 replies; 15+ messages in thread
From: Palmer Dabbelt @ 2022-08-12 22:33 UTC (permalink / raw)
To: Conor.Dooley
Cc: jrtc27, atishp, anup, Will Deacon, mark.rutland, Paul Walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
> On 12/08/2022 15:13, Jessica Clarke wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>
>>> Building riscv/for-next produces following error:
>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>> union sbi_pmu_ctr_info {
>>> ^
>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>> union sbi_pmu_ctr_info {
>>>
>>> This appears to have been caused by a merge conflict resolution between
>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>
>> union, not struct
>
> autopilot, thanks :)
>
>>
>> Jess
>>
>>> properly moved to its header.
>>>
>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>> ---
>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>> 1 file changed, 14 deletions(-)
>>>
>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>> index e7c6fecbf061..6f6681bbfd36 100644
>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>> NULL,
>>> };
>>>
>>> -union sbi_pmu_ctr_info {
>>> - unsigned long value;
>>> - struct {
>>> - unsigned long csr:12;
>>> - unsigned long width:6;
>>> -#if __riscv_xlen == 32
>>> - unsigned long reserved:13;
>>> -#else
>>> - unsigned long reserved:45;
>>> -#endif
>>> - unsigned long type:1;
>>> - };
>>> -};
>>> -
>>> /*
>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>> * per_cpu in case of harts with different pmu counters
Atish just poked me about this as I was tagging my PR, I squashed it in.
I don't see a message on lore, not sure if something went off the rails
or if it's just in the outbox on my box at home.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 22:33 ` Palmer Dabbelt
0 siblings, 0 replies; 15+ messages in thread
From: Palmer Dabbelt @ 2022-08-12 22:33 UTC (permalink / raw)
To: Conor.Dooley
Cc: jrtc27, atishp, anup, Will Deacon, mark.rutland, Paul Walmsley,
aou, linux-riscv, linux-arm-kernel, linux-kernel
On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
> On 12/08/2022 15:13, Jessica Clarke wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>
>>> Building riscv/for-next produces following error:
>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>> union sbi_pmu_ctr_info {
>>> ^
>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>> union sbi_pmu_ctr_info {
>>>
>>> This appears to have been caused by a merge conflict resolution between
>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>
>> union, not struct
>
> autopilot, thanks :)
>
>>
>> Jess
>>
>>> properly moved to its header.
>>>
>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>> ---
>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>> 1 file changed, 14 deletions(-)
>>>
>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>> index e7c6fecbf061..6f6681bbfd36 100644
>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>> NULL,
>>> };
>>>
>>> -union sbi_pmu_ctr_info {
>>> - unsigned long value;
>>> - struct {
>>> - unsigned long csr:12;
>>> - unsigned long width:6;
>>> -#if __riscv_xlen == 32
>>> - unsigned long reserved:13;
>>> -#else
>>> - unsigned long reserved:45;
>>> -#endif
>>> - unsigned long type:1;
>>> - };
>>> -};
>>> -
>>> /*
>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>> * per_cpu in case of harts with different pmu counters
Atish just poked me about this as I was tagging my PR, I squashed it in.
I don't see a message on lore, not sure if something went off the rails
or if it's just in the outbox on my box at home.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
2022-08-12 22:33 ` Palmer Dabbelt
(?)
@ 2022-08-12 22:36 ` Conor.Dooley
-1 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 22:36 UTC (permalink / raw)
To: palmer, Conor.Dooley
Cc: jrtc27, atishp, anup, will, mark.rutland, paul.walmsley, aou,
linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 23:33, Palmer Dabbelt wrote:
> On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
>> On 12/08/2022 15:13, Jessica Clarke wrote:
>>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>>
>>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>>
>>>> Building riscv/for-next produces following error:
>>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>>> union sbi_pmu_ctr_info {
>>>> ^
>>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>>> union sbi_pmu_ctr_info {
>>>>
>>>> This appears to have been caused by a merge conflict resolution between
>>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>>
>>> union, not struct
>>
>> autopilot, thanks :)
>>
>>>
>>> Jess
>>>
>>>> properly moved to its header.
>>>>
>>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>>> ---
>>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>>> 1 file changed, 14 deletions(-)
>>>>
>>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>>> index e7c6fecbf061..6f6681bbfd36 100644
>>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>>> NULL,
>>>> };
>>>>
>>>> -union sbi_pmu_ctr_info {
>>>> - unsigned long value;
>>>> - struct {
>>>> - unsigned long csr:12;
>>>> - unsigned long width:6;
>>>> -#if __riscv_xlen == 32
>>>> - unsigned long reserved:13;
>>>> -#else
>>>> - unsigned long reserved:45;
>>>> -#endif
>>>> - unsigned long type:1;
>>>> - };
>>>> -};
>>>> -
>>>> /*
>>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>>> * per_cpu in case of harts with different pmu counters
>
> Atish just poked me about this as I was tagging my PR, I squashed it in.
> I don't see a message on lore, not sure if something went off the rails
> or if it's just in the outbox on my box at home.
I assume stuck in the outbox. I checked out for-next after I got home
from work and the error was gone so I assumed you'd done so.
:)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 22:36 ` Conor.Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 22:36 UTC (permalink / raw)
To: palmer, Conor.Dooley
Cc: jrtc27, atishp, anup, will, mark.rutland, paul.walmsley, aou,
linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 23:33, Palmer Dabbelt wrote:
> On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
>> On 12/08/2022 15:13, Jessica Clarke wrote:
>>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>>
>>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>>
>>>> Building riscv/for-next produces following error:
>>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>>> union sbi_pmu_ctr_info {
>>>> ^
>>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>>> union sbi_pmu_ctr_info {
>>>>
>>>> This appears to have been caused by a merge conflict resolution between
>>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>>
>>> union, not struct
>>
>> autopilot, thanks :)
>>
>>>
>>> Jess
>>>
>>>> properly moved to its header.
>>>>
>>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>>> ---
>>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>>> 1 file changed, 14 deletions(-)
>>>>
>>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>>> index e7c6fecbf061..6f6681bbfd36 100644
>>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>>> NULL,
>>>> };
>>>>
>>>> -union sbi_pmu_ctr_info {
>>>> - unsigned long value;
>>>> - struct {
>>>> - unsigned long csr:12;
>>>> - unsigned long width:6;
>>>> -#if __riscv_xlen == 32
>>>> - unsigned long reserved:13;
>>>> -#else
>>>> - unsigned long reserved:45;
>>>> -#endif
>>>> - unsigned long type:1;
>>>> - };
>>>> -};
>>>> -
>>>> /*
>>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>>> * per_cpu in case of harts with different pmu counters
>
> Atish just poked me about this as I was tagging my PR, I squashed it in.
> I don't see a message on lore, not sure if something went off the rails
> or if it's just in the outbox on my box at home.
I assume stuck in the outbox. I checked out for-next after I got home
from work and the error was gone so I assumed you'd done so.
:)
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] perf: riscv: fix broken build due to struct redefinition
@ 2022-08-12 22:36 ` Conor.Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor.Dooley @ 2022-08-12 22:36 UTC (permalink / raw)
To: palmer, Conor.Dooley
Cc: jrtc27, atishp, anup, will, mark.rutland, paul.walmsley, aou,
linux-riscv, linux-arm-kernel, linux-kernel
On 12/08/2022 23:33, Palmer Dabbelt wrote:
> On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@microchip.com wrote:
>> On 12/08/2022 15:13, Jessica Clarke wrote:
>>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>>
>>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@microchip.com> wrote:
>>>>
>>>> Building riscv/for-next produces following error:
>>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>>> union sbi_pmu_ctr_info {
>>>> ^
>>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>>> union sbi_pmu_ctr_info {
>>>>
>>>> This appears to have been caused by a merge conflict resolution between
>>>> riscv/for-next & riscv/fixes, causing the struct define not being
>>>
>>> union, not struct
>>
>> autopilot, thanks :)
>>
>>>
>>> Jess
>>>
>>>> properly moved to its header.
>>>>
>>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>>> ---
>>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>>> 1 file changed, 14 deletions(-)
>>>>
>>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>>> index e7c6fecbf061..6f6681bbfd36 100644
>>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>>> NULL,
>>>> };
>>>>
>>>> -union sbi_pmu_ctr_info {
>>>> - unsigned long value;
>>>> - struct {
>>>> - unsigned long csr:12;
>>>> - unsigned long width:6;
>>>> -#if __riscv_xlen == 32
>>>> - unsigned long reserved:13;
>>>> -#else
>>>> - unsigned long reserved:45;
>>>> -#endif
>>>> - unsigned long type:1;
>>>> - };
>>>> -};
>>>> -
>>>> /*
>>>> * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>>> * per_cpu in case of harts with different pmu counters
>
> Atish just poked me about this as I was tagging my PR, I squashed it in.
> I don't see a message on lore, not sure if something went off the rails
> or if it's just in the outbox on my box at home.
I assume stuck in the outbox. I checked out for-next after I got home
from work and the error was gone so I assumed you'd done so.
:)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2022-08-12 22:38 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-12 13:51 [PATCH] perf: riscv: fix broken build due to struct redefinition Conor Dooley
2022-08-12 13:51 ` Conor Dooley
2022-08-12 13:51 ` Conor Dooley
2022-08-12 14:13 ` Jessica Clarke
2022-08-12 14:13 ` Jessica Clarke
2022-08-12 14:13 ` Jessica Clarke
2022-08-12 14:19 ` Conor.Dooley
2022-08-12 14:19 ` Conor.Dooley
2022-08-12 14:19 ` Conor.Dooley
2022-08-12 22:33 ` Palmer Dabbelt
2022-08-12 22:33 ` Palmer Dabbelt
2022-08-12 22:33 ` Palmer Dabbelt
2022-08-12 22:36 ` Conor.Dooley
2022-08-12 22:36 ` Conor.Dooley
2022-08-12 22:36 ` Conor.Dooley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.