From patchwork Wed Jan 22 08:28:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 313164 X-Patchwork-Delegate: sonic.adi@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 0AC802C00AC for ; Wed, 22 Jan 2014 19:35:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82C504B58A; Wed, 22 Jan 2014 09:35:25 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tRbinIor4-mB; Wed, 22 Jan 2014 09:35:25 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F2254B56A; Wed, 22 Jan 2014 09:35:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AFF54B569 for ; Wed, 22 Jan 2014 09:35:20 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z3KRIJpZCS79 for ; Wed, 22 Jan 2014 09:35:14 +0100 (CET) X-Greylist: delayed 386 seconds by postgrey-1.27 at theia; Wed, 22 Jan 2014 09:35:07 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by theia.denx.de (Postfix) with ESMTPS id 11F3D4B568 for ; Wed, 22 Jan 2014 09:35:07 +0100 (CET) Received: by mail-pb0-f54.google.com with SMTP id uo5so86690pbc.13 for ; Wed, 22 Jan 2014 00:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=KTTb7/2YzKZ9s/4zacqn3UH5szAcdjzqnV1nZsgTjYk=; b=nIkE+3osW7Y0QW4NFU8mRSkOtA6fXoJe3rsNx6wwuJJlf/rYonUSg38grlXLNHJVKo ILMGBAR1FD3NIIOBlJjMNS2W0CpL9fGZ0wDx2WaGgo9fx6JCP8jRbTcOZT39k/de/opu +snMj/t8JsxwgfiwRI++RqS1jbUdPvk0zqjfa1hgH0Ye4Pv2EIZ8tM2RXqACRrJvYB2F XKqPH6ingHAN2J/LmdpekAd33MeHd1Hb/yQVip189B8yuXGfBXGxhRvifrdgt1fAmUxT GhNCM8KeWVQaEwNj0h9TwvvbGnfZAQaLOgN9d//2MHRNBFzFgN15s1PxM/SR2Pe0JbTh ADuA== X-Received: by 10.66.255.39 with SMTP id an7mr206014pad.7.1390379317954; Wed, 22 Jan 2014 00:28:37 -0800 (PST) Received: from localhost.localdomain ([114.91.244.100]) by mx.google.com with ESMTPSA id lh13sm42857944pab.4.2014.01.22.00.28.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 00:28:37 -0800 (PST) From: Sonic Zhang To: u-boot@lists.denx.de Date: Wed, 22 Jan 2014 16:28:28 +0800 Message-Id: <1390379308-28014-1-git-send-email-sonic.adi@gmail.com> X-Mailer: git-send-email 1.7.9.5 Cc: Aaron Wu , Sonic Zhang , adi-u-boot-devel@lists.sourceforge.net Subject: [U-Boot] [PATCH] blackfin: Initialize the EMAC VLAN with proper default value X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Aaron Wu EMAC_VLANx regs is not properly initiallized in u-boot, once it's overwrite in the kernel when DSA enabled, hot reset will lead to bringing up EMAC fail in u-boot. Signed-off-by: Aaron Wu Signed-off-by: Sonic Zhang --- arch/blackfin/include/asm/mach-common/bits/emac.h | 3 +++ drivers/net/bfin_mac.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/arch/blackfin/include/asm/mach-common/bits/emac.h b/arch/blackfin/include/asm/mach-common/bits/emac.h index 7a43bbb..4c9bc9d 100644 --- a/arch/blackfin/include/asm/mach-common/bits/emac.h +++ b/arch/blackfin/include/asm/mach-common/bits/emac.h @@ -217,4 +217,7 @@ #define TX_GE1024_CNT 0x00200000 /* 1024-Max-Byte TX Frames Sent */ #define TX_ABORT_CNT 0x00400000 /* TX Frames Aborted */ +/*default value for EMAC_VLANx reg*/ +#define EMAC_VLANX_DEF_VAL 0xFFFF + #endif diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 0ffd59d..42e208c 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c @@ -259,6 +259,8 @@ static int bfin_miiphy_init(struct eth_device *dev, int *opmode) *opmode = 0; bfin_write_EMAC_MMC_CTL(RSTC | CROLL); + bfin_write_EMAC_VLAN1(EMAC_VLANX_DEF_VAL); + bfin_write_EMAC_VLAN2(EMAC_VLANX_DEF_VAL); /* Initialize the TX DMA channel registers */ bfin_write_DMA2_X_COUNT(0);