* [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning
@ 2022-08-12 14:24 Palmer Dabbelt
2022-08-12 15:13 ` Anup Patel
2022-08-12 15:21 ` Conor.Dooley
0 siblings, 2 replies; 4+ messages in thread
From: Palmer Dabbelt @ 2022-08-12 14:24 UTC (permalink / raw)
To: linux-riscv; +Cc: Palmer Dabbelt
I forgot to update this when sorting out the 64-bit hartid code.
Fixes: 3aefb2ee5bdd ("riscv: implement Zicbom-based CMO instructions + the t-head variant")
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
arch/riscv/mm/dma-noncoherent.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
index cd2225304c82..61a4337cf7b1 100644
--- a/arch/riscv/mm/dma-noncoherent.c
+++ b/arch/riscv/mm/dma-noncoherent.c
@@ -83,8 +83,7 @@ void riscv_init_cbom_blocksize(void)
u32 val;
for_each_of_cpu_node(node) {
- unsigned long hartid;
- int cbom_hartid;
+ unsigned long hartid, cbom_hartid;
ret = riscv_of_processor_hartid(node, &hartid);
if (ret)
@@ -103,7 +102,7 @@ void riscv_init_cbom_blocksize(void)
cbom_hartid = hartid;
} else {
if (riscv_cbom_block_size != val)
- pr_warn("cbom-block-size mismatched between harts %d and %lu\n",
+ pr_warn("cbom-block-size mismatched between harts %lu and %lu\n",
cbom_hartid, hartid);
}
}
--
2.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning
2022-08-12 14:24 [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning Palmer Dabbelt
@ 2022-08-12 15:13 ` Anup Patel
2022-08-12 16:05 ` Palmer Dabbelt
2022-08-12 15:21 ` Conor.Dooley
1 sibling, 1 reply; 4+ messages in thread
From: Anup Patel @ 2022-08-12 15:13 UTC (permalink / raw)
To: Palmer Dabbelt; +Cc: linux-riscv
On Fri, Aug 12, 2022 at 7:54 PM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>
> I forgot to update this when sorting out the 64-bit hartid code.
>
> Fixes: 3aefb2ee5bdd ("riscv: implement Zicbom-based CMO instructions + the t-head variant")
> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Looks good to me.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
> ---
> arch/riscv/mm/dma-noncoherent.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
> index cd2225304c82..61a4337cf7b1 100644
> --- a/arch/riscv/mm/dma-noncoherent.c
> +++ b/arch/riscv/mm/dma-noncoherent.c
> @@ -83,8 +83,7 @@ void riscv_init_cbom_blocksize(void)
> u32 val;
>
> for_each_of_cpu_node(node) {
> - unsigned long hartid;
> - int cbom_hartid;
> + unsigned long hartid, cbom_hartid;
>
> ret = riscv_of_processor_hartid(node, &hartid);
> if (ret)
> @@ -103,7 +102,7 @@ void riscv_init_cbom_blocksize(void)
> cbom_hartid = hartid;
> } else {
> if (riscv_cbom_block_size != val)
> - pr_warn("cbom-block-size mismatched between harts %d and %lu\n",
> + pr_warn("cbom-block-size mismatched between harts %lu and %lu\n",
> cbom_hartid, hartid);
> }
> }
> --
> 2.34.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] 4+ messages in thread* Re: [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning
2022-08-12 15:13 ` Anup Patel
@ 2022-08-12 16:05 ` Palmer Dabbelt
0 siblings, 0 replies; 4+ messages in thread
From: Palmer Dabbelt @ 2022-08-12 16:05 UTC (permalink / raw)
To: anup; +Cc: linux-riscv
On Fri, 12 Aug 2022 08:13:54 PDT (-0700), anup@brainfault.org wrote:
> On Fri, Aug 12, 2022 at 7:54 PM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>>
>> I forgot to update this when sorting out the 64-bit hartid code.
>>
>> Fixes: 3aefb2ee5bdd ("riscv: implement Zicbom-based CMO instructions + the t-head variant")
>> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
>
> Looks good to me.
Actually it looks pretty bad to me, I just sent a v2:
https://lore.kernel.org/r/20220812154010.18280-1-palmer@rivosinc.com
> Reviewed-by: Anup Patel <anup@brainfault.org>
>
> Regards,
> Anup
>
>> ---
>> arch/riscv/mm/dma-noncoherent.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
>> index cd2225304c82..61a4337cf7b1 100644
>> --- a/arch/riscv/mm/dma-noncoherent.c
>> +++ b/arch/riscv/mm/dma-noncoherent.c
>> @@ -83,8 +83,7 @@ void riscv_init_cbom_blocksize(void)
>> u32 val;
>>
>> for_each_of_cpu_node(node) {
>> - unsigned long hartid;
>> - int cbom_hartid;
>> + unsigned long hartid, cbom_hartid;
>>
>> ret = riscv_of_processor_hartid(node, &hartid);
>> if (ret)
>> @@ -103,7 +102,7 @@ void riscv_init_cbom_blocksize(void)
>> cbom_hartid = hartid;
>> } else {
>> if (riscv_cbom_block_size != val)
>> - pr_warn("cbom-block-size mismatched between harts %d and %lu\n",
>> + pr_warn("cbom-block-size mismatched between harts %lu and %lu\n",
>> cbom_hartid, hartid);
>> }
>> }
>> --
>> 2.34.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] 4+ messages in thread
* Re: [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning
2022-08-12 14:24 [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning Palmer Dabbelt
2022-08-12 15:13 ` Anup Patel
@ 2022-08-12 15:21 ` Conor.Dooley
1 sibling, 0 replies; 4+ messages in thread
From: Conor.Dooley @ 2022-08-12 15:21 UTC (permalink / raw)
To: palmer, linux-riscv
On 12/08/2022 15:24, Palmer Dabbelt wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> I forgot to update this when sorting out the 64-bit hartid code.
As much as to test your script as anything else & with cbom_hartid
initialised:
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Thanks.
>
> Fixes: 3aefb2ee5bdd ("riscv: implement Zicbom-based CMO instructions + the t-head variant")
> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
> ---
> arch/riscv/mm/dma-noncoherent.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
> index cd2225304c82..61a4337cf7b1 100644
> --- a/arch/riscv/mm/dma-noncoherent.c
> +++ b/arch/riscv/mm/dma-noncoherent.c
> @@ -83,8 +83,7 @@ void riscv_init_cbom_blocksize(void)
> u32 val;
>
> for_each_of_cpu_node(node) {
> - unsigned long hartid;
> - int cbom_hartid;
> + unsigned long hartid, cbom_hartid;
>
> ret = riscv_of_processor_hartid(node, &hartid);
> if (ret)
> @@ -103,7 +102,7 @@ void riscv_init_cbom_blocksize(void)
> cbom_hartid = hartid;
> } else {
> if (riscv_cbom_block_size != val)
> - pr_warn("cbom-block-size mismatched between harts %d and %lu\n",
> + pr_warn("cbom-block-size mismatched between harts %lu and %lu\n",
> cbom_hartid, hartid);
> }
> }
> --
> 2.34.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] 4+ messages in thread
end of thread, other threads:[~2022-08-12 16:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-12 14:24 [PATCH] RISC-V: Don't truncate a hartid in the cbom-block-size mismatch warning Palmer Dabbelt
2022-08-12 15:13 ` Anup Patel
2022-08-12 16:05 ` Palmer Dabbelt
2022-08-12 15:21 ` 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.