From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-sh@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linux-mm@kvack.org, Paul Mackerras <paulus@samba.org>,
linux-hexagon@vger.kernel.org, Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu, Jonas Bonn <jonas@southpole.se>,
linux-arch@vger.kernel.org, Brian Cain <bcain@codeaurora.org>,
Marc Zyngier <maz@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
uclinux-h8-devel@lists.sourceforge.jp,
Fenghua Yu <fenghua.yu@intel.com>, Arnd Bergmann <arnd@arndb.de>,
kvm-ppc@vger.kernel.org,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
openrisc@lists.librecores.org, Stafford Horne <shorne@gmail.com>,
Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Christophe Leroy <christophe.leroy@c-s.fr>,
Tony Luck <tony.luck@intel.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Michael Ellerman <mpe@ellerman.id.au>,
nios2-dev@lists.rocketboards.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org, Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 08:18:41 +0000 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Brian Cain <bcain@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Fenghua Yu <fenghua.yu@intel.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Guan Xuetao <gxt@pku.edu.cn>, James Morse <james.morse@arm.com>,
Jonas Bonn <jonas@southpole.se>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Marc Zyngier <maz@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Paul Mackerras <paulus@samba.org>, Rich Felker <dalias@libc.org>,
Russell King <linux@armlinux.org.uk>,
Stafford Horne <shorne@gmail.com>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Tony Luck <tony.luck@intel.com>, Will Deacon <will@kernel.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org,
linux-sh@vger.kernel.org, nios2-dev@lists.rocketboards.org,
openrisc@lists.librecores.org,
uclinux-h8-devel@lists.sourceforge.jp,
Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Brian Cain <bcain@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Fenghua Yu <fenghua.yu@intel.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Guan Xuetao <gxt@pku.edu.cn>, James Morse <james.morse@arm.com>,
Jonas Bonn <jonas@southpole.se>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Marc Zyngier <maz@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Paul Mackerras <paulus@samba.org>, Rich Felker <dalias@libc.org>,
Russell King <linux@armlinux.org.uk>,
Stafford Horne <shorne@gmail.com>Stefan Kristiansson <s>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-sh@vger.kernel.org, linux-mm@kvack.org,
Paul Mackerras <paulus@samba.org>,
linux-hexagon@vger.kernel.org, Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu, Jonas Bonn <jonas@southpole.se>,
linux-arch@vger.kernel.org, Brian Cain <bcain@codeaurora.org>,
Marc Zyngier <maz@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
uclinux-h8-devel@lists.sourceforge.jp,
Fenghua Yu <fenghua.yu@intel.com>, Arnd Bergmann <arnd@arndb.de>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
kvm-ppc@vger.kernel.org,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
openrisc@lists.librecores.org, Stafford Horne <shorne@gmail.com>,
Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Tony Luck <tony.luck@intel.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
James Morse <james.morse@arm.com>,
nios2-dev@lists.rocketboards.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org, Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-sh@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linux-mm@kvack.org, Paul Mackerras <paulus@samba.org>,
linux-hexagon@vger.kernel.org, Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu, Jonas Bonn <jonas@southpole.se>,
linux-arch@vger.kernel.org, Brian Cain <bcain@codeaurora.org>,
Marc Zyngier <maz@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
uclinux-h8-devel@lists.sourceforge.jp,
Fenghua Yu <fenghua.yu@intel.com>, Arnd Bergmann <arnd@arndb.de>,
kvm-ppc@vger.kernel.org,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
openrisc@lists.librecores.org, Stafford Horne <shorne@gmail.com>,
Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Christophe Leroy <christophe.leroy@c-s.fr>,
Tony Luck <tony.luck@intel.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Michael Ellerman <mpe@ellerman.id.au>,
nios2-dev@lists.rocketboards.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org, Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-sh@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linux-mm@kvack.org, Paul Mackerras <paulus@samba.org>,
linux-hexagon@vger.kernel.org, Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu, Jonas Bonn <jonas@southpole.se>,
linux-arch@vger.kernel.org, Brian Cain <bcain@codeaurora.org>,
Marc Zyngier <maz@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
uclinux-h8-devel@lists.sourceforge.jp,
Fenghua Yu <fenghua.yu@intel.com>, Arnd Bergmann <arnd@arndb.de>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
kvm-ppc@vger.kernel.org,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
openrisc@lists.librecores.org, Stafford Horne <shorne@gmail.com>,
Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Christophe Leroy <christophe.leroy@c-s.fr>,
Tony Luck <tony.luck@intel.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
James Morse <james.morse@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
nios2-dev@lists.rocketboards.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org, Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Brian Cain <bcain@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Fenghua Yu <fenghua.yu@intel.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Guan Xuetao <gxt@pku.edu.cn>, James Morse <james.morse@arm.com>,
Jonas Bonn <jonas@southpole.se>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Marc Zyngier <maz@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Paul Mackerras <paulus@samba.org>, Rich Felker <dalias@libc.org>,
Russell King <linux@armlinux.org.uk>,
Stafford Horne <shorne@gmail.com>, Stefan Kristiansson <s>
Subject: [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK
Date: Sun, 16 Feb 2020 10:18:41 +0200 [thread overview]
Message-ID: <20200216081843.28670-12-rppt@kernel.org> (raw)
In-Reply-To: <20200216081843.28670-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The unicore32 architecture has 2 level page tables and
asm-generic/pgtable-nopmd.h and explicit casts from pud_t to pgd_t for page
table folding.
Add p4d walk in the only place that actually unfolds the pud level and
remove __ARCH_USE_5LEVEL_HACK.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/unicore32/include/asm/pgtable.h | 1 -
arch/unicore32/kernel/hibernate.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index c8f7ba12f309..82030c32fc05 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -9,7 +9,6 @@
#ifndef __UNICORE_PGTABLE_H__
#define __UNICORE_PGTABLE_H__
-#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
#include <asm/cpu-single.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
index f3812245cc00..ccad051a79b6 100644
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -33,9 +33,11 @@ struct swsusp_arch_regs swsusp_arch_regs_cpu0;
static pmd_t *resume_one_md_table_init(pgd_t *pgd)
{
pud_t *pud;
+ p4d_t *p4d;
pmd_t *pmd_table;
- pud = pud_offset(pgd, 0);
+ p4d = p4d_offset(pgd, 0);
+ pud = pud_offset(p4d, 0);
pmd_table = pmd_offset(pud, 0);
return pmd_table;
--
2.24.0
next prev parent reply other threads:[~2020-02-16 8:18 UTC|newest]
Thread overview: 189+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-16 8:18 [PATCH v2 00/13] mm: remove __ARCH_HAS_5LEVEL_HACK Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 01/13] arm/arm64: add support for folded p4d page tables Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 02/13] h8300: remove usage of __ARCH_USE_5LEVEL_HACK Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 03/13] hexagon: remove __ARCH_USE_5LEVEL_HACK Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 04/13] ia64: add support for folded p4d page tables Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 05/13] nios2: " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 06/13] openrisc: " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 07/13] powerpc: " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 10:41 ` Christophe Leroy
2020-02-16 10:41 ` [OpenRISC] " Christophe Leroy
2020-02-16 10:41 ` Christophe Leroy
2020-02-16 10:41 ` Christophe Leroy
2020-02-16 10:41 ` Christophe Leroy
2020-02-16 10:41 ` Christophe Leroy
2020-02-16 10:41 ` Christophe Leroy
2020-02-18 10:54 ` Mike Rapoport
2020-02-18 10:54 ` [OpenRISC] " Mike Rapoport
2020-02-18 10:54 ` Mike Rapoport
2020-02-18 10:54 ` Mike Rapoport
2020-02-18 10:54 ` Mike Rapoport
2020-02-18 10:54 ` Mike Rapoport
2020-02-18 10:54 ` Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:13 ` [OpenRISC] " Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:13 ` Mike Rapoport
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 9:46 ` [OpenRISC] " Christophe Leroy
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 9:46 ` Christophe Leroy
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 10:56 ` [OpenRISC] " Mike Rapoport
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 10:56 ` Mike Rapoport
2020-02-26 11:20 ` Christophe Leroy
2020-02-26 11:20 ` [OpenRISC] " Christophe Leroy
2020-02-26 11:20 ` Christophe Leroy
2020-02-26 11:20 ` Christophe Leroy
2020-02-26 11:20 ` Christophe Leroy
2020-02-26 11:20 ` Christophe Leroy
2020-02-26 11:20 ` Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 12:07 ` [OpenRISC] " Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 12:07 ` Christophe Leroy
2020-02-19 13:24 ` Mike Rapoport
2020-02-19 13:24 ` [OpenRISC] " Mike Rapoport
2020-02-19 13:24 ` Mike Rapoport
2020-02-19 13:24 ` Mike Rapoport
2020-02-19 13:24 ` Mike Rapoport
2020-02-19 13:24 ` Mike Rapoport
2020-02-19 13:24 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 08/13] sh: fault: Modernize printing of kernel messages Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 09/13] sh: drop __pXd_offset() macros that duplicate pXd_index() ones Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 10/13] sh: add support for folded p4d page tables Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport [this message]
2020-02-16 8:18 ` [PATCH v2 11/13] unicore32: remove __ARCH_USE_5LEVEL_HACK Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 12/13] asm-generic: remove pgtable-nop4d-hack.h Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [PATCH v2 13/13] mm: remove __ARCH_HAS_5LEVEL_HACK and include/asm-generic/5level-fixup.h Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` [OpenRISC] " Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:18 ` Mike Rapoport
2020-02-16 8:22 ` [PATCH v2 00/13] mm: remove __ARCH_HAS_5LEVEL_HACK Russell King - ARM Linux admin
2020-02-16 8:22 ` [OpenRISC] " Russell King - ARM Linux admin
2020-02-16 8:22 ` Russell King - ARM Linux admin
2020-02-16 8:22 ` Russell King - ARM Linux admin
2020-02-16 8:22 ` Russell King - ARM Linux admin
2020-02-16 8:22 ` Russell King - ARM Linux admin
2020-02-16 8:22 ` Russell King - ARM Linux admin
2020-02-16 10:45 ` Christophe Leroy
2020-02-16 10:45 ` [OpenRISC] " Christophe Leroy
2020-02-16 10:45 ` Christophe Leroy
2020-02-16 10:45 ` Christophe Leroy
2020-02-16 10:45 ` Christophe Leroy
2020-02-16 10:45 ` Christophe Leroy
2020-02-16 10:45 ` Christophe Leroy
2020-02-17 6:23 ` Mike Rapoport
2020-02-17 6:23 ` [OpenRISC] " Mike Rapoport
2020-02-17 6:23 ` Mike Rapoport
2020-02-17 6:23 ` Mike Rapoport
2020-02-17 6:23 ` Mike Rapoport
2020-02-17 6:23 ` Mike Rapoport
2020-02-17 6:23 ` Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200216081843.28670-12-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bcain@codeaurora.org \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=dalias@libc.org \
--cc=fenghua.yu@intel.com \
--cc=geert+renesas@glider.be \
--cc=gxt@pku.edu.cn \
--cc=jonas@southpole.se \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=ley.foon.tan@intel.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maz@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=nios2-dev@lists.rocketboards.org \
--cc=openrisc@lists.librecores.org \
--cc=paulus@samba.org \
--cc=rppt@linux.ibm.com \
--cc=shorne@gmail.com \
--cc=stefan.kristiansson@saunalahti.fi \
--cc=tony.luck@intel.com \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=will@kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.