From patchwork Mon Apr 30 07:41:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chintan Pandya X-Patchwork-Id: 10371027 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 31E8C6032A for ; Mon, 30 Apr 2018 07:44:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 226D328775 for ; Mon, 30 Apr 2018 07:44:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1720428947; Mon, 30 Apr 2018 07:44:46 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 5E2AB28775 for ; Mon, 30 Apr 2018 07:44:45 +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=8qeAdbWxIc9w3AfqlhG4eWH2FYQDaPw1comTGZgRz8Y=; b=jISQH9dS+k0DkQAvJzjPTVd2jL BUvVpvhBo+SQvec4nztyc2tAJ6cqgXZo7zVQL+BKpVOly6cF4BBwMk8vx54MeGiZdIIE5JqSxYErY jjzK2EcLZ375a0PeM7l/DqA86nfTjduY+H5OHf8WzTcsBVmReUL1AQCHaZMNGAB3oEBmBeG9lr4kC hx3oyNNE3Ri5NyAyDmxP3wPPG80QTYNOKy6VZYMXu90tR0ZLsseHYv1zkcVf0RvMuLDSYhQFE5Wth 8GZ8Cyxi8ELQpXLj3XOioMuzIRLXj79He/IVhr0/z5AY71JILITBVMXZVjbxaS1yFSJnpjvT6wwxY 3yDIl54g==; 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 1fD3UA-0003i9-8l; Mon, 30 Apr 2018 07:44:34 +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 1fD3SL-0002ur-Ki for linux-arm-kernel@lists.infradead.org; Mon, 30 Apr 2018 07:42:48 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 49D2C60FF8; Mon, 30 Apr 2018 07:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525074152; bh=mugyeAAo99d3KfHBr8Pfw5fHLDHlIh91ty0JagHe0Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EszFPippMa5TpszA/19zKvIpD7vLAFK3lbqpQZmzpvoV9fjIpeg9tdhadz2zi5dgV n3MoqoFmQ0KeOWv6hhjca7B6Hc7PDEXmrC5T0R+y7rVsZNJ+FnV3+aJUD3Y4l03cJ+ m84GqPxOAwNT4e9EcAIswaIbvdC1n0G/sQ3nHRqE= 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 2422A61133; Mon, 30 Apr 2018 07:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525074148; bh=mugyeAAo99d3KfHBr8Pfw5fHLDHlIh91ty0JagHe0Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GBpo7HJLKKksJoEyXLiBM6vlUECQ5VWnAqbVc/h1vfgAxHmdGSJxWvt+U8mePwEB/ IOYDJI45pDuHWMTh87GGIHTUw5LIKihivZl8kU+zsQpY6mxXQFD9bXh5l+jG4x0Hnd N2t9dEt34+o6KikCokwIe5RP1OBNjh5wz2C07uJk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2422A61133 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: Will Deacon , Arnd Bergmann , Mark Rutland , Ard Biesheuvel , Marc Zyngier , Andrew Morton Subject: [PATCH v9 4/4] Revert "arm64: Enforce BBM for huge IO/VMAP mappings" Date: Mon, 30 Apr 2018 13:11:34 +0530 Message-Id: <1525074094-25839-5-git-send-email-cpandya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525074094-25839-1-git-send-email-cpandya@codeaurora.org> References: <1525074094-25839-1-git-send-email-cpandya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180430_004241_779154_72F9818E X-CRM114-Status: GOOD ( 12.19 ) 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: linux-arch@vger.kernel.org, Philip Elcan , Chintan Pandya , Toshi Kani , Greg Kroah-Hartman , Joerg Roedel , Dave Hansen , linux-kernel@vger.kernel.org, Kristina Martsenko , Ingo Molnar , James Morse , "H. Peter Anvin" , Thomas Gleixner , Vitaly Kuznetsov , 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 0f651db..170009b 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); set_pud(pudp, pfn_pud(__phys_to_pfn(phys), sect_prot)); return 1; @@ -949,10 +945,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); set_pmd(pmdp, pfn_pmd(__phys_to_pfn(phys), sect_prot)); return 1;