firmware: arm_scmi: Add reset notifications support

Make SCMI reset protocol register with the notification core.

Link: https://lore.kernel.org/r/20200701155348.52864-9-cristian.marussi@arm.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
index de73054554f32d3c595a79d6abe88ceb65a42e5a..fb7cb517900bd341dbfbbcc503b9a49119ee029a 100644 (file)
--- a/drivers/firmware/arm_scmi/reset.c
+++ b/drivers/firmware/arm_scmi/reset.c
@@ -5,7 +5,12 @@
  * Copyright (C) 2019 ARM Ltd.
  */
 
+#define pr_fmt(fmt) "SCMI Notifications RESET - " fmt
+
+#include <linux/scmi_protocol.h>
+
 #include "common.h"
+#include "notify.h"
 
 enum scmi_reset_protocol_cmd {
        RESET_DOMAIN_ATTRIBUTES = 0x3,
@@ -13,10 +18,6 @@ enum scmi_reset_protocol_cmd {
        RESET_NOTIFY = 0x5,
 };
 
-enum scmi_reset_protocol_notify {
-       RESET_ISSUED = 0x0,
-};
-
 #define NUM_RESET_DOMAIN_MASK  0xffff
 #define RESET_NOTIFY_ENABLE    BIT(0)
 
@@ -40,6 +41,18 @@ struct scmi_msg_reset_domain_reset {
 #define ARCH_COLD_RESET                (ARCH_RESET_TYPE | COLD_RESET_STATE)
 };
 
+struct scmi_msg_reset_notify {
+       __le32 id;
+       __le32 event_control;
+#define RESET_TP_NOTIFY_ALL    BIT(0)
+};
+
+struct scmi_reset_issued_notify_payld {
+       __le32 agent_id;
+       __le32 domain_id;
+       __le32 reset_state;
+};
+
 struct reset_dom_info {
        bool async_reset;
        bool reset_notify;
@@ -190,6 +203,75 @@ static struct scmi_reset_ops reset_ops = {
        .deassert = scmi_reset_domain_deassert,
 };
 
+static int scmi_reset_notify(const struct scmi_handle *handle, u32 domain_id,
+                            bool enable)
+{
+       int ret;
+       u32 evt_cntl = enable ? RESET_TP_NOTIFY_ALL : 0;
+       struct scmi_xfer *t;
+       struct scmi_msg_reset_notify *cfg;
+
+       ret = scmi_xfer_get_init(handle, RESET_NOTIFY,
+                                SCMI_PROTOCOL_RESET, sizeof(*cfg), 0, &t);
+       if (ret)
+               return ret;
+
+       cfg = t->tx.buf;
+       cfg->id = cpu_to_le32(domain_id);
+       cfg->event_control = cpu_to_le32(evt_cntl);
+
+       ret = scmi_do_xfer(handle, t);
+
+       scmi_xfer_put(handle, t);
+       return ret;
+}
+
+static int scmi_reset_set_notify_enabled(const struct scmi_handle *handle,
+                                        u8 evt_id, u32 src_id, bool enable)
+{
+       int ret;
+
+       ret = scmi_reset_notify(handle, src_id, enable);
+       if (ret)
+               pr_debug("FAIL_ENABLED - evt[%X] dom[%d] - ret:%d\n",
+                        evt_id, src_id, ret);
+
+       return ret;
+}
+
+static void *scmi_reset_fill_custom_report(const struct scmi_handle *handle,
+                                          u8 evt_id, u64 timestamp,
+                                          const void *payld, size_t payld_sz,
+                                          void *report, u32 *src_id)
+{
+       const struct scmi_reset_issued_notify_payld *p = payld;
+       struct scmi_reset_issued_report *r = report;
+
+       if (evt_id != SCMI_EVENT_RESET_ISSUED || sizeof(*p) != payld_sz)
+               return NULL;
+
+       r->timestamp = timestamp;
+       r->agent_id = le32_to_cpu(p->agent_id);
+       r->domain_id = le32_to_cpu(p->domain_id);
+       r->reset_state = le32_to_cpu(p->reset_state);
+       *src_id = r->domain_id;
+
+       return r;
+}
+
+static const struct scmi_event reset_events[] = {
+       {
+               .id = SCMI_EVENT_RESET_ISSUED,
+               .max_payld_sz = sizeof(struct scmi_reset_issued_notify_payld),
+               .max_report_sz = sizeof(struct scmi_reset_issued_report),
+       },
+};
+
+static const struct scmi_event_ops reset_event_ops = {
+       .set_notify_enabled = scmi_reset_set_notify_enabled,
+       .fill_custom_report = scmi_reset_fill_custom_report,
+};
+
 static int scmi_reset_protocol_init(struct scmi_handle *handle)
 {
        int domain;
@@ -218,6 +300,12 @@ static int scmi_reset_protocol_init(struct scmi_handle *handle)
                scmi_reset_domain_attributes_get(handle, domain, dom);
        }
 
+       scmi_register_protocol_events(handle,
+                                     SCMI_PROTOCOL_RESET, SCMI_PROTO_QUEUE_SZ,
+                                     &reset_event_ops, reset_events,
+                                     ARRAY_SIZE(reset_events),
+                                     pinfo->num_domains);
+
        pinfo->version = version;
        handle->reset_ops = &reset_ops;
        handle->reset_priv = pinfo;

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index d0ea4a5037e74dba330d647a19a0f32a28d035ad..d04d66be596d3b01d3873699de590cfd7ad7c821 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -376,6 +376,7 @@ enum scmi_notification_events {
        SCMI_EVENT_PERFORMANCE_LIMITS_CHANGED = 0x0,
        SCMI_EVENT_PERFORMANCE_LEVEL_CHANGED = 0x1,
        SCMI_EVENT_SENSOR_TRIP_POINT_EVENT = 0x0,
+       SCMI_EVENT_RESET_ISSUED = 0x0,
 };
 
 struct scmi_power_state_changed_report {
@@ -407,4 +408,11 @@ struct scmi_sensor_trip_point_report {
        u32 trip_point_desc;
 };
 
+struct scmi_reset_issued_report {
+       u64 timestamp;
+       u32 agent_id;
+       u32 domain_id;
+       u32 reset_state;
+};
+
 #endif /* _LINUX_SCMI_PROTOCOL_H */