From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (EUR01-VE1-obe.outbound.protection.outlook.com [40.107.14.42]) by mx.groups.io with SMTP id smtpd.web11.1982.1613125447075048374 for ; Fri, 12 Feb 2021 02:24:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DWO38OUw; spf=pass (domain: arm.com, ip: 40.107.14.42, 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=b2aGzheUAFjanVZSjO32Ir91IxQpTPzrwObfJezrYsQ=; b=DWO38OUwnWT8/+CaE8nO0+P1Ek2rYU/AiFOo0zaBnOjU0ZdUxQ2nPzuvIkfSdSI0ji4zgzyE6//Htdq0bxNXGEX+0CgOq182qepG37EPggLwqaz4jbKIFXlT3w1A7AlX9Sq4HXZFlJOJeri9GJMJZvsNSBb2IYjjXTr3pumNTjc= Received: from AS8PR04CA0027.eurprd04.prod.outlook.com (2603:10a6:20b:310::32) by VI1PR08MB5293.eurprd08.prod.outlook.com (2603:10a6:803:df::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.28; Fri, 12 Feb 2021 10:24:03 +0000 Received: from AM5EUR03FT023.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:310:cafe::62) by AS8PR04CA0027.outlook.office365.com (2603:10a6:20b:310::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:24:03 +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 AM5EUR03FT023.mail.protection.outlook.com (10.152.16.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:24:03 +0000 Received: ("Tessian outbound f362b81824dc:v71"); Fri, 12 Feb 2021 10:24:02 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6fe5fc95d37b467c X-CR-MTA-TID: 64aa7808 Received: from 2062990c38da.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 0686FDB6-AAD2-43D1-AD05-DED858883192.1; Fri, 12 Feb 2021 10:23:57 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2062990c38da.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Feb 2021 10:23:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V1IZkjluDF3bHaS8Y7LQ3qDEMJ29sLx3mktaM51gHclXvGRTeJEjlBe2CugAMb/V8GiylZw9QLhL+tcaoEXiKcLjfk8mrf+gCLbzwwGaid/9NEv49woc/F2KfS5zXocK4L9rMtDidRr/Bgz/eF0sdP6KodxrGVje+oFUWawXW/z2rnmGdkDAu1gEOcz1fNdjQadddmUrwPH9tWkIdgQICtjs3HmHLQkGnk/u3d0PECToegVoxiJwrFwI0SLMbA9sYXYUbfONwln/59VcXebIbZu6bWWaSiBBfstoeJ8txGl8xuKq7x864pU/m4N32kv7FCVi32xpUp6Hd1Yd+SkV9A== 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=b2aGzheUAFjanVZSjO32Ir91IxQpTPzrwObfJezrYsQ=; b=EymIbGGbWM3nQrVVyLM/YRqUNDb7G7TsiVISP3i0M0sFbNh0YW0cUecoBDMHNV/fm5Xse4IKVJrfZSb54KU4MWQEzTLv3urxic4o5RnDnxJHeYOIE3MtgUVa2IMsJUB34GGvMGBpPJUlFyCwoCvyozByUmfe7hRZ9j6o8RSmtdQgrAVjVc83uXZTZOZHjX6DGEEDXioSdx90PoWmM2URzz8hJJf2kH+eLQe3piJ9QHk1X5wY9qbDDsIKo2qA90200h6Yu0GWI3mqBP6nQz6L7AYMOBN+JA29Pa4B3E2DuaZ9UHyNjeQzhHzwrErRLmJTmUlaBKwqez6RK7sHNUM7Uw== 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=b2aGzheUAFjanVZSjO32Ir91IxQpTPzrwObfJezrYsQ=; b=DWO38OUwnWT8/+CaE8nO0+P1Ek2rYU/AiFOo0zaBnOjU0ZdUxQ2nPzuvIkfSdSI0ji4zgzyE6//Htdq0bxNXGEX+0CgOq182qepG37EPggLwqaz4jbKIFXlT3w1A7AlX9Sq4HXZFlJOJeri9GJMJZvsNSBb2IYjjXTr3pumNTjc= Received: from DB6PR0601CA0011.eurprd06.prod.outlook.com (2603:10a6:4:7b::21) by VI1PR0801MB1904.eurprd08.prod.outlook.com (2603:10a6:800:81::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26; Fri, 12 Feb 2021 10:23:55 +0000 Received: from DB5EUR03FT037.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:7b:cafe::9e) by DB6PR0601CA0011.outlook.office365.com (2603:10a6:4:7b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:23:55 +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 DB5EUR03FT037.mail.protection.outlook.com (10.152.20.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:23:55 +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; Fri, 12 Feb 2021 10:23:46 +0000 Received: from E107187.Arm.com (10.57.49.120) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 12 Feb 2021 10:23:45 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH edk2-platforms v1 05/12] Platform/ARM/VExpressPkg: Helper macro to map reference token Date: Fri, 12 Feb 2021 10:23:34 +0000 Message-ID: <20210212102341.24056-6-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20210212102341.24056-1-sami.mujawar@arm.com> References: <20210212102341.24056-1-sami.mujawar@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: 66625b05-b0fc-45f8-d659-08d8cf4051d4 X-MS-TrafficTypeDiagnostic: VI1PR0801MB1904:|VI1PR08MB5293: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:6430;OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: O7Y3iLEvbx/t51Vd3E0DGUWA5Uo2uax0KHltkjG9uxBseLzRR8RoFmILWwTs9bRssliROCQrIvxDGMUu3P7Pvc5Nq7O+bkkXY95u/YOhiS+4/klwbeWfteA71t34DOQUko3RoRZiPBa/V6TDwzquR0AwMmAtoLcD5m+QIvNtv9GToIoEDgIDL3mP0QiF9rk91+6CI97zRp6xpY2Z7lysmahPs7zo25TF7rZPNshxj9976Ea4Rq91lQd5rcLl8eSY3xbzl7BDsfCrK4Ov5GbM1Xq+rPVUx5pXhLlAEYUaigmhQ6/0pqpKdd252iWLmOLbbd910n6SQoBq96as/LbkaBwBGt/3IKjdgybYLDDSQOfgcm0iR4muYXJh2qfkeA+C5OgxIHex7YBTlkk71EjLleqW7JPUuhsggDPFQOPzMJ1Cg38zzK2EcoeONcZn6bzz7SjoOj0GhUaVkEiarBh/0VEHErVS3ulfo5QOuXG9pGw0aaYoA/Bpx6LZ66mbjGSaka962lpHv/vEvSLUM9v/Zb1E7kizUAQFIFoeAw8lz/oxii5+qIWMViXBp9ppmuG2QREPnIPqpGmoeY+6998dxK1CTG8yoSQ6BkZkl6OtBDzDx1DRFKCXoOZNCWIdOSa89ZylBsxnWZhIc1MJRA9R2d3rWa5pPUoI5FLVqDzNPJp5vlWNczTNPNh7Uc78i8Ym 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)(396003)(136003)(376002)(346002)(39860400002)(46966006)(36840700001)(4326008)(7696005)(186003)(36860700001)(83380400001)(316002)(54906003)(81166007)(44832011)(356005)(2616005)(36756003)(82740400003)(6916009)(478600001)(70586007)(1076003)(426003)(5660300002)(70206006)(26005)(6666004)(336012)(8936002)(2906002)(82310400003)(8676002)(47076005)(86362001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1904 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 85dc1f2c-6d49-4268-f686-08d8cf404d75 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7Z5ihmZJ381eCPfarOQqaRTvxgj73aYQIsT3Wt7gmVKLDvfynpF1g+HVaYOJ8K8FOCh00IqNNqT6Vl+Vm3u5gEgSb1Jr+yX0sIVYa8NDZRJ+TXXx5ZNNK6GYdMahStqc/GyhWXfW4SujZuYlgd/qfmVWxfpLP8FcLalfQbE2FNy8RExmE4cKUe8yTotWB9Y9XH6D/RzoNoV6hhdr4sCh7TX/hpeGklt3C63fWxhjwJrJlXr2GHpaZ9IcYgdKybFn/Tb+8tBjVpO3BjOEilWpRy6uYZ0i91p8SkRyK6qkBNgbckpbu9tgwgjLLq/ZWcHuSs/or4SbEZygo26qWG3S66/dYCrVWU9g8+8IvmXFXI6PABHvkr6Gn2hoeXA7FBwhO0HMjkUZRJPguJLR8IKbb9Smv4/hNdXPwbLhG+tWG8F90PnjpGwoo8x39Rj6Q8P3YRZvmTwE9uM6zJI0g3SOCnyGUq3oV60PZaqmqG/k7Y8cSuHdKaCXY3jUowvu5OxcKa+9ZpaMmzESrq3LtgIBzD8xI3RHDQSnJ1jRqA35KIPKgdJw6FqiNoJcxS9M+z82x5HaV8M5yHV2+ZSNIm2BuiMXIlbs0kPladQS/tIos+lWtPJ79hbyHrGK/NNJF7SieEysJ0V6pyZYMvF+CVsELCaB+cY7ln8942FSUeCdJDo= 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)(396003)(136003)(346002)(376002)(39860400002)(36840700001)(46966006)(2616005)(336012)(2906002)(6916009)(186003)(44832011)(6666004)(36860700001)(82310400003)(426003)(54906003)(4326008)(83380400001)(478600001)(8936002)(5660300002)(47076005)(1076003)(8676002)(86362001)(70586007)(26005)(316002)(81166007)(36756003)(7696005)(70206006)(82740400003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2021 10:24:03.0095 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66625b05-b0fc-45f8-d659-08d8cf4051d4 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: AM5EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5293 Content-Type: text/plain Introduce helper macro REFERENCE_TOKEN() to map reference tokens. Signed-off-by: Sami Mujawar --- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 3 +-- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 3298f9f9f79a2b23f181d3e961298f1c366976ee..49aa16184a2da587471239a7c90ed864f963896c 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -150,8 +150,7 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo = { // The number of timer frames implemented in the GT Block FVP_TIMER_FRAMES_COUNT, // Reference token for the GT Block timer frame list - (CM_OBJECT_TOKEN)((UINT8*)&VExpressPlatRepositoryInfo + - OFFSET_OF (EDKII_PLATFORM_REPOSITORY_INFO, GTBlock0TimerInfo)) + REFERENCE_TOKEN (GTBlock0TimerInfo) } }, diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index c25ba9fac52fe049236948185dfc052c44a71e4b..c21f160dd082bddb9e8e1ab666143887d67869cd 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -71,6 +71,12 @@ typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( IN OUT CM_OBJ_DESCRIPTOR * CONST CmObject ); +/** A helper macro for mapping a reference token. +*/ +#define REFERENCE_TOKEN(Field) \ + (CM_OBJECT_TOKEN)((UINT8*)&VExpressPlatRepositoryInfo + \ + OFFSET_OF (EDKII_PLATFORM_REPOSITORY_INFO, Field)) + /** The number of CPUs */ #define PLAT_CPU_COUNT 8 -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'