From nobody Sat Jul 25 03:20:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012017.outbound.protection.outlook.com [52.101.53.17]) (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 C7381394497; Mon, 20 Jul 2026 03:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517946; cv=fail; b=myHwPKdK3/cKobNsX00U+L0jOXXWYnGaP7J+rx1bzREgpAxowCEklwdJZ/G9lkWPD4k42bVr3W1OuAqbxZdsPvJbIQRr/hyaLvnirXhEEtlxyegtpQZghqLeUfqmBpSbb3+W7wfZfpv6OrRu4h4hR/oyFsHsifuYQygS6TYsCf8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517946; c=relaxed/simple; bh=AQNsLKTZ+4kTckmp15rsLP59sxOyB0NtNldHVOWwIMs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Vmvd7Ww3im0Jxatp/ZlMxfZ7wCRK9jH/4ECSpVntsBfuNeJG4Hf3o6/Szi/mOmV6otzuWCAsAc9MZ3z2ex0FHNXY3osMwyUTAzfo+gMMDd68/pYWrqLLHJPxjQ369cObrokR9pCoMJScRcrRVQZXXvfKTR+JsIK+8Utal20v4/A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=altera.com; spf=pass smtp.mailfrom=altera.com; dkim=pass (2048-bit key) header.d=altera.com header.i=@altera.com header.b=HkGHRHO0; arc=fail smtp.client-ip=52.101.53.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=altera.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altera.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=altera.com header.i=@altera.com header.b="HkGHRHO0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a3Te+NsilEObPo5NU5zT00Lw8NBXcwMM7g6KFSaWTBuUSYczGYwG58avqK0ur/i4SNjbfT2xYYMFzTDktddiuJq3zwygFmbERQJDSlnjuhEjxZbwZ9fh2gNHygNhRJuD6BDNA3i8UCsT/Mu35QzDfLA+2jbOvswO9E/XRTstsBbUgrAiSChGL/nMDYKlW3xU55nQR6OspXQQzVcb8kjXdRHfgoC0+ny5IgyW6XI3lydG2sudWIa/VYUEbSdH0WYsZZLF6PaU+M3J2xLotxmWmb4E4AiVm8lx6OK4E9z3/azxPmSzqHNiIgLdjr9DQi2WZ93abn4SZGXdbufx7815Aw== 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=QY8x3mL0Ffyn1mLqj3DaCAva8QXPVhQQp4TK3TgkrLM=; b=qosFUSf149QzxPk9/4y6XgH8SmMvoB/dq+CkhD9eFFSA7IJ1A6DhhP1z/+Dh/ZVwSZEkbr7b4k2QLcMf0EhaJbeshvOf1DkR1DD7Q4wV8gB07aX8eobmRzFAEyyLIvCIuM51lhoVxFyRPhe1pT57FW/5cZcQjbprfE4bJQPt2BrJV9EdzkGTGFu1iv1XYWwY/eKuq2Hj/QStFP1GptViMvfSVNM5zYMiGXd4N5bhPVaKuOjRkoXr0wphLZkofPhsjZusXUdWFL11hYDNYeDMlRELFvA5yCYjR1iYqm7tqZuOt7zXQQVFIP4zt6PJ0p1hsj2+qPs9VbOAM9mC+DiVxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=altera.com; dmarc=pass action=none header.from=altera.com; dkim=pass header.d=altera.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=altera.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QY8x3mL0Ffyn1mLqj3DaCAva8QXPVhQQp4TK3TgkrLM=; b=HkGHRHO0JmaZu4A7dedBwlFIRQVi4eBuexxY9O1BO9pYxx1sDvVu0eN6LM/ImS2HLOzdfGIH51jrO71Zct9OjiRanflxY82AM3fuQRIvCIGzFI5oOwYl6B4IKqW0NBnxPOLH6XFZKrQZb/0JvoSWfp15Ll13AhxAY2APjStnqA3wXJunZSjnRoD3xsrnQBU1e/w3aF/nD2GpkXuGeHMBY1CufglP9y8sCsnjb0nnxxPgur42CPam5xHWlHMRtDLbKGFz3upQX+v29/YzQjt/P4Zw4S1/UIrhSbe7uI4/xx+6Y87LzZ9kwcSSkrbEH1D4Yl1ZMuEAo+XDdTxwN2PN6Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=altera.com; Received: from SJ0PR03MB5950.namprd03.prod.outlook.com (2603:10b6:a03:2d3::20) by SA3PR03MB7256.namprd03.prod.outlook.com (2603:10b6:806:300::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.15; Mon, 20 Jul 2026 03:25:42 +0000 Received: from SJ0PR03MB5950.namprd03.prod.outlook.com ([fe80::53a0:bf93:6b6b:de01]) by SJ0PR03MB5950.namprd03.prod.outlook.com ([fe80::53a0:bf93:6b6b:de01%5]) with mapi id 15.21.0223.015; Mon, 20 Jul 2026 03:25:42 +0000 From: tze.yee.ng@altera.com To: Dinh Nguyen , linux-kernel@vger.kernel.org, Guenter Roeck , Jonathan Corbet , Shuah Khan , linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v6 1/2] firmware: stratix10-svc: add async HWMON read commands and register socfpga-hwmon device Date: Sun, 19 Jul 2026 20:25:33 -0700 Message-ID: X-Mailer: git-send-email 2.43.7 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0040.namprd05.prod.outlook.com (2603:10b6:a03:33f::15) To SJ0PR03MB5950.namprd03.prod.outlook.com (2603:10b6:a03:2d3::20) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB5950:EE_|SA3PR03MB7256:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e78c97a-0ba2-41c6-123b-08dee60e9290 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|6133799003|10067099003|11063799006|56012099006|18002099003|22082099003|55112099003|3023799007; X-Microsoft-Antispam-Message-Info: 3bMOZ1JbFrDACztH1/SJFWvBQSXrVJ1gid0arzvrVCqZcTUVIecO0kzC1f9Jc73r6uKDjnOXfhpeaVlgJS4psBmeW5dz0495GFPqqMrclXL8gpkhMZUPmPWDwZx61TBcwHPGTR8Di9kNw12P5gGEhviULDURp6mvo+naLMEFFLo85jaR6WTbjt5Hc38fhtTxeEdW2mh9V5tNnwMGjBoeEMmVlnwz8h2xMJtQBQoAl2+IZMIE40yW8wCCVa7qJAaKms7YJV0drH8IO4cqZDQ5M7grGQkmrrDon7fl5COzwZTFmBNEdAI2n6RY8kmGF5a24GrnXeN0WCBwjn3lDT5c/WxIjUb11WmjsiLawahquq8cVHyss/winWLwicoisRGk4p5C54wz5c/iy4DbyI48DNsUj64y1bnPDF9RogFPKUuyZzA5BD0Kv1dOMZtWzVSMJs7nfrL+Rj34/+HRFBpHVuNP/KzTQbxVOJMy2KjRHz9CSSMntTd4PrvR095jZ2ApyGBmwsFsHc9aOJY3PxVgs55ElUbF8aAF4+nh+oU9szuSIOsnlHwRhLp6DhNZ0ONJaOubFWLVCtABVeC+TaCwA0NY+0wc9N4EstqXn/7wj04/T4DOAN5oPeDPMZL5Wexfun6IhrFqiDV0LfBdLBjwsVfbov+yxFXIonZ20nWrNwU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB5950.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(6133799003)(10067099003)(11063799006)(56012099006)(18002099003)(22082099003)(55112099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1RQ4eP2BI7O18H61fQiRjdOjO2YF72eLWCafn7xxq0TF9aleBWCWSqsf0sQ5?= =?us-ascii?Q?PNa/YJy42eXH6cNLSPMLRuzJPoma1+PeT76WBP7RI/JrnUvsDAsUZcsHCPix?= =?us-ascii?Q?yk/gMQJL1FBrEiqGLQDehVUjdELlH176s+lXsaUA49eV/Ig3bRgb/+WO1VZC?= =?us-ascii?Q?P4rlwuGt++A7L7hNUx5r/2g0+fKUZD0sXXHdZAcE15bbx3CWztMzD71cXMDR?= =?us-ascii?Q?wAjemQMlxHZ1rFJ3JPxvrA1Rq2F7ohWD9W6Tn2aILwlCSu/06wTDuNV88BcT?= =?us-ascii?Q?goqRB5ISG+Ju/4FB7cF6vJmvCj3izrr7KYKTZJHIKEU+pGm7Utl6sDn3d/TI?= =?us-ascii?Q?s4sSvkgNn6c06eI1F3vljLvYzqU9C2jgtJK+7pzg16MpOYhcmnNyo5Rw5hvW?= =?us-ascii?Q?sKqoBR5IrKkdrQDjmjDIDrYKbOe+g8GzY5ZW3Sb6Phuye8DPUsLDEbhLUYxE?= =?us-ascii?Q?AK0GBj2pp6Zy0dEWUMmMnspOqa3qK6m1AP/yrzBOqp9kMzOaTVLGG/6cncSR?= =?us-ascii?Q?WedXP3uy5y4cQKyBR/1QtcV9tL2jfHyFeXnDcGd0viT0MmL+Cuww3Cv6C+nE?= =?us-ascii?Q?j6zJOyT6peOWQeV2DnXfDXshU4kWcjA55ZDxXyMqwVa/4Jufj7LsqfmvA6P/?= =?us-ascii?Q?MzbdzO4kBGU17V1p3Gzu2QId1Bw/ns8HqYVRjmXeiv/9WFyyQx5JKBHGJPu9?= =?us-ascii?Q?a3fMhb+uUaYZVbxR+KlPF+icMKgXhDbdNxE25xE09sdLLccAw+GnJ4UPUjrR?= =?us-ascii?Q?2YsqH7N+eotlYQgW2+LCxUWwq35J739obP+Igi48iNlodIhq0jpWpg9GAjQB?= =?us-ascii?Q?sX8PQ2z8+2t0JX1zsECtbA7LyMyQg9vUHAgwBtDKdqpwAV+BUkxLiPM0zFTU?= =?us-ascii?Q?Il4NUCZXg9Dahm25dAOUVGXpuAufX3GezkUGTU5O/SWYMif3JuYlzYUCGu11?= =?us-ascii?Q?b/8S3d49/5TmShbjYNh8JYJBOEXnmIb60oYg0L3S1Ekdx+QaQpqkrf2XGzqt?= =?us-ascii?Q?QpWLHAe6gPXxdq5ZIMq+CiQRARYJXAvddrmSwKFrBW+UxH7emzxEYEOZXB7r?= =?us-ascii?Q?cG63MUoGrgl171kmO9KutC3RJKkRSrQZA2s1x5trmkzB7pTZk2unVjEOgN88?= =?us-ascii?Q?Z0BEKgDoDSoRzOGyrVWo2qowm1YqrQFhZZ+vZetkto/RUrdjNZr/Az+uIqIM?= =?us-ascii?Q?jMM0LffvL7BuRMVj7a2uzvkGNKMPMNDgAcUZmJ1eGw0yYWlOSBCtEbuDLnaY?= =?us-ascii?Q?OZskOgf1jt7kq2z+nVIk5LOkz8+ywTqtJ71x3WXz8kuh/2xMqimh569jBerw?= =?us-ascii?Q?esNTCmH3Xdk7ZvkOWd3zxZInQ2zHCnvcTtcPlAyV8qOyGamWfLxi/0hLaZ2W?= =?us-ascii?Q?V+zWDAnsxEeRJTUm5GGZDvvvIri21H0qpfjdD2osfjLnH/4DUKPc82U9Nh4r?= =?us-ascii?Q?ArjvSe+wgN62vD2v8b+gTHM/peZinRtFlibKfoZnRghdMH6fBeVEpW0rT+9G?= =?us-ascii?Q?Xw7WjVgNxgDJKY6b8SjSx6IGCCG3zU1jUX5cn2TsgxsKSerb2f4jyuMzrLfg?= =?us-ascii?Q?Z/++CqxGDq3mSJS9pJqweEhIZ5xDeJGgtiV5JpJ3/fYlVi3smROoaXasN0Bh?= =?us-ascii?Q?EZq1xW1o3wtAdqvChJDt7VbMnKAZ2BUJIHozBmcD79cBwT5TuCpKtHyQtEVT?= =?us-ascii?Q?J5HRHQxhI+ztgSe7/wbnWN7rb82c/nWVZlqYPvR3FghWufE7n60Q9+dD1XYo?= =?us-ascii?Q?LEOMFcdlsA=3D=3D?= X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e78c97a-0ba2-41c6-123b-08dee60e9290 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB5950.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2026 03:25:42.2555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pEyXhtQOxxSNtHY2Aj+6/o2HMomb0uVAR0/Nr6bXLCNciwJ0CDUAaPlojHfozfSXlbkYmGsxMWFqnn5fcPTzpA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR03MB7256 Content-Type: text/plain; charset="utf-8" From: Tze Yee Ng Add asynchronous Stratix 10 service layer support for hardware monitor temperature and voltage read commands in stratix10_svc_async_send() and stratix10_svc_async_prepare_response(). Register a socfpga-hwmon platform device from the service layer driver when hardware monitor support is enabled, similar to the RSU device. Signed-off-by: Nazim Amirul Signed-off-by: Tze Yee Ng --- Changes in v6: - No functional changes from v5 Changes in v5: - No functional changes from v4 Changes in v3: - No functional changes from v2 Changes in v2: - Extend patch scope beyond async SMC support: register socfpga-hwmon platform device from stratix10-svc when CONFIG_SENSORS_ALTERA_SOCFPGA_HWM= ON is enabled - Follow RSU-style registration; RSU probe error handling is unchanged - Add err_unregister_clients to unregister hwmon and RSU on populate failure - Unregister hwmon platform device in stratix10-svc remove() --- drivers/firmware/stratix10-svc.c | 46 ++++++++++++++++++-- include/linux/firmware/intel/stratix10-smc.h | 38 ++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-= svc.c index c24ca5823078..fc38afed5b7f 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -45,6 +45,7 @@ =20 /* stratix10 service layer clients */ #define STRATIX10_RSU "stratix10-rsu" +#define SOCFPGA_HWMON "socfpga-hwmon" =20 /* Maximum number of SDM client IDs. */ #define MAX_SDM_CLIENT_IDS 16 @@ -104,9 +105,11 @@ struct stratix10_svc_chan; /** * struct stratix10_svc - svc private data * @stratix10_svc_rsu: pointer to stratix10 RSU device + * @stratix10_svc_hwmon: pointer to stratix10 HWMON device */ struct stratix10_svc { struct platform_device *stratix10_svc_rsu; + struct platform_device *stratix10_svc_hwmon; }; =20 /** @@ -1329,6 +1332,14 @@ int stratix10_svc_async_send(struct stratix10_svc_ch= an *chan, void *msg, args.a0 =3D INTEL_SIP_SMC_ASYNC_RSU_NOTIFY; args.a2 =3D p_msg->arg[0]; break; + case COMMAND_HWMON_READTEMP: + args.a0 =3D INTEL_SIP_SMC_ASYNC_HWMON_READTEMP; + args.a2 =3D p_msg->arg[0]; + break; + case COMMAND_HWMON_READVOLT: + args.a0 =3D INTEL_SIP_SMC_ASYNC_HWMON_READVOLT; + args.a2 =3D p_msg->arg[0]; + break; default: dev_err(ctrl->dev, "Invalid command ,%d\n", p_msg->command); ret =3D -EINVAL; @@ -1422,6 +1433,10 @@ static int stratix10_svc_async_prepare_response(stru= ct stratix10_svc_chan *chan, */ data->kaddr1 =3D (void *)&handle->res; break; + case COMMAND_HWMON_READTEMP: + case COMMAND_HWMON_READVOLT: + data->kaddr1 =3D (void *)&handle->res.a2; + break; =20 default: dev_alert(ctrl->dev, "Invalid command\n ,%d", p_msg->command); @@ -2013,16 +2028,38 @@ static int stratix10_svc_drv_probe(struct platform_= device *pdev) if (ret) goto err_put_device; =20 + if (IS_ENABLED(CONFIG_SENSORS_ALTERA_SOCFPGA_HWMON)) { + svc->stratix10_svc_hwmon =3D + platform_device_alloc(SOCFPGA_HWMON, 0); + if (!svc->stratix10_svc_hwmon) { + dev_err(dev, "failed to allocate %s device\n", + SOCFPGA_HWMON); + } else { + svc->stratix10_svc_hwmon->dev.parent =3D dev; + + ret =3D platform_device_add(svc->stratix10_svc_hwmon); + if (ret) { + dev_err(dev, "failed to add %s device: %d\n", + SOCFPGA_HWMON, ret); + platform_device_put(svc->stratix10_svc_hwmon); + svc->stratix10_svc_hwmon =3D NULL; + } + } + } + ret =3D of_platform_default_populate(dev_of_node(dev), NULL, dev); if (ret) - goto err_unregister_rsu_dev; + goto err_unregister_clients; =20 pr_info("Intel Service Layer Driver Initialized\n"); =20 return 0; =20 -err_unregister_rsu_dev: - platform_device_unregister(svc->stratix10_svc_rsu); +err_unregister_clients: + if (svc->stratix10_svc_hwmon) + platform_device_unregister(svc->stratix10_svc_hwmon); + if (svc->stratix10_svc_rsu) + platform_device_unregister(svc->stratix10_svc_rsu); goto err_free_fifos; err_put_device: platform_device_put(svc->stratix10_svc_rsu); @@ -2046,6 +2083,9 @@ static void stratix10_svc_drv_remove(struct platform_= device *pdev) struct stratix10_svc_controller *ctrl =3D platform_get_drvdata(pdev); struct stratix10_svc *svc =3D ctrl->svc; =20 + if (svc->stratix10_svc_hwmon) + platform_device_unregister(svc->stratix10_svc_hwmon); + stratix10_svc_async_exit(ctrl); =20 of_platform_depopulate(ctrl->dev); diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/f= irmware/intel/stratix10-smc.h index 9116512169dc..18ac6fe96d9d 100644 --- a/include/linux/firmware/intel/stratix10-smc.h +++ b/include/linux/firmware/intel/stratix10-smc.h @@ -695,6 +695,44 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_= CONFIG_COMPLETED_WRITE) #define INTEL_SIP_SMC_ASYNC_POLL \ INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_POLL) =20 +/** + * Request INTEL_SIP_SMC_ASYNC_HWMON_READTEMP + * Async call to request temperature + * + * Call register usage: + * a0 INTEL_SIP_SMC_ASYNC_HWMON_READTEMP + * a1 transaction job id + * a2 Temperature Channel + * a3-a17 not used + * + * Return status + * a0 INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_REJECTED + * or INTEL_SIP_SMC_STATUS_BUSY + * a1-a17 not used + */ +#define INTEL_SIP_SMC_ASYNC_FUNC_ID_HWMON_READTEMP 0xE8 +#define INTEL_SIP_SMC_ASYNC_HWMON_READTEMP \ + INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_HWMON_READTEMP) + +/** + * Request INTEL_SIP_SMC_ASYNC_HWMON_READVOLT + * Async call to request voltage + * + * Call register usage: + * a0 INTEL_SIP_SMC_ASYNC_HWMON_READVOLT + * a1 transaction job id + * a2 Voltage Channel + * a3-a17 not used + * + * Return status + * a0 INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_REJECTED + * or INTEL_SIP_SMC_STATUS_BUSY + * a1-a17 not used + */ +#define INTEL_SIP_SMC_ASYNC_FUNC_ID_HWMON_READVOLT 0xE9 +#define INTEL_SIP_SMC_ASYNC_HWMON_READVOLT \ + INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_HWMON_READVOLT) + /** * Request INTEL_SIP_SMC_ASYNC_RSU_GET_SPT * Async call to get RSU SPT from SDM. --=20 2.43.7 From nobody Sat Jul 25 03:20:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012035.outbound.protection.outlook.com [52.101.53.35]) (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 79EE2392C4B; Mon, 20 Jul 2026 03:25:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517951; cv=fail; b=e+YDKdodMLnbYIu4vPX24WwkciU6Yoz2UlmDyHk0KB/91Ak2VHlRArwX2JR+imqOqut6DvlQh43tPN8JymOAP+s6aP9WB+4NtsHb6WgUE9gg6vNzG3LMyDQas+ppzMU7TNFC1/3D1FslJlo3YnPMsF7Igyc1tsFRsK9NqezUeeE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517951; c=relaxed/simple; bh=g1MN/TPxKGYd8sedOA7gEo3gORY1oND4Rs+H3DqfDSA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=gtyQlKVtVaxppwM9jaCxIJq+66op6IeGH/JIvGWvbyPyBYr1PYEIbIQjbQH3v/AHZeujVFKxHv3JVp5N0cJrVDTRYxdWFgpH4bLjTGCJNyRC1BYnS2lMDA4UT+mxEj/ejCuj0BIZcuAIZG+laqHU9wD3t9ERk1ouzwwaLGo1Pbo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=altera.com; spf=pass smtp.mailfrom=altera.com; dkim=pass (2048-bit key) header.d=altera.com header.i=@altera.com header.b=Q35HEH5b; arc=fail smtp.client-ip=52.101.53.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=altera.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altera.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=altera.com header.i=@altera.com header.b="Q35HEH5b" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UBJankRpe/PVBpFNHRexMEiYw+3lG4FcC60LnvVnWtW5Cz9NoPZYRVOBNj9gt0owjkEoVfAkpN1bRf8SrSZrbU+5mkbKnLQBuNRO5X8WGUh2g4BKHMSq35MiXULb/GV8d19X4q1711hYpqlfVhjzNzD+fWRKrEqbQVU8qE8S1VOsRgIXC02NvT6rMivAm51T4Qdp2RriFSCbemeyAgHBYyUMQETxp6MKnslkg13hwFgXx+UF7IUs8nsEasGuU0DJEPSxD4d83NmoVjGcq67l5Ha6LHHwoa62VAdOF0k1QQX4M6neF0s6XuqWktY0eFXS07caoH3nE6xudbRKXDgrrQ== 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=FykkMUREN8GHmWl4rzD7hEcBHLS8jtLRezFwygIunjg=; b=gqtmFTkojhF/qh+Y//D5IjOQVRbFEAxss6u/MmEXwQxugXcRC1MsrdCUYrhxboaWquZnwDBkoqEyA66WM2asrn2ulY4YUQy+NzG611YRrKvY0GMIYJb2Q2O9otyBdNOaS+65jogREtypgKY/cUzagbuOs7trp0usSzKQQShBc05QHumurDGItgHXVjBqYCDIkIIs7rlwfgN9HnbB5XKbf2+lUMB+MEQ6OJxrMI9+C2Z1AX1HeWfXH11vIMBevkC6JseD1yrvkilGgtdlTKERqsAfUJUmvPyho3XMemi45AzgoYfU3UKFeWdGQhR4hvN/o5U8itQdpI84BCeCG+5myQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=altera.com; dmarc=pass action=none header.from=altera.com; dkim=pass header.d=altera.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=altera.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FykkMUREN8GHmWl4rzD7hEcBHLS8jtLRezFwygIunjg=; b=Q35HEH5b2VUijlCDNP+YBMK6daOiGqCGNZVwBSyZq436BCEZtMptH7v7ukDdTcS4Vjy3SBITFS3pf8tiUUfVChr9qqXiudOpDowL97p4tgQdsMGc7sGuaIP+jWehXsTc65rKOJMyxRBMTaKPnmKuTt5or542jv+9QbbyYZoRQwvTbO4aTIGmxudoLmanVtZ5Wa/snPPiNz0klodriEdsgIChgW3MXsI5UCg4edgIOPj8TsEVoUCZJZqI4lZXKTEQOI3aDU7lTVfU5a2xQiFosAlvxG4cv+nbXVJUTi/BTbdGeF2/qvo0/sXKkyALF3x9QLfk3DGkMgYhVri9/aSj3g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=altera.com; Received: from SJ0PR03MB5950.namprd03.prod.outlook.com (2603:10b6:a03:2d3::20) by SA3PR03MB7256.namprd03.prod.outlook.com (2603:10b6:806:300::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.15; Mon, 20 Jul 2026 03:25:46 +0000 Received: from SJ0PR03MB5950.namprd03.prod.outlook.com ([fe80::53a0:bf93:6b6b:de01]) by SJ0PR03MB5950.namprd03.prod.outlook.com ([fe80::53a0:bf93:6b6b:de01%5]) with mapi id 15.21.0223.015; Mon, 20 Jul 2026 03:25:46 +0000 From: tze.yee.ng@altera.com To: Dinh Nguyen , linux-kernel@vger.kernel.org, Guenter Roeck , Jonathan Corbet , Shuah Khan , linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v6 2/2] hwmon: add Altera SoC FPGA hardware monitoring driver Date: Sun, 19 Jul 2026 20:25:34 -0700 Message-ID: X-Mailer: git-send-email 2.43.7 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0040.namprd05.prod.outlook.com (2603:10b6:a03:33f::15) To SJ0PR03MB5950.namprd03.prod.outlook.com (2603:10b6:a03:2d3::20) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB5950:EE_|SA3PR03MB7256:EE_ X-MS-Office365-Filtering-Correlation-Id: 128d918f-c2ad-4dae-7532-08dee60e966b X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|6133799003|10067099003|11063799006|56012099006|5023799004|18002099003|22082099003|55112099003; X-Microsoft-Antispam-Message-Info: +V2cIAUnKdvmHbWQjx/hDa9OhShoy+yDl9PEmJ3Qz4uv9i30c54NECjJlImg+O1bRyWGPoen2pZuqKdMbwOzDrvLNMicsS8t4srNw04vZ/6znfB9Vr0vDQ9V22GFHICKvQ8C+U7UdDg6h56gCGVT/Z70Mwcn6M26zMdVW5hnnvxv41r7VChfb9lpXr7EkRsSTnJKoPoxSVwesKH+SbR+sOjm2EJO9tS7eARt23FKFE4NBhRQ6Tsa1KyH61V/H/ueVotwoRIp0SRuzNPsi/9vZYzU+TCdeE/Ee4ihWX5o24ANOCfWukvK3uT0y4cZOR48Vig4FpUlqBGa5A16c2jivU7dbmz3d9P5GuuNrkzBpOsjrVmBjH576RGqiA0jzKP/lcVWNCi3y/RXM3ETLmLtxIK0INFBw01uNTnNZ00B89514Eej1tzpi8OFeJlk+Pu88QgX4nuBsneHlkFJV90A2G04DO72XNV9E0+vrsS1CNU9tIWUHUfVla9/ud5FU3fAdtuyp78GX+S8/GJuXgKpUTlAIJN440qtQeUTnPReTMSyWJImqn+Pf8+y1yIlzqTq47kpi/NkNfGalkr9nEbpV1cebz+A5/gn/NJTtnCHQZGNPOPKITD/2iu47drqrDhWvFpPt/tnb22jYoLTxt7CZwyt3uNx0lI7lzFi/O2Fb9Y= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB5950.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(6133799003)(10067099003)(11063799006)(56012099006)(5023799004)(18002099003)(22082099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pjw6eaqqAbnw2TWDaTL0aYHG+O4INT6Ww9oafO9lJ9hVthrfiq96zHfgn8yH?= =?us-ascii?Q?1PyLXl8nMtCpfsOkaalWVoUL+wsEMSyZo7AP1KljYvGjxRD8aLM+mC8AkbWx?= =?us-ascii?Q?q4q+LOuO06GR6vgzVjAhtatkL1+NjaiztNUQ5JR5ClkUixkxJO877YepCUeH?= =?us-ascii?Q?pSumcTVoyKpYeAeICHVDfIWPmMn0yUtntH5RlftG26aGIrO+OkeZFFpksWum?= =?us-ascii?Q?7s64geE5u1/Z0Ya8mQM5NP16E6ULzz7BQijLxyqMLsq55x10Se3X3PEiHeef?= =?us-ascii?Q?0uPbS8fsBIVoeEaDY9F+kQFZkEJUGV8cOentq+94UwCzXiZ6dHvgFbQLumiW?= =?us-ascii?Q?yxlD62NvRcAKmV+n0/WKfTEW/tdf3cqVsDkGEsowxnQ+o21bQDQSRE9z1Py0?= =?us-ascii?Q?fciLfvkfYu8y1UnawGpaqxv9VhnjFtV62wakAOGkVPyEggHFAKw03n8HDLXH?= =?us-ascii?Q?Az13W3kdfCYAsvaK40VQB1Hsw1GTge5MLziaKGM5M/F6oam5Z3rn/l3QbGgK?= =?us-ascii?Q?XVxpcXnx6GPKPAf509RFPBOMXKyN4k2FujlT2WWZncL1fPropQV4LlNhgp+2?= =?us-ascii?Q?DvkQmx6gw1o9gIH8IFG2TrLf1p2NDm/JgS/dDkNk0iWoEQuVQDbhWwpvdcQD?= =?us-ascii?Q?v4ik2QAVVyBsetoaXYXdE0XizAgoL8nUYZg7mQsAFdLe9P6duV8CN9uCpXLQ?= =?us-ascii?Q?xJYrcVw7qVofOdEzqz/qw6XYZ2S3s4g2GRHm5AdB9yYEsJ2P0vUPQKZydsVB?= =?us-ascii?Q?4fycyXWpIBIMnP0hCXyNJ3JVN4W+mM/lEOMKXX1AZ3KVmV9QZZRUoUtkxwi/?= =?us-ascii?Q?XVHfIH6P9xPxaCgjJjQoriWDKlq2Bu6R41bBmbIUp5SMCHyIjb1aAY2o7v9R?= =?us-ascii?Q?k2G44kok3+6zfNt+ZzUQMj+/Jg0U5iBZXU9aOVaXn5YjRD2BSuKIeWuufnJw?= =?us-ascii?Q?bThO8jjuAbqTDdaYK7orRFalVx1bunZYzblNw8CiinZADNChg1LhgsDplGRs?= =?us-ascii?Q?RLWYalUBr0QqzMtF1KBaskbd4H5lCB01GvNZQQRVwyoX96otW17ibwgAWUPv?= =?us-ascii?Q?ZNaluUBPpONEgF+NJeMmvM/5CDHD5s/Zh5KHUUYKmAyNCH85tWn1FuKa3gYb?= =?us-ascii?Q?7X1NJCKk/TgRxp2DWu86TmyxrVcgkWrX6DWiIW8r+bI/b0d+BjXEkbsL7YAC?= =?us-ascii?Q?de9OGKilnBtDtmbJfZtiRsMPqGP59TOacrTZp9O9coLHCtMpqBh+e9ov1PZ/?= =?us-ascii?Q?sWGDWaeNc1aiqu2WyB+QkqK6H0DTJ0UTQY0tTItjYWj1zvSApwmzG2qD0SBk?= =?us-ascii?Q?93DL896WCG4jjsFAkp0OVlo/btasUhKevHSyJUZXd0BjDdpYWTfnopqiC+dx?= =?us-ascii?Q?k7fPjfQGH9DMnNv1LqG5RRlk9xwcxXHcZd6BDydwJ2wxHs8Jwuz+ULzbq3Pv?= =?us-ascii?Q?bzKnGmNehJiDquwL3qzpxYYoq3n+yVLKd51PKzERSq5kYFcXxwNJ+cXtz29+?= =?us-ascii?Q?6zH8VSnkNkGqJwZ3Vq/DMsTo7kDhhhhAQBysOZDRvWfWK45jmoDpBF6Kmbrb?= =?us-ascii?Q?FiW1v9Ski7gPQ7jL/CurAmPl0YFV2ARGbr0V8WmK2Q9JAGRVxxaNzwtm5yGM?= =?us-ascii?Q?PpK4rs263ZB7RwPIPXBA9Pm3keXTuPpKsqxZOVBsO+3eAuXw8mwCEF43j1p7?= =?us-ascii?Q?zJUE4bu5R1fl1FeanpOUg1bVVn6BES9YTFcW/+OEdCuisw1OGAZWFpY68lmp?= =?us-ascii?Q?tvhUqbrAsg=3D=3D?= X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-Network-Message-Id: 128d918f-c2ad-4dae-7532-08dee60e966b X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB5950.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2026 03:25:46.2275 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sLRGoa7FDpUPURu9eQv8U4zWjCCegbzzT34zWoWuWN0xDKwfzuuBBC8/Y1LJYudzNT+L97VyIYnG/grND7R+rA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR03MB7256 Content-Type: text/plain; charset="utf-8" From: Tze Yee Ng Add a hardware monitor driver for Altera SoC FPGA devices using the Stratix 10 service layer. Sensor channels are selected based on the service layer compatible string. Signed-off-by: Nazim Amirul Signed-off-by: Tze Yee Ng --- Changes in v6: - No functional changes from v5 Changes in v5: - Poll async responses until HWMON_TIMEOUT (2 s) instead of a fixed 3-iteration retry loop (~3 ms), fixing premature timeouts observed on silicon - Add MODULE_ALIAS("platform:socfpga-hwmon") Changes in v4: - Register devm_add_action_or_reset() before devm_hwmon_device_register_with_info(); drop manual channel cleanup on hwmon registration failure - Remove unreferenced async completion and pre-poll wait_for_completion_io_timeout(); poll directly after async_send() with the existing retry loop Changes in v3: - Fix 16-bit signed Q8.8 temperature conversion (cast through s16) - Remove unused async callback; pass NULL to stratix10_svc_async_send() - Keep wait_for_completion_io_timeout() before polling with comment explaining the service layer never invokes the callback but firmware needs time to complete the transaction (RSU pattern) - Align async poll loop with RSU (retry on failure instead of aborting) - Use wait_for_completion_timeout() for synchronous reads - Handle -EINVAL and -EOPNOTSUPP when async client registration fails - Defer SVC channel/async cleanup via devm_add_action_or_reset(); drop .remove() Changes in v2: - Drop altr,stratix10-hwmon OF compatible and DT channel parsing - Select channels from hardcoded tables using parent SVC compatible (intel,stratix10-svc or intel,agilex-svc) - Rename driver from stratix10-hwmon to socfpga-hwmon - Rename Kconfig symbol to CONFIG_SENSORS_ALTERA_SOCFPGA_HWMON - Add Agilex voltage and temperature channel tables - Convert SDM Q8.8 degrees Celsius to hwmon millidegrees - Convert SDM Q16 volts to hwmon millivolts - Use socfpga_hwmon as hwmon sysfs device name - Add last_err for synchronous SVC read error propagation - Update Documentation/hwmon and MAINTAINERS accordingly --- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/socfpga-hwmon.rst | 34 ++ MAINTAINERS | 8 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/socfpga-hwmon.c | 579 ++++++++++++++++++++++++++ 6 files changed, 633 insertions(+) create mode 100644 Documentation/hwmon/socfpga-hwmon.rst create mode 100644 drivers/hwmon/socfpga-hwmon.c diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst index 29130df44d12..3299417a24b8 100644 --- a/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst @@ -254,6 +254,7 @@ Hardware Monitoring Kernel Drivers sparx5-temp spd5118 stpddc60 + socfpga-hwmon surface_fan sy7636a-hwmon tc654 diff --git a/Documentation/hwmon/socfpga-hwmon.rst b/Documentation/hwmon/so= cfpga-hwmon.rst new file mode 100644 index 000000000000..e5da42556a62 --- /dev/null +++ b/Documentation/hwmon/socfpga-hwmon.rst @@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: GPL-2.0 + +Kernel driver socfpga-hwmon +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D + +Supported chips: + + * Altera Stratix 10 SoC FPGA + * Altera Agilex SoC FPGA + +Authors: + - Nazim Amirul + - Tze Yee Ng + +Description +----------- + +This driver supports hardware monitoring for Altera SoC +FPGA devices through the Secure Device Manager and Stratix 10 service laye= r. + +The following sensor types are supported: + + * temperature + * voltage + +Usage Notes +----------- + +The stratix10-svc driver registers a socfpga-hwmon platform device when +hardware monitor support is enabled. Sensor channels are selected in the +driver based on the service layer compatible string: + + * intel,stratix10-svc + * intel,agilex-svc diff --git a/MAINTAINERS b/MAINTAINERS index a674e36529f7..ab6cb215a02f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -965,6 +965,14 @@ L: linux-gpio@vger.kernel.org S: Maintained F: drivers/gpio/gpio-altera.c =20 +ALTERA SoC FPGA HWMON DRIVER +M: Nazim Amirul +M: Tze Yee Ng +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/socfpga-hwmon.rst +F: drivers/hwmon/socfpga-hwmon.c + ALTERA TRIPLE SPEED ETHERNET DRIVER M: Boon Khai Ng L: netdev@vger.kernel.org diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 2bfbcc033d59..8e768661fec2 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -2160,6 +2160,16 @@ config SENSORS_SMSC47M192 This driver can also be built as a module. If so, the module will be called smsc47m192. =20 +config SENSORS_ALTERA_SOCFPGA_HWMON + tristate "Altera SoC FPGA hardware monitoring features" + depends on INTEL_STRATIX10_SERVICE + help + If you say yes here you get support for the temperature and + voltage sensors of Altera SoC FPGA devices. + + This driver can also be built as a module. If so, the module + will be called socfpga-hwmon. + config SENSORS_SMSC47B397 tristate "SMSC LPC47B397-NC" depends on HAS_IOPORT diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 63effc0ab8d1..aeedee80e1f0 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -221,6 +221,7 @@ obj-$(CONFIG_SENSORS_SMPRO) +=3D smpro-hwmon.o obj-$(CONFIG_SENSORS_SMSC47B397)+=3D smsc47b397.o obj-$(CONFIG_SENSORS_SMSC47M1) +=3D smsc47m1.o obj-$(CONFIG_SENSORS_SMSC47M192)+=3D smsc47m192.o +obj-$(CONFIG_SENSORS_ALTERA_SOCFPGA_HWMON) +=3D socfpga-hwmon.o obj-$(CONFIG_SENSORS_SPARX5) +=3D sparx5-temp.o obj-$(CONFIG_SENSORS_SPD5118) +=3D spd5118.o obj-$(CONFIG_SENSORS_STTS751) +=3D stts751.o diff --git a/drivers/hwmon/socfpga-hwmon.c b/drivers/hwmon/socfpga-hwmon.c new file mode 100644 index 000000000000..72418201b65d --- /dev/null +++ b/drivers/hwmon/socfpga-hwmon.c @@ -0,0 +1,579 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Altera SoC FPGA hardware monitoring driver + * + * Copyright (c) 2026 Altera Corporation + * + * Authors: + * Nazim Amirul + * Tze Yee Ng + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define HWMON_TIMEOUT msecs_to_jiffies(SVC_HWMON_REQUEST_TIMEOUT_MS) +#define HWMON_RETRY_SLEEP_MS 1U +#define HWMON_ASYNC_MSG_RETRY 3U +#define SOCFPGA_HWMON_MAXSENSORS 16 +#define SOCFPGA_HWMON_CHANNEL_MASK GENMASK(15, 0) +#define SOCFPGA_HWMON_PAGE_SHIFT 16 +#define SOCFPGA_HWMON_CHAN(page, channel) \ + (((page) << SOCFPGA_HWMON_PAGE_SHIFT) | \ + ((channel) & SOCFPGA_HWMON_CHANNEL_MASK)) +#define SOCFPGA_HWMON_ATTR_VISIBLE 0444 +/* Temperature from SDM is signed Q8.8 degrees Celsius (8 fractional bits)= . */ +#define SOCFPGA_HWMON_TEMP_FRAC_BITS 8 +#define SOCFPGA_HWMON_TEMP_FRAC_DIV BIT(SOCFPGA_HWMON_TEMP_FRAC_BITS) +#define SOCFPGA_HWMON_TEMP_MDEG_SCALE 1000 +/* Voltage from SDM is unsigned Q16 volts (16 fractional bits). */ +#define SOCFPGA_HWMON_VOLT_FRAC_BITS 16 +#define SOCFPGA_HWMON_VOLT_FRAC_DIV BIT(SOCFPGA_HWMON_VOLT_FRAC_BITS) +#define SOCFPGA_HWMON_VOLT_MV_SCALE 1000 + +#define ETEMP_INACTIVE 0x80000000U +#define ETEMP_TOO_OLD 0x80000001U +#define ETEMP_NOT_PRESENT 0x80000002U +#define ETEMP_TIMEOUT 0x80000003U +#define ETEMP_CORRUPT 0x80000004U +#define ETEMP_BUSY 0x80000005U +#define ETEMP_NOT_INITIALIZED 0x800000FFU + +struct socfpga_hwmon_channel { + u32 reg; + const char *label; +}; + +struct socfpga_hwmon_board_data { + const struct socfpga_hwmon_channel *temp; + unsigned int num_temp; + const struct socfpga_hwmon_channel *volt; + unsigned int num_volt; +}; + +struct socfpga_hwmon_priv { + struct stratix10_svc_chan *chan; + struct stratix10_svc_client client; + struct completion completion; + struct mutex lock; /* protect SVC calls */ + bool async; + int last_err; /* sync-mode SVC result; 0 on success */ + u32 temperature; + u32 voltage; + int temperature_channels; + int voltage_channels; + const char *temp_chan_names[SOCFPGA_HWMON_MAXSENSORS]; + const char *volt_chan_names[SOCFPGA_HWMON_MAXSENSORS]; + u32 temp_chan[SOCFPGA_HWMON_MAXSENSORS]; + u32 volt_chan[SOCFPGA_HWMON_MAXSENSORS]; +}; + +static umode_t socfpga_hwmon_is_visible(const void *dev, + enum hwmon_sensor_types type, + u32 attr, int chan) +{ + const struct socfpga_hwmon_priv *priv =3D dev; + + switch (type) { + case hwmon_temp: + if (chan < priv->temperature_channels) + return SOCFPGA_HWMON_ATTR_VISIBLE; + return 0; + case hwmon_in: + if (chan < priv->voltage_channels) + return SOCFPGA_HWMON_ATTR_VISIBLE; + return 0; + default: + return 0; + } +} + +static void socfpga_hwmon_readtemp_cb(struct stratix10_svc_client *client, + struct stratix10_svc_cb_data *data) +{ + struct socfpga_hwmon_priv *priv =3D client->priv; + + priv->last_err =3D -EIO; + if (data->status =3D=3D BIT(SVC_STATUS_OK)) { + priv->last_err =3D 0; + priv->temperature =3D (u32)*(unsigned long *)data->kaddr1; + } else if (data->kaddr1) { + dev_err(client->dev, "%s failed with status 0x%x, value 0x%lx\n", + __func__, data->status, + *(unsigned long *)data->kaddr1); + } else { + dev_err(client->dev, "%s failed with status 0x%x\n", + __func__, data->status); + } + + complete(&priv->completion); +} + +static void socfpga_hwmon_readvolt_cb(struct stratix10_svc_client *client, + struct stratix10_svc_cb_data *data) +{ + struct socfpga_hwmon_priv *priv =3D client->priv; + + priv->last_err =3D -EIO; + if (data->status =3D=3D BIT(SVC_STATUS_OK)) { + priv->last_err =3D 0; + priv->voltage =3D (u32)*(unsigned long *)data->kaddr1; + } else if (data->kaddr1) { + dev_err(client->dev, "%s failed with status 0x%x, value 0x%lx\n", + __func__, data->status, + *(unsigned long *)data->kaddr1); + } else { + dev_err(client->dev, "%s failed with status 0x%x\n", + __func__, data->status); + } + + complete(&priv->completion); +} + +static int socfpga_hwmon_parse_temp(long *val, u32 temperature) +{ + switch (temperature) { + case ETEMP_INACTIVE: + case ETEMP_NOT_PRESENT: + case ETEMP_CORRUPT: + case ETEMP_NOT_INITIALIZED: + return -EOPNOTSUPP; + case ETEMP_TIMEOUT: + case ETEMP_BUSY: + case ETEMP_TOO_OLD: + return -EAGAIN; + default: + /* SDM returns a 16-bit signed Q8.8 value in the low 16 bits. */ + *val =3D (long)(s16)(temperature & SOCFPGA_HWMON_CHANNEL_MASK) * + SOCFPGA_HWMON_TEMP_MDEG_SCALE / SOCFPGA_HWMON_TEMP_FRAC_DIV; + return 0; + } +} + +static int socfpga_hwmon_encode_temp_arg(u32 reg, u64 *arg) +{ + u32 page =3D (reg >> SOCFPGA_HWMON_PAGE_SHIFT) & SOCFPGA_HWMON_CHANNEL_MA= SK; + u32 channel =3D reg & SOCFPGA_HWMON_CHANNEL_MASK; + + if (channel >=3D SOCFPGA_HWMON_MAXSENSORS) + return -EINVAL; + + *arg =3D (1ULL << channel) | ((u64)page << SOCFPGA_HWMON_PAGE_SHIFT); + return 0; +} + +static int socfpga_hwmon_encode_volt_arg(u32 reg, u64 *arg) +{ + u32 channel =3D reg & SOCFPGA_HWMON_CHANNEL_MASK; + + if (channel >=3D SOCFPGA_HWMON_MAXSENSORS) + return -EINVAL; + + *arg =3D 1ULL << channel; + return 0; +} + +static int socfpga_hwmon_async_read(struct device *dev, + enum hwmon_sensor_types type, + struct stratix10_svc_client_msg *msg) +{ + struct socfpga_hwmon_priv *priv =3D dev_get_drvdata(dev); + struct stratix10_svc_cb_data data =3D {}; + unsigned long deadline =3D jiffies + HWMON_TIMEOUT; + void *handle =3D NULL; + int status, index, ret; + + for (index =3D 0; index < HWMON_ASYNC_MSG_RETRY; index++) { + status =3D stratix10_svc_async_send(priv->chan, msg, &handle, + NULL, NULL); + if (status =3D=3D 0) + break; + dev_warn(dev, "Failed to send async message: %d\n", status); + msleep(HWMON_RETRY_SLEEP_MS); + } + + if (status && !handle) { + dev_err(dev, "Failed to send async message after %u retries: %d\n", + HWMON_ASYNC_MSG_RETRY, status); + return status; + } + + ret =3D -ETIMEDOUT; + while (!time_after(jiffies, deadline)) { + status =3D stratix10_svc_async_poll(priv->chan, handle, &data); + if (status =3D=3D -EAGAIN) { + dev_dbg(dev, "Async message is still in progress\n"); + } else if (status < 0) { + dev_alert(dev, "Failed to poll async message: %d\n", status); + ret =3D -ETIMEDOUT; + } else if (status =3D=3D 0) { + ret =3D 0; + break; + } + msleep(HWMON_RETRY_SLEEP_MS); + } + + if (ret) { + dev_err(dev, "Failed to get async response\n"); + goto done; + } + + if (data.status) { + dev_err(dev, "%s returned 0x%x from SDM\n", __func__, + data.status); + ret =3D -EFAULT; + goto done; + } + + if (type =3D=3D hwmon_temp) + priv->temperature =3D (u32)*(unsigned long *)data.kaddr1; + else + priv->voltage =3D (u32)*(unsigned long *)data.kaddr1; + + ret =3D 0; + +done: + stratix10_svc_async_done(priv->chan, handle); + return ret; +} + +static int socfpga_hwmon_sync_read(struct device *dev, + enum hwmon_sensor_types type, + struct stratix10_svc_client_msg *msg) +{ + struct socfpga_hwmon_priv *priv =3D dev_get_drvdata(dev); + int ret; + + reinit_completion(&priv->completion); + + if (type =3D=3D hwmon_temp) + priv->client.receive_cb =3D socfpga_hwmon_readtemp_cb; + else + priv->client.receive_cb =3D socfpga_hwmon_readvolt_cb; + + ret =3D stratix10_svc_send(priv->chan, msg); + if (ret < 0) + goto status_done; + + ret =3D wait_for_completion_timeout(&priv->completion, HWMON_TIMEOUT); + if (!ret) { + dev_err(priv->client.dev, "timeout waiting for SMC call\n"); + ret =3D -ETIMEDOUT; + goto status_done; + } + + ret =3D priv->last_err; + +status_done: + stratix10_svc_done(priv->chan); + return ret; +} + +static int socfpga_hwmon_read(struct device *dev, enum hwmon_sensor_types = type, + u32 attr, int chan, long *val) +{ + struct socfpga_hwmon_priv *priv =3D dev_get_drvdata(dev); + struct stratix10_svc_client_msg msg =3D {0}; + int ret; + + if (chan >=3D SOCFPGA_HWMON_MAXSENSORS) + return -EOPNOTSUPP; + + switch (type) { + case hwmon_temp: + ret =3D socfpga_hwmon_encode_temp_arg(priv->temp_chan[chan], + &msg.arg[0]); + if (ret) + return ret; + msg.command =3D COMMAND_HWMON_READTEMP; + break; + case hwmon_in: + ret =3D socfpga_hwmon_encode_volt_arg(priv->volt_chan[chan], + &msg.arg[0]); + if (ret) + return ret; + msg.command =3D COMMAND_HWMON_READVOLT; + break; + default: + return -EOPNOTSUPP; + } + + guard(mutex)(&priv->lock); + if (priv->async) + ret =3D socfpga_hwmon_async_read(dev, type, &msg); + else + ret =3D socfpga_hwmon_sync_read(dev, type, &msg); + if (ret) + return ret; + + if (type =3D=3D hwmon_temp) + ret =3D socfpga_hwmon_parse_temp(val, priv->temperature); + else + /* SDM returns Q16 volts; convert to hwmon millivolts. */ + *val =3D (long)priv->voltage * SOCFPGA_HWMON_VOLT_MV_SCALE / + SOCFPGA_HWMON_VOLT_FRAC_DIV; + return ret; +} + +static int socfpga_hwmon_read_string(struct device *dev, + enum hwmon_sensor_types type, u32 attr, + int chan, const char **str) +{ + struct socfpga_hwmon_priv *priv =3D dev_get_drvdata(dev); + + switch (type) { + case hwmon_in: + *str =3D priv->volt_chan_names[chan]; + return 0; + case hwmon_temp: + *str =3D priv->temp_chan_names[chan]; + return 0; + default: + return -EOPNOTSUPP; + } +} + +static const struct hwmon_ops socfpga_hwmon_ops =3D { + .is_visible =3D socfpga_hwmon_is_visible, + .read =3D socfpga_hwmon_read, + .read_string =3D socfpga_hwmon_read_string, +}; + +static const struct hwmon_channel_info *socfpga_hwmon_info[] =3D { + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL), + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_LABEL), + NULL +}; + +static const struct hwmon_chip_info socfpga_hwmon_chip_info =3D { + .ops =3D &socfpga_hwmon_ops, + .info =3D socfpga_hwmon_info, +}; + +static const struct socfpga_hwmon_channel s10_hwmon_volt_channels[] =3D { + { SOCFPGA_HWMON_CHAN(0, 2), "0.8V VCC" }, + { SOCFPGA_HWMON_CHAN(0, 3), "1.8V VCCIO_SDM" }, + { SOCFPGA_HWMON_CHAN(0, 6), "0.9V VCCERAM" }, +}; + +static const struct socfpga_hwmon_channel s10_hwmon_temp_channels[] =3D { + { SOCFPGA_HWMON_CHAN(0, 0), "Main Die SDM" }, +}; + +static const struct socfpga_hwmon_board_data s10_hwmon_board =3D { + .temp =3D s10_hwmon_temp_channels, + .num_temp =3D ARRAY_SIZE(s10_hwmon_temp_channels), + .volt =3D s10_hwmon_volt_channels, + .num_volt =3D ARRAY_SIZE(s10_hwmon_volt_channels), +}; + +static const struct socfpga_hwmon_channel agilex_hwmon_volt_channels[] =3D= { + { SOCFPGA_HWMON_CHAN(0, 2), "0.8V VCC" }, + { SOCFPGA_HWMON_CHAN(0, 3), "1.8V VCCIO_SDM" }, + { SOCFPGA_HWMON_CHAN(0, 4), "1.8V VCCPT" }, + { SOCFPGA_HWMON_CHAN(0, 5), "1.2V VCCCRCORE" }, + { SOCFPGA_HWMON_CHAN(0, 6), "0.9V VCCH" }, + { SOCFPGA_HWMON_CHAN(0, 7), "0.8V VCCL" }, +}; + +static const struct socfpga_hwmon_channel agilex_hwmon_temp_channels[] =3D= { + { SOCFPGA_HWMON_CHAN(0, 0), "Main Die SDM" }, + { SOCFPGA_HWMON_CHAN(1, 0), "Main Die corner bottom left max" }, + { SOCFPGA_HWMON_CHAN(2, 0), "Main Die corner top left max" }, + { SOCFPGA_HWMON_CHAN(3, 0), "Main Die corner bottom right max" }, + { SOCFPGA_HWMON_CHAN(4, 0), "Main Die corner top right max" }, +}; + +static const struct socfpga_hwmon_board_data agilex_hwmon_board =3D { + .temp =3D agilex_hwmon_temp_channels, + .num_temp =3D ARRAY_SIZE(agilex_hwmon_temp_channels), + .volt =3D agilex_hwmon_volt_channels, + .num_volt =3D ARRAY_SIZE(agilex_hwmon_volt_channels), +}; + +static const struct socfpga_hwmon_board_data * +socfpga_hwmon_get_board(struct device *dev) +{ + struct device_node *np =3D dev->of_node; + + if (!np) + return NULL; + + if (of_device_is_compatible(np, "intel,stratix10-svc")) + return &s10_hwmon_board; + if (of_device_is_compatible(np, "intel,agilex-svc")) + return &agilex_hwmon_board; + + return NULL; +} + +static int socfpga_hwmon_init_channels(struct device *dev, + const struct socfpga_hwmon_board_data *board, + struct socfpga_hwmon_priv *priv) +{ + unsigned int i; + + if (board->num_temp > SOCFPGA_HWMON_MAXSENSORS || + board->num_volt > SOCFPGA_HWMON_MAXSENSORS) + return -EINVAL; + + for (i =3D 0; i < board->num_temp; i++) { + priv->temp_chan_names[i] =3D board->temp[i].label; + priv->temp_chan[i] =3D board->temp[i].reg; + } + priv->temperature_channels =3D board->num_temp; + + for (i =3D 0; i < board->num_volt; i++) { + priv->volt_chan_names[i] =3D board->volt[i].label; + priv->volt_chan[i] =3D board->volt[i].reg; + } + priv->voltage_channels =3D board->num_volt; + + return 0; +} + +static void socfpga_hwmon_release_svc(void *data) +{ + struct socfpga_hwmon_priv *priv =3D data; + + if (priv->async) + stratix10_svc_remove_async_client(priv->chan); + stratix10_svc_free_channel(priv->chan); +} + +static int socfpga_hwmon_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct device *parent =3D dev->parent; + const struct socfpga_hwmon_board_data *board; + struct socfpga_hwmon_priv *priv; + struct device *hwmon_dev; + int ret; + + if (!parent || !parent->of_node) { + dev_err(dev, "missing parent device node\n"); + return -ENODEV; + } + + board =3D socfpga_hwmon_get_board(parent); + if (!board) { + dev_err(dev, "unsupported service layer compatible\n"); + return -ENODEV; + } + + priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->client.dev =3D dev; + priv->client.priv =3D priv; + init_completion(&priv->completion); + mutex_init(&priv->lock); + + ret =3D socfpga_hwmon_init_channels(dev, board, priv); + if (ret) + return ret; + + priv->chan =3D stratix10_svc_request_channel_byname(&priv->client, + SVC_CLIENT_HWMON); + if (IS_ERR(priv->chan)) { + ret =3D PTR_ERR(priv->chan); + if (ret =3D=3D -EPROBE_DEFER) + dev_dbg(dev, "service channel %s not ready, deferring probe\n", + SVC_CLIENT_HWMON); + else + dev_err(dev, "couldn't get service channel %s: %d\n", + SVC_CLIENT_HWMON, ret); + return ret; + } + + ret =3D stratix10_svc_add_async_client(priv->chan, false); + switch (ret) { + case 0: + priv->async =3D true; + break; + case -EINVAL: + case -EOPNOTSUPP: + /* + * stratix10_svc_add_async_client() returns -EINVAL when the + * async controller is not initialized; fall back to sync mode. + */ + dev_dbg(dev, "async operations not supported, using sync mode\n"); + priv->async =3D false; + break; + default: + dev_err(dev, "failed to add async client: %d\n", ret); + stratix10_svc_free_channel(priv->chan); + return ret; + } + + ret =3D devm_add_action_or_reset(dev, socfpga_hwmon_release_svc, priv); + if (ret) + return ret; + + hwmon_dev =3D devm_hwmon_device_register_with_info(dev, "socfpga_hwmon", + priv, + &socfpga_hwmon_chip_info, + NULL); + if (IS_ERR(hwmon_dev)) + return PTR_ERR(hwmon_dev); + + platform_set_drvdata(pdev, priv); + return 0; +} + +static struct platform_driver socfpga_hwmon_driver =3D { + .probe =3D socfpga_hwmon_probe, + .driver =3D { + .name =3D "socfpga-hwmon", + }, +}; +module_platform_driver(socfpga_hwmon_driver); + +MODULE_AUTHOR("Nazim Amirul "); +MODULE_AUTHOR("Tze Yee Ng "); +MODULE_DESCRIPTION("Altera SoC FPGA hardware monitoring driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:socfpga-hwmon"); --=20 2.43.7