From patchwork Wed Oct 26 08:39:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Foerster X-Patchwork-Id: 121856 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 28B6E1007DB for ; Wed, 26 Oct 2011 19:40:38 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 99F09291ED; Wed, 26 Oct 2011 10:40:28 +0200 (CEST) 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 Q8B4QA2A8zTZ; Wed, 26 Oct 2011 10:40:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8574C291F5; Wed, 26 Oct 2011 10:40:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D3C6029182 for ; Wed, 26 Oct 2011 10:40:10 +0200 (CEST) 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 veTSjj-O-Jvu for ; Wed, 26 Oct 2011 10:40:10 +0200 (CEST) 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 smtp.missinglinkelectronics.com (odin.missinglinkelectronics.com [188.40.137.181]) by theia.denx.de (Postfix) with ESMTPS id 1AB1E2914F for ; Wed, 26 Oct 2011 10:40:10 +0200 (CEST) Received: from localhost (odin.missinglinkelectronics.com [127.0.0.1]) by smtp.missinglinkelectronics.com (Postfix) with ESMTP id CEB7F3921E7; Wed, 26 Oct 2011 10:40:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at missinglinkelectronics.com Received: from smtp.missinglinkelectronics.com ([127.0.0.1]) by localhost (smtp.missinglinkelectronics.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MJqzPqgUjxP7; Wed, 26 Oct 2011 10:40:07 +0200 (CEST) Received: from tasse.mle (unknown [217.10.6.146]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: joachim) by smtp.missinglinkelectronics.com (Postfix) with ESMTPSA id AA2493921EE; Wed, 26 Oct 2011 10:40:02 +0200 (CEST) From: Joachim Foerster To: u-boot@lists.denx.de Date: Wed, 26 Oct 2011 10:39:55 +0200 Message-Id: <1319618398-1878-3-git-send-email-joachim.foerster@missinglinkelectronics.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1319618398-1878-1-git-send-email-joachim.foerster@missinglinkelectronics.com> References: <4EA76B64.50302@wytron.com.tw> <1319618398-1878-1-git-send-email-joachim.foerster@missinglinkelectronics.com> Cc: smcnutt@psyent.com Subject: [U-Boot] [PATCH 2/5 v2] altera_tse: Fix SGDMA reset triggering X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 The SW_RESET needs to be set instead of being masked out! Signed-off-by: Joachim Foerster --- Changes for v2: - Remove period from end of summary line - Be more specific in commit message drivers/net/altera_tse.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 47d0047..47b5761 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -357,8 +357,8 @@ static void tse_eth_reset(struct eth_device *dev) if (counter >= ALT_TSE_SGDMA_BUSY_WATCHDOG_CNTR) { debug("Timeout waiting for rx sgdma!\n"); - rx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; - rx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; + rx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; + rx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; } counter = 0; @@ -370,8 +370,8 @@ static void tse_eth_reset(struct eth_device *dev) if (counter >= ALT_TSE_SGDMA_BUSY_WATCHDOG_CNTR) { debug("Timeout waiting for tx sgdma!\n"); - tx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; - tx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; + tx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; + tx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK; } /* reset the mac */ mac_dev->command_config.bits.transmit_enable = 1;