From patchwork Fri Oct 18 16:17:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ritesh Harjani (IBM)" X-Patchwork-Id: 13842035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FFFAD30019 for ; Fri, 18 Oct 2024 16:18:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC61C6B007B; Fri, 18 Oct 2024 12:18:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B75DD6B0082; Fri, 18 Oct 2024 12:18:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3D776B0083; Fri, 18 Oct 2024 12:18:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 862CF6B007B for ; Fri, 18 Oct 2024 12:18:17 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4F7CC1A1AF8 for ; Fri, 18 Oct 2024 16:17:55 +0000 (UTC) X-FDA: 82687230108.29.0B6E16A Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf13.hostedemail.com (Postfix) with ESMTP id D715E2001A for ; Fri, 18 Oct 2024 16:18:03 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OfZH3XaP; spf=pass (imf13.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729268246; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=lI1lmoX0aShbqtjbwicYm75B+4+2640ny91XLHS0QLk=; b=dgNs3A+yEjY537xmrZTaJU0YoZT8wXILomK3uG9WayTCG3t9w15sV9uaIS49Uecy4QWmCX 5cXbyDy5yd8BeqCLcLhr066/3Yv20ILKOxGyRxxtmuuzzo5EKiRf/8KtYMUJm91gnkDbEv w+/w/37s20qijuZ5CR6d6Y8WFbnvbVo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OfZH3XaP; spf=pass (imf13.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729268246; a=rsa-sha256; cv=none; b=iFJsc1WxsAwgYOoO86Mhy9vm/wv0mX4TO3nwoX+NvQsUyPh99NuvwoJUhKkLyGd2VJ5mkC 8lI1DFXFbboEEbymWV4i7XceO/8TsrjrKKIEcCULogFPyTwK5Bnbey/4k692nKwUM2yYEe Wysa0SfV46D1Al1mJcEc9UL3vLHy6wA= Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e5130832aso1643903b3a.0 for ; Fri, 18 Oct 2024 09:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729268294; x=1729873094; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lI1lmoX0aShbqtjbwicYm75B+4+2640ny91XLHS0QLk=; b=OfZH3XaPSHEu+Vyik6jj4CppCoSEwYn5FJk07hFVNowmcyYuEZICg7cX0SrJoZTe7w m4m8htE1ga0kRhPIwYvBw/Hl7XjLYISRgWwcxlwhpOd7eLvY7ycLRxyQgHwH4f24sCEu qt0YcFfnodkyla2zRCtdhXAMd/YXWs8YT4C0oClMonn7epURUV9B7h3MpodEmK2fHH+b xOuROxp3FZd1xjx/ucRyojC0wlh3HzE9AFEnwxuTjeoiY9T8ujO+Wx6kdBsGakjzpb1t /VgR6MFW+CaY9CN7XZ4P6dGSaAZA3PSVmIc5nzyZGnMAlX1rTlCS4gRjuoYY03lLVmI3 DTRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729268294; x=1729873094; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lI1lmoX0aShbqtjbwicYm75B+4+2640ny91XLHS0QLk=; b=qHintU9Ro8UvOWBHcP3KQ7O10ToRlvqqGy3FJLz2OFO9K8pvCsPay3PGeUz6Tz7ew0 umg8ThBurf+7+wp0B6KvgA9ana9QufwkdRiSRMw9HA+1FiSYo6PuYUNXVnEtP1kxYxns Afb8sbqNfdztTkRjVLHhDhOS3kQyiLh+dEigrmDpFcfsiDPZbdQL2XXfJb+9Xs/GPMMv hijcANUZkTHxYZhmmiq3Im/6aj9zTxqZC641Wu1L2XyRBFCV1kpI0pj51hVna1j7RuCc 41mSdXUDDUfwCGv5+EEcPsnze4+czbZXZOJrGgcpXwVlvZH1WAdlVn+80oEjQUCa//QJ qewg== X-Gm-Message-State: AOJu0Yzvsr/6V8GBeOMT0ZFCcFqTBBTVlA8K3TUaMDO1JNPN1hzYkGiF MUOYx5XdcTlNzDPzgI/0Plop5hW5ExdKxPIvx7m13mUYIwIc62Pd X-Google-Smtp-Source: AGHT+IHzJGqOqiYMgY0XNWgsPScuQIuvxXcZGIlbc7649iguD7LwhL7RFqPyEBoqw+pUDCliOqawww== X-Received: by 2002:a05:6a21:6801:b0:1d9:278a:9ab with SMTP id adf61e73a8af0-1d92c56d430mr4837764637.35.1729268294000; Fri, 18 Oct 2024 09:18:14 -0700 (PDT) Received: from dw-tp.ibmuc.com ([171.76.80.151]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ea345677asm1692140b3a.147.2024.10.18.09.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 09:18:13 -0700 (PDT) From: "Ritesh Harjani (IBM)" To: linuxppc-dev@lists.ozlabs.org Cc: linux-mm@kvack.org, Zi Yan , David Hildenbrand , Sourabh Jain , Hari Bathini , Mahesh J Salgaonkar , Michael Ellerman , Madhavan Srinivasan , "Aneesh Kumar K . V" , Donet Tom , LKML , Sachin P Bappalige , "Ritesh Harjani (IBM)" Subject: [PATCH v4 1/3] powerpc/fadump: Refactor and prepare fadump_cma_init for late init Date: Fri, 18 Oct 2024 21:47:55 +0530 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: i8bungm77hdtchtnp57kw7i8cb156oyc X-Rspamd-Queue-Id: D715E2001A X-Rspamd-Server: rspam11 X-HE-Tag: 1729268283-122563 X-HE-Meta: U2FsdGVkX18/77U0bnPmE86gW2KJNa46QP71iNSbflvuFAhCPOHFZPVmRleeque3NSnQavpdlYo4hDhMR5u5sW09Qb3ysV2gxjq0VkGAW99BqW26n/Kw5x9ngDJURnpQiwcPka1ohjGve38IDJjy4UDeDlCagvDgUZS+DVAr172hLMW+wUQ2o1LMET8Y9aRNHd2QuMbQRMT+V2xV7EESCeCWFw3rGX+WRwGX+BXubEwOVgJArwTkXqBvJfMSgo7/FTW81B4Fs/gjIzuoreCmV3RORkpeCGQw9gLwEuNXIrESfNa46ZsxYu8rK8n4doGL2FiQ5NilbiBMuK7/R6DMXKlcnUjFpFQNo9GHCL+cv9Swev37I+Rd8ZIJewtcT03g6sTnklXpj+xuoAu9EjDYhcGw9uXgcAPZYVnHQ2xGt9obF4lOfu8hZFbQsR1ei68NqQh4JTGDLDgMORDpc5W8+g68X/4idTLV3eTS0XcsKjpwQzt9vZaECy8v5baWglq6ea8sUq3sUEJlX4u74S3afLBmMRPrzZJ6FpcknByxnm6E/f+pCpPDLxktfXJHHf9f9PKAZ39fMsK7PBbAUFzO0qv9IKr6lgj051u1MgGF+dHCjQANvUhP4euufAvuifATJp8FKRPoliV5hTt+5GaAn5JDzALgEiXtfBWK06hgBL+wAl62O9XXkUWnWrlxPhjPdB6N6xSkznFL3Z1GCNNZdkMYhS0oCNRs324i6nAQPaYb37hCbuWNgyN+u0eouWMiRlU4/TWQNWM60emIwK/fgyn0AfqrdkA8jfJKkKBk1MDosfQn5GzskzPIlIHeXM4FNfdbEpt90+NYM9GDgpCfooCPqLA1EDAv9IYjI1QQ175qHLRl6x+XhA6BbC2CUd1hOlR7yNvvtvZDhiXOrCUtacmo0nO9JdhVmS9IJhkdFH5LIxs5Gvu/2OiNkLksiakxfuItVZ+C7XMo217eqGd pbQBdSXt UM9ppPeDkTjRN4PY7UQhtP0qX74Fl5R1QlP0DieqNQRot5Vv5qSPVzUEW/xREO5XWAa0g98RUdhgSmc7+N05UpbbZwXMVsTr4nazqWv0VmCIwhjQlH+UzMeAKK8hMD4e05q9LVVi/k1KwET6Z0yEnC9uoH3dJIY9NJnv4NcdzBLi72APKvib8IB6OXN74F6riZS+suJS0drUi+5ZPCUV3+Ay9x5e9zk5pVBLT+7ynfV0GIopTvUxm41KHva6dNZyCJEHTLGBEXhEg8Y+PtDLC5kMwLctvBDccunaIecH0j5KUNgNGxerGm2sZQxl2MlgrIJk9gxtTc4PPr7IbEIPVEQ4NXA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We anyway don't use any return values from fadump_cma_init(). Since fadump_reserve_mem() from where fadump_cma_init() gets called today, already has the required checks. This patch makes this function return type as void. Let's also handle extra cases like return if fadump_supported is false or dump_active, so that in later patches we can call fadump_cma_init() separately from setup_arch(). Acked-by: Hari Bathini Reviewed-by: Madhavan Srinivasan Signed-off-by: Ritesh Harjani (IBM) --- v3 -> v4 ========= 1. Dropped RFC tag. 2. Updated commit subject from fadump: <> powerpc/fadump: 3. Added RvBs and Acks. [v3]: https://lore.kernel.org/linuxppc-dev/030b6d46fddac126a6cf7e119bea48055338f0ed.1728658614.git.ritesh.list@gmail.com/ arch/powerpc/kernel/fadump.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) -- 2.46.0 diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index a612e7513a4f..162327d66982 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -78,27 +78,23 @@ static struct cma *fadump_cma; * But for some reason even if it fails we still have the memory reservation * with us and we can still continue doing fadump. */ -static int __init fadump_cma_init(void) +static void __init fadump_cma_init(void) { unsigned long long base, size; int rc; - if (!fw_dump.fadump_enabled) - return 0; - + if (!fw_dump.fadump_supported || !fw_dump.fadump_enabled || + fw_dump.dump_active) + return; /* * Do not use CMA if user has provided fadump=nocma kernel parameter. - * Return 1 to continue with fadump old behaviour. */ - if (fw_dump.nocma) - return 1; + if (fw_dump.nocma || !fw_dump.boot_memory_size) + return; base = fw_dump.reserve_dump_area_start; size = fw_dump.boot_memory_size; - if (!size) - return 0; - rc = cma_init_reserved_mem(base, size, 0, "fadump_cma", &fadump_cma); if (rc) { pr_err("Failed to init cma area for firmware-assisted dump,%d\n", rc); @@ -108,7 +104,7 @@ static int __init fadump_cma_init(void) * blocked from production system usage. Hence return 1, * so that we can continue with fadump. */ - return 1; + return; } /* @@ -125,10 +121,9 @@ static int __init fadump_cma_init(void) cma_get_size(fadump_cma), (unsigned long)cma_get_base(fadump_cma) >> 20, fw_dump.reserve_dump_area_size); - return 1; } #else -static int __init fadump_cma_init(void) { return 1; } +static void __init fadump_cma_init(void) { } #endif /* CONFIG_CMA */ /* @@ -638,7 +633,7 @@ int __init fadump_reserve_mem(void) pr_info("Reserved %lldMB of memory at %#016llx (System RAM: %lldMB)\n", (size >> 20), base, (memblock_phys_mem_size() >> 20)); - ret = fadump_cma_init(); + fadump_cma_init(); } return ret;