From patchwork Wed Mar 14 08:48:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chintan Pandya X-Patchwork-Id: 10281667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83BB060211 for ; Wed, 14 Mar 2018 08:51:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73DFA2874F for ; Wed, 14 Mar 2018 08:51:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6806328794; Wed, 14 Mar 2018 08:51:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D9B3B2874F for ; Wed, 14 Mar 2018 08:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZY32+ngGJ22NfRRN834IiifcH4USmRWBrVNfVxQsW4s=; b=QXBVSTVjHWN/DgeTA3/RACh1AY HKVz+ShogwYRqaPQVfvvdbsFWbuVrxqt4NZyGzSkwfyELmtBKlXdvBg2VoVHTBHKqGmw8gqXDMU05 GroMzDIz5B5wMAPfBRF1nqfpug1jk1xlDygBYIrXNe1SmMSYWBgXKWiAsUMY2XuH+IO5v/kLFL6NU JIFZ7YBJB3tcIHa0UUReZR9GkKfJ7/fSnl8bl0hUh11OHmAfJ+BTPuv6HUBgPsj940xqvmcnD5bo3 xqE3NXpB34lR8JiiuSPqc+DnjTcjgJBtsPtH376BzqBUOoA3+Fn1acgwOGndp1umfBaK5sE6Uv6rq 6o9GaIhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew27n-0006Mz-Qu; Wed, 14 Mar 2018 08:51:07 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew265-00045U-Rn for linux-arm-kernel@lists.infradead.org; Wed, 14 Mar 2018 08:49:29 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 385B9608BF; Wed, 14 Mar 2018 08:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521017351; bh=hq4I+GH8c9Mo+zd4z/nncPNznixjrbIfbJ2VShLR9Mc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCd5/yKAleTg0O7iaYnwwp6SVaUoHVfdoySqCohYF3PhQyN5DeNPe0TgxSi86ebse hsFDbh23vzsu+pl6zQQj83SVazVGeKOKBa1kHwA9ie+Lo/4/5ZSteZylwtfpAtYm8I Yy0fC91BGc0JRD984mLKmaXe5kV0mB6uYFiFNKJQ= Received: from cpandya-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cpandya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D215060F90; Wed, 14 Mar 2018 08:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521017344; bh=hq4I+GH8c9Mo+zd4z/nncPNznixjrbIfbJ2VShLR9Mc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PtSomUgDJpVZ1GjdSSSO/prwQ85kNS3zYzvC9sVLKYPvuKFh73bx8ZagsC2tIPppl te/+Z+fNGIvPKQzdDJATSkvHYsG8DYbGBrNSF4U2crbxo/KHcPDbLOw7lHkNAX+3/8 eeGQYGUsI+mPop+Dqrdeh/psHoab98cUY3kc8T3c= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D215060F90 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=cpandya@codeaurora.org From: Chintan Pandya To: catalin.marinas@arm.com, will.deacon@arm.com, arnd@arndb.de Subject: [PATCH v1 4/4] Revert "arm64: Enforce BBM for huge IO/VMAP mappings" Date: Wed, 14 Mar 2018 14:18:25 +0530 Message-Id: <1521017305-28518-5-git-send-email-cpandya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521017305-28518-1-git-send-email-cpandya@codeaurora.org> References: <1521017305-28518-1-git-send-email-cpandya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180314_014922_582775_8F2065F3 X-CRM114-Status: GOOD ( 10.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, linux-arch@vger.kernel.org, toshi.kani@hpe.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, kristina.martsenko@arm.com, takahiro.akashi@linaro.org, james.morse@arm.com, Chintan Pandya , tglx@linutronix.de, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This commit 15122ee2c515a ("arm64: Enforce BBM for huge IO/VMAP mappings") is a temporary work-around until the issues with CONFIG_HAVE_ARCH_HUGE_VMAP gets fixed. Revert this change as we have fixes for the issue. Signed-off-by: Chintan Pandya --- arch/arm64/mm/mmu.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c0df264..19116c6 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -935,10 +935,6 @@ int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot) pgprot_t sect_prot = __pgprot(PUD_TYPE_SECT | pgprot_val(mk_sect_prot(prot))); - /* ioremap_page_range doesn't honour BBM */ - if (pud_present(READ_ONCE(*pudp))) - return 0; - BUG_ON(phys & ~PUD_MASK); if (pud_val(*pud) && !pud_huge(*pud)) free_page((unsigned long)__va(pud_val(*pud))); @@ -952,10 +948,6 @@ int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot) pgprot_t sect_prot = __pgprot(PMD_TYPE_SECT | pgprot_val(mk_sect_prot(prot))); - /* ioremap_page_range doesn't honour BBM */ - if (pmd_present(READ_ONCE(*pmdp))) - return 0; - BUG_ON(phys & ~PMD_MASK); if (pmd_val(*pmd) && !pmd_huge(*pmd)) free_page((unsigned long)__va(pmd_val(*pmd)));