From patchwork Tue Apr 29 04:15:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 29280 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5237920553 for ; Tue, 29 Apr 2014 04:15:21 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id at1sf13256621iec.2 for ; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:thread-index:dlp-filter:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding:content-language; bh=gQ15RJvd1k8Le4pJPPqjki0zOvzFDadVu52IjlY8aVA=; b=dWcIe1CTU3/HAu7jFHjOZZ5w1XxhD5PsGk5IjZIfzZgLmBvh0fM+MfPIhmiLIpEKpX tHhkOr0/mW9AllCP/53AzyVSeigBWBI2yRYRdlWwHe3u4+2Ub6vHeFmo6q/2YO7/O6FR 3kPlH0fDlaC57n2BNTju7fPaH9rZY3XhAPZdyhaR+ecaSRK7dbOVxqvE3t73Z2od9fYs zXBunXrZ4NIF7ZKzpGieBoNsnzZDiHWgW6qqWiQR47qrDlVeFP5PDQQWAzSw73KMvcGb LTyzIC110GVoToKjT4gJ+B9X36DCKracW8oFmcwyb3MjYAw6l5aFEEP1V5STWK0GkrPG oRAg== X-Gm-Message-State: ALoCoQkWcOzcWqbzMN7xcd6197bO9D0agUwNsgcGLoa3bw2iYsJu76fHsmxh+VlQNHMK3j1FKU7x X-Received: by 10.42.115.129 with SMTP id k1mr13848604icq.25.1398744920604; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.233 with SMTP id l96ls2829261qgl.90.gmail; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr27424501vcb.6.1398744920495; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id i16si4238724vcv.11.2014.04.28.21.15.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 21:15:20 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hq16so6919173vcb.11 for ; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) X-Received: by 10.220.184.72 with SMTP id cj8mr11594401vcb.10.1398744920400; Mon, 28 Apr 2014 21:15:20 -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 ib8csp166328vcb; Mon, 28 Apr 2014 21:15:20 -0700 (PDT) X-Received: by 10.66.124.137 with SMTP id mi9mr29882610pab.111.1398744919699; Mon, 28 Apr 2014 21:15:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qd9si11794296pac.23.2014.04.28.21.15.19; Mon, 28 Apr 2014 21:15:19 -0700 (PDT) Received-SPF: none (google.com: linux-samsung-soc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752657AbaD2EPS (ORCPT + 9 others); Tue, 29 Apr 2014 00:15:18 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:9610 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbaD2EPR (ORCPT ); Tue, 29 Apr 2014 00:15:17 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N4R00KTTYHFYU70@mailout3.samsung.com>; Tue, 29 Apr 2014 13:15:15 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 34.FD.11120.3572F535; Tue, 29 Apr 2014 13:15:15 +0900 (KST) X-AuditID: cbfee68f-b7eff6d000002b70-a0-535f275375df Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3E.C2.25708.3572F535; Tue, 29 Apr 2014 13:15:15 +0900 (KST) Received: from DObh74an01 ([12.36.166.149]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4R004TXYHFI770@mmp2.samsung.com>; Tue, 29 Apr 2014 13:15:15 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: davem@davemloft.net, ks.giri@samsung.com, vipul.pandya@samsung.com Subject: [PATCH] net: sxgbe: sw reset moved to probe function Date: Tue, 29 Apr 2014 13:15:15 +0900 Message-id: <001b01cf6361$9f4b6650$dde232f0$%an@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac9jYZ8GX4zzr2UcSTqnQx3o9nAn7A== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsVy+t8zA91g9fhgg5stshZzzrewWPQuuMpm Mf/oDiaLGef3MVkcWyBmsW3BBWYHNo8tK28yefRtWcXo8XmTXABzFJdNSmpOZllqkb5dAlfG 0z+fmQsuCVbM3LaZrYHxMF8XIyeHhICJxMZfDxghbDGJC/fWs3UxcnEICSxjlDh2dDYbTNHv JXeZIRLTGSV2H9rECuH8ZpS4cuIdK0gVm4CaRPPMy2AdIgK2EkuOfGYHsZkF3CT2X74NViMM FD/UdhwsziKgKrF53X9mEJtXwEZiyonlLBC2oMSPyfdYIHq1JDZva2KFsOUlNq95C1TPAXSR usSjv7ogpoiAnkTHQlGIChGJfS/eMYKcJiGwjV3i8+QtjBCrBCS+TT7EAtEqK7HpADPEX5IS B1fcYJnAKDYLyeJZSBbPQrJ4FpIVCxhZVjGKphYkFxQnpRcZ6xUn5haX5qXrJefnbmKERFv/ Dsa7B6wPMSYDrZ/ILCWanA+M1rySeENjMyMLUxNTYyNzSzPShJXEee8/TAoSEkhPLEnNTk0t SC2KLyrNSS0+xMjEwSnVwLiMl6NX3ji13qOhM6zvaZNs0LLLazYllvxIk/713l3okfeZa2b7 Py6vN5kUvmJJ9NOVVvIHMo/PWVXElLNhXvam5rsGp38bno96urKlPDxuY+Z61ag4bccpTsfV Bf84Cj461Pad9cAxRh/tKvYfbwqlWZgb9sWc4hbOZzokLtHFVWu26XjQJCWW4oxEQy3mouJE AKAQE3jMAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGKsWRmVeSWpSXmKPExsVy+t9jQd1g9fhggy97JCzmnG9hsehdcJXN Yv7RHUwWM87vY7I4tkDMYtuCC8wObB5bVt5k8ujbsorR4/MmuQDmqAZGm4zUxJTUIoXUvOT8 lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zBygvUoKZYk5pUChgMTiYiV9O0wT QkPcdC1gGiN0fUOC4HqMDNBAwjrGjKd/PjMXXBKsmLltM1sD42G+LkZODgkBE4nfS+4yQ9hi EhfurWfrYuTiEBKYziix+9AmVgjnN6PElRPvWEGq2ATUJJpnXmYDsUUEbCWWHPnMDmIzC7hJ 7L98G6xGGCh+qO04WJxFQFVi87r/YBt4BWwkppxYzgJhC0r8mHyPBaJXS2LztiZWCFteYvOa t0D1HEAXqUs8+qsLYooI6El0LBSFqBCR2PfiHeMERoFZSAbNQjJoFpJBs5C0LGBkWcUomlqQ XFCclJ5rpFecmFtcmpeul5yfu4kRHMvPpHcwrmqwOMQowMGoxMPbERMXLMSaWFZcmXuIUYKD WUmE17YVKMSbklhZlVqUH19UmpNafIgxGejPicxSosn5wDSTVxJvaGxiZmRpZGZhZGJuTpqw kjjvwVbrQCGB9MSS1OzU1ILUIpgtTBycUg2MAU8mRVtfWblk8+u+k0FNq6qDdSuNuX94y14/ Xt5sOznPprm6sd/84p8GTxtfTtVwV9Nv1seZvGNVdkp4MQRqX5N0vBXofPasnKDYQZO+9RMS zmg7KV7p+Sm+u6TleM7v7rtulTc3rF6ybmqO0tWa/SfOCFUymAkKhk/qOjWVSWLZ1ePKMfFK LMUZiYZazEXFiQDDfSUDKQMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bh74.an@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit Content-language: ko This patch moves sw reset to probe function because sw reset is needed early stage before open function. Signed-off-by: Byungho An --- drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 13 ------------- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c index 4d989ff..bb9b5b8 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c @@ -23,21 +23,8 @@ /* DMA core initialization */ static int sxgbe_dma_init(void __iomem *ioaddr, int fix_burst, int burst_map) { - int retry_count = 10; u32 reg_val; - /* reset the DMA */ - writel(SXGBE_DMA_SOFT_RESET, ioaddr + SXGBE_DMA_MODE_REG); - while (retry_count--) { - if (!(readl(ioaddr + SXGBE_DMA_MODE_REG) & - SXGBE_DMA_SOFT_RESET)) - break; - mdelay(10); - } - - if (retry_count < 0) - return -EBUSY; - reg_val = readl(ioaddr + SXGBE_DMA_SYSBUS_MODE_REG); /* if fix_burst = 0, Set UNDEF = 1 of DMA_Sys_Mode Register. diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 27e8c82..6ad7b3a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -2070,6 +2070,24 @@ static int sxgbe_hw_init(struct sxgbe_priv_data * const priv) return 0; } +static int sxgbe_sw_reset(void __iomem *addr) +{ + int retry_count = 10; + + writel(SXGBE_DMA_SOFT_RESET, addr + SXGBE_DMA_MODE_REG); + while (retry_count--) { + if (!(readl(addr + SXGBE_DMA_MODE_REG) & + SXGBE_DMA_SOFT_RESET)) + break; + mdelay(10); + } + + if (retry_count < 0) + return -EBUSY; + + return 0; +} + /** * sxgbe_drv_probe * @device: device pointer @@ -2102,6 +2120,10 @@ struct sxgbe_priv_data *sxgbe_drv_probe(struct device *device, priv->plat = plat_dat; priv->ioaddr = addr; + ret = sxgbe_sw_reset(priv->ioaddr); + if (ret) + goto error_free_netdev; + /* Verify driver arguments */ sxgbe_verify_args();