Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rpmsg-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson:
- Clean up the dev_pm_domain integration in rpmsg core. Correct module
aliases for the rpmsg char driver.
- Transition Qualcomm SMD and GLINK drivers to strscpy() and fix the
regression in legacy code for acquiring outgoing interrupts using the
non-mailbox based mechanism.
* tag 'rpmsg-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
rpmsg: qcom_smd: Fix fallback to qcom,ipc parse
rpmsg: Use strscpy() instead of strscpy_pad()
rpmsg: core: Drop dev_pm_domain_detach() call
rpmsg: char: Export alias for RPMSG ID rpmsg-raw from table
+7
-7
+1
-1
drivers/rpmsg/qcom_glink_native.c
+1
-1
drivers/rpmsg/qcom_glink_native.c
+2
-2
drivers/rpmsg/qcom_smd.c
+2
-2
drivers/rpmsg/qcom_smd.c
···
1089
1089
1090
1090
/* Assign public information to the rpmsg_device */
1091
1091
rpdev = &qsdev->rpdev;
1092
-
strscpy_pad(rpdev->id.name, channel->name, RPMSG_NAME_SIZE);
1092
+
strscpy(rpdev->id.name, channel->name);
1093
1093
rpdev->src = RPMSG_ADDR_ANY;
1094
1094
rpdev->dst = RPMSG_ADDR_ANY;
1095
1095
···
1368
1368
edge->mbox_client.knows_txdone = true;
1369
1369
edge->mbox_chan = mbox_request_channel(&edge->mbox_client, 0);
1370
1370
if (IS_ERR(edge->mbox_chan)) {
1371
-
if (PTR_ERR(edge->mbox_chan) != -ENODEV) {
1371
+
if (PTR_ERR(edge->mbox_chan) != -ENOENT) {
1372
1372
ret = dev_err_probe(dev, PTR_ERR(edge->mbox_chan),
1373
1373
"failed to acquire IPC mailbox\n");
1374
1374
goto put_node;
+2
-1
drivers/rpmsg/rpmsg_char.c
+2
-1
drivers/rpmsg/rpmsg_char.c
···
522
522
523
523
static struct rpmsg_device_id rpmsg_chrdev_id_table[] = {
524
524
{ .name = "rpmsg-raw" },
525
+
{ .name = "rpmsg_chrdev" },
525
526
{ },
526
527
};
528
+
MODULE_DEVICE_TABLE(rpmsg, rpmsg_chrdev_id_table);
527
529
528
530
static struct rpmsg_driver rpmsg_chrdev_driver = {
529
531
.probe = rpmsg_chrdev_probe,
···
567
565
}
568
566
module_exit(rpmsg_chrdev_exit);
569
567
570
-
MODULE_ALIAS("rpmsg:rpmsg_chrdev");
571
568
MODULE_DESCRIPTION("RPMSG device interface");
572
569
MODULE_LICENSE("GPL v2");
+2
-3
drivers/rpmsg/rpmsg_core.c
+2
-3
drivers/rpmsg/rpmsg_core.c
···
479
479
struct rpmsg_endpoint *ept = NULL;
480
480
int err;
481
481
482
-
err = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON);
482
+
err = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON |
483
+
PD_FLAG_DETACH_POWER_OFF);
483
484
if (err)
484
485
goto out;
485
486
···
538
537
539
538
if (rpdrv->remove)
540
539
rpdrv->remove(rpdev);
541
-
542
-
dev_pm_domain_detach(dev, true);
543
540
544
541
if (rpdev->ept)
545
542
rpmsg_destroy_ept(rpdev->ept);