From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, lukasz.luba@arm.com,
james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com,
f.fainelli@gmail.com, etienne.carriere@linaro.org,
thara.gopinath@linaro.org, vincent.guittot@linaro.org,
souvik.chakravarty@arm.com, cristian.marussi@arm.com
Subject: [PATCH v2 7/8] firmware: arm_scmi: make notify_priv really private
Date: Wed, 28 Oct 2020 20:29:13 +0000 [thread overview]
Message-ID: <20201028202914.43662-8-cristian.marussi@arm.com> (raw)
In-Reply-To: <20201028202914.43662-1-cristian.marussi@arm.com>
Notification private data is currently accessible via handle->notify_priv;
this data was indeed meant to be private to the notification core support
and not to be accessible to SCMI drivers: make it private hiding it inside
instance descriptor struct scmi_info.
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
drivers/firmware/arm_scmi/common.h | 4 +++
drivers/firmware/arm_scmi/driver.c | 21 +++++++++++++
drivers/firmware/arm_scmi/notify.c | 49 +++++++++++-------------------
include/linux/scmi_protocol.h | 3 --
4 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 995f19a07b5e..9ae0e4133f31 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -342,4 +342,8 @@ void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);
bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
struct scmi_xfer *xfer);
+void scmi_set_notification_instance_data(const struct scmi_handle *handle,
+ void *priv);
+void *scmi_get_notification_instance_data(const struct scmi_handle *handle);
+
#endif /* _SCMI_COMMON_H */
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 87ceb235194b..d6a975992136 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -113,6 +113,7 @@ struct scmi_protocol_instance {
* @protocols_mtx: A mutex to protect protocols instances initialization.
* @protocols_imp: List of protocols implemented, currently maximum of
* MAX_PROTOCOLS_IMP elements allocated by the base protocol
+ * @notify_priv: Pointer to private data structure specific to notifications.
* @node: List head
* @users: Number of users of this instance
*/
@@ -129,6 +130,7 @@ struct scmi_info {
/* Ensure mutual exclusive access to protocols instance array */
struct mutex protocols_mtx;
u8 *protocols_imp;
+ void *notify_priv;
struct list_head node;
int users;
};
@@ -170,6 +172,25 @@ static inline void scmi_dump_header_dbg(struct device *dev,
hdr->id, hdr->seq, hdr->protocol_id);
}
+void scmi_set_notification_instance_data(const struct scmi_handle *handle,
+ void *priv)
+{
+ struct scmi_info *info = handle_to_scmi_info(handle);
+
+ info->notify_priv = priv;
+ /* Ensure updated protocol private date are visible */
+ smp_wmb();
+}
+
+void *scmi_get_notification_instance_data(const struct scmi_handle *handle)
+{
+ struct scmi_info *info = handle_to_scmi_info(handle);
+
+ /* Ensure protocols_private_data has been updated */
+ smp_rmb();
+ return info->notify_priv;
+}
+
/**
* scmi_xfer_get() - Allocate one message
*
diff --git a/drivers/firmware/arm_scmi/notify.c b/drivers/firmware/arm_scmi/notify.c
index 6d4a1d78c22e..1c0126f41756 100644
--- a/drivers/firmware/arm_scmi/notify.c
+++ b/drivers/firmware/arm_scmi/notify.c
@@ -580,11 +580,9 @@ int scmi_notify(const struct scmi_handle *handle, u8 proto_id, u8 evt_id,
struct scmi_event_header eh;
struct scmi_notify_instance *ni;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return 0;
- ni = handle->notify_priv;
r_evt = SCMI_GET_REVT(ni, proto_id, evt_id);
if (!r_evt)
@@ -760,11 +758,9 @@ int scmi_register_protocol_events(const struct scmi_handle *handle, u8 proto_id,
(!ee->num_sources && !ee->ops->get_num_sources))
return -EINVAL;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return -ENOMEM;
- ni = handle->notify_priv;
/* num_sources cannot be <= 0 */
if (ee->num_sources) {
@@ -849,12 +845,10 @@ void scmi_deregister_protocol_events(const struct scmi_handle *handle,
struct scmi_notify_instance *ni;
struct scmi_registered_events_desc *pd;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return;
- ni = handle->notify_priv;
pd = ni->registered_protocols[proto_id];
if (!pd)
return;
@@ -1357,11 +1351,9 @@ static int scmi_register_notifier(const struct scmi_handle *handle,
struct scmi_event_handler *hndl;
struct scmi_notify_instance *ni;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return -ENODEV;
- ni = handle->notify_priv;
evt_key = MAKE_HASH_KEY(proto_id, evt_id,
src_id ? *src_id : SRC_ID_MASK);
@@ -1405,11 +1397,9 @@ static int scmi_unregister_notifier(const struct scmi_handle *handle,
struct scmi_event_handler *hndl;
struct scmi_notify_instance *ni;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return -ENODEV;
- ni = handle->notify_priv;
evt_key = MAKE_HASH_KEY(proto_id, evt_id,
src_id ? *src_id : SRC_ID_MASK);
@@ -1682,8 +1672,8 @@ int scmi_notification_init(struct scmi_handle *handle)
INIT_WORK(&ni->init_work, scmi_protocols_late_init);
+ scmi_set_notification_instance_data(handle, ni);
handle->notify_ops = ¬ify_ops;
- handle->notify_priv = ni;
/* Ensure handle is up to date */
smp_wmb();
@@ -1695,7 +1685,7 @@ int scmi_notification_init(struct scmi_handle *handle)
err:
dev_warn(handle->dev, "Initialization Failed.\n");
- devres_release_group(handle->dev, NULL);
+ devres_release_group(handle->dev, gid);
return -ENOMEM;
}
@@ -1706,19 +1696,16 @@ int scmi_notification_init(struct scmi_handle *handle)
void scmi_notification_exit(struct scmi_handle *handle)
{
struct scmi_notify_instance *ni;
+ void *gid;
- /* Ensure notify_priv is updated */
- smp_rmb();
- if (!handle->notify_priv)
+ ni = scmi_get_notification_instance_data(handle);
+ if (!ni)
return;
- ni = handle->notify_priv;
-
- handle->notify_priv = NULL;
- /* Ensure handle is up to date */
- smp_wmb();
+ scmi_set_notification_instance_data(handle, NULL);
/* Destroy while letting pending work complete */
destroy_workqueue(ni->notify_wq);
- devres_release_group(ni->handle->dev, ni->gid);
+ gid = ni->gid;
+ devres_release_group(ni->handle->dev, gid);
}
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 383b3d0ca383..66625aedd3a7 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -279,8 +279,6 @@ struct scmi_notify_ops {
* dedicated protocol handler
* @put_ops: method to release a protocol
* @notify_ops: pointer to set of notifications related operations
- * @notify_priv: pointer to private data structure specific to notifications
- * (for internal use only)
*/
struct scmi_handle {
struct device *dev;
@@ -297,7 +295,6 @@ struct scmi_handle {
void (*put_ops)(const struct scmi_handle *handle, u8 proto);
const struct scmi_notify_ops *notify_ops;
- void *notify_priv;
};
enum scmi_std_protocol {
--
2.17.1
next prev parent reply other threads:[~2020-10-28 21:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 20:29 [PATCH v2 0/8] SCMI vendor protocols and modularization Cristian Marussi
2020-10-28 20:29 ` [PATCH v2 1/8] firmware: arm_scmi: review protocol registration interface Cristian Marussi
2020-11-04 16:16 ` Thara Gopinath
2020-11-04 16:56 ` Cristian Marussi
2020-11-06 16:22 ` Thara Gopinath
2020-10-28 20:29 ` [PATCH v2 2/8] firmware: arm_scmi: introduce protocol handles Cristian Marussi
2020-11-04 16:16 ` Thara Gopinath
2020-11-04 16:58 ` Etienne Carriere
2020-11-04 17:44 ` Cristian Marussi
2020-11-06 16:26 ` Thara Gopinath
2020-11-07 12:53 ` Cristian Marussi
2020-10-28 20:29 ` [PATCH v2 3/8] firmware: arm_scmi: introduce new protocol operations support Cristian Marussi
2020-11-04 16:16 ` Thara Gopinath
2020-11-04 18:08 ` Cristian Marussi
2020-11-06 16:07 ` Thara Gopinath
2020-10-28 20:29 ` [PATCH v2 4/8] firmware: arm_scmi: make notifications aware of protocol usage Cristian Marussi
2020-10-28 20:29 ` [PATCH v2 5/8] firmware: arm_scmi: refactor events registration Cristian Marussi
2020-10-28 20:29 ` [PATCH v2 6/8] firmware: arm_scmi: port all protocols and drivers to the new API Cristian Marussi
2020-10-28 20:29 ` Cristian Marussi [this message]
2020-10-28 20:29 ` [PATCH v2 8/8] firmware: arm_scmi: add protocol modularization support Cristian Marussi
2020-11-04 16:15 ` [PATCH v2 0/8] SCMI vendor protocols and modularization Thara Gopinath
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028202914.43662-8-cristian.marussi@arm.com \
--to=cristian.marussi@arm.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=etienne.carriere@linaro.org \
--cc=f.fainelli@gmail.com \
--cc=james.quinlan@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=souvik.chakravarty@arm.com \
--cc=sudeep.holla@arm.com \
--cc=thara.gopinath@linaro.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).