From patchwork Thu Oct 3 11:15:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suma Hegde X-Patchwork-Id: 13820899 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.63]) (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 EE41A15383E for ; Thu, 3 Oct 2024 11:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727954142; cv=fail; b=Ftla8+QWK1f6Pbl24JKFRzYcHalN/gFBW11/YOc8I7t52Sc+HLu79QC+26tuehKvb+/r9AiaUcrDXLegKtIl8k13UquJU6ycyCGYwz7AX0aRqaxiV46hWUmGjdO0Qyk/MD4sMO7fnmXSCf9L8Oefjmkh/hAYnniLh2rTdB6cw8I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727954142; c=relaxed/simple; bh=szhQGfBFAAK4yKyBEHFB21mpAvnVQ12TMHCgTbImRF0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sDcV92bIrenQuTnQK602UmWXG9p7WfoVh3lpy07/E7SS9XLIDx/+ULOLBMxqy9XmLJA0HASzglXCkZqG9Ab97xScWZV2Rl89QsvldIIS/A5JTg26/xec6pBptP5Ak0aGbLutXF6DAc71+r3cA5f9M5Wn58eUhdrd9yzR0c5xtoA= 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=Dt3VnS9Q; arc=fail smtp.client-ip=40.107.237.63 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="Dt3VnS9Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NoYRwXNf/kM8f4waFsNgjE8wj6b4kdswYeRQBxmzeL1onPeKlCqhITUnYzAazj1E1LVEJB1DgrDHos2PKqm54hnc1A4FLOL4NYbCyzBLLoNiB6DwSVUobEDUsgNwTXcIYSs2kyVdqUXxpSVot/TJaZyanjbv57kUlGP4KxAk3EYEQLcPVsrSiy8I+nAVvLyI8dznV8iVyEkDaA7/z3xaHebJ440C0OrwPhHY9Blt/Yo51dVAfzr5k4TiYQoOM6krzvoLab0m5b1VLf66AEaMI6tbXzK32Cyg8m1DWSRWL2YVF+PmlWCFoLQuePdxGbCHxuM6MbwHon/Bh3ooRUxhzg== 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=nwuX7Ne035RuNni5QpO6ADXkmvLKYY7b6Nze1zdRUX8=; b=iOI3MxEuQBvVVvdbLWEtZLVnf1LJK0P3uM4OlUQnt2Vd6hAA3cVwgmfo/cYkQwg2n7iXZ5kBD1KRv6Luc05zVSff3NgMXOOxAjtPiiRrzoC0CJhB+RJPQFsKjH7GcJOvbv8jyP8KwABqJqZAOdPw9mtpSbKoxQFH72Ih3NpemwvMZs42p1bH82hlXUZMaoiQ+l7ONcxVqdJxI+xp3Xujjcvd1mbg9CU6TsQEhwcqV8mRN2lytATevdSCGpGwKOpaVCrR7VrIg4P2V13EIvxyEDhsqhoY/NeKC3vHEi9GuQiske4HDlslAJMPItMgIdMnUS0JHh3p942n7TJo431Iag== 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=nwuX7Ne035RuNni5QpO6ADXkmvLKYY7b6Nze1zdRUX8=; b=Dt3VnS9Qky4O7WMPxbt29wAWSHfs5x76URT4i3ELBkcmkOofPieebsPEEmyMqU/3gRW17d+F1vkl2+lAMnW69+1wFN2GKqp/TRnqiOIupwOg8TMEMsKtvkC5Hcn/YOzMFg3HRRPgra5cMe1ShDyj5xFXmbZvwEmAWC5vVqGlz0c= Received: from CH0PR03CA0282.namprd03.prod.outlook.com (2603:10b6:610:e6::17) by LV3PR12MB9258.namprd12.prod.outlook.com (2603:10b6:408:1bb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.16; Thu, 3 Oct 2024 11:15:38 +0000 Received: from CH1PEPF0000AD7D.namprd04.prod.outlook.com (2603:10b6:610:e6:cafe::ba) by CH0PR03CA0282.outlook.office365.com (2603:10b6:610:e6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.17 via Frontend Transport; Thu, 3 Oct 2024 11:15:38 +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 CH1PEPF0000AD7D.mail.protection.outlook.com (10.167.244.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8026.11 via Frontend Transport; Thu, 3 Oct 2024 11:15: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, 3 Oct 2024 06:15:35 -0500 From: Suma Hegde To: CC: , , Suma Hegde , Naveen Krishna Chatradhi Subject: [v9 02/11] platform/x86/amd/hsmp: Create wrapper function init_acpi() Date: Thu, 3 Oct 2024 11:15:06 +0000 Message-ID: <20241003111515.2955700-2-suma.hegde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241003111515.2955700-1-suma.hegde@amd.com> References: <20241003111515.2955700-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: CH1PEPF0000AD7D:EE_|LV3PR12MB9258:EE_ X-MS-Office365-Filtering-Correlation-Id: 2593a21f-f258-4284-0291-08dce39cb58e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MSMPAg1rn+6zf0URB4KM5ko3urBM+Pa?= =?utf-8?q?ysnlHtmgDIcgPbW0OFk79C9tqTJy6JPeG4nqvPK7qgcIbl5YguEyuhCfq4huTnJjz?= =?utf-8?q?/vKgnb2oBvkDHwr4vpZAdx29cIBL73NfS5IacEPzl8GFpsEN6XwNSfdz8ur1L6BxM?= =?utf-8?q?TDH1IbpjXnHaDxkBiD6LSMJfNrDVRcaBi02JominIp0jYAI4gvyMLz6pD26HAkCUC?= =?utf-8?q?U72jMHCevLQd4jjFBDoRWXrHo4+6y99dxJxg2dtdHv4Ii1XsoE3sK9iio7rFdCZDv?= =?utf-8?q?sj/mUzJOTqai3aWYPTyZQgCjE7CFFDl2M4IF6uMrJxLG/Yorkpyg4bXgDyMGyKEJz?= =?utf-8?q?LCQftCR8OqvbltHvkw5SnWD/62VTqAE3XFqHAklln/aCsgEjvHGnfx06cCHpZUysT?= =?utf-8?q?QULxGY9d2KURHX8zYkBxlIGpRJnu+ZVu8hsLS/riWiP0fmi+k5dNntfnH0wDDAzAh?= =?utf-8?q?/9CWCyNhceLBncOr7BopJE9z+hq8y4jb+Gdq0z746/Zo8OGwITd3giSoL3sC80cSf?= =?utf-8?q?vfTqB3dw9mjPTCfFHVVHb41+FG+QZUvzU5L2sM7ZQnvxa6qqETGBop2gDOlflCYCH?= =?utf-8?q?vLASwFx8LMCMm4HqSUeF7fEGaAror+KKDX0QbMPYwBo5lW9VfFYM//fcr2/nq5V22?= =?utf-8?q?6RRC+dymM1SnYs0AFKHHerhkvq+Icz8fBKc+VeE0djKH8Nw59Xwsj4idIdFsfFNEd?= =?utf-8?q?yntErgHTZ4kvzMOWrTRcsiDWEUMBrn1XVu6pIE69I2gplg1hc89k2g+2ooylrS1Vx?= =?utf-8?q?rZMZqVZvhgIkcGYEcvxprEFQknC4arzjjJDJ8S9GNmwlgDKQHuyLBNjnTB+Xig0sg?= =?utf-8?q?+iSlA6nbyrVrbRNP00B5jl56kLSvq0x68DIZn3bZBJXmluJrQAzJb6K/74al8QdKL?= =?utf-8?q?OORlxpVe0ozPXeXiQYnJD703+pDmNcEU2c2ynzoIVjHERxGTZKikDzBjfW16xcDs6?= =?utf-8?q?RE+JK/U49Dnr35/dGNmluuw+8ONYRQpbQqMQekdpWeu46vs6xbM4D5WIm9WavW/t8?= =?utf-8?q?rNUkhHQN2rI8Cl7D7nWtkoh4VAXieohILU47qKzv3brfxcHm0ZUfQUcFgrmsc9eDA?= =?utf-8?q?Ior1yW9emfoogsIdXHquFLFs3S8/DXneVk5eugOoPA7Wyo5poc01oiYAwk5Fm8fJD?= =?utf-8?q?NfOw+Z5/drrxG5pKJG7ChbCJF7hRdvL4hULeX5xW/2voWpEcSVZQejEKNtTNX6KmC?= =?utf-8?q?tdn6SkrI9O43onjBWznZpMF/ITARN/5Al5yw8jtf3/Z6xV1BIdtwpdo8hjuAwEkNO?= =?utf-8?q?hM+QvY+s/rbu4uXm5EJSto8rGYI4Qyia2VoD3Ukp6avPosKu44UUhfAhZdFPq9cvm?= =?utf-8?q?U6BXocJmgQFz?= 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)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2024 11:15:37.9060 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2593a21f-f258-4284-0291-08dce39cb58e 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: CH1PEPF0000AD7D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9258 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 v8: None Changes since v7: None Changes since v6: None Changes since v5: None Changes since v4: None Changes since v3: None Changes since v2: None 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;