leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware: arm_scmi: Review some virtio log messages

Browse Source 
Be more verbose avoiding to use _once flavour of dev_info/_err/_notice.
Remove usage of __func_ to identify which vqueue is referred in some error
messages and explicitly name the TX/RX vqueue.

Link: https://lore.kernel.org/r/20210916103336.7243-1-cristian.marussi@arm.com
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Cristian Marussi 2021-09-16 11:33:34 +01:00 committed by Sudeep Holla
parent 026d9835b6
commit dfa25e9f0f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/firmware/arm_scmi/virtio.c
View File

@ -95,7 +95,7 @@ static int scmi_vio_feed_vq_rx(struct scmi_vio_channel *vioch,
rc = virtqueue_add_inbuf(vioch->vqueue, &sg_in, 1, msg, GFP_ATOMIC); rc = virtqueue_add_inbuf(vioch->vqueue, &sg_in, 1, msg, GFP_ATOMIC);
if (rc) if (rc)
dev_err_once(dev, "failed to add to virtqueue (%d)\n", rc); dev_err(dev, "failed to add to RX virtqueue (%d)\n", rc);
else else
virtqueue_kick(vioch->vqueue); virtqueue_kick(vioch->vqueue);
@ -193,8 +193,8 @@ static unsigned int virtio_get_max_msg(struct scmi_chan_info *base_cinfo)
static int virtio_link_supplier(struct device *dev) static int virtio_link_supplier(struct device *dev)
{ {
if (!scmi_vdev) { if (!scmi_vdev) {
dev_notice_once(dev, dev_notice(dev,
"Deferring probe after not finding a bound scmi-virtio device\n"); "Deferring probe after not finding a bound scmi-virtio device\n");
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
@ -334,9 +334,8 @@ static int virtio_send_message(struct scmi_chan_info *cinfo,
rc = virtqueue_add_sgs(vioch->vqueue, sgs, 1, 1, msg, GFP_ATOMIC); rc = virtqueue_add_sgs(vioch->vqueue, sgs, 1, 1, msg, GFP_ATOMIC);
if (rc) { if (rc) {
list_add(&msg->list, &vioch->free_list); list_add(&msg->list, &vioch->free_list);
dev_err_once(vioch->cinfo->dev, dev_err(vioch->cinfo->dev,
"%s() failed to add to virtqueue (%d)\n", __func__, "failed to add to TX virtqueue (%d)\n", rc);
rc);
} else { } else {
virtqueue_kick(vioch->vqueue); virtqueue_kick(vioch->vqueue);
} }
@ -427,10 +426,10 @@ static int scmi_vio_probe(struct virtio_device *vdev)
sz /= DESCRIPTORS_PER_TX_MSG; sz /= DESCRIPTORS_PER_TX_MSG;
if (sz > MSG_TOKEN_MAX) { if (sz > MSG_TOKEN_MAX) {
dev_info_once(dev, dev_info(dev,
"%s virtqueue could hold %d messages. Only %ld allowed to be pending.\n", "%s virtqueue could hold %d messages. Only %ld allowed to be pending.\n",
channels[i].is_rx ? "rx" : "tx", channels[i].is_rx ? "rx" : "tx",
sz, MSG_TOKEN_MAX); sz, MSG_TOKEN_MAX);
sz = MSG_TOKEN_MAX; sz = MSG_TOKEN_MAX;
} }
channels[i].max_msg = sz; channels[i].max_msg = sz;