2024-02-27 12:39:35

by Fei Wu

Subject: [PATCH] riscv: Fix definition of _PAGE_NOCACHE_THEAD

_PAGE_NOCACHE_THEAD is not used but the definition is wrong.

Signed-off-by: Fei Wu <[email protected]>
---
arch/riscv/include/asm/pgtable-64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
index b42017d76924..b99bd66107a6 100644
--- a/arch/riscv/include/asm/pgtable-64.h
+++ b/arch/riscv/include/asm/pgtable-64.h
@@ -136,7 +136,7 @@ enum napot_cont_order {
* 10010 - IO Strongly-ordered, Non-cacheable, Non-bufferable, Shareable, Non-trustable
*/
#define _PAGE_PMA_THEAD ((1UL << 62) | (1UL << 61) | (1UL << 60))
-#define _PAGE_NOCACHE_THEAD ((1UL < 61) | (1UL << 60))
+#define _PAGE_NOCACHE_THEAD ((1UL << 61) | (1UL << 60))
#define _PAGE_IO_THEAD ((1UL << 63) | (1UL << 60))
#define _PAGE_MTMASK_THEAD (_PAGE_PMA_THEAD | _PAGE_IO_THEAD | (1UL << 59))

--
2.34.1

2024-02-27 12:45:05

by Alexandre Ghiti

Subject: Re: [PATCH] riscv: Fix definition of _PAGE_NOCACHE_THEAD

Hi Fei,

On 27/02/2024 13:44, Fei Wu wrote:
> _PAGE_NOCACHE_THEAD is not used but the definition is wrong.
>
> Signed-off-by: Fei Wu <[email protected]>
> ---
> arch/riscv/include/asm/pgtable-64.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
> index b42017d76924..b99bd66107a6 100644
> --- a/arch/riscv/include/asm/pgtable-64.h
> +++ b/arch/riscv/include/asm/pgtable-64.h
> @@ -136,7 +136,7 @@ enum napot_cont_order {
> * 10010 - IO Strongly-ordered, Non-cacheable, Non-bufferable, Shareable, Non-trustable
> */
> #define _PAGE_PMA_THEAD ((1UL << 62) | (1UL << 61) | (1UL << 60))
> -#define _PAGE_NOCACHE_THEAD ((1UL < 61) | (1UL << 60))
> +#define _PAGE_NOCACHE_THEAD ((1UL << 61) | (1UL << 60))
> #define _PAGE_IO_THEAD ((1UL << 63) | (1UL << 60))
> #define _PAGE_MTMASK_THEAD (_PAGE_PMA_THEAD | _PAGE_IO_THEAD | (1UL << 59))
>


This fix is already in -fixes:
https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git/commit/?id=c21f014818600ae017f97ee087e7c136b1916aa7

Thanks,

Alex

2024-02-27 12:47:56

by Fei Wu

Subject: Re: [PATCH] riscv: Fix definition of _PAGE_NOCACHE_THEAD

On 2/27/2024 8:44 PM, Alexandre Ghiti wrote:
> Hi Fei,
>
> On 27/02/2024 13:44, Fei Wu wrote:
>> _PAGE_NOCACHE_THEAD is not used but the definition is wrong.
>>
>> Signed-off-by: Fei Wu <[email protected]>
>> ---
>>   arch/riscv/include/asm/pgtable-64.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/riscv/include/asm/pgtable-64.h
>> b/arch/riscv/include/asm/pgtable-64.h
>> index b42017d76924..b99bd66107a6 100644
>> --- a/arch/riscv/include/asm/pgtable-64.h
>> +++ b/arch/riscv/include/asm/pgtable-64.h
>> @@ -136,7 +136,7 @@ enum napot_cont_order {
>>    * 10010 - IO   Strongly-ordered, Non-cacheable, Non-bufferable,
>> Shareable, Non-trustable
>>    */
>>   #define _PAGE_PMA_THEAD        ((1UL << 62) | (1UL << 61) | (1UL <<
>> 60))
>> -#define _PAGE_NOCACHE_THEAD    ((1UL < 61) | (1UL << 60))
>> +#define _PAGE_NOCACHE_THEAD    ((1UL << 61) | (1UL << 60))
>>   #define _PAGE_IO_THEAD        ((1UL << 63) | (1UL << 60))
>>   #define _PAGE_MTMASK_THEAD    (_PAGE_PMA_THEAD | _PAGE_IO_THEAD |
>> (1UL << 59))
>>  
>
>
> This fix is already in -fixes:
> https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git/commit/?id=c21f014818600ae017f97ee087e7c136b1916aa7
>
Thank you Alex, got it.

Fei.

> Thanks,
>
> Alex
>