qemu: Fix axi-ethernet for newer kernels

* Backport patch from upstream which fixes axi-ethernet phy accesses
  with newer kernels

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

2 files changed, 38 insertions, 0 deletions

diff --git a/recipes-devtools/qemu/files/net-xilinx_axienet.c-Add-phy-soft-reset-bit-clearing.patch b/recipes-devtools/qemu/files/net-xilinx_axienet.c-Add-phy-soft-reset-bit-clearing.patch
new file mode 100644
index 00000000..8e8032e9
--- /dev/null
+++ b/recipes-devtools/qemu/files/net-xilinx_axienet.c-Add-phy-soft-reset-bit-clearing.patch
@@ -0,0 +1,37 @@
+From f663faac3e2e9d9134415f75d429ae30432e6038 Mon Sep 17 00:00:00 2001
+From: Nathan Rossi <nathan.rossi@xilinx.com>
+Date: Tue, 8 Apr 2014 18:52:39 -0700
+Subject: [PATCH] net: xilinx_axienet.c: Add phy soft reset bit clearing
+
+Clear the BMCR Reset when writing to registers.
+
+Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
+[ PC:
+ * Trivial style fixes to commit message
+]
+Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+Reviewed-by: Beniamino Galvani <b.galvani@gmail.com>
+Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Upstream-Status: Backport
+---
+ hw/net/xilinx_axienet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
+index 839d97c..0f485a0 100644
+--- a/hw/net/xilinx_axienet.c
++++ b/hw/net/xilinx_axienet.c
+@@ -142,6 +142,9 @@ tdk_write(struct PHY *phy, unsigned int req, unsigned int data)
+             phy->regs[regnum] = data;
+             break;
+     }
++
++    /* Unconditionally clear regs[BMCR][BMCR_RESET] */
++    phy->regs[0] &= ~0x8000;
+ }
+ 
+ static void
+-- 
+1.9.0
+
diff --git a/recipes-devtools/qemu/qemu_2.0.0.bbappend b/recipes-devtools/qemu/qemu_2.0.0.bbappend
index 94296457..01f76bb4 100644
--- a/recipes-devtools/qemu/qemu_2.0.0.bbappend
+++ b/recipes-devtools/qemu/qemu_2.0.0.bbappend
@@ -3,4 +3,5 @@ QEMU_TARGETS += "microblazeel"
 FILESEXTRAPATHS_append := "${THISDIR}/files:"
 SRC_URI_append += " \
                 file://HACK_zynq_slcr_Bring_SLCR_out_of_reset_in_kernel_state.patch \
+                file://net-xilinx_axienet.c-Add-phy-soft-reset-bit-clearing.patch \
                 "