From patchwork Wed Sep 27 10:46:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emiliano Ingrassia X-Patchwork-Id: 9973747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B76716037F for ; Wed, 27 Sep 2017 10:50:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACC51291B0 for ; Wed, 27 Sep 2017 10:50:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0AEE291BD; Wed, 27 Sep 2017 10:50:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 55A94291C4 for ; Wed, 27 Sep 2017 10:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NPvpLa5S7xCY8pCi8T1Sg8QkW32lh366abkJxess2aQ=; b=JdeKbVW23bSyN7 GeQJO9xqT/p1V2xHh7wT1FPZLeDO3bbRmLGyJE//JNGb4NUHF2UCa6ZSXabclG3flcDTG4cQR/sK8 UfKEjQzPmXSKh2+Rx+2WyZykqPqbJFPlKIQq7xvaWKx73U8HMDKURrSJ6bghX+NdQOIkSLJ7sYD4+ iUvR7lf779L5NKxu9gDvvWtFHaqixdi63dq4XpGp8hqCsc+uMHxG6fTY4e8n59FieTvZUEVGDAqpa t20J2RhkFNQQeyQW14eUQCChUSa3o5loPxq4U2j+Kz3dyuh7TXnqapTmnSHT08Hw69xoS6GIImATQ vSVLdDyPaDVEdJgCw0DQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dx9vN-0008It-6R; Wed, 27 Sep 2017 10:50:41 +0000 Received: from mail-wr0-f193.google.com ([209.85.128.193]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dx9v4-0006VG-L2 for linux-amlogic@lists.infradead.org; Wed, 27 Sep 2017 10:50:39 +0000 Received: by mail-wr0-f193.google.com with SMTP id b9so4273346wra.0 for ; Wed, 27 Sep 2017 03:50:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=3eNTyNsEprsrZipqSytCi31+uLXeDyS70R00QbEDGFc=; b=IS7FgykhYxXn0sYghdpSaMVmxwuYEDou8bxSEgDx5OA8L0pdyhoOHi90NwoFVgabbv kzpG7Csva8si2fKiXA+v6mUv+3HI6pi+vtqp/QNII3Si6I5cuK//WIyaftwmTmJxZ4sW 5+o7tmZznO1YicYZtRWRRtJQKh5jqRQl4DskqQRXj0yk4Iihxn/HOc0AMBQOsv/uI2jH nxNCgAhAK/2+yD9vl0oh2EGDFiGQtbcbBeMNJQV6NhM6oENCx1lEFnw8PXy/G0Hiwaga mtMP4XSDBet1v7r62L12G3caGIlY2GnLTgkwHPmRqDkOTDg2KN6HiEaIJQrVgMem+kk9 XSDQ== X-Gm-Message-State: AHPjjUh/ykbgTQNoEsWnb72us9mvysph7GIZ006mw+BPh0B7LGQMp677 zup0va0eWUVyhZwIJpJuL3skghaD X-Google-Smtp-Source: AOwi7QDcKOcdmIVtY/sUtjMYdVByjc6wZGZHy/hexx+Bb4jcbU0qB0lbbq281G6Mgv4UqJJCo2gZFg== X-Received: by 10.223.196.170 with SMTP id m39mr1074520wrf.44.1506509401018; Wed, 27 Sep 2017 03:50:01 -0700 (PDT) Received: from ingrassia.epigenesys.com (host194-85-static.3-79-b.business.telecomitalia.it. [79.3.85.194]) by smtp.gmail.com with ESMTPSA id p2sm1586021wrc.75.2017.09.27.03.49.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Sep 2017 03:50:00 -0700 (PDT) Date: Wed, 27 Sep 2017 12:46:35 +0200 From: Emiliano Ingrassia To: Giuseppe Cavallaro , Alexandre Torgue , netdev@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 4/4] net: stmmac: fixing DMA reset sleep and timeout values Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.3 (2017-05-23) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170927_035023_435529_E38B8474 X-CRM114-Status: UNSURE ( 8.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the sleep and timeout values used during DMA reset, which were inverted in a previous patch. Fixes: 8a70aeca80c2 ("net: stmmac: Use readl_poll_timeout") Signed-off-by: Emiliano Ingrassia --- drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c index 67af0bdd7f10..7516ca210855 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c @@ -34,7 +34,7 @@ int dwmac_dma_reset(void __iomem *ioaddr) err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value, !(value & DMA_BUS_MODE_SFT_RESET), - 100000, 10000); + 10000, 100000); if (err) return -EBUSY;