From patchwork Thu Jul 11 07:33:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13730105 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2081.outbound.protection.outlook.com [40.107.94.81]) (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 1C06314B978 for ; Thu, 11 Jul 2024 07:33:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720683223; cv=fail; b=oMte4Uss0hzY20O1cyuh93gvmfITQ88875FF4T4ZxZNHPVcBLeXcwNar0ODPc3IZuL1FB5uH6Kh6lMQnfGy5VVPSRtihiTN3zO6VmDEtjlKDTW1ldugo+ozBPV7dtSnjoOr88WYyb93/wEoBRwn43eJFbMPcPWYH8s7qt4/gmJs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720683223; c=relaxed/simple; bh=TFv5Y03eXRapwLxvXhe46TkvZsVApwtxP0n2vIABWS8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Xyz9VQJPDNxCvuppJA3ddSfMU99VebddjFJkw/Iwu+MkLZLXTyw3qAu4RE0B/ZvddrcmlvHfkKYvxG/O0+4Cgjlr9dXKPjMLSnVSMG9dIbbuBsWRjKFUMIy98YeRbPzdU29ybT2OH5iAbKGqqz/SETMuanDm2WKdGQM/7Y+UGJA= 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=Co/+JXv3; arc=fail smtp.client-ip=40.107.94.81 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="Co/+JXv3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A6uHh86w2/0Fgiw7sjHRl7ptJj6Fb4HNVY0tkRjWqKpHIz1i8Uz0d0agXWaHg7cnuvOYlsi3RixvFETNk0eol0wAeVf3CR3EQS1brWmCBxqe2dfppxnIoUulidO2Jw4aAhi2MzMF+89I8xiGgrzR2mhZ3dcHc6qImvgUUCr+p/gEq1YlHay5ciRzsMWPE2wTVkDTMa00B8JaYfSzxNlnyO6wj19wtJyxb0GFmcG9bLP0zY7Q1RGCqJ3RQo+Ec5lBqnhsxQVlqG9R62MpsvAnHys/1B8le3hsvnPGOx1GXjsz2C7cBX44wbkZm3KybK29PbrFmTZVhttc6XEXpQdfOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sp7oHV0Dwmi3+5Ac/9pJYTml25UB/nZdCmKaocxSKMA=; b=rOMEylKkSXodJi+oqsuov0o76xPXY0k+up6coqt+nT9kAZ9o/VlQVWJEavsQQhVrpDn5SMil1OXHZtM7QJiK9hWmkD8cXCbdxkBwAm+k6zJCp5tYvRFZNK008TTp+YopMW9srhqRAlHrZ9EsvUuwt7mH1h93z0lAfVddxqZEZtlRcFsJ/uRyd7PEUlCZFcCUM3DM/f8BDhWAgDgOyIwtKb2NRL3GokQCA8N4sFB+0I8c7fSHBHfOz35AR3a8jUx9mHcBy0Lzy+TstEQtrZAjTsBmY2EIvXqkvAtfl0vYg06nePsc65RSDcoare07R37D2ej+mk44H50UgU7qvpgy6w== 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=sp7oHV0Dwmi3+5Ac/9pJYTml25UB/nZdCmKaocxSKMA=; b=Co/+JXv30HwKYb9vp1pOUp7nRzLwlErJtZMkogYtH5bIhSpNpWf5FFnP6R50YOBxpLX8ykzY2To9vfmJ/Ne1jRMHXmT760yCi5sg5yrcatiwZolFDORWS8ziPQ7q3VtussJHIACKkk5Zo00ixyW7iceww2Eshkm7aG77cBXpC90= Received: from BL0PR01CA0023.prod.exchangelabs.com (2603:10b6:208:71::36) by SN7PR12MB7347.namprd12.prod.outlook.com (2603:10b6:806:29a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 07:33:39 +0000 Received: from BL02EPF0001A104.namprd05.prod.outlook.com (2603:10b6:208:71:cafe::76) by BL0PR01CA0023.outlook.office365.com (2603:10b6:208:71::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36 via Frontend Transport; Thu, 11 Jul 2024 07:33:39 +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 BL02EPF0001A104.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7762.17 via Frontend Transport; Thu, 11 Jul 2024 07:33: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, 11 Jul 2024 02:33:36 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [v2 02/11] platform/x86/amd/hsmp: Create wrapper function init_acpi() Date: Thu, 11 Jul 2024 07:33:05 +0000 Message-ID: <20240711073314.2704871-2-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240711073314.2704871-1-suma.hegde@amd.com> References: <20240711073314.2704871-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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A104:EE_|SN7PR12MB7347:EE_ X-MS-Office365-Filtering-Correlation-Id: b851cfd6-df34-46f2-7d13-08dca17bc83c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?WeCMLsvh3Bccf0matqpNF1720WUm21l?= =?utf-8?q?G/Z3JFCMkL2ONuQou5sLqVTn4ahjfWVtMZ/GVF9fvc9COD3YUb1msEh8dLfi3GJaS?= =?utf-8?q?QsEBNc+oHHeoWofluVVUfiUKz1dm4+RSZTnMBZLbjNmlM3ZBTTZLEyJH3Smv7bQk9?= =?utf-8?q?Fm9vhPd98Y753QlZLcnnoMgjUJD4fKzB3Jr7pT7cC270YDPte5+5xntNbCxDQk+JL?= =?utf-8?q?YKPMKoShoUd7O4/zA1366TKLJvSquVfoHooqMQX3Z1ZjqAGQbmemstIQUz7pXDtgp?= =?utf-8?q?Ju3sViBIgPjiOGi/G+Sk10AOmWvX0LjtPBt581SbMH/gqIoSRrTVj6ukRfC0Zht+S?= =?utf-8?q?nG3/CRyo83ccX3sD2BnZaj28MkDJLLhCB4gMcYnskANWYGIZFdLcqqlEAT9UBzPYO?= =?utf-8?q?MMHIRO27s7FdatO52ogze3+pSBAwCrCrD0YY9tym89jli6WiS1ErQ+tvON53C7mu/?= =?utf-8?q?S1i1BnLVwltnDP7p+X1yQcYjAW9Te593SxNMZ1bCW6+0S5mHhhybtAfX77a+AEfKu?= =?utf-8?q?xZ4G9KapARViZnjQRyy21bNkN7fycbUZdTlrWdNx5X38yIG9cJ4FlDr+1wdCYSakp?= =?utf-8?q?oFphFeRTMd5opTRT1IG4IB2FAVpvrkDoMsX6Dm+viObvkdEBv20m6wntp9LvecOKF?= =?utf-8?q?81XCYG/nI+1TFtblekfnz2jWDzZullFlsPxyM5uR7vgDi1oN9PLF3/scc45iKf2po?= =?utf-8?q?4Elv0mfM7NGQDQsJ6wLmfF1EzwNGKZMo2imAMnu9jzu80Y66xYINp/ryBCY4KwLYq?= =?utf-8?q?hqpxsyHHpxxdwyPOuETqmbBdrYvylivca4p/YXTcwcw85z8SSUkt15TtaRCGpblZt?= =?utf-8?q?c2+GfX340JohYv5cAsyudx/2+8uuUrZxEoGS+8l7krJAufmxTZ83AjIN0HPnGBdKu?= =?utf-8?q?lAjvKPthCLOy1AXmTu7XlemcjMEpiRgHX0abjBtuSvfi2qOKAO8w6YZnoxblgj8DP?= =?utf-8?q?ijq90kVbw4RrLBpXhX+bP3vjVELpOuG+mECk5y5soBhvq1fvI90HetRT8k1Akm0/L?= =?utf-8?q?Z8N34ffMg6vVsCughyK8E9sQS4wjgFGHXqXkngq+/0zavYpkRvDa/ljgwJVTfxROX?= =?utf-8?q?tGOW9LOj0674sU3N23YY/7QKs6NRvKL96m5PMEahOcThdrQnpGuudXjy9MQ2vDezo?= =?utf-8?q?k76A3h5DGPe5sf/XtQv6pLWU+YHzzhHw6zNxMmEEiWnH7PZEfNPXedfOgMsP6VNAq?= =?utf-8?q?jt8j+PJu3/vKMy/+6x+38oIYkL77jVRmvazrhV1P1xzglepyKypE6Qj6jqanTTowX?= =?utf-8?q?YYMU+hpD1ZGSGUU8pU8TW+E7DDdAaOxAIkKB9O4ERtRj/x5lzFzb9xDjuvbQIiPpQ?= =?utf-8?q?q8qsOjw0gC0Nx1DfU/6v9DTLcKzSHF4uOqMyiJgmcqO01j2a4QGrLkS4sJrUdQQ+P?= =?utf-8?q?MmlJU9NloP2?= 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)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 07:33:39.0661 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b851cfd6-df34-46f2-7d13-08dca17bc83c 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: BL02EPF0001A104.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7347 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 Reviewed-by: Ilpo Järvinen --- Changes since v1: Add "Reviewed-by: Ilpo Järvinen " 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;