openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rpmsg updates for v5.12 

This fixes two build issues in the GLINK driver and corrects some
 kerneldoc in the same.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmA2oLAbHGJqb3JuLmFu
 ZGVyc3NvbkBsaW5hcm8ub3JnAAoJEAsfOT8Nma3FjeMP/1JpiOzjLfVW53rKjsnA
 UlVeyb8C+fjQLFXLSootS+Lhq4ieWWzaKzf+JH4OVR+mNjVeY5EBwHIM00MNY4tY
 ysvi6JfKLFED2VQLRLj+9Qev2bt8Qhu3QXs8iaLyzTAklKWVxI4MCoS8ECzYFcP8
 Zj6JYkr3V4lSW6UKrOxkUHUPAkebe/Awo+znHfYYMJUn1C2COodWJec6AyUOm9EN
 5EPiGtvT/6S/AdHLUpyPMbfH/rPz4FWYTPJfV+hCc8QOi7WW9xsKZ6ihYScexxmo
 i6spHbhFr4R+LyWETAPYfu0PwDVYLmDF9YllCqzFREDYnyiCf5Fz/XEuyAccuYwH
 71K9c3O//bOiJQmpz8Wfbc1Obh/AgJVM8tN/6O1uhOlnrB7anF70/6bZxKaJjaHz
 r4QrhZwXh8b6Rba5L+Hv3ehhVuV9jhBjkaY9B+jbf3+6m0FqMM4Ex2Ldx/X657uH
 14swvHdiNKHSZ6G17D+iw4jrTuVLwGCVtnrTN5Z8O+5BGnDiu9ujjTaS54hclMEF
 soGi4a6oGhYlI7l1bUokqR5tsJThP9tPo7btObI6hCCb5YZ3IwdwVZXh+PHiXnsH
 CkeLzMI+03DH6/XZHdFjEsbB4KFhzhdyC008LHK92HrveBmhPENt+B1uiZmin5oB
 rY1qlPIQ3p1gu+TLxSbZgF6N
 =SiM/
 -----END PGP SIGNATURE-----

Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc

Pull rpmsg updates from Bjorn Andersson:
 "Fix two build issues in the GLINK driver and correct some kerneldoc in
  the same"

* tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  rpmsg: glink: add include of header file
  rpmsg: glink: Guard qcom_glink_ssr_notify() with correct config
  rpmsg: glink: fix some kerneldoc comments
This commit is contained in:
Linus Torvalds 2021-02-24 11:27:18 -08:00
parent 890caa39a9 3e35772bc1
commit e40242b982
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/rpmsg/qcom_glink_ssr.c
View File

@ -8,15 +8,16 @@
#include <linux/module.h>
#include <linux/notifier.h>
#include <linux/rpmsg.h>
#include <linux/rpmsg/qcom_glink.h>
#include <linux/remoteproc/qcom_rproc.h>
/**
* struct do_cleanup_msg - The data structure for an SSR do_cleanup message
* version: The G-Link SSR protocol version
* command: The G-Link SSR command - do_cleanup
* seq_num: Sequence number
* name_len: Length of the name of the subsystem being restarted
* name: G-Link edge name of the subsystem being restarted
* @version: The G-Link SSR protocol version
* @command: The G-Link SSR command - do_cleanup
* @seq_num: Sequence number
* @name_len: Length of the name of the subsystem being restarted
* @name: G-Link edge name of the subsystem being restarted
*/
struct do_cleanup_msg {
__le32 version;
@ -28,9 +29,9 @@ struct do_cleanup_msg {
/**
* struct cleanup_done_msg - The data structure for an SSR cleanup_done message
* version: The G-Link SSR protocol version
* response: The G-Link SSR response to a do_cleanup command, cleanup_done
* seq_num: Sequence number
* @version: The G-Link SSR protocol version
* @response: The G-Link SSR response to a do_cleanup command, cleanup_done
* @seq_num: Sequence number
*/
struct cleanup_done_msg {
__le32 version;

8
include/linux/rpmsg/qcom_glink.h
View File

@ -7,12 +7,17 @@
struct qcom_glink;
#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK)
void qcom_glink_ssr_notify(const char *ssr_name);
#else
static inline void qcom_glink_ssr_notify(const char *ssr_name) {}
#endif
#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK_SMEM)
struct qcom_glink *qcom_glink_smem_register(struct device *parent,
struct device_node *node);
void qcom_glink_smem_unregister(struct qcom_glink *glink);
void qcom_glink_ssr_notify(const char *ssr_name);
#else
@ -24,7 +29,6 @@ qcom_glink_smem_register(struct device *parent,
}
static inline void qcom_glink_smem_unregister(struct qcom_glink *glink) {}
static inline void qcom_glink_ssr_notify(const char *ssr_name) {}
#endif
#endif