From patchwork Mon Jan 20 12:23:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Marussi X-Patchwork-Id: 11342033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA87C109A for ; Mon, 20 Jan 2020 12:27:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B594F21569 for ; Mon, 20 Jan 2020 12:27:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Fk1So/UI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B594F21569 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Y9ZnBjzz6Qx6wxF/p5saoZGIk9Hunlv334bwhW0prEY=; b=Fk1So/UIhg14YpmcxGJ0uRgXiS O6La0NYKfaTolv8E3zn+rssu0i8S8pJNLHwFcgS9FiwRMWu4M2eJvVZ+sb8q7+bP+CkDpb6ma58nO vqUpejkPycgm5cgoQlot5R8PcBDPTxtOQ4yhFRl3VWKWm/CiQzHOZN+mi2GUhwe2E6fTYqkUkOKvo FTJCD5cYf1m0eJekEEa/0gEr+xLgOPrytFn6ubzGCDjbffhZDguR8ZT+M2xYmqV4uqsoGnLf0kuwf clnm9Rqu0MmVKZy7tTtte6dvYEJiRA2I4qZ9mdxEGZjSC0W7RP7OQgjNwA7u31F07nIyGPmPfa/Ze dFsGI/dw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1itW9m-0006H3-HB; Mon, 20 Jan 2020 12:27:50 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1itW6g-0001Za-34 for linux-arm-kernel@lists.infradead.org; Mon, 20 Jan 2020 12:24:44 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 92D4CFEC; Mon, 20 Jan 2020 04:24:34 -0800 (PST) Received: from e120937-lin.cambridge.arm.com (e120937-lin.cambridge.arm.com [10.1.197.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AE3273F68E; Mon, 20 Jan 2020 04:24:33 -0800 (PST) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 09/11] firmware: arm_scmi: Add Sensor notifications support Date: Mon, 20 Jan 2020 12:23:31 +0000 Message-Id: <20200120122333.46217-10-cristian.marussi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120122333.46217-1-cristian.marussi@arm.com> References: <20200120122333.46217-1-cristian.marussi@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200120_042438_315475_E802598B X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.140.110.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cristian.marussi@arm.com, james.quinlan@broadcom.com, lukasz.luba@arm.com, sudeep.holla@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Make SCMI Sensor protocol register with the notification core. Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/sensors.c | 101 +++++++++++++++++++++++++++- include/linux/scmi_protocol.h | 12 ++++ 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c index db1b1ab303da..1f2f60516810 100644 --- a/drivers/firmware/arm_scmi/sensors.c +++ b/drivers/firmware/arm_scmi/sensors.c @@ -6,6 +6,7 @@ */ #include "common.h" +#include "notify.h" enum scmi_sensor_protocol_cmd { SENSOR_DESCRIPTION_GET = 0x3, @@ -71,6 +72,12 @@ struct scmi_msg_sensor_reading_get { #define SENSOR_READ_ASYNC BIT(0) }; +struct scmi_sensor_trip_notify_payld { + __le32 agent_id; + __le32 sensor_id; + __le32 trip_point_desc; +}; + struct sensors_info { u32 version; int num_sensors; @@ -78,8 +85,11 @@ struct sensors_info { u64 reg_addr; u32 reg_size; struct scmi_sensor_info *sensors; + const struct scmi_handle *handle; }; +static struct sensors_info *sinfo; + static int scmi_sensor_attributes_get(const struct scmi_handle *handle, struct sensors_info *si) { @@ -276,10 +286,80 @@ static struct scmi_sensor_ops sensor_ops = { .reading_get = scmi_sensor_reading_get, }; +static bool scmi_sensor_set_notify_enabled(u8 evt_id, const u32 *src_id, + bool enable) +{ + int ret; + + if (src_id) { + ret = scmi_sensor_trip_point_notify(sinfo->handle, + *src_id, enable); + if (ret) + pr_warn("Failed enabling SCMI Notifications - Sensor - evt[%X] dom[%d] - ret:%d\n", + evt_id, *src_id, ret); + } else { + int r, sens; + + ret = 1; + for (sens = 0; sens < sinfo->num_sensors; sens++) { + r = scmi_sensor_trip_point_notify(sinfo->handle, sens, + enable); + if (r) + pr_warn("Failed enabling SCMI Notifications - Sensor - evt[%X] dom[%d] - ret:%d\n", + evt_id, sens, r); + ret *= r; + } + } + + return !ret ? true : false; +} + +static void *scmi_sensor_fill_custom_report(u8 evt_id, u64 timestamp, + const void *payld, size_t payld_sz, + void *report, u32 *src_id) +{ + void *rep = NULL; + + switch (evt_id) { + case SENSOR_TRIP_POINT_EVENT: + { + const struct scmi_sensor_trip_notify_payld *p = payld; + struct scmi_sensor_trip_point_report *r = report; + + if (sizeof(*p) != payld_sz) + break; + + r->timestamp = timestamp; + r->agent_id = le32_to_cpu(p->agent_id); + r->sensor_id = le32_to_cpu(p->sensor_id); + r->trip_point_desc = le32_to_cpu(p->trip_point_desc); + *src_id = r->sensor_id; + rep = r; + break; + } + default: + break; + } + + return rep; +} + +static const struct scmi_event sensor_events[] = { + { + .evt_id = SENSOR_TRIP_POINT_EVENT, + .max_payld_sz = 12, + .max_report_sz = sizeof(struct scmi_sensor_trip_point_report), + }, +}; + +static const struct scmi_protocol_event_ops sensor_event_ops = { + .set_notify_enabled = scmi_sensor_set_notify_enabled, + .fill_custom_report = scmi_sensor_fill_custom_report, +}; + static int scmi_sensors_protocol_init(struct scmi_handle *handle) { u32 version; - struct sensors_info *sinfo; scmi_version_get(handle, SCMI_PROTOCOL_SENSOR, &version); @@ -299,7 +379,12 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle) scmi_sensor_description_get(handle, sinfo); + scmi_register_protocol_events(SCMI_PROTOCOL_SENSOR, PAGE_SIZE, + &sensor_event_ops, sensor_events, + ARRAY_SIZE(sensor_events)); + sinfo->version = version; + sinfo->handle = handle; handle->sensor_ops = &sensor_ops; handle->sensor_priv = sinfo; @@ -312,3 +397,17 @@ static int __init scmi_sensors_init(void) &scmi_sensors_protocol_init); } subsys_initcall(scmi_sensors_init); + +int scmi_register_sensor_event_notifier(u8 evt_id, u32 *sens_id, + struct notifier_block *nb) +{ + return scmi_register_event_notifier(SCMI_PROTOCOL_SENSOR, evt_id, + sens_id, nb); +} + +int scmi_unregister_sensor_event_notifier(u8 evt_id, u32 *sens_id, + struct notifier_block *nb) +{ + return scmi_unregister_event_notifier(SCMI_PROTOCOL_SENSOR, evt_id, + sens_id, nb); +} diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index a719f3cd394b..833e21af52fe 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -364,4 +364,16 @@ int scmi_register_perf_event_notifier(u8 evt_id, u32 *dom_id, int scmi_unregister_perf_event_notifier(u8 evt_id, u32 *dom_id, struct notifier_block *nb); +struct scmi_sensor_trip_point_report { + ktime_t timestamp; + u32 agent_id; + u32 sensor_id; + u32 trip_point_desc; +}; + +int scmi_register_sensor_event_notifier(u8 evt_id, u32 *sens_id, + struct notifier_block *nb); +int scmi_unregister_sensor_event_notifier(u8 evt_id, u32 *sens_id, + struct notifier_block *nb); + #endif /* _LINUX_SCMI_PROTOCOL_H */