From patchwork Mon Nov 26 10:57:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Durga Prasad Paladugu X-Patchwork-Id: 1003126 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="qKllRssE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 433P6p2P4Lz9sDF for ; Mon, 26 Nov 2018 21:58:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1933CC2221A; Mon, 26 Nov 2018 10:58:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6BDA1C220A0; Mon, 26 Nov 2018 10:58:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7F9FFC21FE7; Mon, 26 Nov 2018 10:58:12 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760059.outbound.protection.outlook.com [40.107.76.59]) by lists.denx.de (Postfix) with ESMTPS id 3EAE0C21DF9 for ; Mon, 26 Nov 2018 10:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3SZCL1m4xk2S6pbiuzMtGrom5KUyobCVWvKNqbYl5Xw=; b=qKllRssEPkZIEiz3QajHSzlV2rTgPvhAC5mhGCVpaNW0XeTqZYbtgDheh8yEq/TDtZukOITwwys0LOFedpc55zVJmnUlkFEWcwPiEd52y2I+UGIOah2oiK/ftCbqOSCuMuCOINQkKK1XeDf84gT6Mh4d9j3G90tR7OpXC8vzwxs= Received: from BN6PR02CA0028.namprd02.prod.outlook.com (2603:10b6:404:5f::14) by SN6PR02MB4463.namprd02.prod.outlook.com (2603:10b6:805:a8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.16; Mon, 26 Nov 2018 10:58:09 +0000 Received: from CY1NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by BN6PR02CA0028.outlook.office365.com (2603:10b6:404:5f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.14 via Frontend Transport; Mon, 26 Nov 2018 10:58:08 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; ni.com; dkim=none (message not signed) header.d=none; ni.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT038.mail.protection.outlook.com (10.152.74.217) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1339.15 via Frontend Transport; Mon, 26 Nov 2018 10:58:08 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:54140 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1gREae-00048i-2B; Mon, 26 Nov 2018 02:58:08 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1gREaY-0003V0-VL; Mon, 26 Nov 2018 02:58:03 -0800 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id wAQAvwBk005317; Mon, 26 Nov 2018 02:57:59 -0800 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1gREaU-0003RN-Ck; Mon, 26 Nov 2018 02:57:58 -0800 From: Siva Durga Prasad Paladugu To: Date: Mon, 26 Nov 2018 16:27:39 +0530 Message-ID: <1543229859-15003-2-git-send-email-siva.durga.paladugu@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543229859-15003-1-git-send-email-siva.durga.paladugu@xilinx.com> References: <1543229859-15003-1-git-send-email-siva.durga.paladugu@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39860400002)(136003)(2980300002)(438002)(189003)(199004)(47776003)(7696005)(76176011)(4326008)(51416003)(5660300001)(36756003)(478600001)(63266004)(316002)(2906002)(126002)(336012)(11346002)(2351001)(107886003)(48376002)(50466002)(106466001)(446003)(14444005)(6916009)(9786002)(16586007)(6666004)(356004)(106002)(186003)(77096007)(54906003)(26005)(50226002)(305945005)(8936002)(8676002)(81156014)(81166006)(36386004)(2616005)(476003)(486006)(426003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR02MB4463; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT038; 1:q/2ShCMmKQRknp+8uBdytBa5T7GnvfbMsPr9xvD3iVDXtm65fJgxZdrpvH6KeXJ/uHZkyT4lsFVk0zml3uZLF/VARu1ZbSs9I3FyVCOTjAXU7yb6pAssar6Z5lQMminv MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f389bdd-6333-464e-83b8-08d6538e0cde X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4608076)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN6PR02MB4463; X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4463; 3:DdaQNxx5Jx1nCCccwfSDzho29+BVlpqlOR+x9oBzpkR3Z3VB1Bd+bwMHvCnQgk2HYgGGWuw4u9LrXra5xYpAyDyAfmMaGt5PNXCL9i1MsQ68CyjNygiHmZ01FDq3W5fr7Wkzi53NXxseYgFrLHyQEoXs9mPO8oWrm1Jjr/RYfzs4Ev5/ewnClhOAmJzY32zBwuqRsLNaY3Z08f3Qgs7Uj5H1c00GtoDxCCmctJsHv4HS5yMIWSLJFtIrofXhhWQW8pFX0ywAE4wp2xFNK5SHEIKLgZvT9sTQldtlMC6SAhMW5SdyOj2ZQgjG6Gr2z9Kqoh1HfJES86aRSf+xg7YsJcnc5RqxdmAcUtQ3hnEJ8GI=; 25:L2cDDjZ1/gg1koC6lkrXhZwdgZpy4XESddBPqi4GRI9pVJLiL4/XPcGbe96OHIf7S2pReCQLsXO0GxPOSCVc0+p167EojHG+77z3LZ0aSbKyNflcjWCOgJhpEIf5bz/6yD6nzBiD7mlRnyp+GXn5osrz5hJZJSC6UyOQATMHwPNkPn8Ugxou2VDWT0qahbhXt6KWmM9RA2+c8747X77L9T6od5+fXVl082ZzACQ8bApDnL9/YuKl1IvD8MgP0jFZ34+6c91gtvlhfYaedp3rvkg5lbMU/+vBYeJYdZEimq6W8IVsxFhm9LoyVUaMwuTe1E24XJ/10LgUR1thkmQ0KA== X-MS-TrafficTypeDiagnostic: SN6PR02MB4463: X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4463; 31:9ujg9mKTw4+72alrh58ZtHDJrreLvKucXkUsQ6B6yk9EIPwB57/RMPMBKUZGNQNU3cUKwGGWalBPsu96I9p90DGoXqQ8Nw1hXGN8QgubXzEYPBreeRtN0yWdIEmVfTZmDKlYhk0N5FMaoPeIns8wNTTbNg4yGpjaAR40tJzM1ANGV+2JMlvIidANjgb61yq8ZO4BcbIsGN4ymcguWtvhqmjyg0qMIf8EyGn0idKm47g=; 20:edSx0L4abMf42ueYRbHrquJsmN1sp7uomCwYsUKgbltycW1fISubHpntHUcrr1bv95z90Xa+6z9v5tSWur0koD6RSj/bg6VU/c0GIsLvrHZpmRv6eYeghIgAY+4ldY9bEKid+JHfTWfn2CRRa6w3TUZN4qofC/6p5/wZ7sWCyD5lPG9jPUYaXcHpChr90TkcabxiwQto6tk+NAteaZH5wHZUA2Iy+WbVcnBB6Nw9vJoBgbAM6pOo7g+QLBub5BqGMN7cPvCiEnF395uZe9nnsXND0h5habKNjXQ79KQOdUDkIYayQt6f2TPy86P2AmcPqcD4JANkQoPZvy8cjPBXDYvjnuyvA5eumL7xsCSsWlvjV1vIQyX+enO9Ma1VME1x2or3uetMxUfPj+39f1Yg1GId6jlVk3adjz/xJ8ZhTYHEa1BqnGmgh5eiRb13BCla2Y1afHP+458YevfcX5YRm9Se4P3ndNRnehuFw6KEmV1Rt6PkFP6bwKjr8Qhx5oif X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93004095)(3231443)(944501410)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:SN6PR02MB4463; BCL:0; PCL:0; RULEID:; SRVR:SN6PR02MB4463; X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4463; 4:0+5slGrFkn1ogIp+MeMeE0jBR7nI6Z49l2Wo1guQtaLJcNQd0LWU1eGxpF5jxwYVkUTldWI5cliDOrck6wcHsE4TrFTNSawcSnIfNYigsv8S6EBX1wr2F69Skw/jHIgHXtcEbAR9VbMyOtHjz1geLyvB7vsiuS/uxOmWZyqajnvu0+ZqzOdOV9KE3cYUWXycJGkrvJJIWpYnxWbBrVy8GThbWgGC5UD3R0nXp/hFS36ClP+dqpziyEGNv377V4n6Y52udKHWNcNg/ejvYLGviA== X-Forefront-PRVS: 086831DFB4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR02MB4463; 23:7PZGhOeeyLCVaKJg0nndifqif1H6b1Vl0pejzZYEc?= DTtWkKF7vvtcKw9LmbB1pUBpAc228INivj9jMlCKi+H1dfsqn52Z1oau3qGVbZptT/7AqyIuOtQx4SuA5tSIERPIVUMVh1M12zLMKOYwIwAwr9Yw8ivW67lPKG/sDJf+7lKJSPoNEWj+8i9ABl+QBLf2CVEekSI/cOyeQZ127aKAepKLQDRnv1MQ5NgfTk/y+W9vjATvkvladYGghAVTx1tCoOGRrfHmdr3TQDrfIdAxf1dD9IUSNh1NviLIGoIst7nZ5lWWqtkstmJUo08AQQYF2qB92iw4iEh06MxvJuAVkssvQlQCZL6FBikBoN+yWoG5Ne5fUmMoPxCCJTCM/5vckNYYcnp6OR1iIA1DPm0Dlj2egOSXlpcRNSRTgDuM+TrfmGBo5Igio1ECTrr760XAYSJGWaccqDOsjVIH6ZB/0Tgj1Pr/MYuI/e3VQe+RClcIEAbkQNUpFbSN6enKs2hdTTA8gLCHyGWRCzr4fDN04C7JSUoLt4tYhxZEzCNmTHH4XdhD/7+r+XpDrI+0aJIhdkB66LxgTUIZ1B65QMaBv44+Egug7Nwk+8gMUVNpjqbIHN8LP/bggYEiIX+bfrPgQuXfKwuFgEOPFSCt7YLRXIsfEUvrHDYIzv1nRHu8mKn/LwoluxeQMrGa3Nnuf68iLQd0aik+fkmbG9eu3moQILV70bDTD4k2KoR6NCIHIKcGkA75j5bvlRTHHXmFFnXMjJxa/VInIU2nnmkXmE59nr7uFyUa2dP8ynEUa/WKGebGDUpQYbr8VoQ8iqlu6QkOaSKDEhSWtWpZX6wSWHzB+PbyTAT1MZRT4oXoTdAzld683GliAKRtz1iNW0Mn1eLOgyu/rEE3izQ02VyxPgEExtiHhuHNQBHBOdDWKTKMllaYBbKWDt1YrzXT1twMG6sAmKiUQcKWhkAaEgxiEhXlv+mBH0sXqJrImzjBOQUco5R+/xutTdE6gpIcPaYqGVu99eL0N0+iwmv+4HFoNy9czpezkmWGeV6DRBaMNjMFPjGV8xqGlLrhrguWF0IqpyIP2XrUXCQSQXeAbgPlm69hfB9yk5ikkBxDBgn/NHCtWf+TVO7Q6jcH8kEMUHlxqzyZ30whddULtsIeP3KFbjZZQ== X-Microsoft-Antispam-Message-Info: BS6tEeJE72MFKBCyjEnETIHFWcJ04OUfPB3KL/hfD66s2IHcy66sET0DoRSH5393CLBlXJmVZPmgclM1vlNlw4ksi5QFCYNqx9UUBBlZx0o7NMwbA6gCL97MHeXawZ0XTOpkR+ZNbQitgPPahk6hksYxcxo/MrjrP65kjVQ8Uk99dhycfF6B+WvDzPN2B3qfWKYrKSzKwJR8g643HQSRlbQyp3IjxpR02jGK3MPD/ib/321PLX0fRc5cszSFCHtuqasoq7lxLh2gRqyL9CFNa/B4Xjx3f3cUcTJo3Su9EA4DIKWA/CEjCWTR4g7TB7Rrpv1SvOwJtutseRn7ZnaPz0gbXxoKC3Wk5pwMRY/AVso= X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4463; 6:2OPeqIGZ8TffDenYvvrlroAgr2Mgq34EHoSKT8yi5KvEuT+bKmPnIG6NifL99rtCy+kISRcUHxj63Rr1Ay6+RAjl71eeMmxGl1OLjg+MBSb3nN5IWmWRH2lzZ2Y76a7/uwVj1fxyYQl4mZaQG0UeqP95JYOn5UwG8l8wbUgyzMrCNmWuxd4WOrFhI1fzbOynWhbWip/54ORPm9aC/ns1GBf3+kb4tMCRo+UTWEnKm7A+98KU3OWbETp9Aqn4DeFOd/65HpD/+KGC210dD6DJkTAjKfWb2RnN3fFHamAfDnu3XOiKypS3d+p4XTraXzUARr0ckT45E+bwyXLAVFtsB893NpUMunHZlCiyCZ5yu1aF0XAtA9wJQK+YZfOPof6uNTexoxEb2qUMrgLlPHfgXJzFZQEhviFMT2GkBE8QFxLuOzRpSUZS/eDwgecXnCb5CR6cETGWAdpnNEfZ1voc6Q==; 5:FK3rEBCUmvR07/RzJZuaV1cIz8b9VOoabZs2XHBuNAhBVKAClnrg73u+6CDCCEYpMGe1/e0D+yEs7vchCQGAu4zj3YBFmesTgXHLxlX86boFC1Hx6c+ThkI2zaWLQNhEVdkWLUbNEwM8NdtW/210gXzN6OIexBxpw845ypn/NW0=; 7:kmS9W/oJrINaFpTWlyGgA9TMnfG3IXQ2/p3FH5XSTfyH3FuoiNRujXHK2csvtPF/8nBOIfE6lR8bbvfDNs4+akMVe1Q+yZp2HQVDwxbdM5zkkVVih/ZKdFr5eGiWAohS34F6/G9GI6P6gD23rz2ywg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2018 10:58:08.4312 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f389bdd-6333-464e-83b8-08d6538e0cde X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4463 Cc: joe.hershberger@ni.com, Michal Simek Subject: [U-Boot] [PATCH 2/2] net: zynq_gem: Add check for 64-bit dma support by hardware X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch throws an error if 64-bit support is expected but DMA hardware is not capable of 64-bit support. It also prints a debug message if DMA is capable of 64-bit but not using it. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- drivers/net/zynq_gem.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index ee528db..9bd79b1 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -102,6 +102,8 @@ DECLARE_GLOBAL_DATA_PTR; #define ZYNQ_GEM_PCS_CTL_ANEG_ENBL 0x1000 +#define ZYNQ_GEM_DCFG_DBG6_DMA_64B BIT(23) + /* Use MII register 1 (MII status register) to detect PHY */ #define PHY_DETECT_REG 1 @@ -150,7 +152,9 @@ struct zynq_gem_regs { u32 stat[STAT_SIZE]; /* 0x100 - Octects transmitted Low reg */ u32 reserved9[20]; u32 pcscntrl; - u32 reserved7[143]; + u32 rserved12[36]; + u32 dcfg6; /* 0x294 Design config reg6 */ + u32 reserved7[106]; u32 transmit_q1_ptr; /* 0x440 - Transmit priority queue 1 */ u32 reserved8[15]; u32 receive_q1_ptr; /* 0x480 - Receive priority queue 1 */ @@ -198,6 +202,7 @@ struct zynq_gem_priv { struct clk clk; u32 max_speed; bool int_pcs; + bool dma_64bit; }; static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, @@ -378,6 +383,23 @@ static int zynq_gem_init(struct udevice *dev) struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC]; struct emac_bd *dummy_rx_bd = &priv->tx_bd[TX_FREE_DESC + 2]; + if (readl(®s->dcfg6) & ZYNQ_GEM_DCFG_DBG6_DMA_64B) + priv->dma_64bit = true; + else + priv->dma_64bit = false; + +#if defined(CONFIG_PHYS_64BIT) + if (!priv->dma_64bit) { + printf("ERR: %s: Using 64-bit DMA but HW doesn't support it\n", + __func__); + return -EINVAL; + } +#else + if (priv->dma_64bit) + debug("WARN: %s: Not using 64-bit dma even HW supports it\n", + __func__); +#endif + if (!priv->init) { /* Disable all interrupts */ writel(0xFFFFFFFF, ®s->idr);