From patchwork Sat Aug 12 14:10:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 800914 X-Patchwork-Delegate: sbabic@denx.de 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="JGEI/X2A"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xV3hr1Gc1z9t2Z for ; Sun, 13 Aug 2017 00:11:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E73B9C21E89; Sat, 12 Aug 2017 14:11:44 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 97265C21DA3; Sat, 12 Aug 2017 14:11:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B5F5DC21E8B; Sat, 12 Aug 2017 14:11:39 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id AF385C21E27 for ; Sat, 12 Aug 2017 14:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=HhcThsNAnAtG5la7HAkMGptT5LQkuzcPEdQ5L25K8L0=; b=JGEI/X2AwFfVgFlcXxbfdGlDUWvlV4a4OPgk9Aw1EKYe0Bdf7ufsw/kjv/X4cKIoTVzMxsoWgGArIReVBbBSxCeySnMhg5U7lsvhiE0w85bDaiIQBKeyi838gvedzYCZRNAib8fRLL/qkBXXMOm+NNg4O/0whRyfuGMtT8o3iPI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-7smt.suse (199.59.231.64) by AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1320.16; Sat, 12 Aug 2017 14:11:36 +0000 From: Peng Fan To: sbabic@denx.de Date: Sat, 12 Aug 2017 22:10:59 +0800 Message-Id: <1502547059-7367-3-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1502547059-7367-1-git-send-email-peng.fan@nxp.com> References: <1502547059-7367-1-git-send-email-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [199.59.231.64] X-ClientProxiedBy: PS1P15301CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:803:2::21) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4dd6ccaf-871f-4919-fd8d-08d4e18c0cb9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:tX/97Dmd8n2kgejMInzHyGpBXRXUdFY6QnOS7XLGdUo1htqFyogz65uLNFymieLMI3WIu8l+JYIWYxcuEZoPol1CXuEsIMZHNzx5g8Cn7xPRcMiqsqSDivfl0ZjuIQG7L9mtahkeXg6Yl18Kw5vbVoNg5pNpYc+tVCUNUs5VyNcm0PXhrk3PtXDcnqQ568R5FOpoF0i4J2wASLjX6yjVxmPv2d1QWV9VzKt0RJGyzMdRYH1SSbz8N8bMnIv4QFMN; 25:Iyai+DSvdRKQwF/eldmLjDa5i1tUeDFvOcCn8I6cOhv2D2dLlmNuxydpeu6dFNhGAA1KJ1gl1unit0z5ZmLu9V62a4Ooi3y1X6HhJfyIfmIvArlIAe1bvvDBn8IgoM/XOPJSaCF2TuYo0KsUOYPSgQZ4Nx0TGlZZpSJHSkci7f+SqeoA/KMvYN6YHKTO0qgIy0U2cQSSdkylH9ii8oUTCW5+I1ib0m52tmsN6oF1ZS+KrgyH03SJdzCIDN7ck9QUD9ampBEq3efp6CuPXEmyPTn7l46DHTIIrPBlvZflppYgs35QcO398ek7FeLAC9zS/t8+JYt/jkAHCVlWjO4IjA==; 31:6m9RI+TYJFzcOHTDu+EZ0oNj6pQxHjIIo8w/rKV9sCarBhsiH5+J75LmlnCfh9IuVx7s8jiQ+TlOS7J9prGBv1Qf8kaBLXwHC/HQAS0VTHzQ6eiVVtWqfPpSiNeEvIFSkm8yVPZBx7uP+4kKX1naF3obfTFnj6C9HYzqLMC6TdW9ZSkcy4CsrF3OTu4Fb2GABzuf2qKye+K04dBhiq1tvtz0D24yCcCwlXTek2kKUqs= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:7IUrOgf0egXbIKPz9mk3JdbThLhlU8psxsRL3Y+RkJUcaLpuge7H3OZh1vG4n50fY2O0jCpZhV4NxniI7xDcSYdzC6tbLl4dGgaeFBP6Wx4Qd2N9V4fAhKeOgOXlvXqcv1RitRN2fYvqAuO/YhfBlbcpN2H5YkWcczp8tPeQemab2u5422LWip1EPmLAg17WtqlBGM1hMZCBA+1drvoO5v7ol4k2mNRmR4Evm0X2xrDTEurYFMOW4W5gS7sb/GGjnn9TK7z2BkrVVoM57fJ0fNnkptSKojmu+x8t6aURxkL+TYnbw0qg7YJLEepphGLLXDAT6b0GDTTyCMyz7NGa1AKhHJvQNu8U7+MjDfJw6uy7zwHo8rLsgLqEMbF7ZS56BQXICkI58KMQRarnK1GzZ/gEV3pBzHRPZhpgDVk4SuLgclJhHUMRHjbyWg65b/FgapsclcILuVwMOQcNonl6FkQ5xe/a3ofgd/wSLRafOyB75ExdMe6+kQMydHftlro3; 4:tETlYIBuMaCALqmpRnQg/kZETq/Yd8f8hK03MXWernbeJ6rYH6w8lFbYdp7xIlBXYAlMZAVej6UHNR4yKvmhBPNJKyJh4tiNmcWmso6HRuumowLOWkuquMH3BYieRk8EbZzdGaJQQrCM5P0AhFP/dr70aO9ENi9ZoBWgB3qAZ7rkglTyvQeNWjWawmsTgnrnbsSSlw2f3+DiH3h4KuP1g7sPn6RrW6ADHJFTTYIoPrCkvBHJA7B8IMe3MQc0lxc86HDYiIPuBGTKR3ZRhoZI7ElARl6bh0j5hWODpThK2T0= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123564025)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR04MB3218; X-Forefront-PRVS: 039735BC4E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(199003)(6116002)(81156014)(7350300001)(81166006)(68736007)(3846002)(50986999)(5660300001)(5003940100001)(50466002)(48376002)(8676002)(2351001)(4326008)(106356001)(2361001)(105586002)(76176999)(25786009)(47776003)(7736002)(69596002)(86362001)(575784001)(6666003)(21086003)(36756003)(478600001)(42186005)(101416001)(66066001)(33646002)(50226002)(6506006)(305945005)(6486002)(189998001)(6512007)(54906002)(6916009)(2906002)(110136004)(97736004)(53936002)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-7smt.suse; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:/9X5gbIGeV6ioXRcYHTcs7fei/XS5k8m2Zv1DKLX3?= =?us-ascii?Q?6vzCcPcwQf9ilBVspLrd8JjHf74FB/13NcB5u0oYz/ynSemtdvp3V8R1CZZb?= =?us-ascii?Q?S6JfHya9pOLkssDU+NH4jRx+zxGuWCn+12CNiH+66epx3cYL7tiUXjTVlYf3?= =?us-ascii?Q?xwtRgozCI5T18BJ14omIwLJFb66gL8rHj1K7UqW8vgX+dNVDp1oe+pfBwzwb?= =?us-ascii?Q?Q+yd1UFtKEbmmJeiKGbY0OX27cR6cL1vqbEZ3aPyOBvKrmSqTpAwUsMYfwzJ?= =?us-ascii?Q?hHIJHdkRejXVKo/19tuUmnfMBGgZsJ+ruwhKaAc7cqeGlOgHuLgWsVrA7rMp?= =?us-ascii?Q?8C54KuslsRzNkUlYD7bSE0JVIazlnH3Et6Ua4bo+LWZ+ynf7zyL5MlDy8Og8?= =?us-ascii?Q?RbQ4HEIvJlSq5zDwBylYuUIpXf7a08B4lWv4NQmt/azJIBM2PUEUbhF+PKet?= =?us-ascii?Q?ERtNqhM25iMA0y8n2gIAlnk66R1hxhLukYuEv59H3T9j4Uaf3qylzrQJ1XVD?= =?us-ascii?Q?KuWyd995IUQKfqgmSWscKmXmvwSE4tjr8EymX8ENcT59xn+lv6ZazYDd5c+H?= =?us-ascii?Q?Noxe/S4PQj1lCKOZPZVimRR6887uvo7sdrN+sFNxRq4VAgJKBm38WqXL4PDA?= =?us-ascii?Q?WJqVpceDnwcxsTFNXJfQjkAMAVJLkN36CB47n+xBFef5a/GPXRC6M3mH03R/?= =?us-ascii?Q?wPeyGruE88P9ObzIdIgcbboBrrSpdyxp7X4Inc0wRWPZLlrsSWYns+xAgZl8?= =?us-ascii?Q?QBykAoD7rQL15WLmqTFzK2L4EtJJIfNXbqZdbeu4pw9mjV3Ne/eIAH+DvWZn?= =?us-ascii?Q?f3PeDoYfERxD7etbhCIHaKNfLPDqli8BqRLSX1w5LfoV5rkXRn9FUXXQ23Xy?= =?us-ascii?Q?Y38GwVbjwuzDQ3FBSuZHFSd1b3yM956OySY7M4XBF6fA2EAe+9YRVSKLeAlw?= =?us-ascii?Q?UqmWqouxakedIyFUuvtvC6lMsDD+oVgBn8f3pM+bghKWoO35Id8bjyjh/ogB?= =?us-ascii?Q?YqKTZE7A4cdYvntLSz82JSuyGQk58DIDSwJunOzSOC7nOpKQ4pWFqCZioHmK?= =?us-ascii?Q?hsUzVmZhV6YEs9NvhDO5/AzFjx3p0/G35w007Fdmn8c3FkKGS1nsr/2HmhCP?= =?us-ascii?Q?u8DnhaPrKir50H1ARtHUKLpetIkBOgr2qjW15hg9d/tlJxrvTHedFhf5xg48?= =?us-ascii?Q?OJssuKCHdAyjbxMBI+oMnBzsaGJOWCDTL80y3b7Ac0200tnFXiw6KXgyg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:W6/ulLkInDlIkaHuuxe0hGEbNROh4apb+kuHavf7jgY5KY7QiGXGFCzX0HzGDdmjSoNk7EA73K98BFjlQzVeLs/t3DqxHEXBlxliMMEX4A2lJpCXVfSG5zDT+9SkE/CNN+4CtdbYyVeevAsBXUF2KcGbRwt4zxj8jJJQUiRAXgcCO44s62dTnU2O8v31edildPI4fiaH60YuFG+87e1DUAmRG+D2qiMqpTDRa24Ap36/TKdzUZyIFUQmwO23z+e+RYVyADjEd4O4ewZ5mBypww9svlDAf3iV9PFHmozsvJ4wOWyiGVkM6W+7I5bHef6aX4vzZcwBikiyWovXKy5Zeg==; 5:FakFb38kWU/Cq+UtIZWMkQaRIQinz7AQp8IvqDarYZd2lF22u2JaS0xwNRYGOuZHxqw6iXhxAW7BXjk1jHyxabrPcBDvGF+06aYxtYAV8Myz2iWk5wx8GWg4JSs+A8YADuCxzhfks59mVsraaL0ZOA==; 24:udwb4wkYvJ9NjiFhbcR4fPdBVqdxgMdHM70d6yrjY8Z6XV7fKg2AazpDyw0YNNJRkGXDSRPV1ohq8DFeAaLjSYaME1ZivaLE3aMsz4ZqSjs=; 7:mkc40MpZqvN5WnbEZjwpEKtWSOcj8TO6pwR9infuGUW4Xb/zukupYjHs+gNhYYvFLsdRjtq4720ioySCvrw1y11x1fWwWr1HzSohjGPvVo5bZ/DHfmMTyAIwJi3h1kAIQ90k+Z+WK5TGqv7n3SBvjt2dPJUA582BXcC70NBg9yZMK/D2c+XDd0qDBY6qmRhEKLSqDMiMThiiNB9hS6C1g8gHoGU4ecrkxTmgktCFYXw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2017 14:11:36.0644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH 3/3] mx7: add epdc qos settings 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 EPDC/EPXP QoS setting is needed for EPDC stress test to pass. Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam --- arch/arm/include/asm/arch-mx7/imx-regs.h | 5 +++++ arch/arm/mach-imx/mx7/soc.c | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h index aab3a9a..a6b2091 100644 --- a/arch/arm/include/asm/arch-mx7/imx-regs.h +++ b/arch/arm/include/asm/arch-mx7/imx-regs.h @@ -152,6 +152,11 @@ #define IP2APB_AXIMON_IPS_BASE_ADDR (AIPS2_OFF_BASE_ADDR+0x1E0000) #define QOSC_IPS_BASE_ADDR (AIPS2_OFF_BASE_ADDR+0x1F0000) +#define REGS_QOS_BASE QOSC_IPS_BASE_ADDR +#define REGS_QOS_EPDC (QOSC_IPS_BASE_ADDR + 0x3400) +#define REGS_QOS_PXP0 (QOSC_IPS_BASE_ADDR + 0x2C00) +#define REGS_QOS_PXP1 (QOSC_IPS_BASE_ADDR + 0x3C00) + /* AIPS_TZ#3 - Global enable (0) */ #define ECSPI1_BASE_ADDR (AIPS_TZ3_BASE_ADDR+0x20000) #define ECSPI2_BASE_ADDR (AIPS_TZ3_BASE_ADDR+0x30000) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 4307ae0..6b37848 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -230,6 +230,42 @@ static void imx_enet_mdio_fixup(void) } } +static void set_epdc_qos(void) +{ + /* Disable clkgate & soft_reset */ + writel(0, REGS_QOS_BASE); + /* Enable all masters */ + writel(0, REGS_QOS_BASE + 0x60); + /* Disable clkgate & soft_reset */ + writel(0, REGS_QOS_EPDC); + /* Disable clkgate & soft_reset */ + writel(0, REGS_QOS_PXP0); + /* Disable clkgate & soft_reset */ + writel(0, REGS_QOS_PXP1); + /* WR, init = 7 with red flag */ + writel(0x0f020722, REGS_QOS_EPDC + 0xd0); + /* RD, init = 7 with red flag */ + writel(0x0f020722, REGS_QOS_EPDC + 0xe0); + /* OT_CTRL_EN =1 */ + writel(1, REGS_QOS_PXP0); + /* OT_CTRL_EN =1 */ + writel(1, REGS_QOS_PXP1); + /* WR, init = 2 with red flag */ + writel(0x0f020222, REGS_QOS_PXP0 + 0x50); + /* WR, init = 2 with red flag */ + writel(0x0f020222, REGS_QOS_PXP1 + 0x50); + /* rD, init = 2 with red flag */ + writel(0x0f020222, REGS_QOS_PXP0 + 0x60); + /* rD, init = 2 with red flag */ + writel(0x0f020222, REGS_QOS_PXP1 + 0x60); + /* tOTAL, init = 4 with red flag */ + writel(0x0f020422, REGS_QOS_PXP0 + 0x70); + /* TOTAL, init = 4 with red flag */ + writel(0x0f020422, REGS_QOS_PXP1 + 0x70); + /* EPDC AW/AR CACHE ENABLE */ + writel(0xe080, IOMUXC_GPR_BASE_ADDR + 0x0034); +} + int arch_cpu_init(void) { init_aips(); @@ -240,6 +276,8 @@ int arch_cpu_init(void) imx_enet_mdio_fixup(); + set_epdc_qos(); + #ifdef CONFIG_APBH_DMA /* Start APBH DMA */ mxs_dma_init();