From patchwork Tue Mar 20 11:45:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chintan Pandya X-Patchwork-Id: 10296935 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 171A660385 for ; Tue, 20 Mar 2018 11:48:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 056F52897A for ; Tue, 20 Mar 2018 11:48:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED80029560; Tue, 20 Mar 2018 11:48:05 +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 5C3C42954C for ; Tue, 20 Mar 2018 11:48:05 +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=nmU/KDJ/ysPOwPfIdkPGZRSlv+Nbb5V1IPH3ze1K8iI=; b=oT56hjd3wv1dT4cPk47AOpCBTf EFSHuXwAPF4p60vPwg0lqkvXrSNu18Bwrj4lk4Sdr996j5pMUIKLoNQTCUDjS+OihRrSjvkf5q8gd keG9Tk+D9oz9AI57bG3gTiGa3y0+4OopgCzb5khi+xNgdDc1p2mXM6Te48i+quRxhfGZoSALA8VFa OsywKMR7NZaWeR0jAFvXc+SYrjpZfrUoRDcOtaOL3iGa8LN1xgb+WkXApeTP8T2uCUdjsUhhUDzzN GDb//BbLC/xS4NMt9U+NQznrbnWim4rw0R2W4CHLa9hUZGttMdpTa7VuKd9bjetNNt6jJ52aaRsWB qvpwz7ww==; 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 1eyFkD-00012A-Ca; Tue, 20 Mar 2018 11:47:57 +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 1eyFiq-00007b-Cq for linux-arm-kernel@lists.infradead.org; Tue, 20 Mar 2018 11:46:44 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A3AE360F94; Tue, 20 Mar 2018 11:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521546381; bh=b4ePx+alQArJX+mjCQEvReBpG2Vhh3+iN9wcwM6qi58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVm7FogWH7sfhnUP7OM5bgqXANPfh4rHoDHe+aeh0E6EjO49lJS90v/QXWHwfMI6z e7tnoHx3O5aJSxu0TbOyAE9qFWEdcEQQ7kAf1g7X52wOVIlLzgBKZSZLBSTEcv5F76 aCBkj0Gx97Uwq8QIT0a+9uv3VLwnpmk6ZnkmBp3U= 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 713F860F6B; Tue, 20 Mar 2018 11:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521546381; bh=b4ePx+alQArJX+mjCQEvReBpG2Vhh3+iN9wcwM6qi58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVm7FogWH7sfhnUP7OM5bgqXANPfh4rHoDHe+aeh0E6EjO49lJS90v/QXWHwfMI6z e7tnoHx3O5aJSxu0TbOyAE9qFWEdcEQQ7kAf1g7X52wOVIlLzgBKZSZLBSTEcv5F76 aCBkj0Gx97Uwq8QIT0a+9uv3VLwnpmk6ZnkmBp3U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 713F860F6B 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, mark.rutland@arm.com Subject: [PATCH v4 3/3] Revert "arm64: Enforce BBM for huge IO/VMAP mappings" Date: Tue, 20 Mar 2018 17:15:14 +0530 Message-Id: <1521546314-31753-4-git-send-email-cpandya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521546314-31753-1-git-send-email-cpandya@codeaurora.org> References: <1521546314-31753-1-git-send-email-cpandya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180320_044633_357652_41F099DE X-CRM114-Status: GOOD ( 10.23 ) 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, toshi.kani@hpe.com, arnd@arndb.de, 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 7be3106..1238717 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;