From patchwork Wed Aug 11 00:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 12429681 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F6E0C4338F for ; Wed, 11 Aug 2021 00:43:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B91E96056C for ; Wed, 11 Aug 2021 00:43:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B91E96056C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id EEC026B0082; Tue, 10 Aug 2021 20:43:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E783B6B0081; Tue, 10 Aug 2021 20:43:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7AA06B0088; Tue, 10 Aug 2021 20:43:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 93AF46B0081 for ; Tue, 10 Aug 2021 20:43:23 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3F3888249980 for ; Wed, 11 Aug 2021 00:43:23 +0000 (UTC) X-FDA: 78460951086.30.16586FA Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf01.hostedemail.com (Postfix) with ESMTP id E38EE504BC75 for ; Wed, 11 Aug 2021 00:43:22 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FF6260E97; Wed, 11 Aug 2021 00:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628642602; bh=xDJ908ZzfO6+yH0suS+Wf2y1mcWCsd5q/TbB74bMqLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dx/7wL9VqmoKx8zT58MEHcTkH3sRnAUzpeBYJPrDooFmOZWP2OEPHhDvVRq1SWBpn rI3jxw5FPKPfAnrRZqqV22NN4vrCt+0MgWAaAcv6iAmMfGOL5CcUf9ZZMWGZFRhFBC TrZM6Pf4/X6/FFbDo4TxsniUc0aO+lVH0C/Rsf4XoTQNd2ZiUOzLDYkEVuRC2Xf0eg t6jq2Trd3/FOcPVYECbXSpQcAFgGAuulYPKg7lyK3GA5xXZmxN8T91uBiKk+Ruhzfh cWneKU1nY8fqyoUdpdf5AW5KWz84GyO70HYRgl7oiNE0miDCnjFtg2lYuVFvIvyT7o mHiBMOwpkp2rA== 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 14/18] ARC: mm: hack to allow 2 level build with 4 level code Date: Tue, 10 Aug 2021 17:42:54 -0700 Message-Id: <20210811004258.138075-15-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 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E38EE504BC75 Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Dx/7wL9V"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of vgupta@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=vgupta@kernel.org X-Stat-Signature: 443am89tg3buyp8h4p6pp5hu7goexsda X-HE-Tag: 1628642602-200069 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: PMD_SHIFT is mapped to PUD_SHIFT or PGD_SHIFT by asm-generic/pgtable-* but only for !__ASSEMBLY__ tlbex.S asm code has PTRS_PER_PTE which uses PMD_SHIFT hence barfs for CONFIG_PGTABLE_LEVEL={2,3} and works for 4. So add a workaround local to tlbex.S - the proper fix is to change asm-generic/pgtable-* headers to expose the defines for __ASSEMBLY__ too Signed-off-by: Vineet Gupta --- arch/arc/mm/tlbex.S | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arc/mm/tlbex.S b/arch/arc/mm/tlbex.S index 6b5872197005..d08bd09a0afc 100644 --- a/arch/arc/mm/tlbex.S +++ b/arch/arc/mm/tlbex.S @@ -145,6 +145,14 @@ ex_saved_reg1: ;TLB Miss handling Code ;============================================================================ +#ifndef PMD_SHIFT +#define PMD_SHIFT PUD_SHIFT +#endif + +#ifndef PUD_SHIFT +#define PUD_SHIFT PGDIR_SHIFT +#endif + ;----------------------------------------------------------------------------- ; This macro does the page-table lookup for the faulting address. ; OUT: r0 = PTE faulted on, r1 = ptr to PTE, r2 = Faulting V-address