From patchwork Thu Jun 27 05:39:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713833 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2062.outbound.protection.outlook.com [40.107.236.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32B8C200B7 for ; Thu, 27 Jun 2024 05:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466828; cv=fail; b=IbcRrc6Pm+2dnJb6O26E/Puy4g3ENk+gtqvQ31MRDelLeSAti3Wbc2GDlKLE3pSPzGjIatGYAfomkiLS4SF4zZX0p+QYVb7fBVGhkOqWU40o237Syt6km4cFb0Bx3AMsFTD7PktiFFM3l93z1VVf4he/TzkfPsl7p+DIe0JrHkA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466828; c=relaxed/simple; bh=IW19AZiZUjmkTY4AyQiCXtkbeN7xYYWTUrORqOsSBw4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YUFduQoCEHfJUcSqhE743hKCYZZlXbockC9WOG/nKz8roaBU7m0M+a6/fFTGv+dIapSycRHREpDBstFA6MxgBS2Mj9+JP44aH2cOTVUPs9tZtfkriYehEjQDno7k3gQkl8pYUM+Gf/hlI8uYVNAhN4LLe3JfL1zSq/88k3toPTs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=vktxVehv; arc=fail smtp.client-ip=40.107.236.62 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="vktxVehv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FXvsWZ7GnIqJDS6z0OjJIkOHgbJ1ZyCF/Q08U5k52bBJGZbhys4FEoRtS1OLmufAEn1ABZpqdBUOJaZuKKmr0VeIKzZ+NJAPY350oLjVGIosPWTGaghsj8URRIsI1o267yQe6OBnBpzw0f76DBXQFb2QKOERTc5lGQsYEVKsR1upoYXrE+GwgLbNETh9G3C6uHSe65FsDgTxUt68UColVvlyIZugf99SEe/jd8FEggVe/h5oOxi0HayB4/5HujAlG9SY2oELixpXgaGCq042HIC/o4JRPpKnpqyAulPG47zZewpSl0mv1/2MsVWyNEdQ+HGch1O8+m3uNAqsrVuAgg== 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=8jSthZjZ68swQTWoIUV0VK3CVPaWVxFfUZv6z2BMJRY=; b=ksx+uyD9H0Qb2lPSV4Z35LEUfKyEJwejLqHnUOLigEjmRFH2CR6CEjsMlLGK4+fxDvQ/wvoGOvR1m/ntTttcwPCXoOHK1lzxxU0TtLONJz+oh/blR5/Fela1jA6DWcqWMEbSyGoytYaCO1BIGQSARi+1JKiSioQ0HlxVFvZD+oSv+5/g/rk/RmDbXNgrrSVXwCpBcS+IZNjUVA+CacVzJeub55H6cbBOp6TqAwa+4ywEwltDanKXFvUI1Rw2lxB/VStfiPex/ju1xIEQsvH1zYI5Zx6+O0FoqZCutrT2rFf1RlS3xqi+508CUzx8xxkX+G024TK+fLzk6yyHpP9VQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=8jSthZjZ68swQTWoIUV0VK3CVPaWVxFfUZv6z2BMJRY=; b=vktxVehvdfBp+bOhrqhkuIchZ3l3Ez0wdgTiYqhllbEMiv0bqBNQ2fjx/mBTpwrIpCyJ5dkJ1isafMj7/t/cHJImgDctnIy1RrU2K6zdt+mWcfYZcJaz3CwHPMCbVBHT8Y32a2231R7OuDUQKD983TgSD2zeZ0oKrqUcKMNJgV8= Received: from PH7PR13CA0008.namprd13.prod.outlook.com (2603:10b6:510:174::15) by SN7PR12MB6958.namprd12.prod.outlook.com (2603:10b6:806:262::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.30; Thu, 27 Jun 2024 05:40:21 +0000 Received: from SN1PEPF000397B3.namprd05.prod.outlook.com (2603:10b6:510:174:cafe::fb) by PH7PR13CA0008.outlook.office365.com (2603:10b6:510:174::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Thu, 27 Jun 2024 05:40:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B3.mail.protection.outlook.com (10.167.248.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:21 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:19 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 01/10] platform/x86/amd/hsmp: Create hsmp/ directory Date: Thu, 27 Jun 2024 05:39:49 +0000 Message-ID: <20240627053958.2533860-2-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B3:EE_|SN7PR12MB6958:EE_ X-MS-Office365-Filtering-Correlation-Id: 66bf12ff-b495-4dce-5608-08dc966ba2ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: SEwDgSvASQvLGQTtA0gAoqKUJuNBB3TNLGuaxwyW2nbcCaOPHltcJ0SYik7VL4SMMRFKQgi3Pbewm4mRzKFgX5LEU4lkaf5i0u3h8hAZwsWyUiPxPZLnUF7pPWx2ToP0NUC9MO7xI+qLAQHlnV1VhHK9DTFm8LBylffFRePuHGX7jRY/rpm85McjB6zc9tYI6Fg0jh7TsRTCtt6oOX+SQUg6dsvG8I0GRK8j4HEokZriBMEUSahsVzmZl3QvplGVnmqyYhfqow5sb5qrto+I1Jo6Gb2OjLF1k1ozqwBX2dGiIwqi8GmvJy2CxMjE+8crlsR4KDghzHs02CO1p6C3YaGG6sbHTwkgz9iyFmbo/4ruNdUExG/+uVtDxYixLwjWNgNc26igDGVjF3Ylt9CYVpf39NeaYGnIYO6qwoSZTtqNBFZGsRvnj3uZwU4fMQinYfokNbXFjbQVklfdG3/AMESbavfmYeuHE9v2YqFQXUzqAag2B+MkMfXHavgcdoesHMUmErsBq9nfxx7DHfEYW5WL4Hd34DJMR+PyzGxBQ87RF0gG1NuzwuIjwWEobyXqDk92YEWJhXqGWGHJFduTWQGxPrAyq7wW4EUr8i4XpKzLsHhbX2/mxzcVw0PG/8mdA+/pNwvXLH7e8ANS92TP7OKq//jwD6oOJd+b33T/JO+QrBUnbDf6E6lLVez+3hjCA6RBMVl/giGjN9TySuSyrzJsQknZWuD94L1VgTuqxohVAbLJOJcn8WTKDPNaZGva5p61sGvEihJZO7NBCPshckbdQowFRMLijOzU2MdSw3+BsHDLg4/BXa8FNTzoLYRf6UcDS2++t87BpPwDM6pQmtJZYkcG7KnBHPEl2hl7owBmLv28MXBC25GpUQWISVrkR2+YQPKmnQHQa5tAbXsFRh0nmPFrBXKbJmj22aPyA3fb+uttgdSNrSIvdd3nFQnFfP0I/+QhSCt5aJU/6Kz+wWgAjO3oGnOakK+JNxrwm8+ubc5shsJjoX0l1iSMtti7HLrOKZg009THPwqDpZffrZ36daya4qnl6LkEF9VINCjct4yQXpTi6MzozW4Du90a4mOUHdLScDuKz6koZr58q0u7rp1RZbTuBbxr/5HrddIFAAA6zCsWFvSfLoB+RVSu7UBXpAgvc2c8lABiMDsFPzYWwUv016D5JyprcR1jRIHqdERF/0X29Twdwh0HAN0AL7F1tRX9mMT3RyKkUdXj0GN1ta/lpX5LdQeyhFbV8n2HrvvL+akWw3sMeHmyTVv/unLGX/NV07j5NlvL/RUJstqnZqbWhx/EHdeP16548szpzIkMOh7T1rfHuYYYQJuG9kIxhyQVveEVj7/+Ds1szR1tjY0/vl0Fetz/7F7ydUcOwHgfXWYwa1wnSS6S8tN1Q0ITY6BRac+IxRr2EEIu3g== 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:21.3700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66bf12ff-b495-4dce-5608-08dc966ba2ac 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: SN1PEPF000397B3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6958 This is in preparation to splitting ACPI and platform device drivers. Create and move hsmp specific code into its own directory, no logical changes. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- MAINTAINERS | 2 +- drivers/platform/x86/amd/Kconfig | 14 +------------- drivers/platform/x86/amd/Makefile | 3 +-- drivers/platform/x86/amd/hsmp/Kconfig | 17 +++++++++++++++++ drivers/platform/x86/amd/hsmp/Makefile | 8 ++++++++ drivers/platform/x86/amd/{ => hsmp}/hsmp.c | 0 6 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 drivers/platform/x86/amd/hsmp/Kconfig create mode 100644 drivers/platform/x86/amd/hsmp/Makefile rename drivers/platform/x86/amd/{ => hsmp}/hsmp.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d6c90161c7bf..a7d79d1f7ec1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1037,7 +1037,7 @@ S: Maintained F: Documentation/arch/x86/amd_hsmp.rst F: arch/x86/include/asm/amd_hsmp.h F: arch/x86/include/uapi/asm/amd_hsmp.h -F: drivers/platform/x86/amd/hsmp.c +F: drivers/platform/x86/amd/hsmp/ AMD IOMMU (AMD-VI) M: Joerg Roedel diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig index f88682d36447..2c671cc17d63 100644 --- a/drivers/platform/x86/amd/Kconfig +++ b/drivers/platform/x86/amd/Kconfig @@ -3,22 +3,10 @@ # AMD x86 Platform Specific Drivers # +source "drivers/platform/x86/amd/hsmp/Kconfig" source "drivers/platform/x86/amd/pmf/Kconfig" source "drivers/platform/x86/amd/pmc/Kconfig" -config AMD_HSMP - tristate "AMD HSMP Driver" - depends on AMD_NB && X86_64 && ACPI - help - The driver provides a way for user space tools to monitor and manage - system management functionality on EPYC server CPUs from AMD. - - Host System Management Port (HSMP) interface is a mailbox interface - between the x86 core and the System Management Unit (SMU) firmware. - - If you choose to compile this driver as a module the module will be - called amd_hsmp. - config AMD_WBRF bool "AMD Wifi RF Band mitigations (WBRF)" depends on ACPI diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile index dcec0a46f8af..96ec24c8701b 100644 --- a/drivers/platform/x86/amd/Makefile +++ b/drivers/platform/x86/amd/Makefile @@ -5,7 +5,6 @@ # obj-$(CONFIG_AMD_PMC) += pmc/ -amd_hsmp-y := hsmp.o -obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o +obj-y += hsmp/ obj-$(CONFIG_AMD_PMF) += pmf/ obj-$(CONFIG_AMD_WBRF) += wbrf.o diff --git a/drivers/platform/x86/amd/hsmp/Kconfig b/drivers/platform/x86/amd/hsmp/Kconfig new file mode 100644 index 000000000000..b55d4ed9bceb --- /dev/null +++ b/drivers/platform/x86/amd/hsmp/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# AMD HSMP Driver +# + +config AMD_HSMP + tristate "AMD HSMP Driver" + depends on AMD_NB && X86_64 && ACPI + help + The driver provides a way for user space tools to monitor and manage + system management functionality on EPYC server CPUs from AMD. + + Host System Management Port (HSMP) interface is a mailbox interface + between the x86 core and the System Management Unit (SMU) firmware. + + If you choose to compile this driver as a module the module will be + called amd_hsmp. diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile new file mode 100644 index 000000000000..fda64906a5e8 --- /dev/null +++ b/drivers/platform/x86/amd/hsmp/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for drivers/platform/x86/amd/hsmp +# AMD HSMP Driver +# + +obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o +amd_hsmp-objs := hsmp.o diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c similarity index 100% rename from drivers/platform/x86/amd/hsmp.c rename to drivers/platform/x86/amd/hsmp/hsmp.c From patchwork Thu Jun 27 05:39:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713834 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2076.outbound.protection.outlook.com [40.107.94.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8CD6208A5 for ; Thu, 27 Jun 2024 05:40:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466828; cv=fail; b=Jrhm0MIPfSpU4wEzfyr0/j3It5ndZQXge5k20CkAePQib4+fcBpvERr7BybjWrttflMxLrLn5fCT9u1bT19r61A2ckgWeuZakP5qpoogMvK2ErlTr5gZoM2cPN0LSEVcQwrLbg9UomTYebMfrOwFXy2PZ8eXNoXTlquLS5lkwfs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466828; c=relaxed/simple; bh=uuo/DIE7syfiarAVApcO+6mD3y9NsavbFjAfzE+gucw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l5Sb2g/1ZyadSRPw3561iuH8GhTzovKUjt8mmED5WTR21yLo7k6hBEffELOLI4Z/pW7KImoq9WILKRIdUWNpBTy7Kq98mwNbpEnb9X73/8fkq/Z/7Y8ZtE6i3pydpdWPoSMuy2P3yY1ER9vhll6c2Am6XaUP8MoVLVaXJOCmf7o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=IdYvM0Gy; arc=fail smtp.client-ip=40.107.94.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="IdYvM0Gy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4/auU4JP24W5K9RSRWmNNaitEVzUClP5UERMHuP7lmZaW4XxmDkLPoEXB5yNuOjbAs/4+pXQYWKQUdgnqFTYrdrqZXmwSXAg4io8H2HvFp398DnY/S58JbVY5rkE8wMXnMtOJb8uuwRvu4xmNHggqi4kQAbQtuQm/JLorDUCdPE8wuP8UiAlOrKNbkgE577xh74DalRxGyD2PJcYX1gmy2/3ojPes6MDHJrFOtD+2YTkSVDqNNeNfpDFzsbxkpe/XrSpzPRUfl6PJHRUpAaCd5yvwDmRUQLEDEwsMAXO5xh5pqkXq5DDiKhLwPnkWJlVhvxXZq+YgmnIwY+z+ibzA== 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=XNmVgMMeGJPgI65Mla2T7buiGtaOIy3xZa6jH1l3JPI=; b=MYuWJJktVp+9qb326mFr3//2U1v/hm0Kb4xtMobqDs3cCSFm1/TiLC47I1tBoU3Hd7V+fCfpnUu4s+yXHzNcCnE2hoRNk2h+J1gdC62ousJ/f1g/lZbnwqaFh4kbxBL5hFW3re+Ox+upMXMbuG43d297Ny+iGtB32UG/1p3Snin6PjmjlrtNvUSetlL9FGg8KTSclct3iRGvAtqrT0zL5LP9i7hZgSAE2Z0y5uEi/DiGc5wPvunGdNGEbHwzoqO6vY1Xh80u5eCM++3zI8QgzK4mBXUETPxAH82eyuENzhhKIgoWaeQOa1RdJByVNCLFH5ghmKlcrMamnMNNYkPNtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=XNmVgMMeGJPgI65Mla2T7buiGtaOIy3xZa6jH1l3JPI=; b=IdYvM0GyYQOZGh2mF4/zT+d/oHpdi0lLFn+qtaesVHPDXxjlya15OxVnKi+b9Bu6zg+uxb4C/x4N76188kxUplIcNT4tF5gi8EPwHjiYJIGkpH9BnSmWwDPSt5jaFt1CBVNiMLgliIg035LTogpX95sjWNG1mB5FbsmOwBI2iu8= Received: from SA1PR05CA0010.namprd05.prod.outlook.com (2603:10b6:806:2d2::12) by MN0PR12MB6149.namprd12.prod.outlook.com (2603:10b6:208:3c7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:23 +0000 Received: from SN1PEPF000397B1.namprd05.prod.outlook.com (2603:10b6:806:2d2:cafe::46) by SA1PR05CA0010.outlook.office365.com (2603:10b6:806:2d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Thu, 27 Jun 2024 05:40:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B1.mail.protection.outlook.com (10.167.248.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:23 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:21 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 02/10] platform/x86/amd/hsmp: Create wrapper function init_acpi() Date: Thu, 27 Jun 2024 05:39:50 +0000 Message-ID: <20240627053958.2533860-3-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B1:EE_|MN0PR12MB6149:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ff77abe-d6c0-4292-fecf-08dc966ba3d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: KOWAGFBUq/el01e7CPeU5xpFha9lSJHJYXKxykSZedtrnMBkRslgXhMcfzlyxfEICIGPggvDIrb8StjZvg5SMkPusQ7VfJx+Ex/ttDdOwr+DtFRDFIXA0Hh2EE+veTV1en0DgLEN+hSDBxRJIv9kkxIG1izWaNpjL56WfQBQed0gKllAV0UBtXRuejazC8/5rcIulHIHzsVi7sX/gf1JCJ6Q77JQEf0+p+IrR8l3fAq6JlRYJnkxOfip28Ly0Uot8/MYcRQoxLt7Ib1Xp3JhemK89HWVPlitB9BTK0nPxTP0TuMJHn79skChvPzYa+RzYPWpyhrvZ7fmgaSaHvh0YyW7zyMG8DD8ccQkoXc8dt3QXPTh/P7x3jD+1zbkpnDoYOPNfSFkn7ZykpKhnC5iHV7ll7fHW83xgCYNfB3hTfn58KfmTFqMnLq/3Gt/nRT/41eURFJoDZUqxcwv5ibPe4q6yAJ3Gwss3xuBh/LinsbkNiTA1z1VVY1fBFKwVuxG6LaLJlaGtGVP5sEtbL2h1vPZYQ8pVF1j01bnOsHhuSPXu5VspqWjl4lIGe/Sx33YA9u+9HDAECB4xnLK0Xj1axqM2p3Gwaqthc7iIASY13YyYWnHvhsBzdAQLMRm94bV+4+30SzzMAyrk2ptlux5ZEm5IwJogidRHSvQQ1ptYjxMGxyZed4bA5JjS/GxCPVV8LGrqN9Bn1SKGeyRL0+/IkREpZ3SLaWpe6+H0id1CckryNghOMZRBg2wgO4kWthcASdVPxZyymEhGeTut5gm1kN+IJKEmg56N2+uRAnNMIvhk4j3XR/EHdKXoND0a/7+jtShc3FTNT7WoxkMh6Ag1R5axr9k4CWvnbMIgKC9WX534Y9cUavqHbQVEJWdMvCDKFikQlCbIXiT37pXHWiS7VfE3wQsP7yctinfny0HWV2fpa+w73ibqJccAadqEufRwm9rcCCa2OiTPeU7171hz0JQONHWrm7y1A3fqaoHTwxLaZYU9gkgYr6gLUXNDFYzUzr6ZUW68MKZhdsNGaNLek1EbSvW7zS087QDJJ+PE0Eg0vlgM/HwteZxLUghXp74hKqpPxz/1mL49am/HaCMmcknNwOXggsgAtqz+637D8EJ6sxe7+yyMnSyPebK4VUsg4cAWWYjoiFDqEBaSChx/u1u7Qgx8ncodzexmlAjsZOZwee7rw93SHjcU0s7xHC1C337h6PUDJhLY74FmzS1gTSLJGGXBaPGzq362QtYN9J6OJx3AHGTlHhEYzhq0zycyMHcu8W7WVgV4EHRnhjk1WAAkI5FT1+TetdhKa31g3/qUCxtnrD8xKwGWWMnZy6c97jsJzJfWxNQhoG1bUIha48Etv9c2MIyF4o1Hp1SwNqWovqG0/454mGCxjrkUeiNq/D7mJpRJDx/hCwRFaEvc4L6EI9P4hsTZXklaWU9Bx9YsRv3u2xbq6pFGUD0xsTO 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:(13230040)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:23.3233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ff77abe-d6c0-4292-fecf-08dc966ba3d3 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: SN1PEPF000397B1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6149 This is in preparation to splitting ACPI and platform device drivers. Having init_acpi() helps in smooth code movement. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/hsmp.c | 91 ++++++++++++++++++---------- 1 file changed, 59 insertions(+), 32 deletions(-) diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index 8fcf38eed7f0..10ab9b2437f1 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -778,6 +778,11 @@ static int init_platform_device(struct device *dev) dev_err(dev, "Is HSMP disabled in BIOS ?\n"); return ret; } + ret = hsmp_cache_proto_ver(i); + if (ret) { + dev_err(dev, "Failed to read HSMP protocol version\n"); + return ret; + } } return 0; @@ -789,10 +794,53 @@ static const struct acpi_device_id amd_hsmp_acpi_ids[] = { }; MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); +static bool check_acpi_support(struct device *dev) +{ + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) + return true; + + return false; +} + +static int init_acpi(struct device *dev) +{ + u16 sock_ind; + int ret; + + ret = hsmp_get_uid(dev, &sock_ind); + if (ret) + return ret; + if (sock_ind >= plat_dev.num_sockets) + return -EINVAL; + + ret = hsmp_parse_acpi_table(dev, sock_ind); + if (ret) { + dev_err(dev, "Failed to parse ACPI table\n"); + return ret; + } + + /* Test the hsmp interface */ + ret = hsmp_test(sock_ind, 0xDEADBEEF); + if (ret) { + dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n", + boot_cpu_data.x86, boot_cpu_data.x86_model); + dev_err(dev, "Is HSMP disabled in BIOS ?\n"); + return ret; + } + + ret = hsmp_cache_proto_ver(sock_ind); + if (ret) { + dev_err(dev, "Failed to read HSMP protocol version\n"); + return ret; + } + + return ret; +} + static int hsmp_pltdrv_probe(struct platform_device *pdev) { - struct acpi_device *adev; - u16 sock_ind = 0; int ret; /* @@ -809,46 +857,25 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev) if (!plat_dev.sock) return -ENOMEM; } - adev = ACPI_COMPANION(&pdev->dev); - if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) { - ret = hsmp_get_uid(&pdev->dev, &sock_ind); - if (ret) - return ret; - if (sock_ind >= plat_dev.num_sockets) - return -EINVAL; - ret = hsmp_parse_acpi_table(&pdev->dev, sock_ind); - if (ret) { - dev_err(&pdev->dev, "Failed to parse ACPI table\n"); - return ret; - } - /* Test the hsmp interface */ - ret = hsmp_test(sock_ind, 0xDEADBEEF); + if (check_acpi_support(&pdev->dev)) { + ret = init_acpi(&pdev->dev); if (ret) { - dev_err(&pdev->dev, "HSMP test message failed on Fam:%x model:%x\n", - boot_cpu_data.x86, boot_cpu_data.x86_model); - dev_err(&pdev->dev, "Is HSMP disabled in BIOS ?\n"); + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); return ret; } + ret = hsmp_create_acpi_sysfs_if(&pdev->dev); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); } else { ret = init_platform_device(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); return ret; } - } - - ret = hsmp_cache_proto_ver(sock_ind); - if (ret) { - dev_err(&pdev->dev, "Failed to read HSMP protocol version\n"); - return ret; - } - - if (plat_dev.is_acpi_device) - ret = hsmp_create_acpi_sysfs_if(&pdev->dev); - else ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + } if (!plat_dev.is_probed) { plat_dev.hsmp_device.name = HSMP_CDEV_NAME; From patchwork Thu Jun 27 05:39:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713835 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2058.outbound.protection.outlook.com [40.107.244.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81B781C6B7 for ; Thu, 27 Jun 2024 05:40:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466831; cv=fail; b=jYymxfbVXj1FCIwo0ocJnFJJ3Lowxs27uLEJY5oOb2vITA6Cgeh+Kv7s7/YZn7NV+DrVRf5UMvrZ7jVOyT14JKmdQuQk3lpVqj1cgstyxdeLJOUMdrMkL0p59D9qaye70CKvxf5PCAHhEEMwGclAC/OavrjCEUMTCfgT/aNtmOY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466831; c=relaxed/simple; bh=EiYxRk0xtwHMHomF5Fk6ttVIfUUlXEiFPp6QCq2OdCw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nSyHoSZEZbrvknbY0zsY9/c705eRdeiw/c3AxrSrYh1Zg7Ah8cKEG6w3QweYng0pVjEa4c8ADPMbflWgZk9quP6z4Xfbc8KcFrjjd9JAUIu1joB2LVp0DX49g7yjjts/PosU548voCbwnzmw9VAr56I85/T+017V1FxoYj/IcXM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=TPzYZ1Qv; arc=fail smtp.client-ip=40.107.244.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="TPzYZ1Qv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XJelpWL+4is7XmOgWOgYzGe6pm66yRCZLVErvTXJWn6daxSkNgY4dxouvBjesMltTEYcaaQMq3FfAHdy0j6DoFRpdFjvUR/DIUPTphXXM0DtyqxiFeItGiDAl9g+BowjQfmecW8AVApmpdNfo4umPzH4K+5xWmih8TW5XZAwY1ONQi1rDZwmbNsJeVpPBtBk9g4EEuKeAbmZOKkcRkXOAORt1axO156G+dggnFwYWk24l689v8XFtJ6mxCNBvWXDaFfDPC2WURlw9VRy/eTBh8+ofzsJVWsD/sTKUUJdPpw55PwmSL64n1ow3wnsIebOEwlWcbchdBqkklBys76+Wg== 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=QWOhoAsnKaDTePLik1ohT+zdLBBZcXrqaii+AKcEWNE=; b=DAoIlAEZGBjm7BG1sZ9wUY8GVqgQwAp52SJVqpwuqndeqsDSP/wWTY+ZoJ0wyhC6g0y/v3kiK4Nf27IpSkcNltzOXE7WGF5922mCZVlcikFE/TL2nnplKhDnjzP/BxpVZqSTLa/OUl7a91ciBtE760lEJvxeBjWMGTT5rk1NBqNO6B3sgFAS3WNHhbWXdFuduj+vqW5u4XIvZhErCc416a5tqiaWpQNGoigYjFEDRwTB/KJDV/DrbO1gXWFbBsV3SXH9eHAaXb1rLOimR/eL0po9TIlSU4ix/SWWyd0ky61MR1aH3LmDc0V5cdeG5hs7blzdMUbJeTcPNENsCyOEhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=QWOhoAsnKaDTePLik1ohT+zdLBBZcXrqaii+AKcEWNE=; b=TPzYZ1QvKFK8cvwPEuclHCWgbyFGahGJdJ936Q48feXzNMTYAothBnJ5loo3NgKFai2DlTeUuc7564yTtoygp7ibARHK8VMUg9DUnI54hlrQkjef5VAr528d6YtFiPn0FM0f3/B+lh/uEq68hdRcTe76ZsVpOy4PlLnoiuURRX4= Received: from SN7P222CA0012.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::26) by MW4PR12MB7439.namprd12.prod.outlook.com (2603:10b6:303:22b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:25 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:124:cafe::ff) by SN7P222CA0012.outlook.office365.com (2603:10b6:806:124::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.25 via Frontend Transport; Thu, 27 Jun 2024 05:40:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:25 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:23 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 03/10] platform/x86/amd/hsmp: Move strcuture and macros to header file Date: Thu, 27 Jun 2024 05:39:51 +0000 Message-ID: <20240627053958.2533860-4-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|MW4PR12MB7439:EE_ X-MS-Office365-Filtering-Correlation-Id: d1290ff1-ee49-4ac5-336e-08dc966ba507 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: HS4cjNWP8YupPbk+dgE4clMnuI3CK9H8SLlgezitgX7D8+vN/xOW0CldlREP8ly5kLm5kGuu0hD5wUD7BK0uVm41oJ0+CYxkoSleYG4wCyONcd/6TgxLmK388heCOfcKzaXIjbs+U5AEcHMBS8Re9oSImuuz7Zog8XHD/jhFqiPnI9VvONUXlRcfzRI2okITqbwZGR9MX8CUyf7oV94fd4UjcYDwN7dJA29BuFZihUnLjHpazJnbkWu5jlxeAjTjQS0776wVlh88Yh5wedlWhkP/9n84huONm+XLJtVBB/3ZJYlm798iLD7dewuGF2HvE713fyznZ0iRYS5WWlf4pLRA4YgR0qpknhup5waO2asTxs9hxn6IksivOZBQULaKZa8FQaxIRxkgr1QsI2NN+YejTNYEoxKVvEyfYKsO1wsa308WvxZ5lsEb89CrQLw5smTmlLjlb1tvWazF0WZnN92i4zkjXNIma2sOoKZEkI9xUhbytlyQ+0yw29Bb+3bwkJGlpU7N5cBBnHEoVXCzjAGUpS1lk+aZUwU4kTQV61UqnAzfhWCmCaiAVmITlhFFSCTHrHn+dbEu0hkkY0Td/UbQ0ldK1muOplII7qQWYlAO/E+ODtpNDXryJelD91ap/WyBdyd1X/SApgy6yJuo+iotWOBjQWNcp3dOM1DDHsd2EBQz5rO4jmPz8++IwdMEkbiFsWWhoNlyxva4NM7uziHu4ggJjzpid60EpyJHsRVgQqZdahh0ahvwsTXRUjQp58101zcU78VqQXqA0P6A2Wc+fNb16OjG64brgQCcSad3Pt0UXDvegEfPA9YOEOgwU7TfFNe9qyrwmXuGWyNaXlFc6KxAPEWuOTjhbQrl41liKfRIFA20qVa2QmtK7dzlyuKo19I0DLqsvMXgHJKZwtPguPEg4rz/otUtq/z5vko1cGcR4LHkPE2Fq8rO6qDiUzbHVcOGf+YoLNsvLDAw9FPl8C/PPM5gjpAI3OfHe69bGHnRVETEv2k0VyTfswq3hpyX+18oATifePZNZJ0G8l+/xMjZJHGAyXI2fcnOPNBasmvhVwoRX5Pru0QPXVmtFZrj4weDhQ/7196ilQrRjuDhUhvx11u95fEtYU4pADOAzXck4IuboyRW/IMC8Wkj89EKHQ6cGf8d5vSSKgwUo1EafZFwO1Qw03vIlQYJ25HtL812hkOGRv9qOOYnK1abKWQHgofWbSPCOioELoZa9vRAXeCzKzzMzCB+mEJ74tj9mP+jTtSXRqj1Z+5CTTwt785ec3/+BncyU+ocmpXpN59akwh34BqNPVcNf6wkQlZ8aMpzfkkQGE4RMOpIcpR/vMBBMlOJPRKsjheYSbbnHJYYGRl0StVcxG9rPK24m5YCBzmSefO7SjVYZ83Oi9/x7+Zw043H7zrfSW43kDgeWxz55VzjNeORG9ZZOS+qHIiqsC7QPeHhs6jZsUoBskyh 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:25.3366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d1290ff1-ee49-4ac5-336e-08dc966ba507 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: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7439 This is in preparation to splitting ACPI and platform device drivers. No logical change, move common structures and macros to hsmp.h Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/hsmp.c | 42 ++-------------------- drivers/platform/x86/amd/hsmp/hsmp.h | 54 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 40 deletions(-) create mode 100644 drivers/platform/x86/amd/hsmp/hsmp.h diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index 10ab9b2437f1..2c9ba51b9614 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -9,15 +9,14 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include "hsmp.h" + #include #include #include -#include -#include #include #include #include -#include #include #define DRIVER_NAME "amd_hsmp" @@ -51,48 +50,11 @@ #define HSMP_INDEX_REG 0xc4 #define HSMP_DATA_REG 0xc8 -#define HSMP_CDEV_NAME "hsmp_cdev" -#define HSMP_DEVNODE_NAME "hsmp" -#define HSMP_METRICS_TABLE_NAME "metrics_bin" - -#define HSMP_ATTR_GRP_NAME_SIZE 10 - /* These are the strings specified in ACPI table */ #define MSG_IDOFF_STR "MsgIdOffset" #define MSG_ARGOFF_STR "MsgArgOffset" #define MSG_RESPOFF_STR "MsgRspOffset" -#define MAX_AMD_SOCKETS 8 - -struct hsmp_mbaddr_info { - u32 base_addr; - u32 msg_id_off; - u32 msg_resp_off; - u32 msg_arg_off; - u32 size; -}; - -struct hsmp_socket { - struct bin_attribute hsmp_attr; - struct hsmp_mbaddr_info mbinfo; - void __iomem *metric_tbl_addr; - void __iomem *virt_base_addr; - struct semaphore hsmp_sem; - char name[HSMP_ATTR_GRP_NAME_SIZE]; - struct pci_dev *root; - struct device *dev; - u16 sock_ind; -}; - -struct hsmp_plat_device { - struct miscdevice hsmp_device; - struct hsmp_socket *sock; - u32 proto_ver; - u16 num_sockets; - bool is_acpi_device; - bool is_probed; -}; - static struct hsmp_plat_device plat_dev; static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h new file mode 100644 index 000000000000..cc11e9303a83 --- /dev/null +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * AMD HSMP Platform Driver + * Copyright (c) 2024, AMD. + * All Rights Reserved. + * + * Header file for HSMP driver + */ + +#ifndef HSMP_H +#define HSMP_H + +#include +#include +#include + +#define HSMP_METRICS_TABLE_NAME "metrics_bin" + +#define HSMP_ATTR_GRP_NAME_SIZE 10 + +#define MAX_AMD_SOCKETS 8 + +#define HSMP_CDEV_NAME "hsmp_cdev" +#define HSMP_DEVNODE_NAME "hsmp" + +struct hsmp_mbaddr_info { + u32 base_addr; + u32 msg_id_off; + u32 msg_resp_off; + u32 msg_arg_off; + u32 size; +}; + +struct hsmp_socket { + struct bin_attribute hsmp_attr; + struct hsmp_mbaddr_info mbinfo; + void __iomem *metric_tbl_addr; + void __iomem *virt_base_addr; + struct semaphore hsmp_sem; + char name[HSMP_ATTR_GRP_NAME_SIZE]; + struct pci_dev *root; + struct device *dev; + u16 sock_ind; +}; + +struct hsmp_plat_device { + struct miscdevice hsmp_device; + struct hsmp_socket *sock; + u32 proto_ver; + u16 num_sockets; + bool is_acpi_device; + bool is_probed; +}; +#endif /* HSMP_H */ From patchwork Thu Jun 27 05:39:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713836 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2083.outbound.protection.outlook.com [40.107.95.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95F331C6B7 for ; Thu, 27 Jun 2024 05:40:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466833; cv=fail; b=gxfZan4NS8n4SCn/Dj7ZQp+4b4uSCyW4Zc7F8vzBWGrH1gort47xgLFON0RtWe7GzK3WT7MIKqdQhd/jUWEmiNWft1evTz/ozR9zjlVMcRk3e5CPwNRNdA0C8bsYkVmCdGB2c7NAPp0PlAajNL/9xsguxVhpzWr2nsaucn0Ov+Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466833; c=relaxed/simple; bh=4ZdhQBjDZQYxGvFukQ9kWIHpNTpg79T1E4fH9uwU4Zg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LENz9+dG32etj1Q9V/gpse8z7smwmn3FOq5236g7oDJSHMjAX9tlSi6hfuzHqVoznyA9SPk/TkdTT+BvAkefaWmL01TxRy03AP3br1acsyVIC6Z+FEoz3qVEhzyL49BXmfM2R98HmdpB7OwACzEBf+9T/fVqkc+Ee9oFLzt7bb4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ZHNqLC7g; arc=fail smtp.client-ip=40.107.95.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ZHNqLC7g" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dHrw3YF0rCTfHSDgzN/2H7AswYTlffYsukl8NxcyUEcl0bxmKTOnXPzQm2SgMLDQ1xpo0usBkNWwtinIXDYHOHEiL18Dt0+qERIYhU12tZEt7ZM2v+M3LGmYsxMug4Uxf+gAhcxPXRSsIa117L6bWQXUxCIoLy/5crOp2qr4Sp222jftk84YyUwug4+PKxWKPj5Gu4U6UChdkw4mOkfzmIE3YomGdpJKAFiGk/1hBqjTQYb4Y9hpq07O+e7IiBcmbppd72tnjyWWzKC8Nca/wavuKW0PppHQB/VGhi5Ze1GGg1qYdtaxWFsvuy8ZE0W9dNCliutMXvpu1fR50a4j0w== 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=lqWNZXH5eBAQMLLQYzu58O0ws8RnRxSLElimrDCeT5w=; b=krtTF1stea27ZO1IhcUs7qXI++A7KmCSYpVjgR7w2AX0hsYwDK5ZUaIS2GxSZ87WAmyhqTESaU9jdqCa+RN1IQJ88KPEJqHr3ftjX2qZhcDi0hqJdanUBSj3Ypbo4GwOse2KT0LYG5vvmb9mIwjtqkfzKoTJyljQQQMcKZjq073swF75VXBWZ2v46wLBk/0ZHfqiTIAMCxbdr5S86T0FT/Mh/lKDA8TWbdESdmD75PyAO4g2Qe/XoKOYQSO4jiF795Ynn0/BxzLIPwIEHwRUqmiroGayQR/keUOAvMo2KQQP47j81gqQFRyKJVn6gMBD5TL9NIqv5PlhmM5G3oNpMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=lqWNZXH5eBAQMLLQYzu58O0ws8RnRxSLElimrDCeT5w=; b=ZHNqLC7gv9dVq4CxqLb0dj/89CbXnO7yhGP/wGJKEojNXtg33UJbk1RVIkRxs1imJUemiKYWyzg+xEqlw+ev0z4EkMixhqPc92F5UFjlFC9LcJBd3dhx4b0V3Gw41uovPihKMsoMvIT+6DbtgUewAHIM2Sn8MqUEvklCJgNvVuo= Received: from SA1P222CA0180.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c4::17) by PH7PR12MB5781.namprd12.prod.outlook.com (2603:10b6:510:1d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:27 +0000 Received: from SN1PEPF000397AF.namprd05.prod.outlook.com (2603:10b6:806:3c4:cafe::b5) by SA1P222CA0180.outlook.office365.com (2603:10b6:806:3c4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Thu, 27 Jun 2024 05:40:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397AF.mail.protection.outlook.com (10.167.248.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:27 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:25 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 04/10] platform/x86/amd/hsmp: Move platform device specific code to plat.c Date: Thu, 27 Jun 2024 05:39:52 +0000 Message-ID: <20240627053958.2533860-5-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AF:EE_|PH7PR12MB5781:EE_ X-MS-Office365-Filtering-Correlation-Id: b6b2d904-537c-44bc-6b6a-08dc966ba688 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: lVoI6K8olnFqJuCY2C6Qp7HtG4UqbYHi37jWKnEafzb6a0qw9aFUmzLCyLL/inTyCBCQSWDkhz+zuUHaO0eBrc+Uoot3kLbvvTgttCCjbiPYciT1E6frVNf9iA0PUSS+hjcG7ud1Gbg0+ES/MDTVBRPYJfJ+lJQlQK8q0OVxQEpiMUg9X+GY2yedVPjujF8UFw5PzO0rNy9lv6HMsjIXfva05SMi9BRYOiuVr+qwIJ003Sgs0rmk8kbAc7/c0axqvfmZIXohi3ixbqbn012m20ZHlp/YBsG7QbmDmmooPAu8R/zmenbyaGjRQSwOsQ0M+JnY4P8M+VCJIx5VIC9IhlDoqUIee0xBsQVAJV7OjT6Visn8PgydV4s14mbmbWEz2LcFLbBLSD6Hv4CG80Qi9tds6i6d0XBC6qBVvBRd2z6vGYYW1eEGzZR7Xr2LsHtio9JwTzaydPTR018VqYQWLH2bd6wmEQwX8Xh4F7d5PiMsPFfzngk0g33BU+7ryugjL7IUP/IDb7/fSUB98f1z5Ey8IbSdlseB/VXKgPO+4N3sohcfaOx45ZybQrHJoLiAxSn4watf11CE/UnqFekvmIks6TBJ2sIxHsaFKGIxvE5JT5QACLKlgQAavvAew2PMDgz81EXxOhQNgJBZ2Hq0rykYax/ijhxOZlQ7E0Bl64J/mPj1/GchgU93gPywDpHNNC+7fHcTQI5D6A+GWFuuChEUJ8pW2QJ8OrjbaUHRZ9bgjbi7pGvwG/09CXIeItgQDy1CVopECC+4ASaMxq56whJMILILQfCUv06wH1PdTJZRZKNHaFSKd/S4s1XIw5PgomOA1CAf9gvhHaJAFR/5PutkHyywTAIdGzjcPFColONx6fA+pUzvv6/YSA316ok6gBHgd0tyAJcUvNAQI7d11eSgtNXv0Af4RFN19DcTbrLv+AAJ3X+IOjr0dn7YWRq9kH4Dv1W3KUHPmsvfOfQsB4TZtvwFDjwwtkXBO20Rz5wTS/H5+xFZ8nbUOfHAGZLJrhe1IKIH1DmOOYcNuzP5SyQC2MsLXhJQSzcag2PrMMqMvRXJ1dmRhh3WUwm2te9vQqlnLnStPT5Y/8qd+fkJB63lz7sKBVf+SRQCjHS02GJshttniByojNqm7PPhX9ikTCEuyN0ru0I718jZlbSY81VHwWezLxd+g6SWIbqzeDQi6temQXtocxgVnWKNZT8KxJKaEay8BDBRejAKaOfO1IC5TSUH5BCV4CHBCydonyliPLuJUyiz1W55AqMGUIxSqPzmELdr589/seau0z5lQepEQFdwRcsfb5OAYRupCAhzh9NFIymy1tGeoI9Clucf04UBDXiZB9821FZI4Du8lKd25AKMe4GZrFhKTzTTc3cpfj6hLdrhe1kEOZ+wZaWPq4ZX/7JtGndP89Wx+L2w8edJdSOkaXurRGEDZmKv/MvAuQTWaguAq71T2z33ZA8n 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:27.8455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6b2d904-537c-44bc-6b6a-08dc966ba688 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: SN1PEPF000397AF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5781 Move platform device part to plat.c. No functinality/logical changes. Common code which can be used by ACPI and platform device remains in hsmp.c. ACPI code in hsmp.c will be moved to acpi.c in next patch. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/Makefile | 2 +- drivers/platform/x86/amd/hsmp/hsmp.c | 347 +------------------------ drivers/platform/x86/amd/hsmp/hsmp.h | 17 ++ drivers/platform/x86/amd/hsmp/plat.c | 336 ++++++++++++++++++++++++ 4 files changed, 367 insertions(+), 335 deletions(-) create mode 100644 drivers/platform/x86/amd/hsmp/plat.c diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile index fda64906a5e8..fb8ba04b2f0d 100644 --- a/drivers/platform/x86/amd/hsmp/Makefile +++ b/drivers/platform/x86/amd/hsmp/Makefile @@ -5,4 +5,4 @@ # obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o -amd_hsmp-objs := hsmp.o +amd_hsmp-objs := hsmp.o plat.o diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index 2c9ba51b9614..cd4de107a470 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -12,17 +12,9 @@ #include "hsmp.h" #include -#include #include -#include -#include -#include #include -#define DRIVER_NAME "amd_hsmp" -#define DRIVER_VERSION "2.2" -#define ACPI_HSMP_DEVICE_HID "AMDI0097" - /* HSMP Status / Error codes */ #define HSMP_STATUS_NOT_READY 0x00 #define HSMP_STATUS_OK 0x01 @@ -36,45 +28,12 @@ #define HSMP_WR true #define HSMP_RD false -/* - * To access specific HSMP mailbox register, s/w writes the SMN address of HSMP mailbox - * register into the SMN_INDEX register, and reads/writes the SMN_DATA reg. - * Below are required SMN address for HSMP Mailbox register offsets in SMU address space - */ -#define SMN_HSMP_BASE 0x3B00000 -#define SMN_HSMP_MSG_ID 0x0010534 -#define SMN_HSMP_MSG_ID_F1A_M0H 0x0010934 -#define SMN_HSMP_MSG_RESP 0x0010980 -#define SMN_HSMP_MSG_DATA 0x00109E0 - -#define HSMP_INDEX_REG 0xc4 -#define HSMP_DATA_REG 0xc8 - /* These are the strings specified in ACPI table */ #define MSG_IDOFF_STR "MsgIdOffset" #define MSG_ARGOFF_STR "MsgArgOffset" #define MSG_RESPOFF_STR "MsgRspOffset" -static struct hsmp_plat_device plat_dev; - -static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write) -{ - int ret; - - if (!sock->root) - return -ENODEV; - - ret = pci_write_config_dword(sock->root, HSMP_INDEX_REG, - sock->mbinfo.base_addr + offset); - if (ret) - return ret; - - ret = (write ? pci_write_config_dword(sock->root, HSMP_DATA_REG, *value) - : pci_read_config_dword(sock->root, HSMP_DATA_REG, value)); - - return ret; -} +struct hsmp_plat_device plat_dev; static void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, u32 *value, bool write) @@ -253,7 +212,7 @@ int hsmp_send_message(struct hsmp_message *msg) } EXPORT_SYMBOL_GPL(hsmp_send_message); -static int hsmp_test(u16 sock_ind, u32 value) +int hsmp_test(u16 sock_ind, u32 value) { struct hsmp_message msg = { 0 }; int ret; @@ -283,7 +242,7 @@ static int hsmp_test(u16 sock_ind, u32 value) return ret; } -static long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) +long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) { int __user *arguser = (int __user *)arg; struct hsmp_message msg = { 0 }; @@ -339,12 +298,6 @@ static long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) return 0; } -static const struct file_operations hsmp_fops = { - .owner = THIS_MODULE, - .unlocked_ioctl = hsmp_ioctl, - .compat_ioctl = hsmp_ioctl, -}; - /* This is the UUID used for HSMP */ static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd, 0xa6, 0x9f, 0x4e, 0xa2, @@ -520,9 +473,9 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) return hsmp_read_acpi_dsd(sock); } -static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, - loff_t off, size_t count) +ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) { struct hsmp_socket *sock = bin_attr->private; struct hsmp_message msg = { 0 }; @@ -581,8 +534,8 @@ static int hsmp_get_tbl_dram_base(u16 sock_ind) return 0; } -static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, - struct bin_attribute *battr, int id) +umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id) { if (plat_dev.proto_ver == HSMP_PROTO_VER6) return battr->attr.mode; @@ -611,8 +564,8 @@ static int hsmp_init_metric_tbl_bin_attr(struct bin_attribute **hattrs, u16 sock /* One bin sysfs for metrics table */ #define NUM_HSMP_ATTRS 1 -static int hsmp_create_attr_list(struct attribute_group *attr_grp, - struct device *dev, u16 sock_ind) +int hsmp_create_attr_list(struct attribute_group *attr_grp, + struct device *dev, u16 sock_ind) { struct bin_attribute **hsmp_bin_attrs; @@ -628,37 +581,7 @@ static int hsmp_create_attr_list(struct attribute_group *attr_grp, return hsmp_init_metric_tbl_bin_attr(hsmp_bin_attrs, sock_ind); } -static int hsmp_create_non_acpi_sysfs_if(struct device *dev) -{ - const struct attribute_group **hsmp_attr_grps; - struct attribute_group *attr_grp; - u16 i; - - hsmp_attr_grps = devm_kcalloc(dev, plat_dev.num_sockets + 1, - sizeof(*hsmp_attr_grps), - GFP_KERNEL); - if (!hsmp_attr_grps) - return -ENOMEM; - - /* Create a sysfs directory for each socket */ - for (i = 0; i < plat_dev.num_sockets; i++) { - attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), - GFP_KERNEL); - if (!attr_grp) - return -ENOMEM; - - snprintf(plat_dev.sock[i].name, HSMP_ATTR_GRP_NAME_SIZE, "socket%u", (u8)i); - attr_grp->name = plat_dev.sock[i].name; - attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; - hsmp_attr_grps[i] = attr_grp; - - hsmp_create_attr_list(attr_grp, dev, i); - } - - return device_add_groups(dev, hsmp_attr_grps); -} - -static int hsmp_create_acpi_sysfs_if(struct device *dev) +int hsmp_create_acpi_sysfs_if(struct device *dev) { struct attribute_group *attr_grp; u16 sock_ind; @@ -681,7 +604,7 @@ static int hsmp_create_acpi_sysfs_if(struct device *dev) return devm_device_add_group(dev, attr_grp); } -static int hsmp_cache_proto_ver(u16 sock_ind) +int hsmp_cache_proto_ver(u16 sock_ind) { struct hsmp_message msg = { 0 }; int ret; @@ -697,76 +620,7 @@ static int hsmp_cache_proto_ver(u16 sock_ind) return ret; } -static inline bool is_f1a_m0h(void) -{ - if (boot_cpu_data.x86 == 0x1A && boot_cpu_data.x86_model <= 0x0F) - return true; - - return false; -} - -static int init_platform_device(struct device *dev) -{ - struct hsmp_socket *sock; - int ret, i; - - for (i = 0; i < plat_dev.num_sockets; i++) { - if (!node_to_amd_nb(i)) - return -ENODEV; - sock = &plat_dev.sock[i]; - sock->root = node_to_amd_nb(i)->root; - sock->sock_ind = i; - sock->dev = dev; - sock->mbinfo.base_addr = SMN_HSMP_BASE; - - /* - * This is a transitional change from non-ACPI to ACPI, only - * family 0x1A, model 0x00 platform is supported for both ACPI and non-ACPI. - */ - if (is_f1a_m0h()) - sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID_F1A_M0H; - else - sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID; - - sock->mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP; - sock->mbinfo.msg_arg_off = SMN_HSMP_MSG_DATA; - sema_init(&sock->hsmp_sem, 1); - - /* Test the hsmp interface on each socket */ - ret = hsmp_test(i, 0xDEADBEEF); - if (ret) { - dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n", - boot_cpu_data.x86, boot_cpu_data.x86_model); - dev_err(dev, "Is HSMP disabled in BIOS ?\n"); - return ret; - } - ret = hsmp_cache_proto_ver(i); - if (ret) { - dev_err(dev, "Failed to read HSMP protocol version\n"); - return ret; - } - } - - return 0; -} - -static const struct acpi_device_id amd_hsmp_acpi_ids[] = { - {ACPI_HSMP_DEVICE_HID, 0}, - {} -}; -MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); - -static bool check_acpi_support(struct device *dev) -{ - struct acpi_device *adev = ACPI_COMPANION(dev); - - if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) - return true; - - return false; -} - -static int init_acpi(struct device *dev) +int init_acpi(struct device *dev) { u16 sock_ind; int ret; @@ -800,178 +654,3 @@ static int init_acpi(struct device *dev) return ret; } - -static int hsmp_pltdrv_probe(struct platform_device *pdev) -{ - int ret; - - /* - * On ACPI supported BIOS, there is an ACPI HSMP device added for - * each socket, so the per socket probing, but the memory allocated for - * sockets should be contiguous to access it as an array, - * Hence allocate memory for all the sockets at once instead of allocating - * on each probe. - */ - if (!plat_dev.is_probed) { - plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, - sizeof(*plat_dev.sock), - GFP_KERNEL); - if (!plat_dev.sock) - return -ENOMEM; - } - if (check_acpi_support(&pdev->dev)) { - ret = init_acpi(&pdev->dev); - if (ret) { - dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); - return ret; - } - ret = hsmp_create_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - } else { - ret = init_platform_device(&pdev->dev); - if (ret) { - dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); - return ret; - } - ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - } - - if (!plat_dev.is_probed) { - plat_dev.hsmp_device.name = HSMP_CDEV_NAME; - plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; - plat_dev.hsmp_device.fops = &hsmp_fops; - plat_dev.hsmp_device.parent = &pdev->dev; - plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME; - plat_dev.hsmp_device.mode = 0644; - - ret = misc_register(&plat_dev.hsmp_device); - if (ret) - return ret; - - plat_dev.is_probed = true; - } - - return 0; - -} - -static void hsmp_pltdrv_remove(struct platform_device *pdev) -{ - /* - * We register only one misc_device even on multi socket system. - * So, deregister should happen only once. - */ - if (plat_dev.is_probed) { - misc_deregister(&plat_dev.hsmp_device); - plat_dev.is_probed = false; - } -} - -static struct platform_driver amd_hsmp_driver = { - .probe = hsmp_pltdrv_probe, - .remove_new = hsmp_pltdrv_remove, - .driver = { - .name = DRIVER_NAME, - .acpi_match_table = amd_hsmp_acpi_ids, - }, -}; - -static struct platform_device *amd_hsmp_platdev; - -static int hsmp_plat_dev_register(void) -{ - int ret; - - amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE); - if (!amd_hsmp_platdev) - return -ENOMEM; - - ret = platform_device_add(amd_hsmp_platdev); - if (ret) - platform_device_put(amd_hsmp_platdev); - - return ret; -} - -/* - * This check is only needed for backward compatibility of previous platforms. - * All new platforms are expected to support ACPI based probing. - */ -static bool legacy_hsmp_support(void) -{ - if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) - return false; - - switch (boot_cpu_data.x86) { - case 0x19: - switch (boot_cpu_data.x86_model) { - case 0x00 ... 0x1F: - case 0x30 ... 0x3F: - case 0x90 ... 0x9F: - case 0xA0 ... 0xAF: - return true; - default: - return false; - } - case 0x1A: - switch (boot_cpu_data.x86_model) { - case 0x00 ... 0x1F: - return true; - default: - return false; - } - default: - return false; - } - - return false; -} - -static int __init hsmp_plt_init(void) -{ - int ret = -ENODEV; - - /* - * amd_nb_num() returns number of SMN/DF interfaces present in the system - * if we have N SMN/DF interfaces that ideally means N sockets - */ - plat_dev.num_sockets = amd_nb_num(); - if (plat_dev.num_sockets == 0 || plat_dev.num_sockets > MAX_AMD_SOCKETS) - return ret; - - ret = platform_driver_register(&amd_hsmp_driver); - if (ret) - return ret; - - if (!plat_dev.is_acpi_device) { - if (legacy_hsmp_support()) { - /* Not ACPI device, but supports HSMP, register a plat_dev */ - ret = hsmp_plat_dev_register(); - } else { - /* Not ACPI, Does not support HSMP */ - pr_info("HSMP is not supported on Family:%x model:%x\n", - boot_cpu_data.x86, boot_cpu_data.x86_model); - ret = -ENODEV; - } - if (ret) - platform_driver_unregister(&amd_hsmp_driver); - } - - return ret; -} - -static void __exit hsmp_plt_exit(void) -{ - platform_device_unregister(amd_hsmp_platdev); - platform_driver_unregister(&amd_hsmp_driver); -} - -device_initcall(hsmp_plt_init); -module_exit(hsmp_plt_exit); - -MODULE_DESCRIPTION("AMD HSMP Platform Interface Driver"); -MODULE_VERSION(DRIVER_VERSION); -MODULE_LICENSE("GPL v2"); diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h index cc11e9303a83..d65ff2acdf3d 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -51,4 +51,21 @@ struct hsmp_plat_device { bool is_acpi_device; bool is_probed; }; + +extern struct hsmp_plat_device plat_dev; + +int init_acpi(struct device *dev); +ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count); +int hsmp_create_acpi_sysfs_if(struct device *dev); +int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write); +int hsmp_cache_proto_ver(u16 sock_ind); +long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg); +umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id); +int hsmp_create_attr_list(struct attribute_group *attr_grp, + struct device *dev, u16 sock_ind); +int hsmp_test(u16 sock_ind, u32 value); #endif /* HSMP_H */ diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c new file mode 100644 index 000000000000..0f181688c972 --- /dev/null +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -0,0 +1,336 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * AMD HSMP Platform Driver + * Copyright (c) 2024, AMD. + * All Rights Reserved. + * + * This file provides platform device implementations. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include "hsmp.h" + +#include +#include +#include +#include +#include + +#define DRIVER_NAME "amd_hsmp" +#define DRIVER_VERSION "2.2" +#define ACPI_HSMP_DEVICE_HID "AMDI0097" + +/* + * To access specific HSMP mailbox register, s/w writes the SMN address of HSMP mailbox + * register into the SMN_INDEX register, and reads/writes the SMN_DATA reg. + * Below are required SMN address for HSMP Mailbox register offsets in SMU address space + */ +#define SMN_HSMP_BASE 0x3B00000 +#define SMN_HSMP_MSG_ID 0x0010534 +#define SMN_HSMP_MSG_ID_F1A_M0H 0x0010934 +#define SMN_HSMP_MSG_RESP 0x0010980 +#define SMN_HSMP_MSG_DATA 0x00109E0 + +#define HSMP_INDEX_REG 0xc4 +#define HSMP_DATA_REG 0xc8 + +int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write) +{ + int ret; + + if (!sock->root) + return -ENODEV; + + ret = pci_write_config_dword(sock->root, HSMP_INDEX_REG, + sock->mbinfo.base_addr + offset); + if (ret) + return ret; + + ret = (write ? pci_write_config_dword(sock->root, HSMP_DATA_REG, *value) + : pci_read_config_dword(sock->root, HSMP_DATA_REG, value)); + + return ret; +} + +static const struct file_operations hsmp_fops = { + .owner = THIS_MODULE, + .unlocked_ioctl = hsmp_ioctl, + .compat_ioctl = hsmp_ioctl, +}; + +static int hsmp_create_non_acpi_sysfs_if(struct device *dev) +{ + const struct attribute_group **hsmp_attr_grps; + struct attribute_group *attr_grp; + u16 i; + + hsmp_attr_grps = devm_kcalloc(dev, plat_dev.num_sockets + 1, + sizeof(*hsmp_attr_grps), + GFP_KERNEL); + if (!hsmp_attr_grps) + return -ENOMEM; + + /* Create a sysfs directory for each socket */ + for (i = 0; i < plat_dev.num_sockets; i++) { + attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), + GFP_KERNEL); + if (!attr_grp) + return -ENOMEM; + + snprintf(plat_dev.sock[i].name, HSMP_ATTR_GRP_NAME_SIZE, "socket%u", (u8)i); + attr_grp->name = plat_dev.sock[i].name; + attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; + hsmp_attr_grps[i] = attr_grp; + + hsmp_create_attr_list(attr_grp, dev, i); + } + + return device_add_groups(dev, hsmp_attr_grps); +} + +static inline bool is_f1a_m0h(void) +{ + if (boot_cpu_data.x86 == 0x1A && boot_cpu_data.x86_model <= 0x0F) + return true; + + return false; +} + +static int init_platform_device(struct device *dev) +{ + struct hsmp_socket *sock; + int ret, i; + + for (i = 0; i < plat_dev.num_sockets; i++) { + if (!node_to_amd_nb(i)) + return -ENODEV; + sock = &plat_dev.sock[i]; + sock->root = node_to_amd_nb(i)->root; + sock->sock_ind = i; + sock->dev = dev; + sock->mbinfo.base_addr = SMN_HSMP_BASE; + + /* + * This is a transitional change from non-ACPI to ACPI, only + * family 0x1A, model 0x00 platform is supported for both ACPI and non-ACPI. + */ + if (is_f1a_m0h()) + sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID_F1A_M0H; + else + sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID; + + sock->mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP; + sock->mbinfo.msg_arg_off = SMN_HSMP_MSG_DATA; + sema_init(&sock->hsmp_sem, 1); + + /* Test the hsmp interface on each socket */ + ret = hsmp_test(i, 0xDEADBEEF); + if (ret) { + dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n", + boot_cpu_data.x86, boot_cpu_data.x86_model); + dev_err(dev, "Is HSMP disabled in BIOS ?\n"); + return ret; + } + + ret = hsmp_cache_proto_ver(i); + if (ret) { + dev_err(dev, "Failed to read HSMP protocol version\n"); + return ret; + } + } + + return 0; +} + +static const struct acpi_device_id amd_hsmp_acpi_ids[] = { + {ACPI_HSMP_DEVICE_HID, 0}, + {} +}; +MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); + +static bool check_acpi_support(struct device *dev) +{ + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) + return true; + + return false; +} + +static int hsmp_pltdrv_probe(struct platform_device *pdev) +{ + int ret; + + /* + * On ACPI supported BIOS, there is an ACPI HSMP device added for + * each socket, so the per socket probing, but the memory allocated for + * sockets should be contiguous to access it as an array, + * Hence allocate memory for all the sockets at once instead of allocating + * on each probe. + */ + if (!plat_dev.is_probed) { + plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, + sizeof(*plat_dev.sock), + GFP_KERNEL); + if (!plat_dev.sock) + return -ENOMEM; + } + + if (check_acpi_support(&pdev->dev)) { + ret = init_acpi(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); + return ret; + } + ret = hsmp_create_acpi_sysfs_if(&pdev->dev); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + } else { + ret = init_platform_device(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); + return ret; + } + ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + } + + if (!plat_dev.is_probed) { + plat_dev.hsmp_device.name = HSMP_CDEV_NAME; + plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; + plat_dev.hsmp_device.fops = &hsmp_fops; + plat_dev.hsmp_device.parent = &pdev->dev; + plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME; + plat_dev.hsmp_device.mode = 0644; + + ret = misc_register(&plat_dev.hsmp_device); + if (ret) + return ret; + + plat_dev.is_probed = true; + } + + return 0; +} + +static void hsmp_pltdrv_remove(struct platform_device *pdev) +{ + /* + * We register only one misc_device even on multi socket system. + * So, deregister should happen only once. + */ + if (plat_dev.is_probed) { + misc_deregister(&plat_dev.hsmp_device); + plat_dev.is_probed = false; + } +} + +static struct platform_driver amd_hsmp_driver = { + .probe = hsmp_pltdrv_probe, + .remove_new = hsmp_pltdrv_remove, + .driver = { + .name = DRIVER_NAME, + .acpi_match_table = amd_hsmp_acpi_ids, + }, +}; + +static struct platform_device *amd_hsmp_platdev; + +static int hsmp_plat_dev_register(void) +{ + int ret; + + amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE); + if (!amd_hsmp_platdev) + return -ENOMEM; + + ret = platform_device_add(amd_hsmp_platdev); + if (ret) + platform_device_put(amd_hsmp_platdev); + + return ret; +} + +/* + * This check is only needed for backward compatibility of previous platforms. + * All new platforms are expected to support ACPI based probing. + */ +static bool legacy_hsmp_support(void) +{ + if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) + return false; + + switch (boot_cpu_data.x86) { + case 0x19: + switch (boot_cpu_data.x86_model) { + case 0x00 ... 0x1F: + case 0x30 ... 0x3F: + case 0x90 ... 0x9F: + case 0xA0 ... 0xAF: + return true; + default: + return false; + } + case 0x1A: + switch (boot_cpu_data.x86_model) { + case 0x00 ... 0x1F: + return true; + default: + return false; + } + default: + return false; + } + + return false; +} + +static int __init hsmp_plt_init(void) +{ + int ret = -ENODEV; + + /* + * amd_nb_num() returns number of SMN/DF interfaces present in the system + * if we have N SMN/DF interfaces that ideally means N sockets + */ + plat_dev.num_sockets = amd_nb_num(); + if (plat_dev.num_sockets == 0 || plat_dev.num_sockets > MAX_AMD_SOCKETS) + return ret; + + ret = platform_driver_register(&amd_hsmp_driver); + if (ret) + return ret; + + if (!plat_dev.is_acpi_device) { + if (legacy_hsmp_support()) { + /* Not ACPI device, but supports HSMP, register a plat_dev */ + ret = hsmp_plat_dev_register(); + } else { + /* Not ACPI, Does not support HSMP */ + pr_info("HSMP is not supported on Family:%x model:%x\n", + boot_cpu_data.x86, boot_cpu_data.x86_model); + ret = -ENODEV; + } + if (ret) + platform_driver_unregister(&amd_hsmp_driver); + } + + return ret; +} + +static void __exit hsmp_plt_exit(void) +{ + platform_device_unregister(amd_hsmp_platdev); + platform_driver_unregister(&amd_hsmp_driver); +} + +device_initcall(hsmp_plt_init); +module_exit(hsmp_plt_exit); + +MODULE_DESCRIPTION("AMD HSMP Platform Interface Driver"); +MODULE_VERSION(DRIVER_VERSION); +MODULE_LICENSE("GPL v2"); From patchwork Thu Jun 27 05:39:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713837 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90AB91CD13 for ; Thu, 27 Jun 2024 05:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466834; cv=fail; b=VfLI9PO+iy4lgP56aPkCgQSAxNo+begAI5xGUHTygPt4TItKd20lPn0mxKOggbgGNlVdoGdSz6d6OFddxejbmPy4LPhUzU66AyvoRrb8128WNFMitvpl2C8Eg8UKKrxPz9qDI5VqhaggIFEtNy7Lzzc0+1UNW0p3MIWAwLF9WvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466834; c=relaxed/simple; bh=C/nQ2PFqIZgL/0Jx4Lae8tsteNgTunHKtNi6uNXrKPk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jqSZQu51h8tfYEvXtFg/Yxz6d65vxJgdgIbrLS3sfu0RCWU6SMlWaUUfx1YL/AtQUKyyMZhgT/Y5VH+jF2F1R94U47a7W889jymdVAo+K+3qfY/MExr36GHDfEqUGbz6oaUfPppMGeFXXCYuoddzfpA8Vc4G5KZ3sy9cJ9PNqs0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=rCSROIj6; arc=fail smtp.client-ip=40.107.220.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="rCSROIj6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QRAwEUEK92Jjm1zG+SJvq6vJ7oTEdLNrb84WBYfl/DzDEH0V9jycy2TTD+Jk8OQZ1eJmAA5cbzVVwdQkuHfBXOWEIWBp0Ob5Km+KjJqg3vTth8vqiP1N5QjxU7yyN2mvwbYkmKWhjRJgAcwjK/DmVaOR/eMkinUuyE/98NRXaz+VQKByR8vZ33IBvAO0zYhQ7ICqIpKgf+zcTl92TcDQ9D53tDSE4ST1ELMGexKz593rd+XjF+k8HqOLAEy3PwlMaRSkEMa1m2GViz3e2hd2/wsf1NUrmLlLrNqGWtCszfoG6lcmWhoRJKPW10mfR+gWSD+dhEHN1YRuJn+21FD/Dw== 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=RU0ENG+nb7Xm5bz3pj4vLmy6yWUGy/b46FoASJjVONY=; b=hDNXyLW8VKb9ZZL2aRD5FBisblwaiz7dKfdW9RQCLL3u4hXdUGZIrAB91HwVpXpeaiNXLq+fLJi6Nuz1g8B+Lsgpa2thmd8GLEtG7Y5HVhMRY+tOpGyK5SocN0a/RjqiwYjikj2cuw5ESJYgkgkXhlTP0fE3FKRb7cxCSab2DkNsQDgxB4+JB+GU/IYrIhRFUDCeQeUB9N5R34cfgrfmRxhFM4CrbQcnxwHr/NxjA6ZIW/cvsBEZZYLnRk6jZRvQDrceEMua/seD7qnhYMW40jiaSUkdEhQmYm/vnOOj+uAoyoM9Lds+GDWeKWxoBUIMjab7mMgvUOx5ebtKtiP/rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=RU0ENG+nb7Xm5bz3pj4vLmy6yWUGy/b46FoASJjVONY=; b=rCSROIj63JcS6GIpw7KreaDbHT8SZCaGdWhBUSdVFxPmAgFBtofbeyUrT2+mizpT7Y1eScZhD/npXwilgeBRPRbTy3EaVuHCI1Gi+JuvelX5DMqNRHMOc09t8IEpEzmI3NH8JU49hEh9eT8DDf1tfBrU4aBhvY0yi9EFVtUz3PQ= Received: from PH8PR07CA0027.namprd07.prod.outlook.com (2603:10b6:510:2cf::25) by SA3PR12MB7879.namprd12.prod.outlook.com (2603:10b6:806:306::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:30 +0000 Received: from SN1PEPF000397B4.namprd05.prod.outlook.com (2603:10b6:510:2cf:cafe::1b) by PH8PR07CA0027.outlook.office365.com (2603:10b6:510:2cf::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.23 via Frontend Transport; Thu, 27 Jun 2024 05:40:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B4.mail.protection.outlook.com (10.167.248.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:29 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:27 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 05/10] platform/x86/amd/hsmp: Move ACPI code to acpi.c Date: Thu, 27 Jun 2024 05:39:53 +0000 Message-ID: <20240627053958.2533860-6-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B4:EE_|SA3PR12MB7879:EE_ X-MS-Office365-Filtering-Correlation-Id: ed4f2f25-b383-4b01-a05d-08dc966ba7af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: EpvrY1eHJdN5rHZrDSgPuknC4akNSC1hTOZKmnTwkll7H+MnnHKkrWpd4e6vAZ16T/t1croO/AaWazUVYDmRvxgtgsgvO8AP7P3xce3EX0TLSaPqUL+e6WK24v8EX1w8/G6DF+Pn/oBCmUIYvxYZRKHovIp6mzHnJV/OPkJE3olpdAf0y1ZkO9mFVzOMrFMmf/NNHnym8nDC2XBjEvphT5NPw4JkCxV2g4nzdE0OEPWvQH0xB/tw/nkxgct2luBGF4tKSoso4Cu5ixpnDYAPO+7m7Fo+N9d56B9GO5Ql1vzr4r9zzxPfFAzlp2Gs4RBXNAEKJ7+zSYgtpmKV3RcoBUC7GLPDT5er5deANn6S+nq4fiwOaAqxb3Rc9dXAjKJhN1tHiAA/DAB/bLXDpa/MSgp13oamIvA3rsubNF6FZwWUKH8EPWfmNe+u4VqLYX5U3RTjCHq4heY/k2eFKmMLKXYDF70MOLHeuWquW1JHezsQmC65Iz8Uff9gALkNIToFkdYuYbtqePCSgyi9sQ8+RAzeTUJaCFzwD8IR6zzr2xMc5yIIA3+INpo4brLfxNGi0FZMnmkkDCg/ZoeMUTUmAkp8416/LXW+Pphhqz3F1LNTe5jT9Z7Gv6pCxFRADa3uIveoyYHIkaAffThdGRyWnwGsP7mdZeUwW6b+5/tUA+H287uO3DCkjrDlKRqAbaH1SPKlPiXb6r2cKKekZMkuZKQ99hlQQMoAl8d5Pm+W2JhG+tOx4d+xgxIlDCfnqb1IHTXZyqYZdBJj1lcPpEr57O9SHrY0LsW0Qe10wgX8Y0mnhYmY6GetIGsKYnhv9iM/d02WIFCassJDCl4NSuSaNcjoa5nhH/soQoOfAxcp1UyiZkABMz+SNi3FXbUplR/mi1urREBo4pgLLC4x+ENdpW2qSVkL6VbsArpGyjeGNls1jAFXnp9IaWz9+Ii47cTPiu0nnaolpkNDDlCMaMZVZonR1/0hZ8NrGHZ8+ZcEdao3rqd6h20Ax5AcaY7nEPiSWKt0W3oRM/PdOgLOMDnGctIBLEaYmuAgs56iLcyioH/VwO3Xe+AWSbke5hXGp3kioYwotJVfws6k60Uz1wkk8Pnt+crbTIlCANUlz7P+0CzEkPD5miIC0yCcP9iu+5z5Fm5O9x9/C6UKXBtAZb69L2HxM4mbI75CHlDy2Sess2i7Mnb67A0RayVcHm16eBhlWksF4s0oqvMA8SRafrWs9nZJiuzI/F2L1pf1J9dN8pmC13zHC1IWeGVv5vuCqwNiz17hhMbvecxlFEpITiMEBrEPbqFGdVzpNpTrVVLWlYDF2xuhG5+gAj6YQSP47hoQDquohXjVEmRy4zRESriPzwQ0bMDAxmlRs64VqIUxyVC15NErQECwwqvbuQD+wqNZxHO/9x1KD1nh/G/Ks3S1k+b4wFH5v+M0J6c3912WTwnZvN5r4OjrHB8MkXM4Had+ 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:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:29.7802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed4f2f25-b383-4b01-a05d-08dc966ba7af 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: SN1PEPF000397B4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7879 Move ACPI related code to acpi.c from hsmp.c. We still have one driver, the driver probe will be split in the next patch. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/Makefile | 2 +- drivers/platform/x86/amd/hsmp/acpi.c | 261 +++++++++++++++++++++++++ drivers/platform/x86/amd/hsmp/hsmp.c | 247 ----------------------- drivers/platform/x86/amd/hsmp/hsmp.h | 2 + 4 files changed, 264 insertions(+), 248 deletions(-) create mode 100644 drivers/platform/x86/amd/hsmp/acpi.c diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile index fb8ba04b2f0d..0cc92865c0a2 100644 --- a/drivers/platform/x86/amd/hsmp/Makefile +++ b/drivers/platform/x86/amd/hsmp/Makefile @@ -5,4 +5,4 @@ # obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o -amd_hsmp-objs := hsmp.o plat.o +amd_hsmp-objs := hsmp.o plat.o acpi.o diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c new file mode 100644 index 000000000000..90bfa1ddadbf --- /dev/null +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -0,0 +1,261 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * AMD HSMP Platform Driver + * Copyright (c) 2024, AMD. + * All Rights Reserved. + * + * This file provides a device implementation for HSMP interface + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include "hsmp.h" + +#include + +/* These are the strings specified in ACPI table */ +#define MSG_IDOFF_STR "MsgIdOffset" +#define MSG_ARGOFF_STR "MsgArgOffset" +#define MSG_RESPOFF_STR "MsgRspOffset" + +void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write) +{ + if (write) + iowrite32(*value, sock->virt_base_addr + offset); + else + *value = ioread32(sock->virt_base_addr + offset); +} + +/* This is the UUID used for HSMP */ +static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd, + 0xa6, 0x9f, 0x4e, 0xa2, + 0x87, 0x1f, 0xc2, 0xf6); + +static inline bool is_acpi_hsmp_uuid(union acpi_object *obj) +{ + if (obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == UUID_SIZE) + return guid_equal((guid_t *)obj->buffer.pointer, &acpi_hsmp_uuid); + + return false; +} + +static inline int hsmp_get_uid(struct device *dev, u16 *sock_ind) +{ + char *uid; + + /* + * UID (ID00, ID01..IDXX) is used for differentiating sockets, + * read it and strip the "ID" part of it and convert the remaining + * bytes to integer. + */ + uid = acpi_device_uid(ACPI_COMPANION(dev)); + + return kstrtou16(uid + 2, 10, sock_ind); +} + +static acpi_status hsmp_resource(struct acpi_resource *res, void *data) +{ + struct hsmp_socket *sock = data; + struct resource r; + + switch (res->type) { + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + if (!acpi_dev_resource_memory(res, &r)) + return AE_ERROR; + if (!r.start || r.end < r.start || !(r.flags & IORESOURCE_MEM_WRITEABLE)) + return AE_ERROR; + sock->mbinfo.base_addr = r.start; + sock->mbinfo.size = resource_size(&r); + break; + case ACPI_RESOURCE_TYPE_END_TAG: + break; + default: + return AE_ERROR; + } + + return AE_OK; +} + +static int hsmp_read_acpi_dsd(struct hsmp_socket *sock) +{ + struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *guid, *mailbox_package; + union acpi_object *dsd; + acpi_status status; + int ret = 0; + int j; + + status = acpi_evaluate_object_typed(ACPI_HANDLE(sock->dev), "_DSD", NULL, + &buf, ACPI_TYPE_PACKAGE); + if (ACPI_FAILURE(status)) { + dev_err(sock->dev, "Failed to read mailbox reg offsets from DSD table, err: %s\n", + acpi_format_exception(status)); + return -ENODEV; + } + + dsd = buf.pointer; + + /* HSMP _DSD property should contain 2 objects. + * 1. guid which is an acpi object of type ACPI_TYPE_BUFFER + * 2. mailbox which is an acpi object of type ACPI_TYPE_PACKAGE + * This mailbox object contains 3 more acpi objects of type + * ACPI_TYPE_PACKAGE for holding msgid, msgresp, msgarg offsets + * these packages inturn contain 2 acpi objects of type + * ACPI_TYPE_STRING and ACPI_TYPE_INTEGER + */ + if (!dsd || dsd->type != ACPI_TYPE_PACKAGE || dsd->package.count != 2) { + ret = -EINVAL; + goto free_buf; + } + + guid = &dsd->package.elements[0]; + mailbox_package = &dsd->package.elements[1]; + if (!is_acpi_hsmp_uuid(guid) || mailbox_package->type != ACPI_TYPE_PACKAGE) { + dev_err(sock->dev, "Invalid hsmp _DSD table data\n"); + ret = -EINVAL; + goto free_buf; + } + + for (j = 0; j < mailbox_package->package.count; j++) { + union acpi_object *msgobj, *msgstr, *msgint; + + msgobj = &mailbox_package->package.elements[j]; + msgstr = &msgobj->package.elements[0]; + msgint = &msgobj->package.elements[1]; + + /* package should have 1 string and 1 integer object */ + if (msgobj->type != ACPI_TYPE_PACKAGE || + msgstr->type != ACPI_TYPE_STRING || + msgint->type != ACPI_TYPE_INTEGER) { + ret = -EINVAL; + goto free_buf; + } + + if (!strncmp(msgstr->string.pointer, MSG_IDOFF_STR, + msgstr->string.length)) { + sock->mbinfo.msg_id_off = msgint->integer.value; + } else if (!strncmp(msgstr->string.pointer, MSG_RESPOFF_STR, + msgstr->string.length)) { + sock->mbinfo.msg_resp_off = msgint->integer.value; + } else if (!strncmp(msgstr->string.pointer, MSG_ARGOFF_STR, + msgstr->string.length)) { + sock->mbinfo.msg_arg_off = msgint->integer.value; + } else { + ret = -ENOENT; + goto free_buf; + } + } + + if (!sock->mbinfo.msg_id_off || !sock->mbinfo.msg_resp_off || + !sock->mbinfo.msg_arg_off) + ret = -EINVAL; + +free_buf: + ACPI_FREE(buf.pointer); + return ret; +} + +static int hsmp_read_acpi_crs(struct hsmp_socket *sock) +{ + acpi_status status; + + status = acpi_walk_resources(ACPI_HANDLE(sock->dev), METHOD_NAME__CRS, + hsmp_resource, sock); + if (ACPI_FAILURE(status)) { + dev_err(sock->dev, "Failed to look up MP1 base address from CRS method, err: %s\n", + acpi_format_exception(status)); + return -EINVAL; + } + if (!sock->mbinfo.base_addr || !sock->mbinfo.size) + return -EINVAL; + + /* The mapped region should be un cached */ + sock->virt_base_addr = devm_ioremap_uc(sock->dev, sock->mbinfo.base_addr, + sock->mbinfo.size); + if (!sock->virt_base_addr) { + dev_err(sock->dev, "Failed to ioremap MP1 base address\n"); + return -ENOMEM; + } + + return 0; +} + +/* Parse the ACPI table to read the data */ +static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) +{ + struct hsmp_socket *sock = &plat_dev.sock[sock_ind]; + int ret; + + sock->sock_ind = sock_ind; + sock->dev = dev; + plat_dev.is_acpi_device = true; + + sema_init(&sock->hsmp_sem, 1); + + /* Read MP1 base address from CRS method */ + ret = hsmp_read_acpi_crs(sock); + if (ret) + return ret; + + /* Read mailbox offsets from DSD table */ + return hsmp_read_acpi_dsd(sock); +} + +int hsmp_create_acpi_sysfs_if(struct device *dev) +{ + struct attribute_group *attr_grp; + u16 sock_ind; + int ret; + + attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), GFP_KERNEL); + if (!attr_grp) + return -ENOMEM; + + attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; + + ret = hsmp_get_uid(dev, &sock_ind); + if (ret) + return ret; + + ret = hsmp_create_attr_list(attr_grp, dev, sock_ind); + if (ret) + return ret; + + return devm_device_add_group(dev, attr_grp); +} + +int init_acpi(struct device *dev) +{ + u16 sock_ind; + int ret; + + ret = hsmp_get_uid(dev, &sock_ind); + if (ret) + return ret; + if (sock_ind >= plat_dev.num_sockets) + return -EINVAL; + + ret = hsmp_parse_acpi_table(dev, sock_ind); + if (ret) { + dev_err(dev, "Failed to parse ACPI table\n"); + return ret; + } + + /* Test the hsmp interface */ + ret = hsmp_test(sock_ind, 0xDEADBEEF); + if (ret) { + dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n", + boot_cpu_data.x86, boot_cpu_data.x86_model); + dev_err(dev, "Is HSMP disabled in BIOS ?\n"); + return ret; + } + + ret = hsmp_cache_proto_ver(sock_ind); + if (ret) { + dev_err(dev, "Failed to read HSMP protocol version\n"); + return ret; + } + + return ret; +} diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index cd4de107a470..d3f0f08cebf7 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -28,22 +28,8 @@ #define HSMP_WR true #define HSMP_RD false -/* These are the strings specified in ACPI table */ -#define MSG_IDOFF_STR "MsgIdOffset" -#define MSG_ARGOFF_STR "MsgArgOffset" -#define MSG_RESPOFF_STR "MsgRspOffset" - struct hsmp_plat_device plat_dev; -static void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write) -{ - if (write) - iowrite32(*value, sock->virt_base_addr + offset); - else - *value = ioread32(sock->virt_base_addr + offset); -} - static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset, u32 *value, bool write) { @@ -298,181 +284,6 @@ long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) return 0; } -/* This is the UUID used for HSMP */ -static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd, - 0xa6, 0x9f, 0x4e, 0xa2, - 0x87, 0x1f, 0xc2, 0xf6); - -static inline bool is_acpi_hsmp_uuid(union acpi_object *obj) -{ - if (obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == UUID_SIZE) - return guid_equal((guid_t *)obj->buffer.pointer, &acpi_hsmp_uuid); - - return false; -} - -static inline int hsmp_get_uid(struct device *dev, u16 *sock_ind) -{ - char *uid; - - /* - * UID (ID00, ID01..IDXX) is used for differentiating sockets, - * read it and strip the "ID" part of it and convert the remaining - * bytes to integer. - */ - uid = acpi_device_uid(ACPI_COMPANION(dev)); - - return kstrtou16(uid + 2, 10, sock_ind); -} - -static acpi_status hsmp_resource(struct acpi_resource *res, void *data) -{ - struct hsmp_socket *sock = data; - struct resource r; - - switch (res->type) { - case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: - if (!acpi_dev_resource_memory(res, &r)) - return AE_ERROR; - if (!r.start || r.end < r.start || !(r.flags & IORESOURCE_MEM_WRITEABLE)) - return AE_ERROR; - sock->mbinfo.base_addr = r.start; - sock->mbinfo.size = resource_size(&r); - break; - case ACPI_RESOURCE_TYPE_END_TAG: - break; - default: - return AE_ERROR; - } - - return AE_OK; -} - -static int hsmp_read_acpi_dsd(struct hsmp_socket *sock) -{ - struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *guid, *mailbox_package; - union acpi_object *dsd; - acpi_status status; - int ret = 0; - int j; - - status = acpi_evaluate_object_typed(ACPI_HANDLE(sock->dev), "_DSD", NULL, - &buf, ACPI_TYPE_PACKAGE); - if (ACPI_FAILURE(status)) { - dev_err(sock->dev, "Failed to read mailbox reg offsets from DSD table, err: %s\n", - acpi_format_exception(status)); - return -ENODEV; - } - - dsd = buf.pointer; - - /* HSMP _DSD property should contain 2 objects. - * 1. guid which is an acpi object of type ACPI_TYPE_BUFFER - * 2. mailbox which is an acpi object of type ACPI_TYPE_PACKAGE - * This mailbox object contains 3 more acpi objects of type - * ACPI_TYPE_PACKAGE for holding msgid, msgresp, msgarg offsets - * these packages inturn contain 2 acpi objects of type - * ACPI_TYPE_STRING and ACPI_TYPE_INTEGER - */ - if (!dsd || dsd->type != ACPI_TYPE_PACKAGE || dsd->package.count != 2) { - ret = -EINVAL; - goto free_buf; - } - - guid = &dsd->package.elements[0]; - mailbox_package = &dsd->package.elements[1]; - if (!is_acpi_hsmp_uuid(guid) || mailbox_package->type != ACPI_TYPE_PACKAGE) { - dev_err(sock->dev, "Invalid hsmp _DSD table data\n"); - ret = -EINVAL; - goto free_buf; - } - - for (j = 0; j < mailbox_package->package.count; j++) { - union acpi_object *msgobj, *msgstr, *msgint; - - msgobj = &mailbox_package->package.elements[j]; - msgstr = &msgobj->package.elements[0]; - msgint = &msgobj->package.elements[1]; - - /* package should have 1 string and 1 integer object */ - if (msgobj->type != ACPI_TYPE_PACKAGE || - msgstr->type != ACPI_TYPE_STRING || - msgint->type != ACPI_TYPE_INTEGER) { - ret = -EINVAL; - goto free_buf; - } - - if (!strncmp(msgstr->string.pointer, MSG_IDOFF_STR, - msgstr->string.length)) { - sock->mbinfo.msg_id_off = msgint->integer.value; - } else if (!strncmp(msgstr->string.pointer, MSG_RESPOFF_STR, - msgstr->string.length)) { - sock->mbinfo.msg_resp_off = msgint->integer.value; - } else if (!strncmp(msgstr->string.pointer, MSG_ARGOFF_STR, - msgstr->string.length)) { - sock->mbinfo.msg_arg_off = msgint->integer.value; - } else { - ret = -ENOENT; - goto free_buf; - } - } - - if (!sock->mbinfo.msg_id_off || !sock->mbinfo.msg_resp_off || - !sock->mbinfo.msg_arg_off) - ret = -EINVAL; - -free_buf: - ACPI_FREE(buf.pointer); - return ret; -} - -static int hsmp_read_acpi_crs(struct hsmp_socket *sock) -{ - acpi_status status; - - status = acpi_walk_resources(ACPI_HANDLE(sock->dev), METHOD_NAME__CRS, - hsmp_resource, sock); - if (ACPI_FAILURE(status)) { - dev_err(sock->dev, "Failed to look up MP1 base address from CRS method, err: %s\n", - acpi_format_exception(status)); - return -EINVAL; - } - if (!sock->mbinfo.base_addr || !sock->mbinfo.size) - return -EINVAL; - - /* The mapped region should be un cached */ - sock->virt_base_addr = devm_ioremap_uc(sock->dev, sock->mbinfo.base_addr, - sock->mbinfo.size); - if (!sock->virt_base_addr) { - dev_err(sock->dev, "Failed to ioremap MP1 base address\n"); - return -ENOMEM; - } - - return 0; -} - -/* Parse the ACPI table to read the data */ -static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) -{ - struct hsmp_socket *sock = &plat_dev.sock[sock_ind]; - int ret; - - sock->sock_ind = sock_ind; - sock->dev = dev; - plat_dev.is_acpi_device = true; - - sema_init(&sock->hsmp_sem, 1); - - /* Read MP1 base address from CRS method */ - ret = hsmp_read_acpi_crs(sock); - if (ret) - return ret; - - /* Read mailbox offsets from DSD table */ - return hsmp_read_acpi_dsd(sock); -} - ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) @@ -581,29 +392,6 @@ int hsmp_create_attr_list(struct attribute_group *attr_grp, return hsmp_init_metric_tbl_bin_attr(hsmp_bin_attrs, sock_ind); } -int hsmp_create_acpi_sysfs_if(struct device *dev) -{ - struct attribute_group *attr_grp; - u16 sock_ind; - int ret; - - attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), GFP_KERNEL); - if (!attr_grp) - return -ENOMEM; - - attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; - - ret = hsmp_get_uid(dev, &sock_ind); - if (ret) - return ret; - - ret = hsmp_create_attr_list(attr_grp, dev, sock_ind); - if (ret) - return ret; - - return devm_device_add_group(dev, attr_grp); -} - int hsmp_cache_proto_ver(u16 sock_ind) { struct hsmp_message msg = { 0 }; @@ -619,38 +407,3 @@ int hsmp_cache_proto_ver(u16 sock_ind) return ret; } - -int init_acpi(struct device *dev) -{ - u16 sock_ind; - int ret; - - ret = hsmp_get_uid(dev, &sock_ind); - if (ret) - return ret; - if (sock_ind >= plat_dev.num_sockets) - return -EINVAL; - - ret = hsmp_parse_acpi_table(dev, sock_ind); - if (ret) { - dev_err(dev, "Failed to parse ACPI table\n"); - return ret; - } - - /* Test the hsmp interface */ - ret = hsmp_test(sock_ind, 0xDEADBEEF); - if (ret) { - dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n", - boot_cpu_data.x86, boot_cpu_data.x86_model); - dev_err(dev, "Is HSMP disabled in BIOS ?\n"); - return ret; - } - - ret = hsmp_cache_proto_ver(sock_ind); - if (ret) { - dev_err(dev, "Failed to read HSMP protocol version\n"); - return ret; - } - - return ret; -} diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h index d65ff2acdf3d..2baeef57ca54 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -68,4 +68,6 @@ umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, int hsmp_create_attr_list(struct attribute_group *attr_grp, struct device *dev, u16 sock_ind); int hsmp_test(u16 sock_ind, u32 value); +void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write); #endif /* HSMP_H */ From patchwork Thu Jun 27 05:39:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713838 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2070.outbound.protection.outlook.com [40.107.236.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFC911CD13 for ; Thu, 27 Jun 2024 05:40:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466837; cv=fail; b=a8c//m/V/iPenrjKDb4+blzVqfWUKPFWTURY1r6PaGRve1YQZ3KRC4y32yhL0AxwuH3Tm3n9LrJICz3Uom6hqGkPi5u3i93OfJGaIyezosU+zkL+70RE9goW2MjVlf1909VGOBw13GZikuHrOnlvwLpGO2gkz3luKRhfre9IcOY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466837; c=relaxed/simple; bh=yDmMcVl65yQteQmh1XZv14Rp2OIYWTGqCVPpLvKtCVM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KWudRCNAvnNS5P8VwRHaPvB51gmdlfT15hmnNAvccVNCrUcJFduv5dxf3vW/EcSJKYVQj3vd4WjNvAp9tJVmC1t8BtoB/HHvyw+XIYqI9mx6Pt+2y36LJ5+nCNz9mNvijSP1qXEFVj9Mawexj3GcPSLxiVjVmlwCC1iJSu6IqSk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=23IXo9RD; arc=fail smtp.client-ip=40.107.236.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="23IXo9RD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gmjzvdd90wTspstDWgzedXWIulFZNhB3/GYCWrb3As52c5DawzZzZLAeiN3KSqx/v7H6+pcW82Lm/yeM9y1dHWvWIGJhFj/X5SFR2JxtgS9kJWkZFkyCoEHmztTXmt1sL8NqwyqifB8D5RPAQOiByhStkCZHIZsi0rbQmu6P9o0bSKpHpLAHrEqjCiBlF70eNUJEncVU6rsrD2rDVEfDG/GD8imbv2SjL9Ugw8IiCKCmCEhFvySKeQFQIVIMBfIlaEpQxGocXwjdUGGPjvPRMzKqBmdw2BMlB6ucZdaxkphwDtneoIIfY5sIhCkmfhNdYx5CCXE1LK1ecA+vt2AZyQ== 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=nzdUieXGfyk23f6JMX07G9LMWRLDEiRcwNt34mFiD/g=; b=Zq2MOhy3CYabodvNMjHgz66XTB8M9llvLdqks8pZznUAgd6Km2vQ81y9SltwFALA6SMbTkMT7b6WMrWE8Xol3u0QMT2VeJP2xtU7RurDXD/GR/MKu9D2tpCT5amhZc0LCBr1tpOAiV5Nz1IVOLLFxdJc381FLwQ8O1hvh0EbZaA06Ir3B8gXng43WokgJceB8QOIxBqf7cBgY8FHrJhWTzVHZ3A7DW9avOYRGfNBL5elvW4ruibF2aUXkJQYD9itnZmUWkkMDB/AbREhybEbIucHCJlJAcLkn55ppRWsJSE65g1Y1ahpBnn+bcQe4TyDLj5pKv9WjULlxmu7njkxmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=nzdUieXGfyk23f6JMX07G9LMWRLDEiRcwNt34mFiD/g=; b=23IXo9RDQjOa/Ffjiuw/HuCsKHheBzYxl0Fo+mJjvjrHCK+EDIV3UX5rDpL0I73VP1dRYKoGpRzf1iz0073N87Rheg69QKmI84C6bzMfDLozXQ9zKC4xPJcYDG1PLr5JqPlHSNM7xK4eDFRWTPVLyUFbxYkxg+iPPYHkDkG9Tz0= Received: from SA1PR05CA0001.namprd05.prod.outlook.com (2603:10b6:806:2d2::6) by SJ2PR12MB8184.namprd12.prod.outlook.com (2603:10b6:a03:4f2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.29; Thu, 27 Jun 2024 05:40:31 +0000 Received: from SN1PEPF000397B1.namprd05.prod.outlook.com (2603:10b6:806:2d2:cafe::6b) by SA1PR05CA0001.outlook.office365.com (2603:10b6:806:2d2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Thu, 27 Jun 2024 05:40:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B1.mail.protection.outlook.com (10.167.248.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:31 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:29 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 06/10] platform/x86/amd/hsmp: Create mutually exclusive ACPI and plat drivers Date: Thu, 27 Jun 2024 05:39:54 +0000 Message-ID: <20240627053958.2533860-7-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B1:EE_|SJ2PR12MB8184:EE_ X-MS-Office365-Filtering-Correlation-Id: fb0793ae-dee8-48c7-182e-08dc966ba8d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: 5HJ49I26Nczi6CAAl+DqYTME7YIUVYrhwDYqryCFMDLu1Co/nEjW5gMuTmkBKIEGRr+xk7mywW9owugrE+EgodVdaEBZ/vNeGjsQaqbVGYOn+xmWsqVygl/yYLMuz/qKgx3+jQnMWLspOR3aL7hemuGkqYxlech0f1GN1lW6mCLdHvdCcFRcCvGodwm1igQhfFUS1ebYJ6xrIhJA8TLNInj7sHn2Iqr8XPKg53Tp9rHsmXw/aivT1W6whrwbc17pN36HAd41dliawzSYqDiryxlm8K0bevoiH3L5sP4Is9mcxKjPero4lo+VWm4wLUw/Ga9IR4kPphPIYdrQz6AQGGc31MocsLnlf3NPbVGXZ8rwFfjCkC3GS9DeC7DCZVZVIQjh9kkQWVrjwcr/lEfaWk+4oc/lWV67lueT8EAT4Hnh5JxMz5ZeeUcol7YcpfcFOtuyyooZ8zOQoZfQf2/4yyQ7T5fC5n9TbW/uKyKuEDCbFqWKu+M7RdmHdilctgoqWufp3BMw6dAHTQ4tCjNWMGCuZHn94vKh02eJhj+YoyzNghEnj7+GKgG5LtGP/52wblzlvk5t4kWHrkibTSMYS4mivlBRQe0numBItrlnI7kiK9vJZyWKBr50oxWroMF4Urv1EkxRop3xSsVerWSA1I/Ynb5cd6PTAWa4OEvMs2Za11hZtijLU7XjsA2XS4IbG1jLCz/ikPaB2hisJE+MkM/aE8taDtwUVBKUwa3vlYlnKz8qttslWH+oxITBav2OmwpsE+f6/Z7Zp3nvpa2Y9lpYp6hEbFgm4XV0p4Fs60+194YXjU1xMz7YixC6RnQBQMwhEyfGhTiFa5OkMSDyihzW9EKGghgUltiQogkT7BI8uK2PJAkYEjy1ZUmV0vu3FEsgaazc2C0BqLrdg4nSxwTh4zLlb6pIF7DhCR6Hf4s4KZrr3Rsjtol22ZKwneZGZPORGbqodQ3ymKTZvu8loXXKvKbrLSy323BpELqzQXofOiR4CyuaHgQdt4RzG5YkQdzHK1WdaByJ1fY1HbHjxFbsxpsiWXiCj24DDAlkfOoiIWYJfrkuGgIPxxCqQMvlpIUHyWNigvKhBqml+RpFpdnPxEViRfRCcfexW6/FJMvICI0Wy7e1WJRZz2i6XwdnEmpjaYsx6zFXiClOaKW1QKQ6Of3uGVd3yLZphPblFcVjYfea3I2ry5owoLANHEVhcdVbkn3di/yzEyxwb3Fq689tnY0y997SZRgTYcCLi9VY1kdTvyGXqUjo9HxL1w8xvpoSsv/wzG7fd4ja4AKHojA7NY48CRExuZPTIjuRecoE3Rz+UYmFmjYB/WXIKfW9l+JK2ndLO6AtlxU3/LMmKCrX9gZTzxYKQbIHAGNoZajtV+liXp8PgiwtVx21G0TuM41rE9OIIfGTLEOqukp6aVsOwl7LaSrGg38UQyVJGyx1SObxPXA+OvXHRuonqPDz 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:31.7453 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb0793ae-dee8-48c7-182e-08dc966ba8d9 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: SN1PEPF000397B1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8184 Separate the probes for ACPI and platform device drivers. Provide a Kconfig option to select either the ACPI or the platform device based driver. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- arch/x86/include/asm/amd_hsmp.h | 2 +- drivers/platform/x86/amd/hsmp/Kconfig | 25 ++++- drivers/platform/x86/amd/hsmp/Makefile | 10 +- drivers/platform/x86/amd/hsmp/acpi.c | 114 ++++++++++++++++++++++- drivers/platform/x86/amd/hsmp/hsmp.c | 25 ++--- drivers/platform/x86/amd/hsmp/hsmp.h | 8 +- drivers/platform/x86/amd/hsmp/plat.c | 122 +++++++------------------ 7 files changed, 183 insertions(+), 123 deletions(-) diff --git a/arch/x86/include/asm/amd_hsmp.h b/arch/x86/include/asm/amd_hsmp.h index 03c2ce3edaf5..ada14e55f9f4 100644 --- a/arch/x86/include/asm/amd_hsmp.h +++ b/arch/x86/include/asm/amd_hsmp.h @@ -5,7 +5,7 @@ #include -#if IS_ENABLED(CONFIG_AMD_HSMP) +#if IS_ENABLED(CONFIG_AMD_HSMP) || IS_ENABLED(CONFIG_AMD_HSMP_ACPI) int hsmp_send_message(struct hsmp_message *msg); #else static inline int hsmp_send_message(struct hsmp_message *msg) diff --git a/drivers/platform/x86/amd/hsmp/Kconfig b/drivers/platform/x86/amd/hsmp/Kconfig index b55d4ed9bceb..1cb10d2aac77 100644 --- a/drivers/platform/x86/amd/hsmp/Kconfig +++ b/drivers/platform/x86/amd/hsmp/Kconfig @@ -3,9 +3,30 @@ # AMD HSMP Driver # +menu "AMD Host System Management Port driver" + depends on AMD_NB + +config AMD_HSMP_ACPI + tristate "AMD HSMP ACPI driver" + depends on ACPI + help + The driver provides a way for user space tools to monitor and manage + system management functionality on EPYC server CPUs from AMD. + + Host System Management Port (HSMP) interface is a mailbox interface + between the x86 core and the System Management Unit (SMU) firmware. + + This driver supports ACPI based probing. + + You may enable this, if your platform bios provides an ACPI object + as described in the documentation. + + If you choose to compile this driver as a module the module will be + called amd_hsmp. + config AMD_HSMP tristate "AMD HSMP Driver" - depends on AMD_NB && X86_64 && ACPI + depends on !(AMD_HSMP_ACPI || AMD_HSMP_ACPI=m) help The driver provides a way for user space tools to monitor and manage system management functionality on EPYC server CPUs from AMD. @@ -15,3 +36,5 @@ config AMD_HSMP If you choose to compile this driver as a module the module will be called amd_hsmp. + +endmenu diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile index 0cc92865c0a2..53ebc462b0f9 100644 --- a/drivers/platform/x86/amd/hsmp/Makefile +++ b/drivers/platform/x86/amd/hsmp/Makefile @@ -4,5 +4,11 @@ # AMD HSMP Driver # -obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o -amd_hsmp-objs := hsmp.o plat.o acpi.o +ifneq ($(CONFIG_AMD_HSMP), ) +obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o +amd_hsmp-objs = hsmp.o plat.o +endif +ifneq ($(CONFIG_AMD_HSMP_ACPI), ) +obj-$(CONFIG_AMD_HSMP_ACPI) += amd_hsmp.o +amd_hsmp-objs = hsmp.o acpi.o +endif diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c index 90bfa1ddadbf..0307f4e7176d 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -12,21 +12,34 @@ #include "hsmp.h" #include +#include +#include + +#define DRIVER_NAME "amd_hsmp" +#define DRIVER_VERSION "2.3" +#define ACPI_HSMP_DEVICE_HID "AMDI0097" /* These are the strings specified in ACPI table */ #define MSG_IDOFF_STR "MsgIdOffset" #define MSG_ARGOFF_STR "MsgArgOffset" #define MSG_RESPOFF_STR "MsgRspOffset" -void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write) +static int amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write) { if (write) iowrite32(*value, sock->virt_base_addr + offset); else *value = ioread32(sock->virt_base_addr + offset); + return 0; } +static const struct file_operations hsmp_fops = { + .owner = THIS_MODULE, + .unlocked_ioctl = hsmp_ioctl, + .compat_ioctl = hsmp_ioctl, +}; + /* This is the UUID used for HSMP */ static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd, 0xa6, 0x9f, 0x4e, 0xa2, @@ -189,7 +202,7 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) sock->sock_ind = sock_ind; sock->dev = dev; - plat_dev.is_acpi_device = true; + sock->amd_hsmp_rdwr = amd_hsmp_acpi_rdwr; sema_init(&sock->hsmp_sem, 1); @@ -202,7 +215,7 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) return hsmp_read_acpi_dsd(sock); } -int hsmp_create_acpi_sysfs_if(struct device *dev) +static int hsmp_create_acpi_sysfs_if(struct device *dev) { struct attribute_group *attr_grp; u16 sock_ind; @@ -225,7 +238,7 @@ int hsmp_create_acpi_sysfs_if(struct device *dev) return devm_device_add_group(dev, attr_grp); } -int init_acpi(struct device *dev) +static int init_acpi(struct device *dev) { u16 sock_ind; int ret; @@ -259,3 +272,94 @@ int init_acpi(struct device *dev) return ret; } + +static const struct acpi_device_id amd_hsmp_acpi_ids[] = { + {ACPI_HSMP_DEVICE_HID, 0}, + {} +}; +MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); + +static bool check_acpi_support(struct device *dev) +{ + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) + return true; + + return false; +} + +static int hsmp_acpi_probe(struct platform_device *pdev) +{ + int ret; + + if (!plat_dev.is_probed) { + plat_dev.num_sockets = amd_nb_num(); + if (plat_dev.num_sockets == 0 || plat_dev.num_sockets > MAX_AMD_SOCKETS) + return -ENODEV; + + plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, + sizeof(*plat_dev.sock), + GFP_KERNEL); + if (!plat_dev.sock) + return -ENOMEM; + } + + if (!check_acpi_support(&pdev->dev)) { + dev_err(&pdev->dev, "Not ACPI device?\n"); + return -ENODEV; + } + + ret = init_acpi(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "Failed to initialize HSMP interface.\n"); + return ret; + } + + ret = hsmp_create_acpi_sysfs_if(&pdev->dev); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + + if (!plat_dev.is_probed) { + plat_dev.hsmp_device.name = HSMP_CDEV_NAME; + plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; + plat_dev.hsmp_device.fops = &hsmp_fops; + plat_dev.hsmp_device.parent = &pdev->dev; + plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME; + plat_dev.hsmp_device.mode = 0644; + + ret = misc_register(&plat_dev.hsmp_device); + if (ret) + return ret; + plat_dev.is_probed = true; + } + + return 0; +} + +static void hsmp_acpi_remove(struct platform_device *pdev) +{ + /* + * We register only one misc_device even on multi socket system. + * So, deregister should happen only once. + */ + if (plat_dev.is_probed) { + misc_deregister(&plat_dev.hsmp_device); + plat_dev.is_probed = false; + } +} + +static struct platform_driver amd_hsmp_driver = { + .probe = hsmp_acpi_probe, + .remove_new = hsmp_acpi_remove, + .driver = { + .name = DRIVER_NAME, + .acpi_match_table = amd_hsmp_acpi_ids, + }, +}; + +module_platform_driver(amd_hsmp_driver); + +MODULE_DESCRIPTION("AMD HSMP Platform Interface Driver"); +MODULE_VERSION(DRIVER_VERSION); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index d3f0f08cebf7..8cad5e813947 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -30,17 +30,6 @@ struct hsmp_plat_device plat_dev; -static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write) -{ - if (plat_dev.is_acpi_device) - amd_hsmp_acpi_rdwr(sock, offset, value, write); - else - return amd_hsmp_pci_rdwr(sock, offset, value, write); - - return 0; -} - /* * Send a message to the HSMP port via PCI-e config space registers * or by writing to MMIO space. @@ -63,7 +52,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms /* Clear the status register */ mbox_status = HSMP_STATUS_NOT_READY; - ret = amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_WR); + ret = sock->amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_WR); if (ret) { pr_err("Error %d clearing mailbox status register\n", ret); return ret; @@ -72,8 +61,8 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms index = 0; /* Write any message arguments */ while (index < msg->num_args) { - ret = amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2), - &msg->args[index], HSMP_WR); + ret = sock->amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2), + &msg->args[index], HSMP_WR); if (ret) { pr_err("Error %d writing message argument %d\n", ret, index); return ret; @@ -82,7 +71,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms } /* Write the message ID which starts the operation */ - ret = amd_hsmp_rdwr(sock, mbinfo->msg_id_off, &msg->msg_id, HSMP_WR); + ret = sock->amd_hsmp_rdwr(sock, mbinfo->msg_id_off, &msg->msg_id, HSMP_WR); if (ret) { pr_err("Error %d writing message ID %u\n", ret, msg->msg_id); return ret; @@ -99,7 +88,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms timeout = jiffies + msecs_to_jiffies(HSMP_MSG_TIMEOUT); while (time_before(jiffies, timeout)) { - ret = amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_RD); + ret = sock->amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_RD); if (ret) { pr_err("Error %d reading mailbox status\n", ret); return ret; @@ -134,8 +123,8 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms */ index = 0; while (index < msg->response_sz) { - ret = amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2), - &msg->args[index], HSMP_RD); + ret = sock->amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2), + &msg->args[index], HSMP_RD); if (ret) { pr_err("Error %d reading response %u for message ID:%u\n", ret, index, msg->msg_id); diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h index 2baeef57ca54..f876370ba65c 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -41,6 +41,7 @@ struct hsmp_socket { struct pci_dev *root; struct device *dev; u16 sock_ind; + int (*amd_hsmp_rdwr)(struct hsmp_socket *sock, u32 off, u32 *val, bool rw); }; struct hsmp_plat_device { @@ -48,19 +49,14 @@ struct hsmp_plat_device { struct hsmp_socket *sock; u32 proto_ver; u16 num_sockets; - bool is_acpi_device; bool is_probed; }; extern struct hsmp_plat_device plat_dev; -int init_acpi(struct device *dev); ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count); -int hsmp_create_acpi_sysfs_if(struct device *dev); -int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write); int hsmp_cache_proto_ver(u16 sock_ind); long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg); umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, @@ -68,6 +64,4 @@ umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, int hsmp_create_attr_list(struct attribute_group *attr_grp, struct device *dev, u16 sock_ind); int hsmp_test(u16 sock_ind, u32 value); -void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write); #endif /* HSMP_H */ diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c index 0f181688c972..62423581d839 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -15,11 +15,9 @@ #include #include #include -#include #define DRIVER_NAME "amd_hsmp" -#define DRIVER_VERSION "2.2" -#define ACPI_HSMP_DEVICE_HID "AMDI0097" +#define DRIVER_VERSION "2.3" /* * To access specific HSMP mailbox register, s/w writes the SMN address of HSMP mailbox @@ -35,8 +33,8 @@ #define HSMP_INDEX_REG 0xc4 #define HSMP_DATA_REG 0xc8 -int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, - u32 *value, bool write) +static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset, + u32 *value, bool write) { int ret; @@ -111,6 +109,7 @@ static int init_platform_device(struct device *dev) sock->sock_ind = i; sock->dev = dev; sock->mbinfo.base_addr = SMN_HSMP_BASE; + sock->amd_hsmp_rdwr = amd_hsmp_pci_rdwr; /* * This is a transitional change from non-ACPI to ACPI, only @@ -144,89 +143,39 @@ static int init_platform_device(struct device *dev) return 0; } -static const struct acpi_device_id amd_hsmp_acpi_ids[] = { - {ACPI_HSMP_DEVICE_HID, 0}, - {} -}; -MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); - -static bool check_acpi_support(struct device *dev) -{ - struct acpi_device *adev = ACPI_COMPANION(dev); - - if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) - return true; - - return false; -} - static int hsmp_pltdrv_probe(struct platform_device *pdev) { int ret; - /* - * On ACPI supported BIOS, there is an ACPI HSMP device added for - * each socket, so the per socket probing, but the memory allocated for - * sockets should be contiguous to access it as an array, - * Hence allocate memory for all the sockets at once instead of allocating - * on each probe. - */ - if (!plat_dev.is_probed) { - plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, - sizeof(*plat_dev.sock), - GFP_KERNEL); - if (!plat_dev.sock) - return -ENOMEM; - } + plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, + sizeof(*plat_dev.sock), + GFP_KERNEL); + if (!plat_dev.sock) + return -ENOMEM; - if (check_acpi_support(&pdev->dev)) { - ret = init_acpi(&pdev->dev); - if (ret) { - dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); - return ret; - } - ret = hsmp_create_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - } else { - ret = init_platform_device(&pdev->dev); - if (ret) { - dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); - return ret; - } - ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); + ret = init_platform_device(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); + return ret; } - if (!plat_dev.is_probed) { - plat_dev.hsmp_device.name = HSMP_CDEV_NAME; - plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; - plat_dev.hsmp_device.fops = &hsmp_fops; - plat_dev.hsmp_device.parent = &pdev->dev; - plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME; - plat_dev.hsmp_device.mode = 0644; - - ret = misc_register(&plat_dev.hsmp_device); - if (ret) - return ret; + ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); + if (ret) + dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - plat_dev.is_probed = true; - } + plat_dev.hsmp_device.name = HSMP_CDEV_NAME; + plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; + plat_dev.hsmp_device.fops = &hsmp_fops; + plat_dev.hsmp_device.parent = &pdev->dev; + plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME; + plat_dev.hsmp_device.mode = 0644; - return 0; + return misc_register(&plat_dev.hsmp_device); } static void hsmp_pltdrv_remove(struct platform_device *pdev) { - /* - * We register only one misc_device even on multi socket system. - * So, deregister should happen only once. - */ - if (plat_dev.is_probed) { - misc_deregister(&plat_dev.hsmp_device); - plat_dev.is_probed = false; - } + misc_deregister(&plat_dev.hsmp_device); } static struct platform_driver amd_hsmp_driver = { @@ -234,7 +183,6 @@ static struct platform_driver amd_hsmp_driver = { .remove_new = hsmp_pltdrv_remove, .driver = { .name = DRIVER_NAME, - .acpi_match_table = amd_hsmp_acpi_ids, }, }; @@ -293,6 +241,12 @@ static int __init hsmp_plt_init(void) { int ret = -ENODEV; + if (!legacy_hsmp_support()) { + pr_info("HSMP is not supported on Family:%x model:%x\n", + boot_cpu_data.x86, boot_cpu_data.x86_model); + return ret; + } + /* * amd_nb_num() returns number of SMN/DF interfaces present in the system * if we have N SMN/DF interfaces that ideally means N sockets @@ -305,19 +259,9 @@ static int __init hsmp_plt_init(void) if (ret) return ret; - if (!plat_dev.is_acpi_device) { - if (legacy_hsmp_support()) { - /* Not ACPI device, but supports HSMP, register a plat_dev */ - ret = hsmp_plat_dev_register(); - } else { - /* Not ACPI, Does not support HSMP */ - pr_info("HSMP is not supported on Family:%x model:%x\n", - boot_cpu_data.x86, boot_cpu_data.x86_model); - ret = -ENODEV; - } - if (ret) - platform_driver_unregister(&amd_hsmp_driver); - } + ret = hsmp_plat_dev_register(); + if (ret) + platform_driver_unregister(&amd_hsmp_driver); return ret; } From patchwork Thu Jun 27 05:39:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713839 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2088.outbound.protection.outlook.com [40.107.102.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DDB01CD3B for ; Thu, 27 Jun 2024 05:40:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466838; cv=fail; b=bX65mZ5NoQNViN67SFOiI2I08QOixcsIQE0OWjzllyDUY1jDlzUGR1TwvQeq1ZCp4wj+1HNSfwGosIsY+c8I2U9hFDVh+nF6S4NHz3SLCqo4xqsZqVA3VCTEBINZKBOZ72AjxCbvHBrMs0PoPA0ecto4qd8lIyxSBSoilLpdjms= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466838; c=relaxed/simple; bh=oAepzXOrW3Y5dN0SK73aDLeheYLFhkOHy4eL2VzGXI4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UJpadLpXUUY+hGnMpfNOF0/2cGTdePZh49QQC4rk+8BWIKUTzqQCRyiPMtM6HOrTNs6z+xnzfDB1HSQwhknad4soSgn6ykRQiiSttBTl+vNYq8ToMSU8crAhg2lvao1wPGoiof7y+glWsW65Qy5IgXeZAoLnL5Xmw595/vN/P6w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Bx7pUEnZ; arc=fail smtp.client-ip=40.107.102.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Bx7pUEnZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2Jp3ZeRo9zyWCxnKX1tRaekZEuGmut6Zckb7ODGKWho8mNQAqToLF7Yhvb6ZPM80miAMggih7/sIEaTn6RLinD3GgZLdszm0YP7rZVi7pjEJXSI3W6wlDXUCy+XrjV2O4zhZjOuP3gbvg9F3ZdfwAj9zpNMdlvEAdirtAF43f4PFcgDASWn9qAhBWKiJC1jAtO7AaK/3MZ22nmpRFJff/VMr+FTS7Umsn9iX4D4SwlhraOxWJsJfh/luuIGQh6lf4tb76XEoU4oypq/6HDPJGwITIPktMTS9MM4DTbrSzRj0raeYNW6LxNFrBrKOskIBM7/al2RNZ07fDaQ/E74pA== 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=ugTRcxsI8tDKQdnjUVYuYMEdWlR6u1ddpN9ohznvvxg=; b=hZvSLK2P0LNObno+IdfD1E5QoFvV2ip1dg9R4Ed3M80HzTNGjL665SToOoVeDnqL/b3XgOr+0TieNNZM+yiYcgCDTmGrXubtNrN5PsNWRv8Ypb5G8GABItIue6KWRbIgnhFdr4FZk+u8y20f4ElTH+PJB79KEj0QQPA0j0NxRsI0ZWZrqHwyhznafCA0n9wmD1xtLo8HGAMspCUNoTdilAECHu+hfZZ91zcp3caYvjAI28WSo55+zANGzBTaRUJawhKz4xM/573hI/TXAscwX7nv0qprxUCNjTYHPyF6UKgam5zuvO2VjwzxfhECjFlKiwxJ7fhFtZXB9OZhZlnkFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=ugTRcxsI8tDKQdnjUVYuYMEdWlR6u1ddpN9ohznvvxg=; b=Bx7pUEnZxArSMWitWF0K1H+E5X7nzBZz+Lj0AZy2snFj8+LYjN6Dh8Zw4YjjdZoamPLAjT+Xi+j4fvYQaho7veBX2NW5uybmTGkzWIEnAor/BFwC3j2x9JInRLPADc4iHxmHGu5UunLieqM9y7AN3y0iiWX0h9b/oKPZKTFNl1c= Received: from SN7P222CA0013.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::11) by IA0PR12MB8906.namprd12.prod.outlook.com (2603:10b6:208:481::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:34 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:124:cafe::1c) by SN7P222CA0013.outlook.office365.com (2603:10b6:806:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.24 via Frontend Transport; Thu, 27 Jun 2024 05:40:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:33 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:31 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 07/10] platform/x86/amd/hsmp: Use name space while exporting module symbols Date: Thu, 27 Jun 2024 05:39:55 +0000 Message-ID: <20240627053958.2533860-8-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|IA0PR12MB8906:EE_ X-MS-Office365-Filtering-Correlation-Id: 31bc66f2-2453-415d-be8d-08dc966baa02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: OxIRofKrM2TyWGq74ZEBgJ4clnkIWQ0IE56vqfljham0Nq+xFXMMzxTs1BJh/VstiCl/QAfIx/7SXAS3QaMbh/nQT/IgjAin9sGSGtOtY5A09I8tWH/en7UnxGu/nj9Ck16oEsV7ITq5MVcjNDiBKo/qHn0Dwp+R6CEwPF777xjBGr3OeioMfcX5P77lQ5z+Ri+yAnn578RZQKhYIDZIfpItY13uz+4QItRiGnjrv3+Y51ShtpxsX1yZ+52GFbHhzjTdvnhwBCSy8E4qrPqZlkxWLPsgqlrUfaq+Qol0jzj7t0/QEMc0wnAQLHKsZyjcjZQ3mxwCTYsNI6Bp5FQn2qGoaLYNLedzYjuxDdB3Tu/hfSTYcHN6aRzCVG6HEp2OouC0XGcH2g4oMxWmNuQ8efw4py7Q2D72ZsTf4scszPkuGx0mo3wT/FZBhL8H5annlIHemGp8+9tjNTSO06lvfdYEDgtzymDzk+CcqXxe45tOGrR0MuC56CbtYIwE/Yg10l1GcbiAAZY/qM0H5u1WSJHwPzvDcEihaPe/zjYT6pk5R+sKhqDLfq2mrJpBncSvGihPI5cAO47daME1Bvr0JexV4e9db2s95xgeZflwosRF7bakI0W4wm9DAhCBoy07k8EB+gLErFWYVbeKQwqbzBEb5hwwD/WjrAkbpzVyIk0MM7cdbPX9C4UkXzbS8EqOX4VBL8wBYG7W8X14LllNl1wRRrU1JN5LmmWp92NZ3M9HsddyYO4WcS+SN+yVSrSNlDS8Ji1dFuSz5y9s7rBBzuvhRA4juRbzJRPvPgVJIGHLnqYaeaxkV3hjmTDK40HxIAfT2pqhf573FxdWPL1zTmwTGl11QmrI6mJw4sjp1BXkoV2RyteXwgIxjtwaLYnBmurB+hdr4ZFXF89wVclvupcfP4LBNco6YQmeFiEg/k0OIomvE3XnEBTuPrBtF9PFZmByFYCMGGEWoDCvOwh/QbWsHM83rTGoIRZ+Y9yNltaGp3NUEKpb/B4cHlv++oQe9HEyLWupY7ud4FltDSkRALMGMIMJ9YdV6EJ84UpZyY7Gn9hRVrNauNNrX+Snl9k4XvO09qeSR379xpx41s1slH/S84DzFwK+GIbq+43t4ipOQKHG5W8C4l/u8RTXWxkCy0/cGFlEGGv2VaCu3ZhsBZv8jOkPreRk08EbSUWmPFlEbxH8+m3K1TD178dPeMi0c7h5SuJLTSD5pzTrwzdu0ovgWmFX3++xQfwnbs4nhEHXn5bU3yGIbyafW+0/OlH7IfjefFDmOpqx0XWeuRZGHJoxBYM2ZCKuc45p8AiaRo56McLsIX/CrxaiD9lMHRn6slrcxfZ5v3yLvRpWpAGsw1G5TCHs/tJCjiR7GXnmHaDAYWSa829uXK+MikrMDYciW2q3kw3bHrcDzuu8aUJJIFdab88budJoKhqkFEZvTu92vKCDwoZau6meaxkuZK6U 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:33.6960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31bc66f2-2453-415d-be8d-08dc966baa02 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: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8906 hsmp_send_message() is exported with AMD_HSMP name space. The other modules who would like to use this symbol, need to import AMD_HSMP namespace using MODULE_IMPORT_NS() to get away with warning. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/hsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index 8cad5e813947..4bf598021f4a 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -185,7 +185,7 @@ int hsmp_send_message(struct hsmp_message *msg) return ret; } -EXPORT_SYMBOL_GPL(hsmp_send_message); +EXPORT_SYMBOL_NS_GPL(hsmp_send_message, AMD_HSMP); int hsmp_test(u16 sock_ind, u32 value) { From patchwork Thu Jun 27 05:39:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713840 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 905741CD3B for ; Thu, 27 Jun 2024 05:40:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466840; cv=fail; b=duo0voFq749eCXCzCPjbfnq+Oa2tP2m1GQ5dMXAZrQdLgyguXFhBfNRrBoBo+HMr/uLbtj7zJCS8tTf5gJ3XZZsp3Im4xjBSP19lDSrlQsOvIVvQnO8+LOfv14dnNLQJUMtOqozm+dFsuNC1SEO19FHOCsonSAd5OuJ+ohF4rdw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466840; c=relaxed/simple; bh=gdx/hSIJb978aaYqCGhwBzKhnM+f2oFcXRY16nKAZTk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HBrHc1Hq5txE/D8FTzKGVTc4BD50IZfax1v/rxWRYBxpEYra0TyITHh6PtICf5B6bQbTH+tBpAw5R2QSREQjb5gDdATY4bOmHRsO2bgo0izQ2LxX27g1XCqwILxNeoDuUBvPZ6gtcYEDmsnDiJI+yTSgmSDjv5cEdYmJfpAtzq4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=T0dB9d3q; arc=fail smtp.client-ip=40.107.236.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="T0dB9d3q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nqHKnLM7wnO2MBIM2796wtg9aOWnRtqhVnjhNjNy9O/V2NL9fjxQtUoQ99Qp4bTFMHELxrAolEr4kS2vtUJoZiYaIiYuho3Wk1qVYnW5ExcBQ2SYaWC+gPOt0Xiqy/+yui5vgJaPDJ/lx2RGflbrXpQmF/Q+Yti6htdf78NeE3iNvNAppgsbGAf3dal4V74KdIcU4oBR+qVZgvoJL6pGlC961qbHevgEte0jsX9CFqantsA2lfTn9GTc59/diIGM7Wk7U+7o1yt4AeewuY/0Egv7+vPm/B/4XDr8ctx2AdGHnqEcdq46z58Fyg60y61kGeDTTdZtRkzjKmTNRVfjDg== 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=PU9CVpfgtD1XkWs2wlwDfO1KT/MPGfCLz0qP3UzYX4o=; b=WSIOGno/7fzrXsPa0DJItIEQRX0FQbnV/P+9qGS37ftXz8ofl9Vq7KTxJZ0q806824lK2bCwocOh729gWMSElcAr5tsyL0AN01ocxOfuS/BWs9x24UhPy6AXbf5SGZv25Ih1+6cAuzCqgmyKXqY4L3tXO8u2AqF6ggzCkRP689rVhr9SLxehbBclAsSmLI5ZcAHU/9ytk5ziSBvkHSTJmPXCUYIGHjMY8CcKg4L+uS4iWd+WvOPfDktWA10IF8wxKB04Oi7Zf0TaUxsYteazfGsMrw13qmUyYkdwdjf1Sva0r9U+6dzbiC72h0bPQfdvGxfVBb+BC3eA4hWsiw7NhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=PU9CVpfgtD1XkWs2wlwDfO1KT/MPGfCLz0qP3UzYX4o=; b=T0dB9d3q59f6PBjHQVsgXE0FY55oWccnA1EbBNYEtaJJrdxAgi3dhn+C5/Jv+cidF/nlqNx5eM8gu631AyOS9ydizFQ6pIGcDDdMI9UMOtGTA6GmvDpZsdeSS6FZdN7bXhypQyuxcv+kcX6Ja47B67myA5aZTlmhwWpwniP3ad8= Received: from PH8PR07CA0039.namprd07.prod.outlook.com (2603:10b6:510:2cf::7) by PH0PR12MB7488.namprd12.prod.outlook.com (2603:10b6:510:1e9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:35 +0000 Received: from SN1PEPF000397B4.namprd05.prod.outlook.com (2603:10b6:510:2cf:cafe::5b) by PH8PR07CA0039.outlook.office365.com (2603:10b6:510:2cf::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.25 via Frontend Transport; Thu, 27 Jun 2024 05:40:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B4.mail.protection.outlook.com (10.167.248.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:35 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:33 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 08/10] platform/x86/amd/hsmp: Move read and is_visible to respective files Date: Thu, 27 Jun 2024 05:39:56 +0000 Message-ID: <20240627053958.2533860-9-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B4:EE_|PH0PR12MB7488:EE_ X-MS-Office365-Filtering-Correlation-Id: d3914a8b-6647-43f8-73c7-08dc966bab32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: xGSPNQ5XPDviZQ6QgmPsyLQssyxHnQ68JB6n4g7BNOD3uA3y7qs0X+ctgfM2Pk06MOEizQaO9YBBktL+6E+1iXkyF2TfQVzi8GBOCRrRKErDupmIEGoGSN3OzgmXvZ82P/b4TdmOwbSwGAtX7B+sVq+OZhRorbCv3k6y/83a6v5SYc6cflKc5Covam9Z7LrWdY1gjoyaSRVlVarAcyZWwwDq0ECWoxAp83CyKek6ts6u06RaRMnx00SCn4md5ZOgegZKk/A9jpTI4RfJ0QXolj+4JhkYHAXF8sNzMVbijZLdAevnEltWra3Za65pvdUpOSqGyt+Al8nZnmzgIO7d61nSkj8JuO766B9P8AiMhS3RwBbxjF+XE4D0pRi11ntRVBRb3mJO1pFUZ8zn8yEqUtEpEbtieyp9MrayGbgJ2We0iJhUFEDq2i7oal0X3eGnXSJR81ZAJZdUDVUnx1LGfK/rwxJdME7Du9gyI6v30W1my9IykVMY4tHoe1kUKZYLU6xMhbuwISF7VTLFfjOKplsQK0VUBHMRwDO4cezyjKl51gO0HCt37tbZJ9DX6IClewcxXJYRxRHKhPi5WsNhVjceEV9MprXDCHBRK8BUVHIUaDJWqfc2j3jYNexUp4J8x0Wo2usNhXX9I/NKnaHWP5KpoZhD82nMD5oticAitr9uh+4OpdmHned+vu1cdUbb615EnEbdUPcFLrH29KyuNAVQOQlNY8o8apJ1C0wMS0kKTr/hqY0WZ3JvFHab+5KrUE17aDIw1Oi6qA0CIKOt5jVPwdDPTefIUa+VxlDNwBNNnT//OKU1lb6u9jVD6j9EWIh28Awc2TXhwL8IJq9TUJPgx9dT9aF29FT61GBvpxTrFtX0Hsck4HoyMt2cz7DdTSFPfn/9X9+lTMmR7CSZ4jcLP+itnNgjn5JnQKrODD2eUSMcvYTBBd0ICgY7pIQQQIeuRk0iz/dfn7dR3iJgsonsesJIxasuwvZSLU5xMpujkWx1RE1OnuD83dOw6qFqgqOSzFnesegQRvSRtGSNDzSoNPtfQpw0hHejpBD5PLPj4gW8laeh+3AtBWkFifixRZr6cWCR+uD5xZozZaDI6TKIWeEAUXQxbwuyX5S3reC0bV76p9sEPiWePYJN9mqIkmuJ7fI7aqlhmLExkDqrhU0Yj4lZB1zuwBVS7Uj1SKLwCvwAGK/4l3rycueLXIW8XWKqTTnKYwAUqJOvpoleBMAe86oEjAwHwT9blzwooW9EFNkrb1yo84o76rVFSOvtpieqij3sUlkaLYNYc0CfmnPcwbqgnu6RQO5fAxK5UeEJOCIGVO8g7jL7G1e+wz5BGqcF/cMoaSJ8M2bfWt556fCVfRNhvyMXDoP1oJ2VOKKNbENaO4twoIYsDXvPYorDfRpAEyMOr3RP9fgaMfgBVA== 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:(13230040)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:35.6863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3914a8b-6647-43f8-73c7-08dc966bab32 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: SN1PEPF000397B4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7488 The .read() and .is_visibile() needs to be handled differently in acpi and platform drivers, due to the way the sysfs files are created. This is in preparation to using .dev_groups instead of dynamic sysfs creation. The sysfs at this point is not functional, it will be enabled in the next patch. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/acpi.c | 41 ++++++++++++++++++++ drivers/platform/x86/amd/hsmp/hsmp.c | 37 ------------------ drivers/platform/x86/amd/hsmp/plat.c | 57 ++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 37 deletions(-) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c index 0307f4e7176d..1ea17aa296c7 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -12,6 +12,7 @@ #include "hsmp.h" #include +#include #include #include @@ -206,6 +207,8 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) sema_init(&sock->hsmp_sem, 1); + dev_set_drvdata(dev, sock); + /* Read MP1 base address from CRS method */ ret = hsmp_read_acpi_crs(sock); if (ret) @@ -238,6 +241,44 @@ static int hsmp_create_acpi_sysfs_if(struct device *dev) return devm_device_add_group(dev, attr_grp); } +ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) +{ + struct device *dev = container_of(kobj, struct device, kobj); + struct hsmp_socket *sock = dev_get_drvdata(dev); + struct hsmp_message msg = { 0 }; + int ret; + + if (!sock) + return -EINVAL; + + /* Do not support lseek(), reads entire metric table */ + if (count < bin_attr->size) { + dev_err(sock->dev, "Wrong buffer size\n"); + return -EINVAL; + } + + msg.msg_id = HSMP_GET_METRIC_TABLE; + msg.sock_ind = sock->sock_ind; + + ret = hsmp_send_message(&msg); + if (ret) + return ret; + memcpy_fromio(buf, sock->metric_tbl_addr, bin_attr->size); + + return bin_attr->size; +} + +umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id) +{ + if (plat_dev.proto_ver == HSMP_PROTO_VER6) + return battr->attr.mode; + else + return 0; +} + static int init_acpi(struct device *dev) { u16 sock_ind; diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index 4bf598021f4a..c199a0ff457d 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -273,34 +273,6 @@ long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) return 0; } -ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, - loff_t off, size_t count) -{ - struct hsmp_socket *sock = bin_attr->private; - struct hsmp_message msg = { 0 }; - int ret; - - if (!sock) - return -EINVAL; - - /* Do not support lseek(), reads entire metric table */ - if (count < bin_attr->size) { - dev_err(sock->dev, "Wrong buffer size\n"); - return -EINVAL; - } - - msg.msg_id = HSMP_GET_METRIC_TABLE; - msg.sock_ind = sock->sock_ind; - - ret = hsmp_send_message(&msg); - if (ret) - return ret; - memcpy_fromio(buf, sock->metric_tbl_addr, bin_attr->size); - - return bin_attr->size; -} - static int hsmp_get_tbl_dram_base(u16 sock_ind) { struct hsmp_socket *sock = &plat_dev.sock[sock_ind]; @@ -334,15 +306,6 @@ static int hsmp_get_tbl_dram_base(u16 sock_ind) return 0; } -umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, - struct bin_attribute *battr, int id) -{ - if (plat_dev.proto_ver == HSMP_PROTO_VER6) - return battr->attr.mode; - else - return 0; -} - static int hsmp_init_metric_tbl_bin_attr(struct bin_attribute **hattrs, u16 sock_ind) { struct bin_attribute *hattr = &plat_dev.sock[sock_ind].hsmp_attr; diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c index 62423581d839..57aa64b18e0d 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -11,6 +11,7 @@ #include "hsmp.h" +#include #include #include #include @@ -88,6 +89,62 @@ static int hsmp_create_non_acpi_sysfs_if(struct device *dev) return device_add_groups(dev, hsmp_attr_grps); } +ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) +{ + struct hsmp_message msg = { 0 }; + struct hsmp_socket *sock; + u8 sock_ind; + int ret; + + ret = kstrtou8(bin_attr->private, 10, &sock_ind); + if (ret) + return ret; + + if (sock_ind >= plat_dev.num_sockets) + return -EINVAL; + + sock = &plat_dev.sock[sock_ind]; + if (!sock) + return -EINVAL; + + /* Do not support lseek(), reads entire metric table */ + if (count < bin_attr->size) { + dev_err(sock->dev, "Wrong buffer size\n"); + return -EINVAL; + } + + msg.msg_id = HSMP_GET_METRIC_TABLE; + msg.sock_ind = sock_ind; + + ret = hsmp_send_message(&msg); + if (ret) + return ret; + memcpy_fromio(buf, sock->metric_tbl_addr, bin_attr->size); + + return bin_attr->size; +} + +umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id) +{ + u8 sock_ind; + int ret; + + ret = kstrtou8(battr->private, 10, &sock_ind); + if (ret) + return ret; + + if (id == 0 && sock_ind >= plat_dev.num_sockets) + return SYSFS_GROUP_INVISIBLE; + + if (plat_dev.proto_ver == HSMP_PROTO_VER6) + return battr->attr.mode; + else + return 0; +} + static inline bool is_f1a_m0h(void) { if (boot_cpu_data.x86 == 0x1A && boot_cpu_data.x86_model <= 0x0F) From patchwork Thu Jun 27 05:39:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713841 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2085.outbound.protection.outlook.com [40.107.220.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 857CD1CA80 for ; Thu, 27 Jun 2024 05:40:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466842; cv=fail; b=jH1VrwlToyz8pd9A7vgUtYpTyBBf31/7RI1tWNsH2JbJNTi3kLsK2htcCNyTtxzJvsWXP00pVTr986HcJGz8COFmdt7OmpjwhtR3+uJiNe+VhDLMDkg0xe3bDAzNndDfaPB2twW2Mp8jiJ30uigYP5KDadTa3GxrB7P2wPzQ+HU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466842; c=relaxed/simple; bh=OXEeE68SEIL3J1NCnVhNYez/wf2LEb1AO+kQWlwnC9c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DxhO9j6wE5AWVAS/M9tBv/LE5j46tlO7vPv/lB7KNR1UuhBV9uDlOqZ50i2USIBOX/k60lt3sEITb7stw5GS3+PyEvYbBYcAD2aQU7dol6YJBetX4QbbTIJPomyzkQxLvIZVjZXscAEdGmEgxRWgy3KOVwG5tQFhH+gQezdt9Bg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=NpGqIjFP; arc=fail smtp.client-ip=40.107.220.85 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="NpGqIjFP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oZPttGU8PDxgfJYtUDE+MD/9OnCqGktjmCd1e0tyNkPgsLy1RWPxggXvSMDjyGPPkQzb8pw4a47SZJeAIv6g92L3l05cNTwP3s9XYDapNYTm8gnDH1sHCvzVMkIlDx867pC//UX/jxOKEskO5+/I7LY8p/1M+tJIpNBKBSlIrQbd3muELx+qwzV8Z7H6/zrdNy+/yT1MqeJMRVUFwEsQpyQ7Y7UDvaUyQfZGDHYWIBFTmG9ChYS6igQNKR0F4gIysgPnWsa7IuqO1k0NNMZMqUTvXJaY6jf2SqDUAy6tSC3CtNSXZb0HX4IZm7536qj7ElcVtQLmqg/6XFmLSr0QOQ== 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=ucGVGOdpB4IAnE8wA0LxecSqAW/syncsvVOYDvx5thY=; b=Y8Z9lwFXwJUEuYNMi3woSvA2NiNW4OQuOGLdnw9gW0QghQFI1EkgBJvUkkub6C/9ukuMGh4EvpQBllkX5B+/3EPQwYTH92cyK1FUvdbgTW2l5qobRJ2mOsxW7znKcisaKQfYV4pVVSP/o8/U6mb47njhJohXx7QJELoDZLtO4cP1aacY7sDK4cXs2vdVLExG5Orq2rLiKNjBPRHlUfqhsXbLc0p0GYKhgk8iiAwhjXlNhLnf/xlaAe7lNxJkzeoA529SwMbwWgPY9E8HCZPVnZLYV1IpCkrhKQNBEV8bwKnjbolTafyO9h6P3GlBqoI7ox7MW3yURTwURbKPtyu8WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=ucGVGOdpB4IAnE8wA0LxecSqAW/syncsvVOYDvx5thY=; b=NpGqIjFPIZFarxnvfMnBmlN9+txzFG0SQpzM8+moe/ZFe3AFyGa/meHRuBGfeH+spxDm6gjZaqV+/+ZHo2HWukWhiaS9+03ozFCYEVD/MqraBL6N4etH2U/Ow9qc+t7/PH8k8cFRJX6Is924a257saGf1F2wcuMU8CHVz6gmziI= Received: from SN7P222CA0008.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::12) by LV2PR12MB5943.namprd12.prod.outlook.com (2603:10b6:408:170::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Thu, 27 Jun 2024 05:40:37 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:124:cafe::16) by SN7P222CA0008.outlook.office365.com (2603:10b6:806:124::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Thu, 27 Jun 2024 05:40:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:37 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:35 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 09/10] platform/x86/amd/hsmp: Use dev_groups in the driver structure Date: Thu, 27 Jun 2024 05:39:57 +0000 Message-ID: <20240627053958.2533860-10-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|LV2PR12MB5943:EE_ X-MS-Office365-Filtering-Correlation-Id: 54abab71-6b76-4495-f1fd-08dc966bac5d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: GBnEM++9vSUjJd2icOpnVhp7eat5feianw36i/ITC5gH5o4YRyeCUrJVTecaokoka64r0ilxGRVZO67EaJ1fm4JkKQnlYmzdn4gCcnK5Cv5nSMbnyZyXZJ681Aq9yCpv5X4fw6QPr3RZQJwg07Pi9k7FMgHLiGaGW/yDBfJfM/IspfPV29lTsDjfIgVw4QqroPpre/SdVY6rL1uGtLngrxZ7GtzhwdSpi8GVgbxXgJmviiYGB379xzL0Bp9RtF3tIATQ3npx9fFOrzoFU3KJ1OGrffCXXEPk9sMfPx5tnnjtPFk2l8ha4gm+OmPLVNsse1hoQuRj8r08yWGF1GWj7ZAhQYIwUX3OAS7DQn2I2ofNxqh9jpZ3KZp2L4BfShdtdh/kD+yr8QW/RFNcKbS/XL1OAQgbJMlnXQm33bqY66EgcoZur4G32Mzj690PWOID4jsFw3Y5+D3JRxKx/2/ZadLTkGviSCcTMciJAIdaxQmDhAlBuPcMoNPY1bxXEwXD0YGMrHyYmiCX6HJODQmYmV8Y9V+xxHfRwVMLjPE3fMhBaEpcOuKLAfgZ4X2J7gPUkIcUMRZo/10epJNPt205cOR8KhSSnRNsCc1GsGucyNjJ6QnVVuCREJx4VmjTc3B9HhjppeeuQzQ5MAgNLzknG4jE2b5XSno+1CH9HaMy8lXK90nyiiTv/C7gCuU6VyuWd/5ttxGVs6wUIc2PiKiYLm2lslTpQ78hrKj/Kj/4dCzWDMxN8IPnzolYzBZLDKZj9bBMILPQI+1IXHJH0OlVt3v+goqlEJCHAOIvanG8EFr0MxnMUVrdUzwJp+HsRKXWHsVBb118mGYRR32dJJqUsclQltbIsOMK8YfpYQQ+kpQn3x3gW4x3JHk3r8lUROxKdrv59ubXYhzVUpC+ozTC9pMNY4SoKhSNQb5n9C1t42gBdNNa06bEHtA5Rp3ZOMf63c9u3oAYKhNwRBv0b/niK/PMHHLIy+pzceC678u3+UtoQUTw1l7KDnZ+XSDuf0k/zSZ2PFliSYOt6hSXiJV7w6nSL0yas4bTZYHhWROjuHdVxciOoYZOBZUJmGH7o8IKTnAX8vMuCikuBdhbkCpF33b/V8g6pkISFihqlspaRzIcrcrcMk3urIOflg3G3IzDvExIlOf+T500TTc60IDu5jJ1XSldqv+gGgtVf2Xh+9CthAICcAyOgyykDkWUYBKsrTtE/kOV6Db0eHYr3Xi/lRBSmNEeNe5Qu/mrga4a0XIiM8qnVEokfwuViYrnxPgVpE9iBK8nRDIcS+rbqXk751OhT1CWuif7uz8P+KzbOEAF9yS7DHnJmd/mQK5n+6SinxOchdlK+UbLZns1sF5rt4THPT1cJiQasa8wBVmroIN55Jff6WtzvPwge/+5fzYjymdWWBkdpWyaWvQqVAPBtn2ZWa6c4F4t7sRNGR54pvHWMP+Hc6u500uTyj/R/knc 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:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:37.6491 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54abab71-6b76-4495-f1fd-08dc966bac5d 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: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5943 Move out of device_add_group() variants, instead assign static array of attribute groups to .dev_groups in platform_driver structure. Then use is_visible to enable only the necessary files on the platform. Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/acpi.c | 65 ++++++++-------- drivers/platform/x86/amd/hsmp/hsmp.c | 40 +--------- drivers/platform/x86/amd/hsmp/hsmp.h | 8 +- drivers/platform/x86/amd/hsmp/plat.c | 106 +++++++++++++++++---------- 4 files changed, 102 insertions(+), 117 deletions(-) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c index 1ea17aa296c7..087cb360814a 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -218,32 +218,9 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind) return hsmp_read_acpi_dsd(sock); } -static int hsmp_create_acpi_sysfs_if(struct device *dev) -{ - struct attribute_group *attr_grp; - u16 sock_ind; - int ret; - - attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), GFP_KERNEL); - if (!attr_grp) - return -ENOMEM; - - attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; - - ret = hsmp_get_uid(dev, &sock_ind); - if (ret) - return ret; - - ret = hsmp_create_attr_list(attr_grp, dev, sock_ind); - if (ret) - return ret; - - return devm_device_add_group(dev, attr_grp); -} - -ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, - loff_t off, size_t count) +static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) { struct device *dev = container_of(kobj, struct device, kobj); struct hsmp_socket *sock = dev_get_drvdata(dev); @@ -270,8 +247,8 @@ ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, return bin_attr->size; } -umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, - struct bin_attribute *battr, int id) +static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id) { if (plat_dev.proto_ver == HSMP_PROTO_VER6) return battr->attr.mode; @@ -311,9 +288,36 @@ static int init_acpi(struct device *dev) return ret; } + if (plat_dev.proto_ver == HSMP_PROTO_VER6) { + ret = hsmp_get_tbl_dram_base(sock_ind); + if (ret) + dev_err(dev, "Failed to init metric table\n"); + } + return ret; } +static struct bin_attribute hsmp_metric_tbl_attr = { + .attr = { .name = HSMP_METRICS_TABLE_NAME, .mode = 0444}, + .read = hsmp_metric_tbl_read, + .size = sizeof(struct hsmp_metric_table), +}; + +static struct bin_attribute *hsmp_attr_list[] = { + &hsmp_metric_tbl_attr, + NULL +}; + +static struct attribute_group hsmp_attr_grp = { + .bin_attrs = hsmp_attr_list, + .is_bin_visible = hsmp_is_sock_attr_visible, +}; + +static const struct attribute_group *hsmp_groups[] = { + &hsmp_attr_grp, + NULL +}; + static const struct acpi_device_id amd_hsmp_acpi_ids[] = { {ACPI_HSMP_DEVICE_HID, 0}, {} @@ -357,10 +361,6 @@ static int hsmp_acpi_probe(struct platform_device *pdev) return ret; } - ret = hsmp_create_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - if (!plat_dev.is_probed) { plat_dev.hsmp_device.name = HSMP_CDEV_NAME; plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; @@ -396,6 +396,7 @@ static struct platform_driver amd_hsmp_driver = { .driver = { .name = DRIVER_NAME, .acpi_match_table = amd_hsmp_acpi_ids, + .dev_groups = hsmp_groups, }, }; diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c index c199a0ff457d..5120d8ff707b 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -273,7 +273,7 @@ long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) return 0; } -static int hsmp_get_tbl_dram_base(u16 sock_ind) +int hsmp_get_tbl_dram_base(u16 sock_ind) { struct hsmp_socket *sock = &plat_dev.sock[sock_ind]; struct hsmp_message msg = { 0 }; @@ -306,44 +306,6 @@ static int hsmp_get_tbl_dram_base(u16 sock_ind) return 0; } -static int hsmp_init_metric_tbl_bin_attr(struct bin_attribute **hattrs, u16 sock_ind) -{ - struct bin_attribute *hattr = &plat_dev.sock[sock_ind].hsmp_attr; - - sysfs_bin_attr_init(hattr); - hattr->attr.name = HSMP_METRICS_TABLE_NAME; - hattr->attr.mode = 0444; - hattr->read = hsmp_metric_tbl_read; - hattr->size = sizeof(struct hsmp_metric_table); - hattr->private = &plat_dev.sock[sock_ind]; - hattrs[0] = hattr; - - if (plat_dev.proto_ver == HSMP_PROTO_VER6) - return hsmp_get_tbl_dram_base(sock_ind); - else - return 0; -} - -/* One bin sysfs for metrics table */ -#define NUM_HSMP_ATTRS 1 - -int hsmp_create_attr_list(struct attribute_group *attr_grp, - struct device *dev, u16 sock_ind) -{ - struct bin_attribute **hsmp_bin_attrs; - - /* Null terminated list of attributes */ - hsmp_bin_attrs = devm_kcalloc(dev, NUM_HSMP_ATTRS + 1, - sizeof(*hsmp_bin_attrs), - GFP_KERNEL); - if (!hsmp_bin_attrs) - return -ENOMEM; - - attr_grp->bin_attrs = hsmp_bin_attrs; - - return hsmp_init_metric_tbl_bin_attr(hsmp_bin_attrs, sock_ind); -} - int hsmp_cache_proto_ver(u16 sock_ind) { struct hsmp_message msg = { 0 }; diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h index f876370ba65c..c2d451c7c9fd 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -54,14 +54,8 @@ struct hsmp_plat_device { extern struct hsmp_plat_device plat_dev; -ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, - loff_t off, size_t count); int hsmp_cache_proto_ver(u16 sock_ind); long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg); -umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, - struct bin_attribute *battr, int id); -int hsmp_create_attr_list(struct attribute_group *attr_grp, - struct device *dev, u16 sock_ind); int hsmp_test(u16 sock_ind, u32 value); +int hsmp_get_tbl_dram_base(u16 sock_ind); #endif /* HSMP_H */ diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c index 57aa64b18e0d..da4ddb6e9819 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -59,39 +59,9 @@ static const struct file_operations hsmp_fops = { .compat_ioctl = hsmp_ioctl, }; -static int hsmp_create_non_acpi_sysfs_if(struct device *dev) -{ - const struct attribute_group **hsmp_attr_grps; - struct attribute_group *attr_grp; - u16 i; - - hsmp_attr_grps = devm_kcalloc(dev, plat_dev.num_sockets + 1, - sizeof(*hsmp_attr_grps), - GFP_KERNEL); - if (!hsmp_attr_grps) - return -ENOMEM; - - /* Create a sysfs directory for each socket */ - for (i = 0; i < plat_dev.num_sockets; i++) { - attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), - GFP_KERNEL); - if (!attr_grp) - return -ENOMEM; - - snprintf(plat_dev.sock[i].name, HSMP_ATTR_GRP_NAME_SIZE, "socket%u", (u8)i); - attr_grp->name = plat_dev.sock[i].name; - attr_grp->is_bin_visible = hsmp_is_sock_attr_visible; - hsmp_attr_grps[i] = attr_grp; - - hsmp_create_attr_list(attr_grp, dev, i); - } - - return device_add_groups(dev, hsmp_attr_grps); -} - -ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, - loff_t off, size_t count) +static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) { struct hsmp_message msg = { 0 }; struct hsmp_socket *sock; @@ -126,8 +96,8 @@ ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, return bin_attr->size; } -umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, - struct bin_attribute *battr, int id) +static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, + struct bin_attribute *battr, int id) { u8 sock_ind; int ret; @@ -145,6 +115,61 @@ umode_t hsmp_is_sock_attr_visible(struct kobject *kobj, return 0; } +/* + * AMD supports maximum of 8 sockets in a system. + * Static array of 8 + 1(for NULL) elements is created below + * to create sysfs groups for sockets. + * is_bin_visible function is used to show / hide the necessary groups. + */ +#define HSMP_BIN_ATTR(index, _list) \ +static struct bin_attribute attr##index = { \ + .attr = { .name = HSMP_METRICS_TABLE_NAME, .mode = 0444}, \ + .private = #index, \ + .read = hsmp_metric_tbl_read, \ + .size = sizeof(struct hsmp_metric_table), \ +}; \ +static struct bin_attribute _list[] = { \ + &attr##index, \ + NULL \ +} + +HSMP_BIN_ATTR(0, *sock0_attr_list); +HSMP_BIN_ATTR(1, *sock1_attr_list); +HSMP_BIN_ATTR(2, *sock2_attr_list); +HSMP_BIN_ATTR(3, *sock3_attr_list); +HSMP_BIN_ATTR(4, *sock4_attr_list); +HSMP_BIN_ATTR(5, *sock5_attr_list); +HSMP_BIN_ATTR(6, *sock6_attr_list); +HSMP_BIN_ATTR(7, *sock7_attr_list); + +#define HSMP_BIN_ATTR_GRP(index, _list, _name) \ +static struct attribute_group sock##index##_attr_grp = { \ + .bin_attrs = _list, \ + .is_bin_visible = hsmp_is_sock_attr_visible, \ + .name = #_name, \ +} + +HSMP_BIN_ATTR_GRP(0, sock0_attr_list, socket0); +HSMP_BIN_ATTR_GRP(1, sock1_attr_list, socket1); +HSMP_BIN_ATTR_GRP(2, sock2_attr_list, socket2); +HSMP_BIN_ATTR_GRP(3, sock3_attr_list, socket3); +HSMP_BIN_ATTR_GRP(4, sock4_attr_list, socket4); +HSMP_BIN_ATTR_GRP(5, sock5_attr_list, socket5); +HSMP_BIN_ATTR_GRP(6, sock6_attr_list, socket6); +HSMP_BIN_ATTR_GRP(7, sock7_attr_list, socket7); + +static const struct attribute_group *hsmp_groups[] = { + &sock0_attr_grp, + &sock1_attr_grp, + &sock2_attr_grp, + &sock3_attr_grp, + &sock4_attr_grp, + &sock5_attr_grp, + &sock6_attr_grp, + &sock7_attr_grp, + NULL +}; + static inline bool is_f1a_m0h(void) { if (boot_cpu_data.x86 == 0x1A && boot_cpu_data.x86_model <= 0x0F) @@ -195,6 +220,12 @@ static int init_platform_device(struct device *dev) dev_err(dev, "Failed to read HSMP protocol version\n"); return ret; } + + if (plat_dev.proto_ver == HSMP_PROTO_VER6) { + ret = hsmp_get_tbl_dram_base(i); + if (ret) + dev_err(dev, "Failed to init metric table\n"); + } } return 0; @@ -216,10 +247,6 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev) return ret; } - ret = hsmp_create_non_acpi_sysfs_if(&pdev->dev); - if (ret) - dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n"); - plat_dev.hsmp_device.name = HSMP_CDEV_NAME; plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR; plat_dev.hsmp_device.fops = &hsmp_fops; @@ -240,6 +267,7 @@ static struct platform_driver amd_hsmp_driver = { .remove_new = hsmp_pltdrv_remove, .driver = { .name = DRIVER_NAME, + .dev_groups = hsmp_groups, }, }; From patchwork Thu Jun 27 05:39:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13713842 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2072.outbound.protection.outlook.com [40.107.237.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 117C21CA80 for ; Thu, 27 Jun 2024 05:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466844; cv=fail; b=WitZsFpYx85JLVnIAUX1thfmRXqhN6jjd84bChjZ37Mae/fceH2tJNbej849AB2R1H0+ljRdDjXzIqvj7NceSw9DNOu4ROvl26yb5k7jsbxL96yoPHPJOaZ97TfAJQOJ9ZZWPziz3ySfrHLXEn3FWbBnHHnITzYZMxdzm3rHA1g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719466844; c=relaxed/simple; bh=iTmKxT7l9mu3NIBewz0vZrirq06u5Jajarj1sVba9Hg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A3kUEFMkvOC7DQ+ftv9nBNYFwwsGGaEBjTil9iPcTlwmJb3NCxAEi4LJwWrb+D+1AiTr6OqWOHsFa3mjWHyYfM/ZLafECSly18lHKpa8ltv4IsOiiLpZlvhvIXrXtzgapCb9exl4Ilbgo5Ezta/gY7gxqANXlZ9UZFFgkCQgtMU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=qXDxECdA; arc=fail smtp.client-ip=40.107.237.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="qXDxECdA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eq4BYBZg30Ug7qmPBQtUr2Tn2YNU4UwDIXyqYoeAAuox9svXNmfZuqNcWCXN3HK2NrEu0nwrxJUewAVgpi0O2CoNyTCCpZQYWcM1F1NehQylHe/GpodJjrQ1TFAhpnKyJDDbKlRWZx7ZC+Y9T2d373McYE6rZ0bEbXsY6T9M9jhGQDM5Pb3XAzlbgfdQdkB9uOscdDMQLkquXUIF8OjiHQssQvQCpSR2C5/o8LuG5V0yKXW3ztPaEQj2ASm0I+UjstIYf8GiM6Em5+pxjh7zm1JS7zYpo4uL1ndGjhyPrrHQsGlURsfA2QocN6v5AlVRPW5fd4YIN1DReQD2aSmZXw== 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=GoT0zq0OOofGYCLr5+9vN7LL8SYSVCnWLea4kyZqD8E=; b=bX5sm9nFhgV9KOXT1Jg9eCLJDnxTRQoEHvEQZ/KPtRAm712wKgBHzWYDn1t359nocEZT9xhc4mN1HUoZUPMAST1+zI5HtnCpM4KXQNy1ZLTfeTQgMvAJNucgIhPOcIZPRgs07FXwZ28SyDy2Ksg/4efuBIXBYypHl/Qus3f4ZQjSRrhQFrtWUlh5+nTB5u5J5wpEWWhBtevzoCcjhUJ+TSP/LGbjQ/PuxDFnEFfdYeW7n5UDvLj42bPqlk6YtG/InWBXz/9HiCwXrm9+AI6fxE5hlULIdOMqSM6xoFazUjsrwfV+mpHXfdDDblwFiolgAyeQjsHcfWhuINdUgOn55w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=GoT0zq0OOofGYCLr5+9vN7LL8SYSVCnWLea4kyZqD8E=; b=qXDxECdA3cjxJ4m8E+JE6ZnlYPq1c9z1Orc795P4EOTsJxLwOGtfR6iieK0XHv29THuujdUTu5X8tjHVpcksORoE0twLIpNvrb0MDtRjkabOeiHIrtaN1E43saJwqfCzBbYFYd8UIx88fzRk4lkAPSjxbjFRDVjlIcakh+Tpd60= Received: from PH0PR07CA0059.namprd07.prod.outlook.com (2603:10b6:510:e::34) by CH3PR12MB9429.namprd12.prod.outlook.com (2603:10b6:610:1c9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.35; Thu, 27 Jun 2024 05:40:40 +0000 Received: from SN1PEPF000397B0.namprd05.prod.outlook.com (2603:10b6:510:e:cafe::f5) by PH0PR07CA0059.outlook.office365.com (2603:10b6:510:e::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.23 via Frontend Transport; Thu, 27 Jun 2024 05:40:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B0.mail.protection.outlook.com (10.167.248.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 05:40:39 +0000 Received: from amd.amd.com (10.180.168.240) 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.2507.39; Thu, 27 Jun 2024 00:40:37 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [PATCH 10/10] platform/x86/amd/hsmp: Fix potential spectre issue Date: Thu, 27 Jun 2024 05:39:58 +0000 Message-ID: <20240627053958.2533860-11-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240627053958.2533860-1-suma.hegde@amd.com> References: <20240627053958.2533860-1-suma.hegde@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B0:EE_|CH3PR12MB9429:EE_ X-MS-Office365-Filtering-Correlation-Id: d33796c0-c151-447d-c50c-08dc966bad8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: D7w27081ySYo8+SDvT0Qm+1g1trmXAUXqpN/+tPRJE+kNE5oDPPZbQK6RHEXVgKlTx8YFWlsgT7DYOQNp9zOt+pz+mpyADRKSuU5oainNBvVaSVKk12aN3mOZiq3udzWf2Xiwbht/gHHZcS/HceZj6YyzX2Gh0Xyd3sRsm50WXTkuajxjjTMqJXk9kHrHAxTT5LfPxrtrhs68O8asr4eRm8EIS0TUBQ8sjZcr5/PsmmzukvClAr4RODuw0MdUAOYrVyiBDk0HrBRt9RJNAjj20wr2eebx4jrx4R9VMcydXgZgimt+aHxlwhabI26nsoYAOr0rhZgks+AHkhBoiA2TTE5AX1QfyRnrQHILW8gTlqd2JlzLW+qqSc+F8fR6v9k/vnIIsklylfLxYSlNqRExj5fZcKXxUA/nAiQDBvVf0VgjuUZhynsWrqOieRy7STK352UnrBbGVwC5LPgPzeUUNURwPFLYGuUq9QvbVvTf2i8PrAUO9zVS2aznTr8B/c63yJSSYN+haLNMVrKlodMUxrMoW9A+aYnTrfLO2FK80EFztlXAHgaLru1xhLPN4UoxuDY1vYkSmsvied3r4r2tLYdGCV7GNlE/tN+O89RQaAcWBQYkPls5QCyikr/SNqu89YtQ8+DWgvflqlAoLX9iavd3LoajqpkUsOuNq9jpCPC0zG+Ui0lT5bDfUOJJx5LbaFZT6rd3vE8yZpT9CcC/rKwSkDF8Y0P8uLIT2A3wqOdUVeToH+UhiUANlQuDUmAudg/tCoferreN5rj31sUuDriX1lZWr1UsXyw8frkoRB7+CjV27z0jERHXKHnOZwB1UhFtD5t6BHHK+PcTEj0PMsWdeEnaqs2WRu67wc6xJKfGmf0BXIigwykkabluLyKL+emsGS6ELfAshOKZiY776EsjBFbOh5lAxP6+T7dxiQPDDmEDJgNfVBpjt7Rsjk10vtlbv1/ftqdDlNNCNcCDgXpq5WeUuoZZQPuiLZkAOixLgucf09l+QADs6kpooE/4VvmD9rXL14M2xVXkypzX38+qgtfv93WH6d2WlQAlfLYIt+Y1hAj7IX7TeCmyE4s+jMvIsDYS2B9S4B9wc2fHjMVDxdpbjoEfCBrgM1D0yVBTuL17Z5RftE/sJQSOBr4b7hmsub+fwvoOegu2gNPfJHqIxxm9EcGDyaPbRgapNfTlGV1h7AzrSik9SrAGQ1GqwA8z1PA/kuBVas5d1yvXJ3Za7KPOq/fG3mK4VzHvmdFq6vm/cafh4ySz9S/1lWNyKSJEMIt8PIgNCC6DBF8mwahea9OEJ+B9TIHyQWWNKf3vI+0EjZJ/ZpbTvKaznmMzN/XZCoNDXm/3RmW1N0EcUkiIyv3B+w/8OlT1fWrZvLG5c32ZXjMi2tkBbfC6TETr0XY/mpyGSDzFW6T0O9qYL4v2UBVpwe7pqakHho4vxloMMOL8bs/1bbQlGOiBARR 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:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 05:40:39.6206 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d33796c0-c151-447d-c50c-08dc966bad8a 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: SN1PEPF000397B0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9429 Fix below warning caused by smatch by using array_index_nospec() to clamp the index within the range. "warn: potential spectre issue 'plat_dev.sock' [r] (local cap)" Signed-off-by: Suma Hegde Reviewed-by: Naveen Krishna Chatradhi --- drivers/platform/x86/amd/hsmp/acpi.c | 3 +++ drivers/platform/x86/amd/hsmp/plat.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c index 087cb360814a..f6d990fe0cb1 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #define DRIVER_NAME "amd_hsmp" @@ -267,6 +268,8 @@ static int init_acpi(struct device *dev) if (sock_ind >= plat_dev.num_sockets) return -EINVAL; + sock_ind = array_index_nospec(sock_ind, plat_dev.num_sockets); + ret = hsmp_parse_acpi_table(dev, sock_ind); if (ret) { dev_err(dev, "Failed to parse ACPI table\n"); diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c index da4ddb6e9819..04d1da455257 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #define DRIVER_NAME "amd_hsmp" @@ -75,6 +76,8 @@ static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj, if (sock_ind >= plat_dev.num_sockets) return -EINVAL; + sock_ind = array_index_nospec(sock_ind, plat_dev.num_sockets); + sock = &plat_dev.sock[sock_ind]; if (!sock) return -EINVAL;