summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorJean-Christophe Dubois2016-05-30 19:25:51 +0200
committerJason Wang2016-06-02 04:42:46 +0200
commit4816dc168b5745708eba4c005f5e8771623ee405 (patch)
tree9b0b3d3e0b4560d81ed82e1de1e3caf5477806a1 /hw
parentnet: handle optional VLAN header in checksum computation. (diff)
downloadqemu-4816dc168b5745708eba4c005f5e8771623ee405.tar.gz
qemu-4816dc168b5745708eba4c005f5e8771623ee405.tar.xz
qemu-4816dc168b5745708eba4c005f5e8771623ee405.zip
i.MX: Fix FEC code for MDIO operation selection
According to the FEC chapter of i.MX25 reference manual When writing the MMFR register, bit 29 and 28 select the requested operation. * 10 means read operation with valid MII mgmt frame * 11 means read operation with non compliant MII mgmt frame * 01 means write operation with valid MII mgmt frame * 00 means write operation with non compliant MII mgmt frame So while bit 28 does change beween read/write for valid MII mgmt frame, the mening is inverted for non compliant MII mgmt frame. Bit 29 on the other hand means read/write whatever the type of mgmt frame involved. So this patch change the operation selection from bit 28 to bit 29 as it is more generic. Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/net/imx_fec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 9055ea89a9..fce366145e 100644
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -459,10 +459,10 @@ static void imx_fec_write(void *opaque, hwaddr addr,
case 0x040: /* MMFR */
/* store the value */
s->mmfr = value;
- if (extract32(value, 28, 1)) {
- do_phy_write(s, extract32(value, 18, 9), extract32(value, 0, 16));
- } else {
+ if (extract32(value, 29, 1)) {
s->mmfr = do_phy_read(s, extract32(value, 18, 9));
+ } else {
+ do_phy_write(s, extract32(value, 18, 9), extract32(value, 0, 16));
}
/* raise the interrupt as the PHY operation is done */
s->eir |= FEC_INT_MII;