Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b83c52a authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

rpmsg: Allow callback to return errors 



Some rpmsg backends support holding on to and redelivering messages upon
failed handling of them, so provide a way for the callback to report and
error and allow the backends to handle this.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent e88dae5d

drivers/rpmsg/virtio_rpmsg_bus.c

+6 −4
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static void rpmsg_xmit_done(struct virtqueue *svq) 
}



/* invoked when a name service announcement arrives */

static void rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,

static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,

		       void *priv, u32 src)

{

	struct rpmsg_ns_msg *msg = data;
@@ -808,7 +808,7 @@ static void rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, 


	if (len != sizeof(*msg)) {

		dev_err(dev, "malformed ns msg (%d)\n", len);

		return;

		return -EINVAL;

	}



	/*
@@ -819,7 +819,7 @@ static void rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, 
	 */

	if (rpdev) {

		dev_err(dev, "anomaly: ns ept has an rpdev handle\n");

		return;

		return -EINVAL;

	}



	/* don't trust the remote processor for null terminating the name */
@@ -842,6 +842,8 @@ static void rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, 
		if (!newch)

			dev_err(dev, "rpmsg_create_channel failed\n");

	}



	return 0;

}



static int rpmsg_probe(struct virtio_device *vdev)

include/linux/rpmsg.h

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct rpmsg_device { 
	const struct rpmsg_device_ops *ops;

};



typedef void (*rpmsg_rx_cb_t)(struct rpmsg_device *, void *, int, void *, u32);

typedef int (*rpmsg_rx_cb_t)(struct rpmsg_device *, void *, int, void *, u32);



/**

 * struct rpmsg_endpoint - binds a local rpmsg address to its user
@@ -129,7 +129,7 @@ struct rpmsg_driver { 
	const struct rpmsg_device_id *id_table;

	int (*probe)(struct rpmsg_device *dev);

	void (*remove)(struct rpmsg_device *dev);

	void (*callback)(struct rpmsg_device *, void *, int, void *, u32);

	int (*callback)(struct rpmsg_device *, void *, int, void *, u32);

};



int register_rpmsg_device(struct rpmsg_device *dev);

samples/rpmsg/rpmsg_client_sample.c

+4 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct instance_data { 
	int rx_count;

};



static void rpmsg_sample_cb(struct rpmsg_device *rpdev, void *data, int len,

static int rpmsg_sample_cb(struct rpmsg_device *rpdev, void *data, int len,

						void *priv, u32 src)

{

	int ret;
@@ -43,13 +43,15 @@ static void rpmsg_sample_cb(struct rpmsg_device *rpdev, void *data, int len, 
	/* samples should not live forever */

	if (idata->rx_count >= MSG_LIMIT) {

		dev_info(&rpdev->dev, "goodbye!\n");

		return;

		return 0;

	}



	/* send a new message now */

	ret = rpmsg_send(rpdev->ept, MSG, strlen(MSG));

	if (ret)

		dev_err(&rpdev->dev, "rpmsg_send failed: %d\n", ret);



	return 0;

}



static int rpmsg_sample_probe(struct rpmsg_device *rpdev)