From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, 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 10921C43387 for ; Thu, 17 Jan 2019 12:16:23 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 637022054F for ; Thu, 17 Jan 2019 12:16:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 637022054F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43gNN40HBHzDqHF for ; Thu, 17 Jan 2019 23:16:20 +1100 (AEDT) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43gNJt6Y5tzDqjl for ; Thu, 17 Jan 2019 23:13:34 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Received: by ozlabs.org (Postfix) id 43gNJt3gZfz9sBn; Thu, 17 Jan 2019 23:13:34 +1100 (AEDT) Received: by ozlabs.org (Postfix, from userid 1034) id 43gNJs6Vjtz9sCX; Thu, 17 Jan 2019 23:13:33 +1100 (AEDT) From: Michael Ellerman To: linuxppc-dev@ozlabs.org Subject: [PATCH 1/4] powerpc/64s: Always set mmu_slb_size using slb_set_size() Date: Thu, 17 Jan 2019 23:13:25 +1100 Message-Id: <20190117121328.13395-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: npiggin@gmail.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" It's easier to reason about the code if we only set mmu_slb_size in one place, so convert open-coded assignments to use slb_set_size(). Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/mm/pgtable-radix.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 4181ec715f88..14693f8ccb80 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -238,7 +238,7 @@ static void __init init_mmu_slb_size(unsigned long node) of_get_flat_dt_prop(node, "ibm,slb-size", NULL); if (slb_size_ptr) - mmu_slb_size = be32_to_cpup(slb_size_ptr); + slb_set_size(be32_to_cpup(slb_size_ptr)); } #else #define init_mmu_slb_size(node) do { } while(0) diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index 931156069a81..949fbc96b237 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -328,7 +328,8 @@ void __init radix_init_pgtable(void) struct memblock_region *reg; /* We don't support slb for radix */ - mmu_slb_size = 0; + slb_set_size(0); + /* * Create the linear mapping, using standard page size for now */ -- 2.20.1