rpmsg: glink: Use complete_all for open states
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 1/5 rpmsg: glink: Use complete_all for open states
From: Chris Lew <[email protected]>
The open_req and open_ack completion variables are the state variables to represet a remote channel as open. Use complete_all so there are no races with waiters and using completion_done.
--- drivers/rpmsg/qcom_glink_native.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rpmsg/qcom_glink_native.c +2 -2
@@ -949,7 +949,7 @@ static int qcom_glink_rx_open_ack(struct qcom_glink *glink, unsigned int lcid)return -EINVAL ; } -complete (&channel->open_ack); +complete_all (&channel->open_ack);return 0 ; }
@@ -1393,7 +1393,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, channel->rcid = ret;spin_unlock_irqrestore (&glink->idr_lock, flags); -complete (&channel->open_req); +complete_all (&channel->open_req);if (create_device) { rpdev =kzalloc (sizeof (*rpdev),GFP_KERNEL );
Signature · 1 line
1.9.1
PATCH v5 1/5 rpmsg: glink: Use complete_all for open states
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
The open_req and open_ack completion variables are the state variables to represet a remote channel as open. Use complete_all so there are no races with waiters and using completion_done.
--- drivers/rpmsg/qcom_glink_native.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rpmsg/qcom_glink_native.c +2 -2
@@ -949,7 +949,7 @@ static int qcom_glink_rx_open_ack(struct qcom_glink *glink, unsigned int lcid)return -EINVAL ; } -complete (&channel->open_ack); +complete_all (&channel->open_ack);return 0 ; }
@@ -1393,7 +1393,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, channel->rcid = ret;spin_unlock_irqrestore (&glink->idr_lock, flags); -complete (&channel->open_req); +complete_all (&channel->open_req);if (create_device) { rpdev =kzalloc (sizeof (*rpdev),GFP_KERNEL );
Signature · 1 line
1.9.1
PATCH v5 2/5 rpmsg: Guard against null endpoint ops in destroy
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
In RPMSG GLINK the chrdev device will allocate an ept as part of the rpdev creation. This device will not register endpoint ops even though it has an allocated ept. Protect against the case where the device is being destroyed.
--- drivers/rpmsg/rpmsg_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/rpmsg_core.c +1 -1
@@ -81,7 +81,7 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_device *rpdev,*/ void rpmsg_destroy_ept (struct rpmsg_endpoint *ept) { -if (ept) +if (ept && ept->ops) ept->ops->destroy_ept (ept); }EXPORT_SYMBOL (rpmsg_destroy_ept);
Signature · 1 line
1.9.1
PATCH v5 2/5 rpmsg: Guard against null endpoint ops in destroy
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
In RPMSG GLINK the chrdev device will allocate an ept as part of the rpdev creation. This device will not register endpoint ops even though it has an allocated ept. Protect against the case where the device is being destroyed.
--- drivers/rpmsg/rpmsg_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/rpmsg_core.c +1 -1
@@ -81,7 +81,7 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_device *rpdev,*/ void rpmsg_destroy_ept (struct rpmsg_endpoint *ept) { -if (ept) +if (ept && ept->ops) ept->ops->destroy_ept (ept); }EXPORT_SYMBOL (rpmsg_destroy_ept);
Signature · 1 line
1.9.1
PATCH v5 3/5 rpmsg: glink: Add support for rpmsg glink chrdev
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
RPMSG provides a char device interface to userspace. Probe the rpmsg chrdev channel to enable the rpmsg_ctrl device creation on glink transports.
--- drivers/rpmsg/qcom_glink_native.c | 40 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/rpmsg/qcom_glink_native.c +39 -1
@@ -1158,7 +1158,7 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev)__be32 *val = defaults;int size; -if (glink->intentless) +if (glink->intentless || !completion_done (&channel->open_ack))return 0 ; prop =of_find_property (np,"qcom,intents" ,NULL );
@@ -1544,6 +1544,40 @@ static void qcom_glink_work(struct work_struct *work) } } +static void qcom_glink_device_release (struct device *dev) +{ +struct rpmsg_device *rpdev =to_rpmsg_device (dev); +struct glink_channel *channel =to_glink_channel (rpdev->ept); + +/* Release qcom_glink_alloc_channel() reference */ +kref_put (&channel->refcount, qcom_glink_channel_release); +kfree (rpdev); +} + +static int qcom_glink_create_chrdev (struct qcom_glink *glink) +{ +struct rpmsg_device *rpdev; +struct glink_channel *channel; + + rpdev =kzalloc (sizeof (*rpdev),GFP_KERNEL ); +if (!rpdev) +return -ENOMEM ; + + channel =qcom_glink_alloc_channel (glink,"rpmsg_chrdev" ); +if (IS_ERR (channel)) { +kfree (rpdev); +return PTR_ERR (channel); + } + channel->rpdev = rpdev; + + rpdev->ept = &channel->ept; + rpdev->ops = &glink_device_ops; + rpdev->dev.parent = glink->dev; + rpdev->dev.release = qcom_glink_device_release; + +return rpmsg_chrdev_register_device (rpdev); +} + struct qcom_glink *qcom_glink_native_probe(struct device *dev, unsigned long features, struct qcom_glink_pipe *rx,
@@ -1603,6 +1637,10 @@ struct qcom_glink *qcom_glink_native_probe(struct device *dev,if (ret)return ERR_PTR (ret); + ret =qcom_glink_create_chrdev (glink); +if (ret) +dev_err (glink->dev,"failed to register chrdev\n" ); +return glink; }EXPORT_SYMBOL_GPL (qcom_glink_native_probe);
Signature · 1 line
1.9.1
PATCH v5 3/5 rpmsg: glink: Add support for rpmsg glink chrdev
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
RPMSG provides a char device interface to userspace. Probe the rpmsg chrdev channel to enable the rpmsg_ctrl device creation on glink transports.
--- drivers/rpmsg/qcom_glink_native.c | 40 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/rpmsg/qcom_glink_native.c +39 -1
@@ -1158,7 +1158,7 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev)__be32 *val = defaults;int size; -if (glink->intentless) +if (glink->intentless || !completion_done (&channel->open_ack))return 0 ; prop =of_find_property (np,"qcom,intents" ,NULL );
@@ -1544,6 +1544,40 @@ static void qcom_glink_work(struct work_struct *work) } } +static void qcom_glink_device_release (struct device *dev) +{ +struct rpmsg_device *rpdev =to_rpmsg_device (dev); +struct glink_channel *channel =to_glink_channel (rpdev->ept); + +/* Release qcom_glink_alloc_channel() reference */ +kref_put (&channel->refcount, qcom_glink_channel_release); +kfree (rpdev); +} + +static int qcom_glink_create_chrdev (struct qcom_glink *glink) +{ +struct rpmsg_device *rpdev; +struct glink_channel *channel; + + rpdev =kzalloc (sizeof (*rpdev),GFP_KERNEL ); +if (!rpdev) +return -ENOMEM ; + + channel =qcom_glink_alloc_channel (glink,"rpmsg_chrdev" ); +if (IS_ERR (channel)) { +kfree (rpdev); +return PTR_ERR (channel); + } + channel->rpdev = rpdev; + + rpdev->ept = &channel->ept; + rpdev->ops = &glink_device_ops; + rpdev->dev.parent = glink->dev; + rpdev->dev.release = qcom_glink_device_release; + +return rpmsg_chrdev_register_device (rpdev); +} + struct qcom_glink *qcom_glink_native_probe(struct device *dev, unsigned long features, struct qcom_glink_pipe *rx,
@@ -1603,6 +1637,10 @@ struct qcom_glink *qcom_glink_native_probe(struct device *dev,if (ret)return ERR_PTR (ret); + ret =qcom_glink_create_chrdev (glink); +if (ret) +dev_err (glink->dev,"failed to register chrdev\n" ); +return glink; }EXPORT_SYMBOL_GPL (qcom_glink_native_probe);
Signature · 1 line
1.9.1
PATCH v5 4/5 rpmsg: glink: Expose rpmsg name attr for glink
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
Expose the name field as an attr so clients listening to uevents for rpmsg can identify the edge the events correspond to.
--- drivers/rpmsg/qcom_glink_native.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/rpmsg/qcom_glink_native.c +26 -0
@@ -1544,6 +1544,26 @@ static void qcom_glink_work(struct work_struct *work) } } +static ssize_t rpmsg_name_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int ret =0 ; +const char *name; + + ret =of_property_read_string (dev->of_node,"label" , &name); +if (ret <0 ) + name = dev->of_node->name; + +return snprintf (buf,RPMSG_NAME_SIZE ,"%s\n" , name); +} +static DEVICE_ATTR_RO (rpmsg_name); + +static struct attribute *qcom_glink_attrs[] = { + &dev_attr_rpmsg_name.attr, +NULL +}; +ATTRIBUTE_GROUPS (qcom_glink); +static void qcom_glink_device_release (struct device *dev) {struct rpmsg_device *rpdev =to_rpmsg_device (dev);
@@ -1593,6 +1613,12 @@ struct qcom_glink *qcom_glink_native_probe(struct device *dev,return ERR_PTR (-ENOMEM ); glink->dev = dev; + glink->dev->groups = qcom_glink_groups; + + ret =device_add_groups (dev, qcom_glink_groups); +if (ret) +dev_err (dev,"failed to add groups\n" ); + glink->tx_pipe = tx; glink->rx_pipe = rx;
Signature · 1 line
1.9.1
PATCH v5 4/5 rpmsg: glink: Expose rpmsg name attr for glink
In reply to a message not in the archiveFrom: Chris Lew <[email protected]>
Expose the name field as an attr so clients listening to uevents for rpmsg can identify the edge the events correspond to.
--- drivers/rpmsg/qcom_glink_native.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/rpmsg/qcom_glink_native.c +26 -0
@@ -1544,6 +1544,26 @@ static void qcom_glink_work(struct work_struct *work) } } +static ssize_t rpmsg_name_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int ret =0 ; +const char *name; + + ret =of_property_read_string (dev->of_node,"label" , &name); +if (ret <0 ) + name = dev->of_node->name; + +return snprintf (buf,RPMSG_NAME_SIZE ,"%s\n" , name); +} +static DEVICE_ATTR_RO (rpmsg_name); + +static struct attribute *qcom_glink_attrs[] = { + &dev_attr_rpmsg_name.attr, +NULL +}; +ATTRIBUTE_GROUPS (qcom_glink); +static void qcom_glink_device_release (struct device *dev) {struct rpmsg_device *rpdev =to_rpmsg_device (dev);
@@ -1593,6 +1613,12 @@ struct qcom_glink *qcom_glink_native_probe(struct device *dev,return ERR_PTR (-ENOMEM ); glink->dev = dev; + glink->dev->groups = qcom_glink_groups; + + ret =device_add_groups (dev, qcom_glink_groups); +if (ret) +dev_err (dev,"failed to add groups\n" ); + glink->tx_pipe = tx; glink->rx_pipe = rx;
Signature · 1 line
1.9.1
PATCH v5 5/5 rpmsg: glink: unregister rpmsg device during endpoint destroy
In reply to a message not in the archiveRpmsg device unregister is not happening if channel close is triggered from local side and causing re-registration of device failures.
Unregister rpmsg device for local close in endpoint destroy path.
--- drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/rpmsg/qcom_glink_native.c +9 -0
@@ -1187,6 +1187,7 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept) {struct glink_channel *channel =to_glink_channel (ept);struct qcom_glink *glink = channel->glink; +struct rpmsg_channel_info chinfo;unsigned long flags;spin_lock_irqsave (&channel->recv_lock, flags);
@@ -1194,6 +1195,13 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)spin_unlock_irqrestore (&channel->recv_lock, flags);/* Decouple the potential rpdev from the channel */ +if (channel->rpdev) { +strncpy (chinfo.name, channel->name,sizeof (chinfo.name)); + chinfo.src =RPMSG_ADDR_ANY ; + chinfo.dst =RPMSG_ADDR_ANY ; + +rpmsg_unregister_device (glink->dev, &chinfo); + } channel->rpdev =NULL ;qcom_glink_send_close_req (glink, channel);
@@ -1459,6 +1467,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)rpmsg_unregister_device (glink->dev, &chinfo); } + channel->rpdev =NULL ;qcom_glink_send_close_ack (glink, channel->rcid);
Signature · 1 line
1.9.1
PATCH v5 5/5 rpmsg: glink: unregister rpmsg device during endpoint destroy
In reply to a message not in the archiveRpmsg device unregister is not happening if channel close is triggered from local side and causing re-registration of device failures.
Unregister rpmsg device for local close in endpoint destroy path.
--- drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/rpmsg/qcom_glink_native.c +9 -0
@@ -1187,6 +1187,7 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept) {struct glink_channel *channel =to_glink_channel (ept);struct qcom_glink *glink = channel->glink; +struct rpmsg_channel_info chinfo;unsigned long flags;spin_lock_irqsave (&channel->recv_lock, flags);
@@ -1194,6 +1195,13 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)spin_unlock_irqrestore (&channel->recv_lock, flags);/* Decouple the potential rpdev from the channel */ +if (channel->rpdev) { +strncpy (chinfo.name, channel->name,sizeof (chinfo.name)); + chinfo.src =RPMSG_ADDR_ANY ; + chinfo.dst =RPMSG_ADDR_ANY ; + +rpmsg_unregister_device (glink->dev, &chinfo); + } channel->rpdev =NULL ;qcom_glink_send_close_req (glink, channel);
@@ -1459,6 +1467,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)rpmsg_unregister_device (glink->dev, &chinfo); } + channel->rpdev =NULL ;qcom_glink_send_close_ack (glink, channel->rcid);
Signature · 1 line
1.9.1