Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp4018662pxt; Tue, 10 Aug 2021 17:45:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjZYlPsAEqL4bRPUkaCsvaeAjY7SVlt5VNRE+0pSZC5og1ZlnaYCcj5TNFgJxFXVpms1SB X-Received: by 2002:aa7:c7d0:: with SMTP id o16mr8108587eds.75.1628642713943; Tue, 10 Aug 2021 17:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628642713; cv=none; d=google.com; s=arc-20160816; b=E0qRrrol5pjoz+dDooSs9PddHVofz3sTWbo0L54xYgUPe5eLMpsKgWlssT87X2j0oS vtJC9rhQ9qyBUAwbo9PQ3fLC1V9oKO2Nj8hXpx0cJH1XoHj6aYlq5zrOnSIxxAHFIU9V UgjqvtywD7Gg1gzJfMFEfR7M1TLD6xFMxmb3qnHmUcwLcF9Bt2mBksmoavx5Ag14K6Wo xug07Ye2n2Rqy6KvN3AoH4zsjOSqBA3BVFOsQT9uhwz1goyq9kP04AtNva4nqbX4pzNX QgSLO9vn3/lExWrk8tJBsxs76LtzKojkgNSwu5q3RllBebUTC45cYJOwToKi23wsokiT U8fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WwfUxP6wu7dS3GTYQqaV9WkuWbtJkZj1i1D+/Sj2ptg=; b=jrJusNwByYuPPfkH2ONM+bw7G0xY1vxQEn4DwemPqxmdFUvXdGbUe8BF4vs6tYBSOG AjCUppvMETXDlPtcETjftpPuhWof21neUNZRWgb8uVK4zkSawEj9Nu/34EU1gzxF3p0J cARzcRDOTFL2vyZ8aMM8Xp0AsHm1vrzzeGbuQkZvpC3aH9FvFZ3KUOAxjyk+uLPBgeTS qDTR041vzDMaVtFp8bWsqZFAOvV9DtOzb4gF5KiMWK1khkDN5rdqb3bbm2+lanPRZk2K TUUpk3UasQRynYKtOLgbxeZCA8rfHnsYina4qGNPOdGkshCcYL9CZqTU3rjQGOQwjpFZ lgmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZkJz7h7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nb30si23621395ejc.534.2021.08.10.17.44.50; Tue, 10 Aug 2021 17:45:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZkJz7h7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236095AbhHKAnt (ORCPT + 99 others); Tue, 10 Aug 2021 20:43:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:38824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235981AbhHKAnl (ORCPT ); Tue, 10 Aug 2021 20:43:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C1C06101D; Wed, 11 Aug 2021 00:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628642598; bh=SDwFDPOQmz/pmHMM+4prMbb/FBKaF/3A8kiP4jUiFjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZkJz7h7+oRGr3Xu1DUppMJk0wp3gXJP97aJv06qXq1C4tMizWAXPfFe5GyVCcMKmT +vPP/Ls42lfy8cgY4VR+nEGmA3S59MGj1hVyPixzMORUsnw2WxfPJqoCRGZuTx0mdD RdowomDxp3/FtdZbae2lZGnJAvVQb3RJrx1SPcmtMcvRC8+cMDbj6UVbitRzs6Ti9w x4iWLmXJXWjEHmuPA59CjG8jRhMnzUCdq/fdTSXgaZLh4dDN5MmG4PsFU4Zb58WdRF 9LkrTwbllbHu4pkenQgBHaTko3uU7oTXGT4YJqugupg64C+RCKItUwjwomN0F5mOG3 bd2XlgnvbUzaQ== From: Vineet Gupta To: linux-snps-arc@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Anshuman Khandual , Mike Rapoport , Vineet Gupta Subject: [PATCH 05/18] ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS Date: Tue, 10 Aug 2021 17:42:45 -0700 Message-Id: <20210811004258.138075-6-vgupta@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210811004258.138075-1-vgupta@kernel.org> References: <20210811004258.138075-1-vgupta@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Vineet Gupta --- 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 -- 2.25.1