From patchwork Wed Mar 28 10:58:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chintan Pandya X-Patchwork-Id: 10312769 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 B2A1C60353 for ; Wed, 28 Mar 2018 11:01:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1BF32872F for ; Wed, 28 Mar 2018 11:01:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94400296CA; Wed, 28 Mar 2018 11:01: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 1EE4E2872F for ; Wed, 28 Mar 2018 11:01:13 +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=eqIBEUUW1CFytzQpP7CaOv0zIvNuyIa8QL4hlXmvSl8=; b=eRTs+13aAhjbuzzZplyH2zn7PQ tR7zjErjA9PMMYg4+mhNGveTYQNt52oSAUoHIcz+R0iouv5HQ1iLAZOt11JDbwoJ45WuHIgbuJk2U 1nwg7Px0x+YoZguNsTG+dLoY0VajyF4pJ8qjrSows+SmCJf7aqSh4SeVMaDSQ902/mRUkaO6tckOZ eIq0DboPNMexn93wNPSk5nmguBQC/2XrHWhabQgg7/nLOymdnxcvt16DsRZRrKgvpplBMCKcXSVPv 9RflMP/lpHhUfNDO/fCUxHLvRg+tdFwgJN90dTRx201jpYURtPsEPnp/NEtEK8b1Hc56NRu7C+1Im P8K8/5ug==; 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 1f18pH-0002DW-LQ; Wed, 28 Mar 2018 11:01: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 1f18o0-00087e-Q4 for linux-arm-kernel@lists.infradead.org; Wed, 28 Mar 2018 10:59:52 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7C1C360AFB; Wed, 28 Mar 2018 10:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522234778; bh=5LnhQ/QrCMd31xkFZkClBBp5NoUdTN++br/tTIzaSSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dq96Vknsg0GVuf8aqjfqaYbx5mLJZIGFU5uRuCOSVlTZMFBTwpJCq82DE0cvXzbks 8k9Wu0g136e7kZHPM1264+g55SqZss7cvtWui52QoGsUlQ+CoUKVkoXH95v/wlVfQW /zxKvua8GSbmEMrz9RNR+O1taAJgMFc96tquqY1Y= 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 CC0B960F5C; Wed, 28 Mar 2018 10:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522234771; bh=5LnhQ/QrCMd31xkFZkClBBp5NoUdTN++br/tTIzaSSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eDIChwzA4ZpG3S4vKtEJrRM7pwyHKycb6pU/tJgfoHcmRiJFItMoqGi5we0DmVfoj EuDcaIHuJTL/6CrRKL+uXG/yion+KVWAqXXA/uKL1Vfmu7z2cuiuU2kA2Y55wR1IRj SWRVyBPsXKiERhJHgVjGKiGz6gIqpmP75wYGCTe8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CC0B960F5C 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, toshi.kani@hpe.com Subject: [PATCH v6 4/4] Revert "arm64: Enforce BBM for huge IO/VMAP mappings" Date: Wed, 28 Mar 2018 16:28:51 +0530 Message-Id: <1522234731-27397-5-git-send-email-cpandya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1522234731-27397-1-git-send-email-cpandya@codeaurora.org> References: <1522234731-27397-1-git-send-email-cpandya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180328_035948_943773_8C90857E X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. 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, 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 --- From: V1-> V6: - No change 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 f84b747..601f22f 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;