firmware: arm_scmi: Review some virtio log messages
authorCristian Marussi <cristian.marussi@arm.com>
Thu, 16 Sep 2021 10:33:34 +0000 (11:33 +0100)
committerSudeep Holla <sudeep.holla@arm.com>
Wed, 17 Nov 2021 11:24:50 +0000 (11:24 +0000)
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>
drivers/firmware/arm_scmi/virtio.c

index 87039c5..c30f82c 100644 (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);
        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
                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)
 {
        if (!scmi_vdev) {
-               dev_notice_once(dev,
-                               "Deferring probe after not finding a bound scmi-virtio device\n");
+               dev_notice(dev,
+                          "Deferring probe after not finding a bound scmi-virtio device\n");
                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);
        if (rc) {
                list_add(&msg->list, &vioch->free_list);
-               dev_err_once(vioch->cinfo->dev,
-                            "%s() failed to add to virtqueue (%d)\n", __func__,
-                            rc);
+               dev_err(vioch->cinfo->dev,
+                       "failed to add to TX virtqueue (%d)\n", rc);
        } else {
                virtqueue_kick(vioch->vqueue);
        }
@@ -427,10 +426,10 @@ static int scmi_vio_probe(struct virtio_device *vdev)
                        sz /= DESCRIPTORS_PER_TX_MSG;
 
                if (sz > MSG_TOKEN_MAX) {
-                       dev_info_once(dev,
-                                     "%s virtqueue could hold %d messages. Only %ld allowed to be pending.\n",
-                                     channels[i].is_rx ? "rx" : "tx",
-                                     sz, MSG_TOKEN_MAX);
+                       dev_info(dev,
+                                "%s virtqueue could hold %d messages. Only %ld allowed to be pending.\n",
+                                channels[i].is_rx ? "rx" : "tx",
+                                sz, MSG_TOKEN_MAX);
                        sz = MSG_TOKEN_MAX;
                }
                channels[i].max_msg = sz;