From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.50]) by mx.groups.io with SMTP id smtpd.web09.32105.1611166819309755001 for ; Wed, 20 Jan 2021 10:20:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=emUWL5Av; spf=pass (domain: arm.com, ip: 40.107.5.50, mailfrom: joey.gouly@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=vfHDcT18ScHq4iDMWC8XA9VwvMZE0GwGQkB12A9bz9I=; b=emUWL5AvlokJEnbsiTggq9HPiZpphgK2gGxfcGsLhwMhJ6T91eXv6vq40zHRlJ9uqihhSP6zFgZ/w+nitqwvi8E2yvOdAY61ZOvmvYWUX0cs/Uv1wKcAdjAKXR+onWDJQwqkwYGOFinaSAdMDEpUkxo8EAozFO1DeyQX7xC8cCk= Received: from AS8PR04CA0079.eurprd04.prod.outlook.com (2603:10a6:20b:313::24) by AM9PR08MB6132.eurprd08.prod.outlook.com (2603:10a6:20b:2d7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9; Wed, 20 Jan 2021 18:20:16 +0000 Received: from VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:313:cafe::aa) by AS8PR04CA0079.outlook.office365.com (2603:10a6:20b:313::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Wed, 20 Jan 2021 18:20:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT007.mail.protection.outlook.com (10.152.18.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Wed, 20 Jan 2021 18:20:15 +0000 Received: ("Tessian outbound 4d8113405d55:v71"); Wed, 20 Jan 2021 18:20:15 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 49d12407345e2c9e X-CR-MTA-TID: 64aa7808 Received: from ba780e353eaa.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 90ECEBC9-5E5B-44D3-8BEF-5D9596B3E298.1; Wed, 20 Jan 2021 18:20:09 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ba780e353eaa.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 20 Jan 2021 18:20:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ksW/LPix8a0npNlTlsIUL8JpJg848m66wCRnb4pcxFr5D8kcmt58xcwK/Y7C1Ai5yBOKebr47wVFSrPQV3At/G5vrtEIsLNK+TH5iOgk3nr5PUVAGWmodS3T4t7+eb7lJsP1Etq7xX80M9/fAJn1IVkq5S5+qQHpqCY1IdEd060OfY8qplTaZq3Y3osxwBO/YsmnyYrVTuT6zLcSwN0texYhuX0JHjWy+pZa6oL+uEQtcvrmUJ2uVuV6vMJSpIOhO3dh3kf8doWVhwZ1zhL8o8WrijED9Y5jY+2kLUkLo8qGbK4zykzvVWrsuNCuJfHlNls8HR+UHKvOcqSgH/BRVg== 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-SenderADCheck; bh=vfHDcT18ScHq4iDMWC8XA9VwvMZE0GwGQkB12A9bz9I=; b=PH5q0AFB17IhrwKfSTLcEnDv4lrrcEhxjTvSDLYEkT+Mw/YVzoCj3xkdow9Ikz3L5ZblJ5FV896LJdty0wtDxjsuCo+l4rbXbL0n/92XU62u/u/o+6HB2qvUJnBiQnhE4yg0bgSZTCGb75+Cdvkt0CDBIQ1JDPH7fcAM77srkYeG+eqOwlUV3R6h/4uci1CejiomELVX7nJgIQoZHW79GvPpJ6DM5qv1oO4fZiuq7LduGlv/elNzQrpLfgZG2+3ke6lS3xyflV/dMaMohE01G2CiPX8k1Jm/SOsEVRGwSPXse+DVECHiAIklw/mrp0GnJLrqHxU93pIZBBB+iewGFw== 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=vfHDcT18ScHq4iDMWC8XA9VwvMZE0GwGQkB12A9bz9I=; b=emUWL5AvlokJEnbsiTggq9HPiZpphgK2gGxfcGsLhwMhJ6T91eXv6vq40zHRlJ9uqihhSP6zFgZ/w+nitqwvi8E2yvOdAY61ZOvmvYWUX0cs/Uv1wKcAdjAKXR+onWDJQwqkwYGOFinaSAdMDEpUkxo8EAozFO1DeyQX7xC8cCk= Received: from DB6PR0601CA0021.eurprd06.prod.outlook.com (2603:10a6:4:7b::31) by VE1PR08MB5677.eurprd08.prod.outlook.com (2603:10a6:800:1ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Wed, 20 Jan 2021 18:20:08 +0000 Received: from DB5EUR03FT062.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:7b:cafe::ae) by DB6PR0601CA0021.outlook.office365.com (2603:10a6:4:7b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10 via Frontend Transport; Wed, 20 Jan 2021 18:20:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT062.mail.protection.outlook.com (10.152.20.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Wed, 20 Jan 2021 18:20:08 +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.2044.4; Wed, 20 Jan 2021 18:20:05 +0000 Received: from e124191.cambridge.arm.com (10.11.7.12) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Wed, 20 Jan 2021 18:20:05 +0000 From: "Joey Gouly" To: CC: , , , , , , Subject: [PATCH v1 2/2] DynamicTablesPkg: Add an override for 16550 HID in SSDT Date: Wed, 20 Jan 2021 18:20:05 +0000 Message-ID: <20210120182005.2580-3-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210120182005.2580-1-joey.gouly@arm.com> References: <20210120182005.2580-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93f00628-b104-47d9-1c03-08d8bd7008eb X-MS-TrafficTypeDiagnostic: VE1PR08MB5677:|AM9PR08MB6132: X-LD-Processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:4303;OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: w1AamMkgV74vWMofECHo7OmTj3At/WE98MqFh0v7wvh0Wd4PFUkha8DjneymOY5b9GGal8+By0UmzEj04Zz2qBxmfdAfYNB2DvGiN9Uo6MJiBOMdpQt2eOf/9WqVLJn11BgwHBym7F1lb8jYGCS45SSDYnvUHoBjAT/mwaGFL4fG5hTpIhvxdYBdueDjzSnvuAcmptsKpCcLqgSX03ynLaCHglRYKO8bB6G7gCtst4ITJ1mjT2IRkPJfYHT0T8TypqSPmTDemG/2uYVzaPZKiJBkkCNlZ9aNvG0mC/gXjM80jJ+qLLbJblEisl45vhoR/UmZ9c7/t7I90UKRN5r1NyXi8Qg1zdejwCCky+iuW1SjfZZWWTWtyENK9/Ej5mELbVyBsTtA91/pQnnpYlbmLcrBVq5xBouImU7xztTIr2KxzLpdmMKvWmuwp9UTPexWpKgKaLYKLdVdvkcAOwncW9YqXNd1uNzrcj5meVfg6yalPS2CwDBkjPsuOVwD5pBKPCJ23GZ23K+A+MacS9w1VH1ZBVud4y2i4sFF8SozC9j+YG3K5gLxGQ/nwjDKAOTF7SNApfds3T52AsdBczpi59QMo6DIVId0F/me9BeGZGX5rErucxJSaY9/oyABxxSr 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:(4636009)(346002)(136003)(396003)(376002)(39860400002)(46966006)(7696005)(70586007)(316002)(186003)(54906003)(2906002)(47076005)(36756003)(70206006)(82740400003)(6916009)(356005)(83380400001)(82310400003)(478600001)(336012)(2616005)(426003)(44832011)(81166007)(5660300002)(8676002)(8936002)(86362001)(4326008)(1076003)(26005)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5677 Return-Path: Joey.Gouly@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 03b7c8db-f20d-4db9-b019-08d8bd70046a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tNwfWHRKD8V6gEVN5CwHklViIfT9qpwa0XIMFc2ZJ5iaXYLvc5EoC/dsC+sPz+tjQu504FjKp8jiGoQOmDTuW/DuS/W5/SD+0PiCB6zL04WvtI/+TrjAyulR7Mmzn+TXFEEbB+Vj4TzpV/fvq/CbghQEJMZIZK1iQwvrqsQjS9Y48z79W9bH2U6ei2+PO5gQA1Q/mg7H/28aL4ClAS0Lefqnqokh9laYoHbDlXPEi13d5Q4J1KQdTRgzSXYjiOENC2N2G3DCwrEfo5KQ9VPcA7f92Y4H4ZnApb5hR7N6g4PNtgWhhKKav0YvnDltA5CPXQQMnTtW5lresPuFVaGgdqR5SHTJwySYH9gIPyVeMLNprRLD2XHxG/2JfMlbvVLv5oy7BhkWkmtK7T1j52j3d4pm2w0WMf/I0KQy810k8g2XcZEhhvsS+cEKwjIWmGs/Dz78FEA++ZmqEvJJn4GI7A== 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:(4636009)(376002)(396003)(346002)(136003)(39860400002)(46966006)(47076005)(7696005)(81166007)(82740400003)(8676002)(70586007)(54906003)(1076003)(478600001)(86362001)(44832011)(4326008)(336012)(2616005)(2906002)(26005)(426003)(36756003)(186003)(83380400001)(6916009)(82310400003)(70206006)(5660300002)(316002)(8936002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2021 18:20:15.5258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93f00628-b104-47d9-1c03-08d8bd7008eb 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: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6132 Content-Type: text/plain Some platforms advertise support for a 16550 UART, but are not compatible with the PNP0500 HID. Allow them to override the HID by setting PcdNonSbsaCompliantSerialHid. Signed-off-by: Joey Gouly --- DynamicTablesPkg/DynamicTablesPkg.dec | 3 +++ DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.inf | 4 +++- DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.c | 14 +++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/DynamicTablesPkg/DynamicTablesPkg.dec b/DynamicTablesPkg/DynamicTablesPkg.dec index 291a45a69679ae82219ecd2f26dfabfbab1f7f65..3ec4fff116a8f538be331edf341867948c025116 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dec +++ b/DynamicTablesPkg/DynamicTablesPkg.dec @@ -44,5 +44,8 @@ [PcdsFixedAtBuild] # Maximum number of Custom DT Generators gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdMaxCustomDTGenerators|1|UINT16|0xC0000003 + # Non SBSA Compliant Serial HID + gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdNonSbsaCompliantSerialHid|""|VOID*|0x40000008 + [Guids] gEdkiiDynamicTablesPkgTokenSpaceGuid = { 0xab226e66, 0x31d8, 0x4613, { 0x87, 0x9d, 0xd2, 0xfa, 0xb6, 0x10, 0x26, 0x3c } } diff --git a/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.inf b/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.inf index af3d404393f5f1385ab2d40f45f7222ab66f9b3a..b64825982e8fb7aaf78f3fd68992e1c78d20c408 100644 --- a/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.inf +++ b/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.inf @@ -1,7 +1,7 @@ ## @file # SSDT Serial Port fixup Library # -# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -28,3 +28,5 @@ [LibraryClasses] AmlLib BaseLib +[Pcd] + gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdNonSbsaCompliantSerialHid diff --git a/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.c b/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.c index 0ff071485ef25f4ca63de0eeab5120d1beece4db..73a8087ed8a8ff84b64531a3c73d319585dfb6cf 100644 --- a/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.c +++ b/DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFixupLib.c @@ -1,7 +1,7 @@ /** @file SSDT Serial Port Fixup Library. - Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -139,13 +139,21 @@ FixupIds ( AML_OBJECT_NODE_HANDLE NameOpIdNode; CONST CHAR8 * HidString; CONST CHAR8 * CidString; + CONST CHAR8 * NonSbsaHid; // Get the _CID and _HID value to write. switch (SerialPortInfo->PortSubtype) { case EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_FULL_16550: { - HidString = "PNP0501"; - CidString = "PNP0500"; + // If there is a non-SBSA compliant HID, use that. + NonSbsaHid = (CONST CHAR8*)PcdGetPtr (PcdNonSbsaCompliantSerialHid); + if ((NonSbsaHid != NULL) && (AsciiStrLen (NonSbsaHid) != 0)) { + HidString = NonSbsaHid; + CidString = ""; + } else { + HidString = "PNP0501"; + CidString = "PNP0500"; + } break; } case EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_PL011_UART: -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")