From patchwork Thu Jun 22 17:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 13289509 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE06EEB64DA for ; Thu, 22 Jun 2023 17:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=CkXNqrHg4sgaTatHnETLThxTct9vnfc5kPpvZU/K/8A=; b=ebvXSH7UWKnBA2 SQnklXrmrni6U11uKpHgAubxM0hXIt5mobBKVZQiiCbb+f6qIMTyRpQC06dYOfBHKVFoH3S48BT6a Eh6rIn8eAS/PxkqfYNPyXGkpPFbnpI/+HmzldU5cdrMH8yzPvpzSBFcbCIh0IkxzLTF2Y0DwjC6FA lOR+F4p9tB90CqNdt8JqHGBXphrIPr26gN19Ecf2gV9djB6oBEHrVDNKM9398ZxWLfX2iczmlL3NE JoiLjxuFYOd0gCxwnnbMS7JphnphmDyo1MN3s1Ik3659CQF4rUixFLTNYuFlrpzpR1CtQ3VdxyTOV GwzjZUoi674E+LfkwpGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qCOTm-001Nz9-1e; Thu, 22 Jun 2023 17:52:22 +0000 Received: from smtpng1.i.mail.ru ([94.100.181.251]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qCOTi-001NwK-0h for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 17:52:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail4; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=zXjoDRbVXMU6vb06CWzK6yq3hVHeHFiXaIRJZFK7fbU=; t=1687456338;x=1687546338; b=P9k9nca1a6qmVQy8ZGO6U9FMiR6F4CeomT6JOQMSs/dY+cJxaAatZNBk6rC+HNQnJszAVnSq6scf7CvuxIPk/+fSO8x+W9wES42uUwQIZCfRxP9iwp8mqfIQK1Murgt1lO2z/gA7cgtO6Oy2saZATm9E5kB0PZkDvnyHFcnkzm/2CG6n7JHSNJtnD+oHSslQHlEKQ7gOp1Jn6RW8I3ZBzlTsCiYRtmmsqcq3E6YSLOVw+xuiGoNupD1GfgwF00rYByymL5Kod8DEZ9CrkcFCMwqy5ljc9A+sEOMPaRAgMIVjEg549OS8l7W/oEHSFRMiFqt1NIhE3p0245fewShvrw==; Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1qCOTa-0007nX-6I; Thu, 22 Jun 2023 20:52:10 +0300 From: Maxim Kochetkov To: netdev@vger.kernel.org Cc: Maxim Kochetkov , Radhey Shyam Pandey , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michal Simek , Andrew Lunn , Robert Hancock , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/1] net: axienet: Move reset before DMA detection Date: Thu, 22 Jun 2023 20:52:00 +0300 Message-Id: <20230622175200.74033-1-fido_max@inbox.ru> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Authentication-Results: smtpng1.m.smailru.net; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-Mailru-Src: smtp X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD95D99986233CC4DDC426F77D841B18B42694044EA105F6AAD182A05F5380850400B44E5DFD61226C9C164A172F770E7E1DA5BCD2A2C70F13C704E025EC0715AAF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BB17EE3498E810FEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AAEFEF2B38A4D0058638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D42730F99B4A620FC0CB81695E71B88E6F9789CCF6C18C3F8528715B7D10C86878DA827A17800CE71AE4D56B06699BBC9FA2833FD35BB23D9E625A9149C048EE1E561CDFBCA1751FF04B652EEC242312D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B3238885582065B7B389733CBF5DBD5E9B5C8C57E37DE458B9E9CE733340B9D5F3BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735D2D576BCF940C736C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5AD745CCC44C3CF219B89CBA18E19EEEC570D8D2E4A392975F87CCE6106E1FC07E67D4AC08A07B9B062B3BD3CC35DA5889C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742D3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFC1113EE3D37281C80ABCF84072D8F5A13505A1F3356E4527FD752AB42C1274D4F85183ADB301C8A8B05B57073EAFDF970A0C62A06E3D37BB78FE44A23B5A427121BEC6C0C71ED4F84C41F94D744909CEE921556F0E976A29E6EC0772259F8F8F8815B87D7EC76CB9 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojB41c+mu8Ac+/kSHgJhDwrg== X-Mailru-Sender: 689FA8AB762F73930F533AC2B33E986B862EE9EDEFF493C6A39EF55076659A0A98CC072019C18A892CA7F8C7C9492E1F2F5E575105D0B01ADBE2EF17B331888EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230622_105218_889213_3BD447AF X-CRM114-Status: GOOD ( 14.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DMA detection will fail if axinet was started before (by boot loader, boot ROM, etc). In this state axinet will not start properly. XAXIDMA_TX_CDESC_OFFSET + 4 register (MM2S_CURDESC_MSB) is used to detect 64 DMA capability here. But datasheet says: When DMACR.RS is 1 (axinet is in enabled state), CURDESC_PTR becomes Read Only (RO) and is used to fetch the first descriptor. So iowrite32()/ioread32() trick to this register to detect DMA will not work. So move axinet reset before DMA detection. Fixes: 04cc2da39698 ("net: axienet: reset core on initialization prior to MDIO access") Signed-off-by: Maxim Kochetkov Reviewed-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 3e310b55bce2..734822321e0a 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -2042,6 +2042,11 @@ static int axienet_probe(struct platform_device *pdev) goto cleanup_clk; } + /* Reset core now that clocks are enabled, prior to accessing MDIO */ + ret = __axienet_device_reset(lp); + if (ret) + goto cleanup_clk; + /* Autodetect the need for 64-bit DMA pointers. * When the IP is configured for a bus width bigger than 32 bits, * writing the MSB registers is mandatory, even if they are all 0. @@ -2096,11 +2101,6 @@ static int axienet_probe(struct platform_device *pdev) lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD; lp->coalesce_usec_tx = XAXIDMA_DFT_TX_USEC; - /* Reset core now that clocks are enabled, prior to accessing MDIO */ - ret = __axienet_device_reset(lp); - if (ret) - goto cleanup_clk; - ret = axienet_mdio_setup(lp); if (ret) dev_warn(&pdev->dev,