[PATCH 13/27] m68k: Use common bits from generic tlb.h

[PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/m68k/include/asm/tlb.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/m68k/include/asm/tlb.h b/arch/m68k/include/asm/tlb.h
index 1785cff..74c15f6 100644
--- a/arch/m68k/include/asm/tlb.h
+++ b/arch/m68k/include/asm/tlb.h
@@ -1,19 +1,11 @@
 #ifndef _M68K_TLB_H
 #define _M68K_TLB_H
 
-/*
- * m68k doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma)	do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb)		flush_tlb_mm((tlb)->mm)
+#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
+#define __pte_free_tlb __pte_free_tlb
+#define __pmd_free_tlb __pmd_free_tlb
+#endif
 
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

On Wed, May 14, 2014 at 8:59 PM, Richard Weinberger <richard@nod.at> wrote:
> --- a/arch/m68k/include/asm/tlb.h
> +++ b/arch/m68k/include/asm/tlb.h
> @@ -1,19 +1,11 @@
>  #ifndef _M68K_TLB_H
>  #define _M68K_TLB_H
>
> -/*
> - * m68k doesn't need any special per-pte or
> - * per-vma handling..
> - */
> -#define tlb_start_vma(tlb, vma)        do { } while (0)
> -#define tlb_end_vma(tlb, vma)  do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address)     do { } while (0)
> -
> -/*
> - * .. because we flush the whole mm when it
> - * fills up.
> - */
> -#define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
> +#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)

Syntax error:

#if defined(CONFIG_MMU) && ...

But why this sudden #ifdef checks?

> +/* These defines are needed to override the defaults from asm-generic/tlb.h */
> +#define __pte_free_tlb __pte_free_tlb
> +#define __pmd_free_tlb __pmd_free_tlb
> +#endif

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 21:19, schrieb Geert Uytterhoeven:
> On Wed, May 14, 2014 at 8:59 PM, Richard Weinberger <richard@nod.at> wrote:
>> --- a/arch/m68k/include/asm/tlb.h
>> +++ b/arch/m68k/include/asm/tlb.h
>> @@ -1,19 +1,11 @@
>>  #ifndef _M68K_TLB_H
>>  #define _M68K_TLB_H
>>
>> -/*
>> - * m68k doesn't need any special per-pte or
>> - * per-vma handling..
>> - */
>> -#define tlb_start_vma(tlb, vma)        do { } while (0)
>> -#define tlb_end_vma(tlb, vma)  do { } while (0)
>> -#define __tlb_remove_tlb_entry(tlb, ptep, address)     do { } while (0)
>> -
>> -/*
>> - * .. because we flush the whole mm when it
>> - * fills up.
>> - */
>> -#define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
>> +#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)
> 
> Syntax error:
> 
> #if defined(CONFIG_MMU) && ...

Whoops, thanks for pointing this out.

> But why this sudden #ifdef checks?

They are needed because in pgalloc.h you have:
#ifdef CONFIG_MMU
#include <asm/virtconvert.h>
#if defined(CONFIG_COLDFIRE)
#include <asm/mcf_pgalloc.h>
#elif defined(CONFIG_SUN3)
#include <asm/sun3_pgalloc.h>
#else
#include <asm/motorola_pgalloc.h>
#endif

And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
Therefore we need to define them such that the generic tlb.h versions will not clash
with yours.

Thanks,
//richard

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

Hi Richard,

On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>> But why this sudden #ifdef checks?
>
> They are needed because in pgalloc.h you have:
> #ifdef CONFIG_MMU
> #include <asm/virtconvert.h>
> #if defined(CONFIG_COLDFIRE)
> #include <asm/mcf_pgalloc.h>
> #elif defined(CONFIG_SUN3)
> #include <asm/sun3_pgalloc.h>
> #else
> #include <asm/motorola_pgalloc.h>
> #endif
>
> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
> Therefore we need to define them such that the generic tlb.h versions will not clash
> with yours.

Thanks for the clarification!

Perhaps this deserves a comment:

/* Applies to Classic m68k MMU only */

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 21:34, schrieb Geert Uytterhoeven:
> Hi Richard,
> 
> On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>>> But why this sudden #ifdef checks?
>>
>> They are needed because in pgalloc.h you have:
>> #ifdef CONFIG_MMU
>> #include <asm/virtconvert.h>
>> #if defined(CONFIG_COLDFIRE)
>> #include <asm/mcf_pgalloc.h>
>> #elif defined(CONFIG_SUN3)
>> #include <asm/sun3_pgalloc.h>
>> #else
>> #include <asm/motorola_pgalloc.h>
>> #endif
>>
>> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
>> Therefore we need to define them such that the generic tlb.h versions will not clash
>> with yours.
> 
> Thanks for the clarification!

One problem which arises here is that me need to make sure that pgalloc.h is included before
tlb.h. Which kind of sucks.
I'll move __pte/pmd_free_tlb from *_pgalloc.h into tlb.h to prevent this issue.

Are you fine with that?

> Perhaps this deserves a comment:
> 
> /* Applies to Classic m68k MMU only */

Will add.

Thanks,
//richard

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

Hi Richard,

On Wed, May 14, 2014 at 10:57 PM, Richard Weinberger <richard@nod.at> wrote:
>> On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>>>> But why this sudden #ifdef checks?
>>>
>>> They are needed because in pgalloc.h you have:
>>> #ifdef CONFIG_MMU
>>> #include <asm/virtconvert.h>
>>> #if defined(CONFIG_COLDFIRE)
>>> #include <asm/mcf_pgalloc.h>
>>> #elif defined(CONFIG_SUN3)
>>> #include <asm/sun3_pgalloc.h>
>>> #else
>>> #include <asm/motorola_pgalloc.h>
>>> #endif
>>>
>>> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
>>> Therefore we need to define them such that the generic tlb.h versions will not clash
>>> with yours.
>>
>> Thanks for the clarification!
>
> One problem which arises here is that me need to make sure that pgalloc.h is included before
> tlb.h. Which kind of sucks.

Indeed.

arch/m68k/include/asm/mmu_context.h includes pgalloc.h, but not tlb.h.
Didn't check whether it gets it indirectly.

> I'll move __pte/pmd_free_tlb from *_pgalloc.h into tlb.h to prevent this issue.
>
> Are you fine with that?

As long as it compiles, I'm happy ;-)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds