From patchwork Fri Oct 15 15:46:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1541818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=gRbrqCyr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HW9h45zr9z9sR4 for ; Sat, 16 Oct 2021 02:49:56 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HW9h44RrFz3c5b for ; Sat, 16 Oct 2021 02:49:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=gRbrqCyr; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::535; helo=mail-pg1-x535.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=gRbrqCyr; dkim-atps=neutral Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HW9cN33v8z3c95 for ; Sat, 16 Oct 2021 02:46:44 +1100 (AEDT) Received: by mail-pg1-x535.google.com with SMTP id 75so8983296pga.3 for ; Fri, 15 Oct 2021 08:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WCoLPL0394EyEbAAqA4/lqZq2wRN2EeHKApovTkjBY0=; b=gRbrqCyrbNWNTcD52baDBnw63snBlefg4CgjUJ3KQTRGpzSk7tXwqk8yR/AYjSRjLR EC9dqADs6NTd6XCsuzk4RlBRj15oKv820L/mPXwkIUv9aDMulur2B8PVvwvFTuM1c8Ux CXjoMOdnK4AD8ajfnC7Z7avfCO+srUmQgEOIvtNXqvo8PJ1PFtKU7DBwqTysiPMN7qym wKBlYZtNan+SAmqnc34DIz/dAjpbxNqjTX3WtfjUuFU+ibZa0Qv9QZGOsBOnETvRu/co 7gvwcHJguprt8sguSz3y1BzmzCU//1vTkPto/9C/Kltz8rbEl4SbF3PyNIsjRKy+VTXx iXFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WCoLPL0394EyEbAAqA4/lqZq2wRN2EeHKApovTkjBY0=; b=yw6ae1eR+LW9IASuWGTNiAk85Tm8+EePj+gs9Xn8N+w93s9XMc3nSg6OZM3y0BCg7W EpPFN6oEAh3kQue23xDTJLCxtxYQ2jA6qvKwSJoQeAx4YwW3q/ySeKx9LvWsjlJv2qGS 7pj2poMyEm18uaAy8Vm/ihRpW8un9+fDa+OmUhRfR5r+tn7F1MUNQKFGTmixFuMwrbJ2 VM+wV/yoqRWC1qcfMLBwBz7HVPAObc6pljzrhMSX5XsUvyoXOnID3HM8lQSbvMqaUOp4 eF0YhHNY7INu9/a5bIV1ktizMN5pUtZ/rNFeWvd+XzHwUoFSXnNp9WeySYswF1rC1GGq LHpA== X-Gm-Message-State: AOAM531MtOuCUI/oiB7Z9DwCjeapwB2ll4OnyBG4lhK3cZsVcaqlxbAq Kz2ebjYv92F9a4+pVj0ma/dUP8kxCvI= X-Google-Smtp-Source: ABdhPJwQELNe3fSqUIlHAGyU/v3x9Ydgm7An18txoO/RXXieZYd8yIfg7mOHKFFEXufJWdnaI+q9aQ== X-Received: by 2002:a62:5209:0:b0:44c:68a7:3a61 with SMTP id g9-20020a625209000000b0044c68a73a61mr12470776pfb.83.1634312802289; Fri, 15 Oct 2021 08:46:42 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (14-203-144-177.static.tpgi.com.au. [14.203.144.177]) by smtp.gmail.com with ESMTPSA id y1sm5392092pfo.104.2021.10.15.08.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 08:46:42 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v1 05/11] powerpc/pseries: move pseries_lpar_register_process_table() out from hash specific code Date: Sat, 16 Oct 2021 01:46:18 +1000 Message-Id: <20211015154624.922960-6-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20211015154624.922960-1-npiggin@gmail.com> References: <20211015154624.922960-1-npiggin@gmail.com> MIME-Version: 1.0 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: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This reduces ifdefs in a later change making hash support configurable. Signed-off-by: Nicholas Piggin --- arch/powerpc/platforms/pseries/lpar.c | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 3df6bdfea475..06d6a824c0dc 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -712,6 +712,34 @@ void vpa_init(int cpu) #ifdef CONFIG_PPC_BOOK3S_64 +static int pseries_lpar_register_process_table(unsigned long base, + unsigned long page_size, unsigned long table_size) +{ + long rc; + unsigned long flags = 0; + + if (table_size) + flags |= PROC_TABLE_NEW; + if (radix_enabled()) { + flags |= PROC_TABLE_RADIX; + if (mmu_has_feature(MMU_FTR_GTSE)) + flags |= PROC_TABLE_GTSE; + } else + flags |= PROC_TABLE_HPT_SLB; + for (;;) { + rc = plpar_hcall_norets(H_REGISTER_PROC_TBL, flags, base, + page_size, table_size); + if (!H_IS_LONG_BUSY(rc)) + break; + mdelay(get_longbusy_msecs(rc)); + } + if (rc != H_SUCCESS) { + pr_err("Failed to register process table (rc=%ld)\n", rc); + BUG(); + } + return rc; +} + static long pSeries_lpar_hpte_insert(unsigned long hpte_group, unsigned long vpn, unsigned long pa, unsigned long rflags, unsigned long vflags, @@ -1680,34 +1708,6 @@ static int pseries_lpar_resize_hpt(unsigned long shift) return 0; } -static int pseries_lpar_register_process_table(unsigned long base, - unsigned long page_size, unsigned long table_size) -{ - long rc; - unsigned long flags = 0; - - if (table_size) - flags |= PROC_TABLE_NEW; - if (radix_enabled()) { - flags |= PROC_TABLE_RADIX; - if (mmu_has_feature(MMU_FTR_GTSE)) - flags |= PROC_TABLE_GTSE; - } else - flags |= PROC_TABLE_HPT_SLB; - for (;;) { - rc = plpar_hcall_norets(H_REGISTER_PROC_TBL, flags, base, - page_size, table_size); - if (!H_IS_LONG_BUSY(rc)) - break; - mdelay(get_longbusy_msecs(rc)); - } - if (rc != H_SUCCESS) { - pr_err("Failed to register process table (rc=%ld)\n", rc); - BUG(); - } - return rc; -} - void __init hpte_init_pseries(void) { mmu_hash_ops.hpte_invalidate = pSeries_lpar_hpte_invalidate;