[v2,04/19] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS

Message ID	20210812233753.104217-5-vgupta@kernel.org
State	New
Headers	show Return-Path: <linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Vineet Gupta <vgupta@kernel.org> To: linux-snps-arc@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Anshuman Khandual <anshuman.khandual@arm.com>, Mike Rapoport <rppt@kernel.org>, Vineet Gupta <vgupta@kernel.org> Subject: [PATCH v2 04/19] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS Date: Thu, 12 Aug 2021 16:37:38 -0700 Message-Id: <20210812233753.104217-5-vgupta@kernel.org> In-Reply-To: <20210812233753.104217-1-vgupta@kernel.org> References: <20210812233753.104217-1-vgupta@kernel.org> MIME-Version: 1.0 preview: Signed-off-by: Vineet Gupta <vgupta@kernel.org> --- arch/arc/mm/tlb.c \| 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c index 6079dfd129b9..15cbc285b0de 100644 --- a/arch/arc/mm/tlb.c +++ b/arch/arc/mm/tlb.c @@ -71, 7 +71, 7 @@ static void tlb_entry_erase(unsigned int va [...] Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-snps-arc" <linux-snps-arc-bounces@lists.infradead.org> Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	ARC mm updates: support 3/4 levels and asm-generic/pgalloc \| expand [v2,00/19] ARC mm updates: support 3/4 levels and asm-generic/pgalloc [v2,01/19] ARC: mm: use SCRATCH_DATA0 register for caching pgdir in ARCv2 only [v2,02/19] ARC: mm: remove tlb paranoid code [v2,03/19] ARC: mm: move mmu/cache externs out to setup.h [v2,04/19] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS [v2,05/19] ARC: mm: Enable STRICT_MM_TYPECHECKS [v2,06/19] ARC: ioremap: use more commonly used PAGE_KERNEL based uncached flag [v2,07/19] ARC: mm: pmd_populate* to use the canonical set_pmd (and drop pmd_set) [v2,08/19] ARC: mm: switch pgtable_t back to struct page * [v2,09/19] ARC: mm: switch to asm-generic/pgalloc.h [v2,10/19] ARC: mm: non-functional code cleanup ahead of 3 levels [v2,11/19] ARC: mm: move MMU specific bits out of ASID allocator [v2,12/19] ARC: mm: move MMU specific bits out of entry code ... [v2,13/19] ARC: mm: disintegrate mmu.h (arcv2 bits out) [v2,14/19] ARC: mm: disintegrate pgtable.h into levels and flags [v2,15/19] ARC: mm: hack to allow 2 level build with 4 level code [v2,16/19] ARC: mm: support 3 levels of page tables [v2,17/19] ARC: mm: support 4 levels of page tables [v2,18/19] ARC: mm: vmalloc sync from kernel to user table to update PMD ... [v2,19/19] ARC: mm: introduce _PAGE_TABLE to explicitly link pgd, pud, pmd entries

Message ID

20210812233753.104217-5-vgupta@kernel.org

State

New

Headers

From: Vineet Gupta <vgupta@kernel.org>
To: linux-snps-arc@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
 Anshuman Khandual <anshuman.khandual@arm.com>,
 Mike Rapoport <rppt@kernel.org>, Vineet Gupta <vgupta@kernel.org>
Subject: [PATCH v2 04/19] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS
Date: Thu, 12 Aug 2021 16:37:38 -0700
Message-Id: <20210812233753.104217-5-vgupta@kernel.org>
In-Reply-To: <20210812233753.104217-1-vgupta@kernel.org>
References: <20210812233753.104217-1-vgupta@kernel.org>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-snps-arc" <linux-snps-arc-bounces@lists.infradead.org>
Errors-To: 
 linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

ARC mm updates: support 3/4 levels and asm-generic/pgalloc | expand

Commit Message

Vineet Gupta Aug. 12, 2021, 11:37 p.m. UTC

Signed-off-by: Vineet Gupta <vgupta@kernel.org>
---
 arch/arc/mm/tlb.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c
index 6079dfd129b9..15cbc285b0de 100644
--- a/arch/arc/mm/tlb.c
+++ b/arch/arc/mm/tlb.c
@@ -71,7 +71,7 @@  static void tlb_entry_erase(unsigned int vaddr_n_asid)
 	}
 }
 
-static void tlb_entry_insert(unsigned int pd0, pte_t pd1)
+static void tlb_entry_insert(unsigned int pd0, phys_addr_t pd1)
 {
 	unsigned int idx;
 
@@ -109,13 +109,16 @@  static void tlb_entry_erase(unsigned int vaddr_n_asid)
 	write_aux_reg(ARC_REG_TLBCOMMAND, TLBDeleteEntry);
 }
 
-static void tlb_entry_insert(unsigned int pd0, pte_t pd1)
+static void tlb_entry_insert(unsigned int pd0, phys_addr_t pd1)
 {
 	write_aux_reg(ARC_REG_TLBPD0, pd0);
-	write_aux_reg(ARC_REG_TLBPD1, pd1);
 
-	if (is_pae40_enabled())
+	if (!is_pae40_enabled()) {
+		write_aux_reg(ARC_REG_TLBPD1, pd1);
+	} else {
+		write_aux_reg(ARC_REG_TLBPD1, pd1 & 0xFFFFFFFF);
 		write_aux_reg(ARC_REG_TLBPD1HI, (u64)pd1 >> 32);
+	}
 
 	write_aux_reg(ARC_REG_TLBCOMMAND, TLBInsertEntry);
 }
@@ -391,7 +394,7 @@  void create_tlb(struct vm_area_struct *vma, unsigned long vaddr, pte_t *ptep)
 	unsigned long flags;
 	unsigned int asid_or_sasid, rwx;
 	unsigned long pd0;
-	pte_t pd1;
+	phys_addr_t pd1;
 
 	/*
 	 * create_tlb() assumes that current->mm == vma->mm, since

[v2,04/19] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS

Commit Message

Patch