linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: David Hildenbrand <david@redhat.com>,
	Jason Wang <jasowang@redhat.com>,
	virtualization@lists.linux-foundation.org
Subject: [PATCH v3 29/38] virtio_balloon: use LE config space accesses
Date: Wed, 5 Aug 2020 09:44:33 -0400	[thread overview]
Message-ID: <20200805134226.1106164-30-mst@redhat.com> (raw)
In-Reply-To: <20200805134226.1106164-1-mst@redhat.com>

Balloon is LE, it's cleaner to access it as such directly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/virtio/virtio_balloon.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 8bc1704ffdf3..31cc97f2f515 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -398,12 +398,9 @@ static inline s64 towards_target(struct virtio_balloon *vb)
 	s64 target;
 	u32 num_pages;
 
-	virtio_cread(vb->vdev, struct virtio_balloon_config, num_pages,
-		     &num_pages);
-
 	/* Legacy balloon config space is LE, unlike all other devices. */
-	if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-		num_pages = le32_to_cpu((__force __le32)num_pages);
+	virtio_cread_le(vb->vdev, struct virtio_balloon_config, num_pages,
+			&num_pages);
 
 	target = num_pages;
 	return target - vb->num_pages;
@@ -462,11 +459,8 @@ static void update_balloon_size(struct virtio_balloon *vb)
 	u32 actual = vb->num_pages;
 
 	/* Legacy balloon config space is LE, unlike all other devices. */
-	if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-		actual = (__force u32)cpu_to_le32(actual);
-
-	virtio_cwrite(vb->vdev, struct virtio_balloon_config, actual,
-		      &actual);
+	virtio_cwrite_le(vb->vdev, struct virtio_balloon_config, actual,
+			 &actual);
 }
 
 static void update_balloon_stats_func(struct work_struct *work)
@@ -579,12 +573,10 @@ static u32 virtio_balloon_cmd_id_received(struct virtio_balloon *vb)
 {
 	if (test_and_clear_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID,
 			       &vb->config_read_bitmap)) {
-		virtio_cread(vb->vdev, struct virtio_balloon_config,
-			     free_page_hint_cmd_id,
-			     &vb->cmd_id_received_cache);
 		/* Legacy balloon config space is LE, unlike all other devices. */
-		if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-			vb->cmd_id_received_cache = le32_to_cpu((__force __le32)vb->cmd_id_received_cache);
+		virtio_cread_le(vb->vdev, struct virtio_balloon_config,
+				free_page_hint_cmd_id,
+				&vb->cmd_id_received_cache);
 	}
 
 	return vb->cmd_id_received_cache;
@@ -987,8 +979,8 @@ static int virtballoon_probe(struct virtio_device *vdev)
 		if (!want_init_on_free())
 			memset(&poison_val, PAGE_POISON, sizeof(poison_val));
 
-		virtio_cwrite(vb->vdev, struct virtio_balloon_config,
-			      poison_val, &poison_val);
+		virtio_cwrite_le(vb->vdev, struct virtio_balloon_config,
+				 poison_val, &poison_val);
 	}
 
 	vb->pr_dev_info.report = virtballoon_free_page_report;
-- 
MST


  parent reply	other threads:[~2020-08-05 19:28 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-05 13:43 [PATCH v3 00/38] virtio: config space endian-ness cleanup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 01/38] virtio_balloon: fix sparse warning Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 02/38] virtio_ring: sparse warning fixup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 03/38] virtio: allow __virtioXX, __leXX in config space Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 04/38] virtio_9p: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 05/38] virtio_balloon: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 06/38] virtio_blk: " Michael S. Tsirkin
2020-08-05 14:24   ` Stefano Garzarella
2020-08-05 13:43 ` [PATCH v3 07/38] virtio_console: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 08/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 09/38] virtio_fs: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 10/38] virtio_gpu: " Michael S. Tsirkin
2020-08-07 11:22   ` Gerd Hoffmann
2020-08-05 13:43 ` [PATCH v3 11/38] virtio_input: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 12/38] virtio_iommu: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 13/38] virtio_mem: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 14/38] virtio_net: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 15/38] virtio_pmem: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 16/38] virtio_scsi: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 17/38] virtio_config: disallow native type fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 18/38] mlxbf-tmfifo: sparse tags for config access Michael S. Tsirkin
2020-08-05 14:24   ` Andy Shevchenko
2020-08-05 13:44 ` [PATCH v3 19/38] vdpa: make sure set_features is invoked for legacy Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 20/38] vhost/vdpa: switch to new helpers Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 21/38] virtio_vdpa: legacy features handling Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 22/38] vdpa_sim: fix endian-ness of config space Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 23/38] virtio_config: cread/write cleanup Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 24/38] virtio_config: rewrite using _Generic Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 25/38] virtio_config: disallow native type fields (again) Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 26/38] virtio_config: LE config space accessors Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 27/38] virtio_caif: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 28/38] virtio_config: add virtio_cread_le_feature Michael S. Tsirkin
2020-08-05 13:44 ` Michael S. Tsirkin [this message]
2020-08-05 13:44 ` [PATCH v3 30/38] virtio_input: convert to LE accessors Michael S. Tsirkin
2020-08-19  5:59   ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 31/38] virtio_fs: " Michael S. Tsirkin
2020-08-06 17:28   ` Vivek Goyal
2020-08-05 13:44 ` [PATCH v3 32/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 33/38] virtio_pmem: " Michael S. Tsirkin
2020-08-07 20:05   ` Ira Weiny
2020-08-05 13:44 ` [PATCH v3 34/38] drm/virtio: " Michael S. Tsirkin
2020-08-07 11:22   ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 35/38] virtio_mem: " Michael S. Tsirkin
2020-08-10  7:57   ` David Hildenbrand
2020-08-05 13:44 ` [PATCH v3 36/38] virtio-iommu: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 37/38] virtio_config: drop LE option from config space Michael S. Tsirkin
2020-08-05 13:45 ` [PATCH v3 38/38] virtio_net: use LE accessors for speed/duplex Michael S. Tsirkin
2020-08-05 13:59   ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200805134226.1106164-30-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=david@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).