From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.64]) by mx.groups.io with SMTP id smtpd.web11.9353.1634914070271876577 for ; Fri, 22 Oct 2021 07:47:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=zynyryqj; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.220.64, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HyfgUwput2ImPMPwXNTAoeYbuQlzy5yifzXf/xmXZcZV9p+qdpY1OuB1Ia7vZZ0RBwVqgDvhBvcn9xzOYGaRdkiaUmaEZa16ELSGJxJR/ds8tLaZAoQ9ZTF9LszHfiubbskxE9QYqPBL3HYhuQQp4uf7jqRdcbt44LzFsWWDFqajX9EDCkaN+jREe1ocgXO3FwiPDo3w8/AoSBWdvxLw5BbCCTwtz2WBWXPVkSd9WgvdbS5PNmaGZBgMSbvIvykX2MQeGDs7H8g59ivYP0BrBPrEnx60BZCu4q2BC7SMWwWDL/icz8J5+WY0qtnePwapvRM+m7XtKl9fUUEC0Ux8Ig== 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=NCraOCj06C+tlRdL4+W+c+CjA+3Hgl7gLI4JidaSf+0=; b=VrLp6aWge06zPo8+EoGEyrqq+hCrg4ht8J8WyiqOH+GeeM+WvZmuEehLy6w4KleFm5uh17+OOUHW7TM3B18N6A8qmwkHFUXSOWc0fNHZh4Ckc2qE0pXCeyVSVwKL5glnHIyf0AdfWeARThGab2MWOx6uVusNmFCnZzdT1PvTXZ3dONNXkfLmvX35N5qAQXYX2r8f80N3gfGil910ptlt1VasrDlEG/kT9HumiKkbSKgGs2yGv0BZnLhA7F3NPWFun4/50309l7UEQDjTpHfNX5A2//bCG5jn0PXXNCyj3pRKfnYKw6OmysVAwBb7NXqJSq9KEzn7oCkHFkqC37AI0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NCraOCj06C+tlRdL4+W+c+CjA+3Hgl7gLI4JidaSf+0=; b=zynyryqjrpH+HKVOk7mXK88mP66MwouPBcsQeHMQyNBQyoGDsa2UunqNNMXK9k3MxWNzGn2QfAEx1wy/Y0a6YHuV469WtZEKbGXma5WM3lG6X7pGvDIuZ8dUIiOYZQ1WX/gDPnvbVlEb3b4m8+T+RfLVecd+4hl8N5TirtP/pIE= Received: from CO2PR04CA0112.namprd04.prod.outlook.com (2603:10b6:104:7::14) by DM6PR12MB3546.namprd12.prod.outlook.com (2603:10b6:5:18d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Fri, 22 Oct 2021 14:47:48 +0000 Received: from CO1NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:104:7:cafe::4c) by CO2PR04CA0112.outlook.office365.com (2603:10b6:104:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 14:47:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT036.mail.protection.outlook.com (10.13.174.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 14:47:47 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Fri, 22 Oct 2021 09:47:47 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Fri, 22 Oct 2021 07:47:46 -0700 Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2308.15 via Frontend Transport; Fri, 22 Oct 2021 09:47:45 -0500 From: "Abdul Lateef Attar" To: CC: Chasel Chiu , Nate DeSimone , Liming Gao , "Eric Dong" Subject: [edk2-platforms] [PATCH v1 2/2] MinPlatformPkg: AcpiProcessorUid for multi-socket Date: Fri, 22 Oct 2021 20:17:46 +0530 Message-ID: <20211022144746.10671-3-abdattar@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022144746.10671-1-abdattar@amd.com> References: <20211022144746.10671-1-abdattar@amd.com> MIME-Version: 1.0 Return-Path: AbdulLateef.Attar@amd.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee61d766-80ed-4872-b5d4-08d9956aea40 X-MS-TrafficTypeDiagnostic: DM6PR12MB3546: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: svrBM2QxLNEczc3wx7DsrvBh/gNQz7OKwYHbAIKYds7uHo8NechfWbQMe8LytGydfq6MPzvBGPBOVrOnsbRM8FCZttMXc9Eew5aDWb2epPpo23d7zLpk88CPCnqGdGEz7AGh80ThQ32wfy/JbRnG0hfWrVchG6gXX2/A08WfCJJzVmoUBfnfOGljmxjXneJKenKfdjfJwCf6YmlkKC9Pe8SO/TM/ejcauwwR/KNJ2FjWjnuIujXtpNsd9c7o8wsOG8D4lc4DGyqeunumxfOfJxcQyNZ95Ksc/k9A2UeIWH332eaUQk7MfzMkyZtRhDY9zLhFnvazCa7Q7/1PtQU1aPacYoOK/JeTCSNu+dNrdAu9KC4uBNcr0rIofU+kxG1bILwVE3W3bGyQJZFPMh/E3SsxPi2PsMZBmOSJ2HHUY7so9VqOSIo9q4Mrxm4bLiE6lHQNFgT4LW6Rj3kDHBxdo3DEBwBVHGmjp8QupHVxSac9X5+u3dt5/J24lrBpqFgX6krDp9I3alhhOvxkT7N0EZvUQD0R2TUYlLYqNUqzysbf2bpuHg2Aos/KpZr1+klBAY37B0UNP2P8qkRdicYOp1SgJ0B3Rf//zG1tjtFvFETWbk8M8Jz4fh4TrSgV5lKlHalfX7n3UfMnVbfj0zpzxjTwTRpOXeX8vF5L4jzi7lW8saSwI7ieMNMqh+068HblEWWVK12EcGovphr8Ntjq/a4UZ5yQqrCXdmZE83MexbY= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(2616005)(316002)(54906003)(426003)(356005)(82310400003)(508600001)(47076005)(7696005)(8676002)(8936002)(36860700001)(36756003)(83380400001)(6916009)(70586007)(26005)(336012)(81166007)(5660300002)(70206006)(2906002)(1076003)(186003)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 14:47:47.7388 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee61d766-80ed-4872-b5d4-08d9956aea40 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3546 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Corrects the AcpiProcessorUid for Multi socket/package. The ProcessorInfoBuffer.Location.Package holds the stale entry of the last processor. In multi-socket system it holds the Socket/Package number of last socket/package, resulting wrong AcpiProcessorUid assignment for socket 0 processors. Hence do the bit shift on stored SocketNum. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Abdul Lateef Attar --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b= /Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index 032903029a95..785cf4c2f911 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -287,7 +287,7 @@ SortCpuLocalApicInTable ( for (Socket =3D 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); Socket= ++) {=0D for (CurrProcessor =3D 0, Index =3D 0; CurrProcessor < mNumberOfCpus; = CurrProcessor++) {=0D if (mCpuApicIdOrderTable[CurrProcessor].Flags && (mCpuApicIdOrderTab= le[CurrProcessor].SocketNum =3D=3D Socket)) {=0D - mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorUid =3D (Processo= rInfoBuffer.Location.Package << mNumOfBitShift) + Index;=0D + mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorUid =3D (mCpuApic= IdOrderTable[CurrProcessor].SocketNum << mNumOfBitShift) + Index;=0D Index++;=0D }=0D }=0D --=20 2.25.1