From patchwork Fri Jan 26 23:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oreoluwa Babatunde X-Patchwork-Id: 192880 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2395:b0:106:343:edcb with SMTP id gw21csp222761dyb; Fri, 26 Jan 2024 16:03:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IG5zNygrU3KIMVRA3tSLtFAzTdiRqNPxS/DSpAEY8a4VI3Uhy8xEKeYW14xBA0JMGXOyU/a X-Received: by 2002:a05:6808:601:b0:3bd:62ac:cd3d with SMTP id y1-20020a056808060100b003bd62accd3dmr594158oih.47.1706313790032; Fri, 26 Jan 2024 16:03:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706313790; cv=pass; d=google.com; s=arc-20160816; b=BHd/hYWFUPBpDhXS0l/KEet8driB2c7u15lAXXc0Juh3wzZoPfELp7rkoqdNosSLd4 oaqKM6p8vfWnWRZvHnQhy186MDtrmWKpls7hAOAbY1WTrAHNKAi0XehtQsbU2Jb4nvYV 1m6pHZcQ6Ds1g7RJIBFUyZjxYF8xZVw00xmxiG5kgQKUAkZn0/GOjHw6OZw08zI+Z7LN ICsg4FMIPwjovSqKkrPqJ/khCHEXY1HNrmthj5HP0jH6NGsx0zpCz095kVI7tbd8nswG iOOBA9o6TXbV14DPv5SHhPsDvotWzVX2kSrm6yV/B8BBVCMnD2YYdqAo+Is7g0Dg3wdN dnUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U+UATSXEeXs8N4A3dvS/aUlabuPy4uxVicMZX+w6gGA=; fh=hY6kMi6FvW8wLTV87L8suYr4n1TqNWWZDZNH+E6XASg=; b=0kNDnIIDxGpXmvruIktmfHcevRuvWQW9F5VVkjqK+zuiE0LBStUicBCxd/JgWRVUaY 0Z2vHYMVRBvkbKVRyCZjIIr6uM/3an1RUYs7zCr96gfvBoxmqAjqzY6PK7+txzABhjgx qWevX01YahxwV0ewP/YNE/1ogOKyoOYum6VCeHXtnJaJjRnydNrrjo6+yqjCxOtAxiyH IJeQNYIxkn8DrLjN9eplV1l28ljta5ADunJkE/bC08G8H4Own55Q4GTXuJqtrnds4KG4 5o/DGejYHi92s03ZiMhfzAnItevTWOJb0nd+/SMrnKJmNcuRW98wE/tos9xthQCr3T6K oALg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=OhZU6uAU; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-40885-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40885-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id vz25-20020a05620a495900b0078326674eabsi2404946qkn.409.2024.01.26.16.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 16:03:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-40885-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=OhZU6uAU; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-40885-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40885-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 3A7C41C283F8 for ; Sat, 27 Jan 2024 00:00:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A095E64CEF; Fri, 26 Jan 2024 23:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="OhZU6uAU" Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A285E605B5; Fri, 26 Jan 2024 23:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706313363; cv=none; b=ZKjamwedZlGgMhwDZfut/KTa3SpNoJ68oWD7KzOkNDWwJWF9+oBWbcmpyK/h3EvFHhxxT8/LHV+9FTyjFuUkYogEmPDu8X2o/Cp62jXdvAINDuPtqQG3N2aPXGvNxLXoPzP6VB9JEZQ76ZOENtlsYQ87O6zJ7zxZ8vhJBIoMzOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706313363; c=relaxed/simple; bh=UFtlQJJOP/ynG15B1VxGKrn6Aybnif7XJF/2t0ORLGM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Uw6hLqLJ+UHy/idzQ8Oip6ANpLSWiLGe6C/quuwotmdXoylneo91w6sBko2O2BTD5gNu7QvLiYlTnIrtGgFtebnmB55A9w1a+a2GREVB1q7IyvAcvitKwGB0c7xCrVauKxgQYCzm77d6HcE3vFK9STDtehohU/FJ+tZhYL9HyHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=OhZU6uAU; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40QKa90W020977; Fri, 26 Jan 2024 23:55:11 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=U+UATSXEeXs8N4A3dvS/ aUlabuPy4uxVicMZX+w6gGA=; b=OhZU6uAUDmSzZC0qc+jo1qHfgOBmTjY/5TbA qqr7FAM9+802uld+6AfYtc/wE5GRNTAig+31AW2bZhU84xhgH8BOhZHWHCMXev2R 3QmfqzyESYIUpdhWkTLKCL8YDeujiYUjbrhMG8eWzHcJwSXUQko+kRB5FFH/WM/m Yd+T45lAcGAGkOqHQ7dHHwJ14R7z84P81lzZyWI0LiaBr7X9s6shd/8liPVvjMfT JtICzAZe6jHsJlHMAbh8N7+S6ZYeOiAjqj5FAZkF5H6n/wWq79ypu5ALxa0vMr1b uHKWYf0fW4ZW6VOCBHkxOHtbsBCx48koACEMWcQ7HBXpM7Ry+Q== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vvjx88dmb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 23:55:11 +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 40QNtAhP009370 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 23:55:10 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:03 -0800 From: Oreoluwa Babatunde To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , Oreoluwa Babatunde Subject: [PATCH 16/46] xtensa: reserved_mem: Implement the new processing order for reserved memory Date: Fri, 26 Jan 2024 15:53:55 -0800 Message-ID: <20240126235425.12233-17-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ORIG-GUID: 5nTE8YjTrsjVCPcMJnLNndpE1SmrgzBu X-Proofpoint-GUID: 5nTE8YjTrsjVCPcMJnLNndpE1SmrgzBu 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 bulkscore=0 spamscore=0 priorityscore=1501 adultscore=0 phishscore=0 clxscore=1015 malwarescore=0 suspectscore=0 mlxlogscore=555 lowpriorityscore=0 impostorscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401260176 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789199688773630813 X-GMAIL-MSGID: 1789199688773630813 Call early_fdt_scan_reserved_mem() in place of early_init_fdt_scan_reserved_mem() to carry out the first stage of the reserved memory processing only. The early_fdt_scan_reserved_mem() function is used to scan through the DT and mark all the reserved memory regions as reserved or nomap as needed, as well as allocate the memory required by the dynamically-placed reserved memory regions. The second stage of the reserved memory processing is done by fdt_init_reserved_mem(). This function is used to store the information of the statically-placed reserved memory nodes in the reserved_mem array as well as call the region specific initialization function on all the stored reserved memory regions. The call to fdt_init_reserved_mem() is placed right after early_fdt_scan_reserved_mem() because memblock allocated memory should already be writable at this point. Signed-off-by: Oreoluwa Babatunde --- arch/xtensa/mm/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index b2587a1a7c46..ed3dd5f67b4a 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -47,7 +48,8 @@ void __init bootmem_init(void) */ memblock_reserve(0, PHYS_OFFSET ? PHYS_OFFSET : 1); - early_init_fdt_scan_reserved_mem(); + early_fdt_scan_reserved_mem(); + fdt_init_reserved_mem(); if (!memblock_phys_mem_size()) panic("No memory found!\n");