From patchwork Fri Jan 26 23:54:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oreoluwa Babatunde X-Patchwork-Id: 13533680 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2D83C48285 for ; Fri, 26 Jan 2024 23:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ucNeUwIzeUmuKPu96WCuUaYmQ2xRX+OBrhztR5wu0SA=; b=vTjSQkp+LQmZQL GuxYsYeRsSldhfcAhFp+p0l9jl94ptel3qMeLNlyScWFxai4tv1zOmoBTQT89rs04reO+kmjLe7f2 CwRYGBzZEz6uhZWQbSQPuMdPd2cOehuUSO+FwUwlz3qLIxNhEKnqg/qiWzpqonICL9SLkncFjBnsT 326c7C/CfzY8DyGKAFj/FrwsqwIzA6DPwh9SGazHYUdImxkElACBftFMk3cpi9kz9ds4DBLpVZcIf IyT91AILCXLMlK35U5NT9rkyURrxIbdeaooUoCqsR+oB7qudqIkvYn1+QZHuSnEctDc3kx8RAjTTI npKcBFqAypD1o1wL1JMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTW3t-00000005qvW-3Xbl; Fri, 26 Jan 2024 23:56:41 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTW2v-00000005q58-1zfP for linux-arm-kernel@lists.infradead.org; Fri, 26 Jan 2024 23:55:43 +0000 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40QNnZbP027998; Fri, 26 Jan 2024 23:55:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=GQs+FJwVsA823rjqyLGR cinzYCeaIEqNRS4nUJ1K5mQ=; b=nN6cuJjHUxjIrloQjVh7Ipm2VfLMXv/5My1J c91boeGeg0PNzzRCsPkVv1MnZ4FFj4vR5E5Ef3rbtP0FI3TzNMMPcT+hfWu5X36m 26SuSVtUvm/2V/CxrzYEoi4XsapDpE/6k4N/AyChzgdwNo8vVPZMgrYkFwrhfPuf YYeL4wNfOLuj8RTA9sHyqM2bYsCw4vlve7EQtaWdOtbizbQ4/kI6JXk2LoVJURgD Vl7O86gffKATpclkhJSy+8LcsWBSFpQnvnBBsBgp0Zwk0yC5dilfZTBv19Cgl0EE 7XIlEHbVIRFUk0Asvf/el2OzuCQupu6Xc0sEBLG4Lmx6CxYzMA== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vvhxyrhya-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 23:55:26 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40QNtPhh009489 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 23:55:25 GMT Received: from hu-obabatun-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 26 Jan 2024 15:55:09 -0800 From: Oreoluwa Babatunde To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , Oreoluwa Babatunde Subject: [PATCH 26/46] powerpc: resrved_mem: Move fdt_init_reserved_mem() below unflatten_device_tree() Date: Fri, 26 Jan 2024 15:54:05 -0800 Message-ID: <20240126235425.12233-27-quic_obabatun@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240126235425.12233-1-quic_obabatun@quicinc.com> References: <20240126235425.12233-1-quic_obabatun@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: NllxamRcH2qFCdcEEfsv55660cYbKRqO X-Proofpoint-ORIG-GUID: NllxamRcH2qFCdcEEfsv55660cYbKRqO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 malwarescore=0 mlxscore=0 phishscore=0 adultscore=0 clxscore=1015 mlxlogscore=769 priorityscore=1501 bulkscore=0 lowpriorityscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401260176 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240126_155541_666609_F991BEF5 X-CRM114-Status: GOOD ( 18.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The unflattened devicetree structure is available to be used not long after the page tables have been set up on most architectures, and is available even before that on other architectures. Hence, move the call to fdt_init_reserved_mem() to after unflatten_device_tree() is called so that the reserved memory nodes can be accessed using the unflattened device tree APIs. Using the unflattened devicetree APIs is more efficient than using the flattened devicetree APIs. Signed-off-by: Oreoluwa Babatunde --- arch/powerpc/kernel/prom.c | 2 -- arch/powerpc/kernel/setup-common.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 5f6307ea3069..3cf8213b114c 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -621,7 +620,6 @@ static void __init early_reserve_mem_dt(void) early_init_fdt_reserve_self(); early_fdt_scan_reserved_mem(); - fdt_init_reserved_mem(); dt_root = of_get_flat_dt_root(); diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 9b142b9d5187..96bd4c964943 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -890,6 +891,8 @@ void __init setup_arch(char **cmdline_p) /* Unflatten the device-tree passed by prom_init or kexec */ unflatten_device_tree(); + fdt_init_reserved_mem(); + /* * Initialize cache line/block info from device-tree (on ppc64) or * just cputable (on ppc32).