From nobody Fri May 17 08:24:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91068+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91068+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1657037548; cv=none; d=zohomail.com; s=zohoarc; b=jlDvHg6lnF/3IxZNAybYscbZfCoD3Msv5Kv5i4+2Iec5STZ+RSF7ie99x7YgxT4eRrfTGHSNOhjA61akNrGWMFuBV1WnQKhusnwGCQtb9vGjVaI0yPK3BT4kKjeZIZFVlan5FUhgTYVKlzg0xZ9q+ICEMuqY7yRINdeWRuNc/7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657037548; h=Content-Type:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=3wKnTez8T+4tLQN+62QACKk/k8biuaYFqwdFnW7+Cqw=; b=ifIuPA+DWSmeaqx+f8ulXhwxWXOw3Gx0+PELzPUt/oKghZjuOjB4uU5FKlt5OHeACckA29j2hOd2LIMsSHTw7fYxeyJWnMM5oM5tusLjYb0OemoT/MdA65e8gCCk52xV3zhUYAipfI9gH0Pcb7wzDZv8Ca00+XS4UOAed0iIlZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91068+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657037548921976.5329980789624; Tue, 5 Jul 2022 09:12:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XXaqYY1788612xdrClOZkQyi; Tue, 05 Jul 2022 09:12:27 -0700 X-Received: from mailgw02.mediatek.com (mailgw02.mediatek.com [210.61.82.184]) by mx.groups.io with SMTP id smtpd.web08.81373.1657004115654570817 for ; Mon, 04 Jul 2022 23:55:16 -0700 X-UUID: b12e7f896dff4da8aa56cae262b8b198-20220705 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:30736602-9316-46be-bea9-8aa157425143,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:0f94e32,CLOUDID:d308a2d6-5d6d-4eaf-a635-828a3ee48b7c,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: b12e7f896dff4da8aa56cae262b8b198-20220705 X-Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 457716794; Tue, 05 Jul 2022 14:55:09 +0800 X-Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 5 Jul 2022 14:55:08 +0800 X-Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Tue, 5 Jul 2022 14:55:08 +0800 From: "Mark-PK Tsai via groups.io" To: CC: , , , , , , "Mark-PK Tsai" , YJ Chiang Subject: [edk2-devel] [PATCH] ArmVirtPkg: Fix boot fail on numa system. Date: Tue, 5 Jul 2022 14:55:03 +0800 Message-ID: <20220705065503.29583-1-mark-pk.tsai@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mark-pk.tsai@mediatek.com X-Gm-Message-State: 5RJLez1rjzcJ9HnhaWkLbvJ3x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657037547; bh=cvsKWP4RxQlMnrB8waZ3hcpWUx1++IR7f4w5IZ2toV4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=oMbGB2Wtt7X9GX8SaATq6vqAz5tMeX+wFCRhwuEXFZLmzFomI7u6zlZ754D5RGdxNUK JFzsNHCQi9Y6z60J8j0ZPWby+jB3915/6BbiuGIy7mhsewcy3zUCyJBjrcHZ/20Lv6ho6 BWz3XuK3EcefVU6m3D0cdrhjhozforv0szI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657037550137100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If "numa-node-id" is specified in a memory node, take node 0 as system memory instead of taking the first memory node. Cc: YJ Chiang Signed-off-by: Mark-PK Tsai --- ArmVirtPkg/PrePi/FdtParser.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/ArmVirtPkg/PrePi/FdtParser.c b/ArmVirtPkg/PrePi/FdtParser.c index 5a91f7e62d..5c7de3bc31 100644 --- a/ArmVirtPkg/PrePi/FdtParser.c +++ b/ArmVirtPkg/PrePi/FdtParser.c @@ -19,19 +19,43 @@ FindMemnode ( INT32 SizeCells; INT32 Length; CONST INT32 *Prop; + INT32 NumaId; + INT32 Node, Prev; + CONST CHAR8 *Type; =20 if (fdt_check_header (DeviceTreeBlob) !=3D 0) { return FALSE; } =20 // - // Look for a node called "memory" at the lowest level of the tree + // Look for the lowest memory node. + // On Numa system, use node 0 as system memory. // - MemoryNode =3D fdt_path_offset (DeviceTreeBlob, "/memory"); - if (MemoryNode <=3D 0) { - return FALSE; + MemoryNode =3D -1; + NumaId =3D -1; + + for (Prev =3D 0; ; Prev =3D Node) { + Node =3D fdt_next_node (DeviceTreeBlob, Prev, NULL); + if (Node < 0) + break; + + Type =3D fdt_getprop (DeviceTreeBlob, Node, "device_type", &Length); + if (Type && (AsciiStrnCmp (Type, "memory", Length) =3D=3D 0)) { + Prop =3D fdt_getprop (DeviceTreeBlob, Node, "numa-node-id", &Length); + if (Prop && Length =3D=3D 4) { + NumaId =3D fdt32_to_cpu (*Prop); + } + + if (!Prop || (Prop && NumaId =3D=3D 0)) { + MemoryNode =3D Node; + break; + } + } } =20 + if (MemoryNode < 0) + return FALSE; + // // Retrieve the #address-cells and #size-cells properties // from the root node, or use the default if not provided. --=20 2.32.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91068): https://edk2.groups.io/g/devel/message/91068 Mute This Topic: https://groups.io/mt/92188181/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-