[PATCH v3 1/2] MIPS: loongson2ef: remove function __uncached_access()

[PATCH v3 1/2] MIPS: loongson2ef: remove function __uncached_access()

[Yanteng Si]

we no longer need the MESA workaround (which shouldn't be there in
the first place, IMHO)

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 arch/mips/loongson2ef/common/mem.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/mips/loongson2ef/common/mem.c b/arch/mips/loongson2ef/common/mem.c
index 057d58bb470e..fceb3ee47eb0 100644
--- a/arch/mips/loongson2ef/common/mem.c
+++ b/arch/mips/loongson2ef/common/mem.c
@@ -41,14 +41,3 @@ void __init prom_init_memory(void)
 		memblock_add(LOONGSON_HIGHMEM_START, highmemsize << 20);
 #endif /* !CONFIG_64BIT */
 }
-
-/* override of arch/mips/mm/cache.c: __uncached_access */
-int __uncached_access(struct file *file, unsigned long addr)
-{
-	if (file->f_flags & O_DSYNC)
-		return 1;
-
-	return addr >= __pa(high_memory) ||
-		((addr >= LOONGSON_MMIO_MEM_START) &&
-		 (addr < LOONGSON_MMIO_MEM_END));
-}
-- 
2.27.0

[PATCH v3 2/2] MIPS: mm:remove function __uncached_access()

[Yanteng Si]

MIPS can now use the default uncached_access like other archs.

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 arch/mips/mm/cache.c | 8 --------
 drivers/char/mem.c   | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 23b16bfd97b2..9cfd432d99f6 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -207,11 +207,3 @@ void cpu_cache_init(void)
 
 	setup_protection_map();
 }
-
-int __weak __uncached_access(struct file *file, unsigned long addr)
-{
-	if (file->f_flags & O_DSYNC)
-		return 1;
-
-	return addr >= __pa(high_memory);
-}
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 43c871dc7477..869b9f5e8e03 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -291,13 +291,6 @@ static int uncached_access(struct file *file, phys_addr_t addr)
 	 * attribute aliases.
 	 */
 	return !(efi_mem_attributes(addr) & EFI_MEMORY_WB);
-#elif defined(CONFIG_MIPS)
-	{
-		extern int __uncached_access(struct file *file,
-					     unsigned long addr);
-
-		return __uncached_access(file, addr);
-	}
 #else
 	/*
 	 * Accessing memory above the top the kernel knows about or through a
-- 
2.27.0

Re: [PATCH v3 2/2] MIPS: mm:remove function __uncached_access()

[Greg Kroah-Hartman]

On Wed, Jan 27, 2021 at 10:38:06AM +0800, Yanteng Si wrote:
> MIPS can now use the default uncached_access like other archs.
> 
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
> ---
>  arch/mips/mm/cache.c | 8 --------
>  drivers/char/mem.c   | 7 -------
>  2 files changed, 15 deletions(-)
> 

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH v3 1/2] MIPS: loongson2ef: remove function __uncached_access()

[Thomas Bogendoerfer]

On Wed, Jan 27, 2021 at 10:38:05AM +0800, Yanteng Si wrote:
> we no longer need the MESA workaround (which shouldn't be there in
> the first place, IMHO)
> 
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
> ---
>  arch/mips/loongson2ef/common/mem.c | 11 -----------
>  1 file changed, 11 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH v3 2/2] MIPS: mm:remove function __uncached_access()

[Thomas Bogendoerfer]

On Wed, Jan 27, 2021 at 10:38:06AM +0800, Yanteng Si wrote:
> MIPS can now use the default uncached_access like other archs.
> 
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
> ---
>  arch/mips/mm/cache.c | 8 --------
>  drivers/char/mem.c   | 7 -------
>  2 files changed, 15 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]