From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.13.83; helo=eur01-he1-obe.outbound.protection.outlook.com; envelope-from=sami.mujawar@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130083.outbound.protection.outlook.com [40.107.13.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7892321B02822 for ; Tue, 19 Mar 2019 06:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o+qSdgoXqxwWvneV9TOqBTKeG051zhWV6LJdrEL7Gwc=; b=PTtOS/KbTTzTE6JNiHtzh9N1YP1vyUmcj4NwESh0nbNc0zw/dTjpf3dFU8d+bk24uReHb/ihNb+1iXD2v98k2ZPT+ot1uBvYMxux8IWxjLpgU/1PhfmOsBgQo7GP4klGJ6TulWVeRZ0Us7MA3BJLSTKDhMLI+ShLXwmEuFE/SNk= Received: from HE1PR08CA0043.eurprd08.prod.outlook.com (10.170.248.142) by HE1PR0802MB2537.eurprd08.prod.outlook.com (10.175.35.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.14; Tue, 19 Mar 2019 13:47:57 +0000 Received: from VE1EUR03FT057.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::200) by HE1PR08CA0043.outlook.office365.com (2603:10a6:7:2a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1709.13 via Frontend Transport; Tue, 19 Mar 2019 13:47:57 +0000 Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=bestguesspass 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 VE1EUR03FT057.mail.protection.outlook.com (10.152.19.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1730.9 via Frontend Transport; Tue, 19 Mar 2019 13:47:56 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Tue, 19 Mar 2019 13:47:36 +0000 Received: from E107187.Arm.com (10.1.195.55) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Tue, 19 Mar 2019 13:47:36 +0000 From: Sami Mujawar To: CC: , , , , , Date: Tue, 19 Mar 2019 13:47:24 +0000 Message-ID: <20190319134726.95524-5-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20190319134726.95524-1-sami.mujawar@arm.com> References: <20190319134726.95524-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:40.67.248.234; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(136003)(346002)(396003)(2980300002)(199004)(189003)(6916009)(77096007)(47776003)(76176011)(72206003)(53416004)(186003)(15650500001)(8936002)(106002)(2906002)(106466001)(26005)(54906003)(50466002)(2351001)(4326008)(478600001)(48376002)(316002)(68736007)(36756003)(305945005)(51416003)(97736004)(16586007)(7696005)(86362001)(81166006)(356004)(8676002)(6666004)(53936002)(81156014)(44832011)(486006)(11346002)(426003)(446003)(2616005)(336012)(126002)(476003)(5660300002)(1076003)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0802MB2537; H:nebula.arm.com; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7651431e-5d7a-4118-5c24-08d6ac717e4f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4608103)(4709054)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:HE1PR0802MB2537; X-MS-TrafficTypeDiagnostic: HE1PR0802MB2537: NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0981815F2F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Q9UKKfGZeVzNH+mnWrvXhnr+XAiMMkFCoEMX5HLkVNU+qqcoia1IcMc7513TZjXycXFWaFO/+DCY+i/tAAiNBp5sHvOLtzrh+wvFxAjuCriYaYvpUu6YXIO5wfkq84ENWsgnqXV6pA2BvAZRplM+gsOs9+zqevttDnn3rh3drxip1Qt14drn9AGp4aw2TYemLB6PRCMuguoN+F5XST58IyC12KN1lElTf2xJ7/+rwxgB9b0Lo1eERkcEkdsei2CeXu52/EmT8tabErgDgek82pEDVuMgsiUZujtBZNSVBXKQHIRTNCRjM4JLe5DF5iRs0lK6aefdBpg1MDoksJuYGHqlIP/YoWz9YdM4JHHSP8HyiI/fyF5TjLeRTjbH9p3KqN36iJYJE+DqhJmEjrq4ACwnbPfxOjsPBqyIOc/7G28= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2019 13:47:56.8384 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7651431e-5d7a-4118-5c24-08d6ac717e4f X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[40.67.248.234]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2537 Subject: [PATCH v2 4/6] DynamicTablesPkg: DGB2: Update DBG2_DEBUG_PORT_DDI X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:01 -0000 Content-Type: text/plain This patch was originally merged in edk2 master at 6814256083a90ef218e7ae240e51922045175df1. However, this was later reverted at db8382ef5e44bd07654fb4726b77f3c329210561 as it was merged during the Soft Feature Freeze for edk2-stable201903. Resubmitting this patch as the edk2 merge window is now open. The DBG2_DEBUG_PORT_DDI() macro supports adding only one Generic Base Address Register. Therefore, removed the superfluous parameter NumReg and updated the macro to use DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS which has a value 1. Cc: Laszlo Ersek Cc: Alexei Fedorov Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c index 697cfc46abaedf34d30abf26e7ebb2b4d271822a..90380f48da017b257476ee63bcc1beae5efe1d65 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c @@ -97,14 +97,12 @@ typedef struct { /** A helper macro used for initializing the debug port device information structure. - @param [in] NumReg The number of generic address registers. @param [in] SubType The DBG Port SubType. @param [in] UartBase The UART port base address. @param [in] UartAddrLen The UART port address range length. @param [in] UartNameStr The UART port name string. **/ #define DBG2_DEBUG_PORT_DDI( \ - NumReg, \ SubType, \ UartBase, \ UartAddrLen, \ @@ -116,7 +114,7 @@ typedef struct { /* UINT16 Length */ \ sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \ /* UINT8 NumberofGenericAddressRegisters */ \ - NumReg, \ + DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \ /* UINT16 NameSpaceStringLength */ \ DBG2_NAMESPACESTRING_FIELD_SIZE, \ /* UINT16 NameSpaceStringOffset */ \ @@ -164,7 +162,6 @@ DBG2_TABLE AcpiDbg2 = { * Debug port 1 */ DBG2_DEBUG_PORT_DDI ( - DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, 0, // {Template}: Serial Port Subtype 0, // {Template}: Serial Port Base Address PL011_UART_LENGTH, -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'