From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.67]) by mx.groups.io with SMTP id smtpd.web10.14874.1679321187241735677 for ; Mon, 20 Mar 2023 07:06:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=HkjpO1QM; spf=pass (domain: arm.com, ip: 40.107.20.67, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dTdVq3wasCCtVEg6DzDKNjtdOCKGyMh+Q5UwEPWHULA=; b=HkjpO1QMskRcC5VtOj8GfCGFVNS4B466oZFIPALXKf5tdwTVK4wRBJjlRYj1/fVbR7lmxxR8zMrmI5BZgi7eE9E34HJdLplLl4gh8Rol9eEtXlMi7Xm1HuLxREpaLlWsa3q4Td5XuybuufKrvDVNBS2+WnVoSyf3nnz3dqxwZzI= Received: from DB6PR0202CA0018.eurprd02.prod.outlook.com (2603:10a6:4:29::28) by AM9PR08MB6642.eurprd08.prod.outlook.com (2603:10a6:20b:2ff::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:06:14 +0000 Received: from DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::5) by DB6PR0202CA0018.outlook.office365.com (2603:10a6:4:29::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:06:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT017.mail.protection.outlook.com (100.127.142.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:06:14 +0000 Received: ("Tessian outbound cfb430c87a1e:v135"); Mon, 20 Mar 2023 14:06:14 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1cfbba2903aa2388 X-CR-MTA-TID: 64aa7808 Received: from 664f5b891a8f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D84EAE51-A542-4B29-9B13-50CCA5131A1F.1; Mon, 20 Mar 2023 14:06:08 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 664f5b891a8f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Mar 2023 14:06:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mN/tPeg6DORi8Casp4uF9PFwPAjhPjmmi+py6bYSoQUdtRHkH35XFHtf2VLSn0QgY7AoGFVGHVH9rjKfycrzFAvU7eZeu+cOynlpT0aeK+xVeuCqNmNSHALcT42paHYJj4KTXFdDjo95HwZlRe7P9Gt1mi0syurpz3NlplYjNbd282m3Ou5D46G2XlIwCktljwZ+6Gb9W2quikjm/VGBKE90D/Oo6TdbTomGdneHexO6eK/bfECjUqkzsAHdJVTkg2k16OvO3pLqoCeNw+W4lxST6zb+uBd0iMPNZ3v7HWG1iunW2SV9HJxMzGzZek2J1SM8XOQjL6lRHB6yOU7r6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dTdVq3wasCCtVEg6DzDKNjtdOCKGyMh+Q5UwEPWHULA=; b=OOLrHkd/idvzdY6opLUA0Wglg4o3QMR8U6FpIFQSjAwCsG6Uo/Db+5hEMkg9U16XswGQTNqT+1XH4QHSlqWDCp40qYF5NTY2b29jaOsj2WEBrYENlBPnzbGFl5GanOrfR4u9ZU34kzkkZyEGZ4xSDAzUeGZHi9gC5sTPknf1a1Jz0kbdspkTqUU3hxZVYr84k019CI/JnOL+c7351OLeU0RrsvtGVyEn6eomM/LYH+hBSuUqc1gLxws0gH0Do/HW0aal3qGBlcdu2PlxfaVARDs6J9Yg0mQWGTcTcHfVihqEI1fa/rdMWjx/mKLIGwu7L8NbljyaZO/Ina+y6H8Zog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dTdVq3wasCCtVEg6DzDKNjtdOCKGyMh+Q5UwEPWHULA=; b=HkjpO1QMskRcC5VtOj8GfCGFVNS4B466oZFIPALXKf5tdwTVK4wRBJjlRYj1/fVbR7lmxxR8zMrmI5BZgi7eE9E34HJdLplLl4gh8Rol9eEtXlMi7Xm1HuLxREpaLlWsa3q4Td5XuybuufKrvDVNBS2+WnVoSyf3nnz3dqxwZzI= Received: from AM6PR10CA0072.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::49) by AS8PR08MB8468.eurprd08.prod.outlook.com (2603:10a6:20b:566::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:06:03 +0000 Received: from AM7EUR03FT032.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:80:cafe::d1) by AM6PR10CA0072.outlook.office365.com (2603:10a6:209:80::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:06:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by AM7EUR03FT032.mail.protection.outlook.com (100.127.140.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:06:03 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Mon, 20 Mar 2023 14:06:00 +0000 Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.17 via Frontend Transport; Mon, 20 Mar 2023 14:06:00 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , , Subject: [PATCH v1 3/4] ArmVirtPkg: Fix parsing of serial port node Date: Mon, 20 Mar 2023 14:05:56 +0000 Message-ID: <20230320140557.40348-4-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20230320140557.40348-1-sami.mujawar@arm.com> References: <20230320140557.40348-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT032:EE_|AS8PR08MB8468:EE_|DBAEUR03FT017:EE_|AM9PR08MB6642:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bfdfc52-f4ea-4a2c-930d-08db294c4453 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: e9xu3gW6W4gFvFL79pl41GFy7bDd51uWIkA4ieEYOkLTzfU4zBAd+J72mSPmWAiyvmRKN+lNLwaNtY0b26PjEPzfnJ+TA12JqiQlRkKVk3Yae1wrKxShMXajNWYVUcgFEPIJ9hg72adzsKe04UTSt28uqBSRPYdFmEqPklhcMwfVAK5bjnlHZsKajMdSEn6c5P0/qz5gK6fnWQbKcbZBKG80bSgSJp/SbbJ0am4cyUlVBduuD+3+qzZKrTJBStRl4HFslLH7SnRC7AamZPGbotDvbnh7mxT5AU4QLYT4Nb2GvGCmCoWouf2CBryMPXAZnqUGtSLRyC/+SuDqt9XhxCURDafB3cjt6ltXJ1GasU+9CRNSkz2SKuyxHJUpI88lCJXEb72vpBs2LmQK/oLuXhu02DVEtixc6liaMma+4bd96Zjo5L0rQCwkdzYXzZEZje4LhDxZqGRvE+y5HQHmQQtQX1eMBb0BI/JPhwCPQj7fYFVKjprF57pm2jDCLfOiSi0QRVcFTa7fHr6ztkNhkBptynWniDsf+CpWQpeVVlI44lYmGV90Xv6kI1s7whqRqrbnMKZxB6+7FRzfdb/E7I9s1COEVe5NalACszJhmZoBdb4A0tbPS38pV8TOmVKmOHiIK5MVINbkRMa73VexD60XNpQFD1rJtiUwjhDjK4ZWsJsMgftEh4MbL7c7m32yKG6O/ZFd6Mizp4q5xveNZnozAwyk0qQYdFJpO/Am588= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(346002)(376002)(136003)(39860400002)(451199018)(46966006)(36840700001)(40470700004)(44832011)(8936002)(41300700001)(5660300002)(4326008)(36860700001)(40480700001)(356005)(86362001)(82310400005)(36756003)(40460700003)(82740400003)(81166007)(2906002)(83380400001)(1076003)(478600001)(47076005)(6666004)(7696005)(426003)(186003)(336012)(26005)(8676002)(70586007)(70206006)(6916009)(2616005)(54906003)(316002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8468 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 5f10a217-47ad-4f38-1267-08db294c3dd3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qRJ1EO8i0qcdBOQrKh/+iEZy8Ukv26cjYRiSVTikGTXCSHTRL1cj0Z7DzCtZ4eKfFVn73UMtc8FCRG8WEnGMcQVGOagiT0NgLsSvpI4AyNIodsCIQc5Fu9qCaH3CYycpmC3hGh8jBkYvVt1EKSWGuAAVwIdd0CLtyddJSx2UDZidmGsB31yA4iVBdsa6RyVOjU9fTiGzNrqkQckX68xsdQU/Mk7zQ5m5UfYJ4N4R6e322cz3496Yh60IgQAhrBrs5SwTmKDOfScRIpt96b4+mwcQNM0gaG5prGuqsT3BniYsGFYOjfdV3igaJx0+9sjgv6xEg9rs3hwfg7yw+J83Njw+B/LLHoj0gagcgDrEA7N8U5IpJY6mI4ENLyitdox1KF257bMmEriLK1MSPRAhHc8ZgQ2SpjUoNEyqWr8UmG4H8RnRWDKrTTt6yCI3oL6vVKWlEjF+ApEDTnxdWaffQTaJZK3pzNbMMey7KS+3EpvXQsBppQmyFwZDRuEdl03/rieZ9FgiwXiWJus0YGvKQfNIDrge+YIkm8QF0Rae5Wh5PxO73sYYIcPyV1DdPZj+8JijdqFm6OXbdQk0Op4jokzxdpiTJjmFIKvAaMcbgKhhAHLlednkal6N+vNru9Cw+HhENRyO4jCy+RXuPCznNeib5Qde02a2U0Qn1FBZuzZyaY8+DCKr71mtrzXDPLiMS4m5cOXLAbzAtVidIxOgA== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230025)(4636009)(396003)(136003)(39860400002)(346002)(376002)(451199018)(36840700001)(40470700004)(46966006)(8936002)(5660300002)(44832011)(36860700001)(41300700001)(82310400005)(86362001)(40480700001)(36756003)(40460700003)(82740400003)(81166007)(2906002)(4326008)(47076005)(336012)(83380400001)(478600001)(6666004)(426003)(7696005)(2616005)(186003)(1076003)(26005)(54906003)(316002)(8676002)(70586007)(6916009)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:06:14.3638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2bfdfc52-f4ea-4a2c-930d-08db294c4453 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6642 Content-Type: text/plain When scanning for the Serial Port in the device tree, the length and value parameters to ScanMem8() are not in the right order. This results in the serial port not being detected if the chosen node in the device tree has additional elements. Therefore, pass the parameters to ScanMem8() in the correct order to fix this issue. Signed-off-by: Sami Mujawar --- ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.c b/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.c index fb1daf32769c20521e93de7af0f54a6a8e2c8369..c1b81920214b16137fd7c40b8ec897031e6fe9aa 100644 --- a/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.c +++ b/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.c @@ -1,7 +1,7 @@ /** @file Early Platform Hook Library instance for 16550 Uart. - Copyright (c) 2020, ARM Ltd. All rights reserved.
+ Copyright (c) 2020 - 2023, Arm Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -67,7 +67,7 @@ GetSerialConsolePortAddress ( } // Determine the actual path length, as a colon terminates the path. - Path = ScanMem8 (Prop, ':', PropSize); + Path = ScanMem8 (Prop, PropSize, ':'); if (Path == NULL) { PathLen = AsciiStrLen (Prop); } else { -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'