From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8MS1-0004W9-MX for qemu-devel@nongnu.org; Thu, 02 Jun 2016 02:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8MRx-0005ZL-Jt for qemu-devel@nongnu.org; Thu, 02 Jun 2016 02:49:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8MRx-0005ZE-EJ for qemu-devel@nongnu.org; Thu, 02 Jun 2016 02:49:49 -0400 From: Jason Wang Date: Thu, 2 Jun 2016 14:48:15 +0800 Message-Id: <1464850102-17829-25-git-send-email-jasowang@redhat.com> In-Reply-To: <1464850102-17829-1-git-send-email-jasowang@redhat.com> References: <1464850102-17829-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL V4 24/31] i.MX: Fix FEC code for MDIO operation selection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Jean-Christophe Dubois , Jason Wang From: Jean-Christophe Dubois 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 Signed-off-by: Jason Wang --- hw/net/imx_fec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 9055ea8..fce3661 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; -- 2.7.4