From patchwork Thu Apr 17 10:33:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 28569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 63CED20674 for ; Thu, 17 Apr 2014 12:14:08 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id lh14sf1072819vcb.6 for ; Thu, 17 Apr 2014 05:14:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=+UZdj5PXkO+0z8Zpn6SdeYlLJ43JJb1oPMAB5I8MAtk=; b=a/1RHHZ30ljI2DCo9xFPN27HDobeoDRONKqgBX5xLK1y8xqgv0MX+o+M2PvfAvUdNn dmaPPT0BtG49kIwVVAf9/5izvL4y4LmDxuGHadlwDAZKgF9AxAAidH9kFIP0xnf1JKaF 7RyHWwcAthomjEHGDEhGMA98eAkl8lEomYtfE1DCdbWpX8H5jOWkr4/oWCj9GEsUlZe4 YD+VS6IIHwr7P57+LJll5u+9beganbngH1maRP7DdEnMSfQO4N/HY1bEAH9iZKTCxEdg 0ZV5KEhzRCCSo7Fj9Ox8QYoi/sf+qzrbSV4bIacsjjSsWrdbPx8jj9xFZqlLv4VU+bc4 bflg== X-Gm-Message-State: ALoCoQm/rH1ZGtWSJ9thq68GwqAGPSV4fdX+2PgS/5izGzU0G+2cXT6+D4SvppDIOyhooUGY4w1Y X-Received: by 10.236.88.210 with SMTP id a58mr6326842yhf.50.1397736848134; Thu, 17 Apr 2014 05:14:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.3 with SMTP id 3ls1012627qgc.83.gmail; Thu, 17 Apr 2014 05:14:08 -0700 (PDT) X-Received: by 10.221.20.199 with SMTP id qp7mr7446427vcb.24.1397736848049; Thu, 17 Apr 2014 05:14:08 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id sc12si4419137veb.133.2014.04.17.05.14.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 05:14:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so376038veb.4 for ; Thu, 17 Apr 2014 05:14:08 -0700 (PDT) X-Received: by 10.52.53.101 with SMTP id a5mr7105634vdp.14.1397736847964; Thu, 17 Apr 2014 05:14:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp30162vcb; Thu, 17 Apr 2014 05:14:07 -0700 (PDT) X-Received: by 10.140.46.36 with SMTP id j33mr9645779qga.27.1397736847436; Thu, 17 Apr 2014 05:14:07 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id gq5si10429311qab.141.2014.04.17.05.14.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 05:14:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:59398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WajfJ-0000am-E6 for patch@linaro.org; Thu, 17 Apr 2014 06:35:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waje6-0007fG-Qt for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Waje5-0002Qo-Rf for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:18 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waje5-0002OB-KB for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:17 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Wajdx-00022C-Kw for qemu-devel@nongnu.org; Thu, 17 Apr 2014 11:34:09 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 17 Apr 2014 11:33:59 +0100 Message-Id: <1397730846-7576-45-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> References: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 44/51] allwinner-emac: set autonegotiation complete bit on link up X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Beniamino Galvani Signed-off-by: Beniamino Galvani Reviewed-by: Peter Crosthwaite Message-id: 1395771730-16882-7-git-send-email-b.galvani@gmail.com Signed-off-by: Peter Maydell --- hw/net/allwinner_emac.c | 4 ++-- include/hw/net/allwinner_emac.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 469f2f0..91931ac 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -27,11 +27,11 @@ static uint8_t padding[60]; static void mii_set_link(RTL8201CPState *mii, bool link_ok) { if (link_ok) { - mii->bmsr |= MII_BMSR_LINK_ST; + mii->bmsr |= MII_BMSR_LINK_ST | MII_BMSR_AN_COMP; mii->anlpar |= MII_ANAR_TXFD | MII_ANAR_10FD | MII_ANAR_10 | MII_ANAR_CSMACD; } else { - mii->bmsr &= ~MII_BMSR_LINK_ST; + mii->bmsr &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP); mii->anlpar = MII_ANAR_TX; } } diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h index a5e944a..5ae7717 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -144,6 +144,7 @@ #define MII_BMSR_10T_FD (1 << 12) #define MII_BMSR_10T_HD (1 << 11) #define MII_BMSR_MFPS (1 << 6) +#define MII_BMSR_AN_COMP (1 << 5) #define MII_BMSR_AUTONEG (1 << 3) #define MII_BMSR_LINK_ST (1 << 2)