[Qemu-devel] [PULL v2 0/2] Net patches

[Qemu-devel] [PULL v2 0/2] Net patches

[Stefan Hajnoczi]

v2:
 * Include git-request-pull(1) output [aliguori]

This pull request fixes the vmxnet3 big-endian host build failure and allows
iPXE to netboot on vmxnet3.

The following changes since commit 9196dd411d580c27f85daa209ff9a501d719ebc0:

  Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm (2013-04-06 12:53:54 +0000)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 389dd80795c646c914ab3c4366c9409e309f0e4f:

  vmxnet3: const_cpu_to_le64 wrapping for feature bits dropped (2013-04-08 14:01:25 +0200)

----------------------------------------------------------------
Dmitry Fleytman (2):
      vmxnet3: iPXE compatibility fixes
      vmxnet3: const_cpu_to_le64 wrapping for feature bits dropped

 hw/vmxnet3.c | 11 +++++++++++
 hw/vmxnet3.h | 11 ++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH v2 1/2] vmxnet3: iPXE compatibility fixes

[Stefan Hajnoczi]

From: Dmitry Fleytman <dmitry@daynix.com>

iPXE vmxnet3 driver makes a few assumptions regarding device operation
that were missed during testing with Linux and Windows drivers.
This patch adds following logic:
  1. Additional GET commands processing added
  2. Max number of RX chunks should be set to 1 when driver passes 0
     via corresponding shared memory field
  3. Enforecement for max chunks number added

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/vmxnet3.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hw/vmxnet3.c b/hw/vmxnet3.c
index bdd256e..1e18168 100644
--- a/hw/vmxnet3.c
+++ b/hw/vmxnet3.c
@@ -1033,6 +1033,7 @@ vmxnet3_indicate_packet(VMXNET3State *s)
         is_head = false;
         ready_rxcd_pa = new_rxcd_pa;
         new_rxcd_pa = 0;
+        num_frags++;
     }
 
     if (0 != ready_rxcd_pa) {
@@ -1324,6 +1325,10 @@ static void vmxnet3_activate_device(VMXNET3State *s)
     s->max_rx_frags =
         VMXNET3_READ_DRV_SHARED16(s->drv_shmem, devRead.misc.maxNumRxSG);
 
+    if (s->max_rx_frags == 0) {
+        s->max_rx_frags = 1;
+    }
+
     VMW_CFPRN("Max RX fragments is %u", s->max_rx_frags);
 
     s->event_int_idx =
@@ -1524,6 +1529,12 @@ static uint64_t vmxnet3_get_command_status(VMXNET3State *s)
         VMW_CFPRN("Device active: %" PRIx64, ret);
         break;
 
+    case VMXNET3_CMD_RESET_DEV:
+    case VMXNET3_CMD_QUIESCE_DEV:
+    case VMXNET3_CMD_GET_QUEUE_STATUS:
+        ret = 0;
+        break;
+
     case VMXNET3_CMD_GET_LINK:
         ret = s->link_status_and_speed;
         VMW_CFPRN("Link and speed: %" PRIx64, ret);
-- 
1.8.1.4

[Qemu-devel] [PATCH v2 2/2] vmxnet3: const_cpu_to_le64 wrapping for feature bits dropped

[Stefan Hajnoczi]

From: Dmitry Fleytman <dmitry@daynix.com>

Byte swap is redundant because shared memory reading functions
already swap bytes when required

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/vmxnet3.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/hw/vmxnet3.h b/hw/vmxnet3.h
index 7db0c8f..4eae7c7 100644
--- a/hw/vmxnet3.h
+++ b/hw/vmxnet3.h
@@ -37,10 +37,8 @@
 #define __packed QEMU_PACKED
 
 #if defined(HOST_WORDS_BIGENDIAN)
-#define const_cpu_to_le64(x) bswap_64(x)
 #define __BIG_ENDIAN_BITFIELD
 #else
-#define const_cpu_to_le64(x) (x)
 #endif
 
 /*
@@ -137,10 +135,10 @@ struct UPT1_RSSConf {
 
 /* features */
 enum {
-    UPT1_F_RXCSUM        = const_cpu_to_le64(0x0001), /* rx csum verification */
-    UPT1_F_RSS        = const_cpu_to_le64(0x0002),
-    UPT1_F_RXVLAN        = const_cpu_to_le64(0x0004), /* VLAN tag stripping */
-    UPT1_F_LRO        = const_cpu_to_le64(0x0008),
+    UPT1_F_RXCSUM        = 0x0001, /* rx csum verification */
+    UPT1_F_RSS           = 0x0002,
+    UPT1_F_RXVLAN        = 0x0004, /* VLAN tag stripping */
+    UPT1_F_LRO           = 0x0008,
 };
 
 /* all registers are 32 bit wide */
@@ -752,7 +750,6 @@ struct Vmxnet3_DriverShared {
 #undef __le32
 #undef __le64
 #undef __packed
-#undef const_cpu_to_le64
 #if defined(HOST_WORDS_BIGENDIAN)
 #undef __BIG_ENDIAN_BITFIELD
 #endif
-- 
1.8.1.4