From patchwork Fri Jul 20 12:47:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 946885 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RVd2cnRD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41X9h01Lp9z9s7c for ; Fri, 20 Jul 2018 22:49:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390192AbeGTNgN (ORCPT ); Fri, 20 Jul 2018 09:36:13 -0400 Received: from mail-eopbgr50085.outbound.protection.outlook.com ([40.107.5.85]:15725 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389545AbeGTNgM (ORCPT ); Fri, 20 Jul 2018 09:36:12 -0400 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:X-MS-Exchange-SenderADCheck; bh=qNPMUKXocvP96g9ZKtbNa7Q7xyE/0NGp3VueT5OBo8M=; b=RVd2cnRDP7Pmg1sAOCgbukiH1y+UIbu6n9sOyafTGG4y6o4iA4XTm5JUGfUr+GRIh2ZYaE3uP4XKqwZGnthIYgoMLG7M5f+kVPP8Jud/UrycDaoI5EoryI+Kt4/U1GLW8wvWTM92zHQ/emm8mgyqJ3w1Oh7bdJoDKvcmE2wNGYU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; Received: from localhost.localdomain (95.76.156.53) by AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.20; Fri, 20 Jul 2018 12:47:59 +0000 From: Leonard Crestez To: Lucas Stach , Richard Zhu , Andrey Smirnov Cc: Shawn Guo , Joao Pinto , Jingoo Han , Bjorn Helgaas , Lorenzo Pieralisi , linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Estevam , Dong Aisheng , kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v2 1/3] Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping" Date: Fri, 20 Jul 2018 15:47:42 +0300 Message-Id: <221deb47d7d38ecd6e0c7636f9a87ab693a3c539.1532090446.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [95.76.156.53] X-ClientProxiedBy: AM5PR06CA0015.eurprd06.prod.outlook.com (2603:10a6:206:2::28) To AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37835fbb-bf68-4ed8-ea6f-08d5ee3f0667 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4293; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 3:yDly7s6iNrzgKjoV6yF+2omfNj+zxa50d29GVAFQYUTrkZ5hs2x4ky12SMxgKTgki13U5Hd0TLjQNuwOsah9FFaCk0jQ76GTx+aM+KiqZZNk04m9XhtpA3VSgVzPkVbML/TlEYRChyPrKnbmrbbsRLa193wbriOWUZfDjpd/1HDe9PTo2hVGwHrwI2b+IcYSgXEzQvpuk+0FvIoeJDKZ+dXc+SIrmRN1nEI5Px+ZCW3CB6NNdqjqVIvWYWdc7CMq; 25:7jq0vo3rYn/h8zBXoDaKqSVLNHNba42kAsyu9eNDds/C65x7FpG4W1hQROmhoKitrMAQ8022VXiwL5iXpnRJYQDRDrQD64/uJ/9AsNFOlEI/8ZPEezqBhneqNVRxsCDp0T/+iZLuta+WwHNj1mamoBvYv1tCy1m2Q1ffuh9jFEhVBug9OqEt56TCAuMrGqvDeuo16FkCqKauLFT7ZOUTYj/39qeVvP+VALvUrJprCFnOIujekdPdK/Bz8b7mT/phnFHzh2Q7MqVLXfI0c6Mv6kf+O1195tLK/LAUSXzK9zNh2IcXTKYJ+bB2anmXJxc4eYMuwndU2/m3Y/6nD1OUgw==; 31:CGleWtbx+/D+67WK+srCeE34bwyidrG4n2QG5vx1N57MlmNlumhSByhFBTy8RDEPnNwu20ptX4PptgLW/1xVkdBG3JLjH6ZZzIRJU5tDGrt8Rz2PUpwsJckaCj2lW9jJDUOo9vK7fne10tk82eLA4gHDFghm2Jh0L7/PnxJPS6UjXitwD49ssvd2xZHdpH5u5w8XFMA+LlUvLBHjXph8vgY+JaC76yMDRjDAonW+M0M= X-MS-TrafficTypeDiagnostic: AM6PR04MB4293: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 20:ZhzO+BcSy3ivmF0z1QxuUAcHeMMkVvsX4siMDXM2H1u8VNvXUyNIGp9fFbdd1khRI2LDa5N9GAjSpT6I7KlF+zm9TMcHHTRpo3PbqUatklU2Z9i18qVdAnyMgAJuqSZuKG75k6a9eu3OFSjdIiMEIPVw6z5yRBfGLt1+R8lGrzZaR3dq0pz2FimmwK0b3FT2KiSAedMeAY4DZLW0vWCpx9JmCq4ncU83XUh/ZWLTFg6TjvI1VeojT3dQmxCHonRwiMN0iMYVfHT1RUtGujt9VE+UbfAx1LuORxznGoFdGvi3W2FDyWJotcob52UbMUNB9AASygu4EcKIfr5D0tFc58vUHklbPCAyE+HCk2Wv17L4YD/XEDj4EY8LJL3PQVjk8qIOVUzIKiTFzH1EHgaF2s1bLTOBLNY3YX6vh408ss8uROmirH4IVRpUcwDMlS+H4aRObwVgK+VEWq7HEP/x6p9+ejAYldp/9tWtyD4m8XpoZ4VAEHqZjgSJFyd9Io4g; 4:dW0RHBQs94wWmNjE0XznZegot8OmHIhZoSx4N3DfLc9zoec8p1WLPKsbgel7oayauHolDt6riQ3N6TriwATTjHp67BPuT9qgVHNnsu0oS9mjLu/TjtqgS7ylK5xYuC5Rob2WRI3JE9wmzzR1ahxyxscHgv+LUedRuUxfwY33Hm7DXASHrU0Gl3Hyru6aWUOnV4z1nVqtpDnhDy3OS0msa9qDff861V3O9SRLYmnXTp1rmdV+gd5xjHi3LyGsyq6zIbdVu+WKkz1T/JijvCQ7N/dThsO1UsR3juk0kMu3He0Nk1llCxQ8/52CWAxCh9EU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM6PR04MB4293; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4293; X-Forefront-PRVS: 073966E86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(376002)(136003)(346002)(396003)(39860400002)(199004)(189003)(2616005)(39060400002)(110136005)(575784001)(54906003)(50466002)(86362001)(4326008)(305945005)(8676002)(48376002)(7416002)(8936002)(105586002)(81156014)(2906002)(81166006)(106356001)(51416003)(11346002)(486006)(53936002)(97736004)(52116002)(956004)(25786009)(6666003)(16586007)(478600001)(476003)(76176011)(316002)(5660300001)(3846002)(6512007)(44832011)(36756003)(6116002)(6486002)(26005)(6506007)(50226002)(186003)(16526019)(386003)(66066001)(118296001)(446003)(7736002)(47776003)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4293; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 23:nuhhaoTqbx8vmTDO/CM6vVyU717fXZcRjixcjnbCFhSUEqPRZGwNNKvANsKfuu3X48jVtEyXLpChUgZprgdofq4E1kyuvIbNDLTMTMB1jlULXxc8c06bAaU2oQTaqsFm72PDABfrgwNpKUDifBE3NQQAZ7RDN5B84urFiuaquaLa6pwMLMosvvOGsSI1pcMIFZN467bXGBPNlOAIbqw6wXm5WObJsbpgVF70Oj5sRx04VVXT9HjG8yUNhglpHrckXcFbtMXgYRbu9wRxacyJRGyjW+CmT0/io6AFdIJUQyMK2upODrkRZOxj+2/M+xLZKLP4PsgO9ZPcrzojb7/eilGd7K2uB+4Ol/8DjvYQ5mJZoq0vQSUqpKNE/TUcU0HaCNq4UM1dSkQN6sytnb0HhQ8r06b3J/v77yJYHMWySota+9xcQ1aQG348IBeO1x0FouVD3IUZiv+XU1DTjlIrSDsGx8dYrw4p9mgU5qeiq/aAkuRpBFabxZXX8GOPIBGPxgIDkoWBnPdyWeWLRBVlZwXUTS9QL2beh4AvTlk4IgejmkPYUDFmY+BlWKVo8RLwRct5LbZZ9wr2IHt4P4uhNEYuvR0g98sOPtgfkjpb0PBhWMHyER7GeuEn55IsZbzwVyc7iMk6M5pmySjIKpcqY32ALTCEefViq1Y9BA5h6H8y3UYxFcgDDUB+z7bLvAaDmRzXA+UfkXsj5PYBMjK9IpUbw/DsJZtV8S+Gbvj3E1O9E6+ESSAaHY+MqD4FFO/pPLnwZyFQyqVzvXl0kMCdDV+GEQyJZKGKnw3VdJ+hIHn+DmX4yByVSzlpIbOckVOG0McclDgYYT9ICgXxt9ExMWHEV4GOeaKAxEzf1XNUN5LvrpTKVTF8F/tVMEXbtOwiK/cSG5eWa7UzfjgNERviHFrHhSpE9rxUPOHT3G/c8E7ieM0cPDpdOO/n9iLy4idVp/qEKiDPX6N4gHVufMSCPFj5LSndHxWlrDSgUHXKbW1QeabsXHe9a28bJzQAbXZZ30dAihU+Ha9kgIDKG3ph144GJSblaV2XwFAF7L2gDHYl8r2847KjDRxOdgXRztlZ1yCWuOPk3XKF401IzK6Cgtn9Ma1Fp6WteE78/tfPAOrjEGGWkFLt371oxJlhmnMycLcAlpkoytZwktWGtVI1knRR3MCjelK/9tDelDxErLa89vksOLrBLizE4VfQDJxnjzdhJ1wjIQraWurfBdRVqm1Xza4MZN2iujV9slpXSk5DcG/XUYbjF2mGmrRfIkOIoln/6cORYm7RKsMlMxXiVJijPPtcf3kdBetambvNjAQ= X-Microsoft-Antispam-Message-Info: DFBAkEWtr3HM5XyINll2Olykr1x3vxq1dX30miEmrd2YDCvWqk8DBBUgUgJE8AxGi1XvKOzLxCfDsSn6nbBt/uPOEiti21EJPF+iZOe4pX/slfS9DAqf9Wg0oqRvBnogqKMSnbf90bsn83FVW+YEmHf8sUZbOLUVDq5fqocvNH9IHtNPfr9SyjIxiNaNv/PWqXSAtsO3YoYfvI48zij7n03ThX0HlMUD0Sc6cEvZ3Lmc/elQ6HfJSwG4BDnYf/v2RZFjH5EATDkO0Yxsj/0xs93mAWAYZp91M5NTGYX6aS8gr8SqCuAoKOLjVqTjILaVRx5zWGsl6sok0CMnkr0drgQKqK/xBcgJ9ITp4gQgPIg= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 6:3UUAGGJGIIBwXMy/6rH9BWbWh5V6EjEM4C32PkSFDYhe0bCPDy2495kB524qIQOGj+9QPasd6mTgqRdDMCw9XRK2JEaKaltqtrukxq8Os/H4OqKmQ4CA9ZUPYRIqwXGZYs4SNzOR76e6rloTtorzQyWUkLG0n/m61F/HAEaXgM/c61YsD5CYf7gMqhvFigAe4BkzLiQTEj+nlQ6gJZLmFT9KdBj46V8XwXX1vZFtP/dInLtD0qTUiaAuKOBKDHnkbtbolMeLut+a7Q1XZ/ApvCTSPMo7V7TyRAQBx51kvDlL1ylgSkzK3U96rPKqwDQf3PFENXBIseF0WAhoomhCkFYqynhlILwvedFYd27n5sj0L84y+LK9fru8T1BkYRAzpLeLT1sdBXpvOLzTPptakEZTHURYo8N499yz87j1HuhTNsy6VB0WdYtkt9iAaOz/ZP8nZwQXoL5SVVWCEtFDvg==; 5:j0jb72DbRltkiUyJDkdMZrRlGI5RXTRMSSLuh/5zZ/RlVerrL43S13qDLKUYMdeJHh7fjh0pUi+ce8filOu3RbWzxu+Q0EhfdkWwExhspjZIV9Gl+wpBLcMfVhLdu744IT1texIDM5C6wpI3YQyFckijZqrHbx0sPcU3Mo6lylM=; 24:eEFwq3rga4fgKbn3tCiMCMYdm16GwtmTtRlV8xnL9oTsNbaK7gHYLsH3pweE+xobE5NplaDwZP3U2QIgW8qFmuQGcZVgyjbpbUkfoULbbjo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 7:iiDuS/jeM/KndeJssFmMb5HPgiN3oP77Q58ADF9xMRNJaitqKxxKrhXSVN9IbjdXb5YO5HyXGDNuIn5a3RChaIJU/8T6FNP2cwIHEjF0SRrI878AGKN5NWtyzRsq0msQlZU29WcW+IrzHk5/WcuLKo5u9qdXs8SznUEUAQHPjvGgaK5s/HJi4dE+RIBaj0cF3guHc07zPRDoqih1jCAWRiTAx/daJNAll1iZ5BHS9+5iOXNfyZAlowcES7BrM8SZ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2018 12:47:59.3429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37835fbb-bf68-4ed8-ea6f-08d5ee3f0667 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4293 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This reverts commit 1c86c9dd82f859b474474a7fee0d5195da2c9c1d. That commit followed the reference manual but unfortunately the imx7d manual is incorrect. Tested with ath9k pcie card and confirmed internally. Signed-off-by: Leonard Crestez --- arch/arm/boot/dts/imx7d.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index 8d3d123d0a5c..12c5ba7e9f1e 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -123,14 +123,14 @@ num-lanes = <1>; interrupts = ; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>, <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>, <&clks IMX7D_PCIE_PHY_ROOT_CLK>; clock-names = "pcie", "pcie_bus", "pcie_phy"; assigned-clocks = <&clks IMX7D_PCIE_CTRL_ROOT_SRC>, From patchwork Fri Jul 20 12:47:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 946884 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="TcbTtQZ1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41X9gv2cpdz9s7c for ; Fri, 20 Jul 2018 22:49:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390412AbeGTNge (ORCPT ); Fri, 20 Jul 2018 09:36:34 -0400 Received: from mail-eopbgr50085.outbound.protection.outlook.com ([40.107.5.85]:15725 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389265AbeGTNgb (ORCPT ); Fri, 20 Jul 2018 09:36:31 -0400 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:X-MS-Exchange-SenderADCheck; bh=eYcZM0EG+KIni3X1hJuLTSCBuOjGNQD4bYP1JG45BmM=; b=TcbTtQZ11D7ODI1ivvX4LZ7S8AoIBkq7lWAQvGd1DH7L+MmRSa+M9mOe2oOtNsPZrxz1xX9NruC2H1FJ/dRBGWK842R2l8JB87mjKneVoWxm73zujLX9m4Ypshoq0cw0WWQw5Ff4NNUDDA5hHk5gGecbGypRxpgcXorL2PEYoCk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; Received: from localhost.localdomain (95.76.156.53) by AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.20; Fri, 20 Jul 2018 12:48:00 +0000 From: Leonard Crestez To: Lucas Stach , Richard Zhu , Andrey Smirnov Cc: Shawn Guo , Joao Pinto , Jingoo Han , Bjorn Helgaas , Lorenzo Pieralisi , linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Estevam , Dong Aisheng , kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v2 2/3] reset: imx7: Fix always writing bits as 0 Date: Fri, 20 Jul 2018 15:47:43 +0300 Message-Id: <54f436a1d2a11a379af642a3327312367ef95343.1532090446.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [95.76.156.53] X-ClientProxiedBy: AM5PR06CA0015.eurprd06.prod.outlook.com (2603:10a6:206:2::28) To AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fcfbf11-5e4d-474c-45f4-08d5ee3f0705 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4293; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 3:6DKySgyLyk/VC3IV3VX1Tr9yk0TAlAdls5LyViAs/qpxrtT1pUgdY+y+UnZlB0A/t1oT92WDp9OsEHRIRi+THnRXKTbJXWHFtK8xOGA7Lca27PSyGFM6H/AFU5pYLlZBEAsu6y3rwZn0Sqz63eW8+nTww9UnVdt/dlniihK59M5BKau/DOAIjjDntTRimALLx60HQ2N7ZaxXtxM3q6BhiFvzEBZ42+EV3d0tgSuirte7SWcD9sDKX9N8xVvIdX7n; 25:2GZb4E8c7ImP+4BgaEKqGPr0cInn6LGmbFhHYYLO2OGe2A8QDjeG5GtvyuBBP99C5kNgYp3FJaWL80LK7hx1g97pklDiSiKQGDNHEtESnczuzfXckTSEYnxTtOZcAjwQ/XHE/k+AlFsApoMRvJREKT6JRowa9K/k/IAU4JpTdERXcyprh064XybOHdzyzvm5DOLrmCANJpgaV7Zzpw/krYemDN3SN0K9bBW6+VpEr7J85qx8MzPwMXo7gSzragqlAUXRd43x6FMn9OpiBzaAmeqhmVREWJHG5Denkj3WY9BV7vQRvHIRm/diN8IhEr4CKezC/xodJ1IV9DBgY4mBXg==; 31:AdfosXsSkSqzTWb8mBjnu0x/OpVwtH/FekTRnZn46xZutFggKlqReNhUOTT39sJn9Cq/+zpShDhnsWQ8Tn8Ah7ygXi7AXhCBaoMVBxz48CNDdN3vRtbhLw1DllvXxybz8Aup8qZ3zcGG98PHUrebgt0xExvH79YFxTauWNOx3ngbJFB4AuJk9zBfEspkwLQGrORncYT3VxlquGuoQGYIEe+ptm7YIEnRJ4NQRgZ+eDA= X-MS-TrafficTypeDiagnostic: AM6PR04MB4293: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 20:ABHjPkTeloS1x4S8/NTEP5bdLyPIishgvMbcZD0vOlQagUFqPtORQcBsQHV/Y7Q8/GueS5Boy14ZHkXJhsk1b672eoBfiymHPLbMJ/8xxDdHW/UjAoAylD0XR00IXlTMbh8RN3RdMsvoV0CSWNo311FvrpWC14SiYgUkcMnM7+5rypk73R84C8vYnmrFkz5nMuMmFOv5Sxf0qQtI27bdXX2dOp7smyIiMiKm1ECPaEXJGjy4urXuXbs9ez+31cx2ZKkN9EUEGzdBOa1MmAsPA9teK0BcUrAhoCT6OW8aaT/qrkPTRdNr5gw11b2kpxlfE1jR+KUz6d6WW41shb6QEGeAwbRMtzW6LlzzOjMvzZ1FyCRMki7kU593II30zRi1ktbxqnCCHwn39iyi+bQdFkIfTo/SJzyyQIYMbIAGiblMCoT27p6kCSMhIpDXXvL9oETyBw0x1iVU7htajgUwD7sJRUW/gDAegJOtVQNiiBZTcR9JlKU7PayjL9qct6Ng; 4:JrImp8l6GCLiq3p6YyIMrRHSYs6/zKJoCmornGTlCUz0bNrb5y60EnI3wMP392IsTnFFKJCRiW5FFHsXE3Cz+++qu+yah8jitibLJnrul+m3CdXJdkSyFNDgXuP71MMXg7LF61oy5sKT4RGVo0giCfGKOUjfoRdhUWip53+CrR/KePkWHN/ux2bWQ+Kcy/GVr1eHibsOUQaWluTUdRC3BmYBvFiL5d9roAvL9dDgOeI25xkwb6qDlfJ0kiatQp8mJ7odlB0hWXjGjTOJNMqrNr3jfrqAbxnEiEnh4yjjq3QwIzjukD9Cea7w4Z4bD9Yf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM6PR04MB4293; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4293; X-Forefront-PRVS: 073966E86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(376002)(136003)(346002)(396003)(39860400002)(199004)(189003)(2616005)(39060400002)(110136005)(54906003)(50466002)(86362001)(4326008)(305945005)(8676002)(48376002)(7416002)(8936002)(105586002)(81156014)(2906002)(81166006)(106356001)(51416003)(11346002)(14444005)(486006)(53936002)(97736004)(52116002)(956004)(25786009)(6666003)(16586007)(478600001)(476003)(76176011)(316002)(5660300001)(3846002)(6512007)(44832011)(36756003)(6116002)(6486002)(26005)(6506007)(50226002)(186003)(16526019)(386003)(66066001)(118296001)(446003)(7736002)(47776003)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4293; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 23:A5fUdLAT0QWfDwvPf98Gdb+jIjPW4OnJxKpUddX0bebq6blt0bX0YfnNFhhIdrX2pOuCaLjZs+E5ZNA2Rs4a/p3QMQXQ5qKFlg+qJTSAiF1IrIWlDx6864msYPgX/nRLMwozhx3MKlq1WK7z2GVLXYR4VT2y51OvjVpG33R/LIuXvob52SIT1RlChr8ah8w8Z+Q9LqMn6CNO8FfQUeBa+9a9rBrTvBP198fP80EvsCs8mb6/S2L/yCGixiNP/Ez5AxgzdzTUhkvYC+inRuCQuxj+rYHa1sBjcPtFWByvyShCTOaaNrRc36x+8E6mI+CH97pvNPKYS0Hi3JnO4zecXz4WoP8PBjNXAiEcM8zPBataWK74AR9p5xVRRSq5Hup/Fg6fBmX9/tans6aIEi/tfkzcUk7Xbrc7j+glGt64F0T3cBpuFqNVT8blkL+dGEMyGx5bMeMFtVvY2AK74uL+zUE3AD2TJNkxl2lyk9Bpx2vxde6iOBsAoET258LUFI0gJiq9KonHTL6b0v0qmyrcjpD6FTcKeOf5CtpX1EmYzyKkNFXrA/f71G7EHaHkBmtyqfj6J7i+QMn5t1H/qqSN+aP5IFmdKmC6DObaDSdmqwg4AvAyjAUqxoCpHCs/uy2ky0pPwWMttVGLxuiH6xT0sPmT5s09Ddhnjg6cI/qgBvRQNHUW4p6y9QVuepA/MTBUWxACYW48uTlGb+lw4u8gXKZSRGHDHvvAejCrex+cw3dwX00+qthASBnHaqBrhB1OA4wS+wf2yn3UttZCyMivGR0Gp4tC0FY6aZyYQYDO9PLsOyeeiFrdpqzI4/tt9uR1EZ3HLBTjvMok9/zm/n2OXgfa1CnKlfx5HP8q1pG6I9Kuwp275v3AHT6T+v0CmQs4fT1uFXGVvmND+21dTD3CPsjlYnWsrD7AVN3THOMi3e/WeQaYjbEb+ekvcafEilPKy2G9q3yKEzrq4tIzOa17t+LKh1fzXFAcZeaIIeYw0g3acnpTGXs/mhCzP/FVxghzgVPFhfq9f4djKvW1WGEt+Z0jZs0lix5wfBmpIAQ8jjbA2WBMQusloSy8euY1tv1bnBm29+cIwMGj5uWf+Y4PiZLS1Uk1/+uy1zkX7Uk6dSUTDvDbDnQde3YzSrdOrDvUQPn9FZeqIbTojc/2ZhK6ROfhN26Wt321/+r+4cvbY5vWuY88RfRGjO3bkdnOQJczG793gPBFd7c/NZg+K4XPx/PEpdjezFVlNN7KdWEG0Ye0ZmX3B2U8BWSSlXD+2KV/RHJuHOks615x9OXxf9+FlgrRaAzOVUrkf8WZtPF9Db8= X-Microsoft-Antispam-Message-Info: qPNQLclL6JvtgWFvD7n9QjM3aOS8YeW7H71TY+LHf1J5oZeqf1RePXmz+tH3+IiNZuwKDacgqVyu+X11LPhJQP8QLBbBhBpT94l+TlPjIf8PsOs3eeDAk5Q67CraoYMhuS7L+dRRb9qQhOaIGqIuw+35aH2lBLbaP5M6Pm9HSSiZPQStAMk9++8+HAtNsNDWxpvpBjnmBGq6z7rAHBbJ8SuaPXAEzF2AGr2WoCXVrRjEbDPeVPih6JKkgEgGcp++NL9qiOZMicwqfNMhU2lEDRojwY1H0wCXknYdJ3s8L8RVFq0ctQCt416SyZsnD2JRnDSDqzZhJQmdj9Fu6+ulsN0yC3jL82Dniw4b5ec8q88= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 6:yuTQIm1RavJuTCHRJw7t85p3Uiy1wxeGwGuTOm5YlzTBa5lH87TNE7wv63zUHs1tPRfFmVm3pQkeifo4vxxC89utN4tjj72gZiIsTIS+0LL0hl0xQjoVvTEytBdBUC3X77uk8paX819D2MHi8jRLppR7lAbxZnokQ+r5PLtOyw+gLvabjO4Y7apFsyCDLu8yveFipn3wf1rRpw3QojQwxHqjpaRse7PgojHXjNL4KxG34fw4DzmCMNAP9a1Ah/Zrv6zRiRk7JSBeKEt2+PuzUy8DP/PYHHwWtqlHV/IIvVG2DVC5rMuCKYFlSGVemqLSMkVq3+78cskSevGYaqqvJPrnvApoAJwW29iYxbxuwH6YcGwWQEqvriZPRQ6I+rrlzvkiMLVoSFg5TyBQa9lCol5997EXXwzwB3sUUNwjAr0OXMPX+H/Ji84zpB8SQKg713fEebpp+Gp6pkjSbX/bnQ==; 5:E+7/AQz5IC1cI8+EpKlQpoCPf01xKehO4ChQKoorKD5gyu+KRxi8+CNw0W1hicOzrXPK3DYffStD8fXJgwpUkkqJqC8c3Qj25B+u9zRQLuEnTZ99ik4jpDDJMg2QK5mSXJIBiyD8H0upqLnMZ3BInKgJDMSTp6HJZO5+KBIQdHU=; 24:OrOrejUffVrcSe93acmJa90muren4RjYVmSxCi1KLiHTcFS99OuQJEjKji4HjA9yzOpXduFxwM3S0QMQhA1/R9SOHB/YB4FG3lPqknQ0pvo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 7:sK6HUT0EDVZ8kBiSG+eCFg3ytG56HMPoDvHEfk3wu8GrJqHaxNfNk8oVQk9BVWcD2fns9kbhta0IP5zzJCtQbGcv+tcVzPk3FQAj00ZH3Fed1F28t7IoQxYWO7kdPzfiUU+OJmWj2KDaOlUwiwWJEhZVUtnLpz+4E+G/MZdtR7Z6OnNaaM0RzsPlkhywOCoPMLes58OhjbpQlUU7aL1fhbGsPVC7fVhYttYONTVPDEi6idiBOmSGu7FvHNWPG1dq X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2018 12:48:00.3585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0fcfbf11-5e4d-474c-45f4-08d5ee3f0705 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4293 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Right now the only user of reset-imx7 is pci-imx6 and the reset_control_assert and deassert calls on pciephy_reset don't toggle the PCIEPHY_BTN and PCIEPHY_G_RST bits as expected. Fix this by writing 1 or 0 respectively. The reference manual is not very clear regarding SRC_PCIEPHY_RCR but for other registers like MIPIPHY and HSICPHY the bits are explicitly documented as "1 means assert, 0 means deassert". The values are still reversed for IMX7_RESET_PCIE_CTRL_APPS_EN. Signed-off-by: Leonard Crestez Reviewed-by: Lucas Stach --- drivers/reset/reset-imx7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c index 4db177bc89bc..fdeac1946429 100644 --- a/drivers/reset/reset-imx7.c +++ b/drivers/reset/reset-imx7.c @@ -78,11 +78,11 @@ static struct imx7_src *to_imx7_src(struct reset_controller_dev *rcdev) static int imx7_reset_set(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { struct imx7_src *imx7src = to_imx7_src(rcdev); const struct imx7_src_signal *signal = &imx7_src_signals[id]; - unsigned int value = 0; + unsigned int value = assert ? signal->bit : 0; switch (id) { case IMX7_RESET_PCIEPHY: /* * wait for more than 10us to release phy g_rst and From patchwork Fri Jul 20 12:47:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 946883 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="uYTrEqK+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41X9gr28Hbz9s7c for ; Fri, 20 Jul 2018 22:49:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389377AbeGTNgh (ORCPT ); Fri, 20 Jul 2018 09:36:37 -0400 Received: from mail-eopbgr50085.outbound.protection.outlook.com ([40.107.5.85]:15725 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388476AbeGTNgg (ORCPT ); Fri, 20 Jul 2018 09:36:36 -0400 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:X-MS-Exchange-SenderADCheck; bh=acD2/XdmvNYxlbciyzRWc2ZqKd0G3KLa/bG4DsrygKs=; b=uYTrEqK+1Ej8uZjKp+/RhQx4aiFAcqQmKK3OGKqMu9QN14cJShUQCYDovemVMr9Go93+ekUXkFnGIGU35p0SoNfDLlFqGeT5lQF8cpU8DcUbH75VQH19Irob9dg1rQTf4Yzx3dPZbunW963CuAy4YM1ST4hVx1PZrZpi1pvU4Z4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; Received: from localhost.localdomain (95.76.156.53) by AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.20; Fri, 20 Jul 2018 12:48:01 +0000 From: Leonard Crestez To: Lucas Stach , Richard Zhu , Andrey Smirnov Cc: Shawn Guo , Joao Pinto , Jingoo Han , Bjorn Helgaas , Lorenzo Pieralisi , linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Estevam , Dong Aisheng , kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v2 3/3] PCI: imx: Initial imx7d pm support Date: Fri, 20 Jul 2018 15:47:44 +0300 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [95.76.156.53] X-ClientProxiedBy: AM5PR06CA0015.eurprd06.prod.outlook.com (2603:10a6:206:2::28) To AM6PR04MB4293.eurprd04.prod.outlook.com (2603:10a6:209:4f::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 842374ad-e175-4281-7a5f-08d5ee3f079b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4293; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 3:d+RJDemYutNXnb/s7qZSRC0JIlqGXrJYkyB78X6VT++KQP1/RbLqakWkeWT6Io155yACMa3B6yneIJQWtZZeAkRnzbEOtfTLUXd3A13pe/flHcbtidKsh3mV8qIICeQyt4WVRdd5lmQpWxWLZHa0+5sHGzU3l3AbaDBkhKh1mGifpx7FveNSH3rvJi/NXcUP5GG1p3AtWkp7ZEiAne2kJCgyfgw4q0LES5uWmtN7titT9jT+1n8nsdHjsgM8l5xo; 25:8Q5JeckhwZfOiL3IsY7wSQX1R9fkICGaNHfSeesjRxJfJYx3CCuH8QMpTqfjAHnlBArOP4iZuwHpnbiPYyjF9c3FdAGEah4mk6soM13JTZjIpvk+aFmcHuYzk2k6neKLhSIQbQEiJxM8chl7odBnp5hnD1l5BYrL9bmHTvL4Cx1Kt5LEK7TGDsQCdmxM81u9FxhY5AdpxfoDKTIaI7EijX6MrBnYGIKRQ9M5LkMypOWJ6VILyB3YHdy1aakW/9K811oGQTUKXK6o3rDj9OChZvuJsrHpqR+7A8VV8ZzChev9kCxPqSpGbaZzZ11nJqyalX5GNBooMAVMjOljUihAmw==; 31:IRyFagrnmeaMo5Vv6DjYSylqeOayU7aAQT6lMfK5MiuDxE620QgcUzY9Bl7Kqrs0bI9tEpD9BkY6I9kBtrcX3AqyydUIGIJOKEm689f7wXuMYpT7Wy26yY5aRjmRNsbTB1NCasaYjir5xBVbL5/FpbJlfS/DE8LdhXbYalG8BkPpL5fk+/Un30KlN/NlmQ2C6ER+1639DwWMgs+y1lUwu8ipEeKbKONTvTt4mc4ifXw= X-MS-TrafficTypeDiagnostic: AM6PR04MB4293: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 20:eBNeVonDUJ37/54D55NUPO4Xo4fSVHPzdzYZfASpuK13S32UR+YVCdnSiWpGLSno+7wOPt/y3LYn6IhvFnYsVMnZg3AxerZlGRPPhNODivgKAXwCnaRq+0z1OKAsjfN9T0rihwIYZOIh626LPBeAO8SJ/oXye3OXD230Xt3cWIa03XKiAPSeaDvdLCfyYacS4E6RQt4KpndcQSazya2TyqejVcuKQVbsyAfJjBrUXKNFfww44VvVF/8ZjamCRCnE8ldsbiD1OyZ/s8vnoMgrl0hioknRRDnnO5N29IAG9UZyJELY38rdj5Q86TD6dYBTTPALKNN0PKoCGrCRBE581g1Tuk7rHZs4R1TcG7PHLXCV6j5gJ5ikyHd602ZrMkAAoEWL2zhYr4jCa4VatQFBjA97As+i+G4GVPFjsHvLFn4Z52YxBNLQdU9ZZg98CT6rQhxfc3Gk5oPRXzjx4EscLOAIvjBn+mUhRbLQEPgjC7gZfLVvADyoo5r3i+DZUDzX; 4:LU74a5NUzFyIIk7lNzuaoSsoBuvBOECqmZ8DnR0oXRASvZyOHScReoDin4LWDTQmdqR+5DpBe48QGz3cIIfcuY4pR50//YhB2FOwp8xoXW/9YrOmSHUkj4ia9ZZpH7JyF61cE/VMDsIp2vgr4g26BAn3rSymSQZcEgWCokXSMHUFCGaXxypQL/oprJoPtl+RZ0QS0WU6krefC0OEgzEfLr4dGlP6Cv0MWXaJ91aicWjnLF8WFqLv7e7IowCtoKUddyj9xeKntkWmVneJCFC3toBTHWnuNjFdt+HvT812QVCKeeF8j/Ul3N7daSmZfvw8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM6PR04MB4293; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4293; X-Forefront-PRVS: 073966E86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(376002)(136003)(346002)(396003)(39860400002)(199004)(189003)(2616005)(39060400002)(110136005)(54906003)(50466002)(86362001)(4326008)(305945005)(8676002)(48376002)(7416002)(8936002)(105586002)(81156014)(2906002)(81166006)(106356001)(51416003)(11346002)(14444005)(486006)(53936002)(97736004)(52116002)(956004)(25786009)(6666003)(16586007)(478600001)(476003)(76176011)(316002)(5660300001)(3846002)(6512007)(44832011)(36756003)(6116002)(6486002)(26005)(6506007)(50226002)(186003)(16526019)(386003)(66066001)(118296001)(446003)(7736002)(47776003)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4293; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 23:ldT/JTNHF2Kv90pAYiltXxwIs044S0UW2TC3VLo9OyZ8kG8GGFj23mssDcrFHK4jjTFn2fvDNvUITfbddyMKD7MYLAnP9I81Gs/rEWmOgxLp9oZGmnuPFsFYbqNOuy47cDY87leDxrjw7Ro7wOI/8w7CojrdBoi0yovnc/FR7D5wPhoXSEExFDL0rfLEZCJrcz6HTfljumN5FW5JiDZ7umvX3oBssyBWCzrot0+Ck0zimqhOpKxWskKqq+vSiXqwKRksy6xs0/kLX4KNTXeMIJxfW5GRuukpAvH3U1gU1TF3BYiU4HHqh8ETXaT0OXbTIipbyFj+DgRW+4+gZcpRkaYLiTZp+U9voFTRCxzeglzvX9SL5g+LZVan9iul2uBYpTxDsZP9Tio4xljPK3Bm40tjBQrrJ41bYXF1Gd2y31tSiAtpkUIKTAIjDIvEK/NQHeoe22/VEJh4+Q7kCAydNz8BUHhcNiTnKxek+AFqPZ1yozQRUmQu/0C22zrjLXRBe7zHa3GlkcJWrYRcJ02xRwZfR3nzi6bvxukxqi2QPZcNZ8TZThu01R/s0PBMJEtdujOHXPINla/HmE4Uifjl1aNk7tGSeoprSfGtu4tVHR4X0Mqfo4RibZ3ixTZgzMDlENX/acKKpJCzf5baUgcUIN6aPWiI8g1gBEQHaPJtJd1sFI0zYritQqrP+A24vSFCc15ZonWb1v3Ahp3QbyTyATEEpjbTGtt8Gb/qU/rHJip1uWLkqwEfdneD+z7gLAgsomWpIkHbGUoC3IPq7kO6/LgbiwdwCeqpxfSFuLmsfp9NSezM9IWdPOMdcqkYOHNaENb1O4IfuChcLvwJqvbZOooZajJXXl/jPaxoVchnE+m7FyEjyFE6rzyNF7Hwz7Xo+GeH0myWU0EdW7yBDUJQqttAvEnYa2VGFbop7p55koNLGeOztBZ+AEIbtnW2QbXm3jGBgzbREqurxwi4tBaVH4oCGcYEse7zR4m9C0U0OfuWxmV5pRfSkqurJ8UL3IvT3hU0/wHn2GolxeJJr32XPZ6uLhyjytgqeVYESZE5akzw4rluzfrx9uDttQSbfIkFwR7cAQiWw1ygb4JHG96aM5tHDFyOF8R7owdh78LMiTkrZghcGcCVsbkgn0cZWKxBeEHoIJbveDFQV816bO+t/a+5C6/nkeo1VHX0XPMOlrADeSjfIFc1HCQKIHoYIHe71XlrfTv4aaE0e5WOzyhCZUCOVD2zcRnI3RxRFzznH+BXg2DcwzwiWeg5LNXBCPfoLDPd+2m/pZfbyBg35T1hfTAVzrlq3VEHBc/RqGhvwZw= X-Microsoft-Antispam-Message-Info: 0DUw9BNc2HZ5I6MHWRJ3dE3lQnROt8y8tKN+KSQtukUFmFDQWcADjhx6EKRfjoOQ0jDZRUt7PPsF2JEHzGsbBc30oEf/WoYj+yHUTcF82E4pQToDrpbUSUZVOTBfEitEEUQrO9yRKppWKoFGFH81ygNLhAC50ABCdWVAz3QGoA2g5OgNmCEpPP/Ml1egWBtst1EFdnpxWR4mZiQxNnbz+9/UtZDU50motPyjeIk+4GBOvGgIH0SMtuWrAuKhFFPQwTp6fqHR3dOqbkqh7BPjxQeBBCvXGViYW2X12yWvpMGB6wAZ2OGIJMu88DwDT/Hfc54fC1I2KY5yP/G3vyGUo/mdjOy5wLCDqSPUm6ItwAM= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 6:V+ZSydo6vozC+YHRQUkkvCBEt2mk2l6bcm65Nd3jAVdF1/qJ637JNP9GwLyZ8Qcen4o7wNvLQ5XqO2IMFinjF8J1dYGcpRH13L/pa6ElIvZ1tZOVFOdCDr3BbwGyVHkkAgVQwyBz/Rqt+jjObrJaKX4P8MS5RXUfMVZ0FXA7YcMzIkj2sY4x3negNlqnhpsl0+nZSRTkq0jC6Voerj5TGUUY97SW+PlRE8FWHbBvmnwwCAfOggxvJky9H4CYILvBuXT8xmO9Wk31t56ukSHhq9e2hutDylPgrOKWuGveqR4rSWrKVjVU2Z0AgzH4hiRUcikvM5tVhK4zbqFaAxhJUBxrEtjZqZol4lQMR55mn8ajGF4sOhmJdstkdTg5HsyNVMjgpymS7gYlQAqvijitZYVj1uPvnW+yhTYv/IX5GIgUM4qoCJttmJiA1ndABdmfmn8jIgJjc3feDERdnbFSOg==; 5:+gIaYEN3eJHjXRRaLT4ndvg/tzW/UmkJChwAitFlqTeN7fJRiPI83gM0AcgBfnNX6JHQ3mu9rH82raxRNeQA50CXCS0MfMImJaWo2PBDyBphwsPKC/JgjuG1Dzl9ctO6jV9Xt1qu0UHEhFeWcc0dWt+v38PHagYOC24yHjMt3y0=; 24:uimU6S/9GB4R4fIyNirKjeP3AU0ZkfjimLm4CSBScY0L1aCAmWunf21B8AoJjSRTAP56olGwcSkZJu//Ks97ekewKJlfiH4/2c5vbeXMEtw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4293; 7:Ur4pyb8m6SvD/gH/zgsO+FJnblyM9hJioDu1k7mmiZ3rO+EWv+BbS7UFY0xcEw4cD1E2el5VG+KwHS/041BuSdrVfBXP3uBO8gOjUjI95I/5WthFUWaA5BcG1zVavvMOIlaz35PLflkKE25OkIROXJW9W/C+pKY58/ZTnANY8evSKv1M8JACFcN5YXwpTMhpIjHqx1rLIiwcGoNad9oAclrMF/OCw//08IHkqHVz7lUeqFh88FBV0tn2nbdkZyAP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2018 12:48:01.3585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 842374ad-e175-4281-7a5f-08d5ee3f079b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4293 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On imx7d the pcie-phy power domain is turned off in suspend and this can make the system hang after resume when attempting any read from PCI. Fix this by adding minimal suspend/resume code from the nxp internal tree. This will prepare for powering down on suspend and reset the block on resume. Code is only for imx7d but a very similar sequence can be used for other socs. The original author is mostly Richard Zhu , this patch adjusts the code to the upstream imx7d implemention using reset controls and power domains. Signed-off-by: Leonard Crestez --- drivers/pci/controller/dwc/pci-imx6.c | 95 +++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 80f604602783..daebee905108 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -540,10 +540,27 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) dev_err(dev, "Speed change timeout\n"); return -EINVAL; } +static void imx6_pcie_ltssm_enable(struct device *dev) +{ + struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + + switch (imx6_pcie->variant) { + case IMX6Q: + case IMX6SX: + case IMX6QP: + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX6Q_GPR12_PCIE_CTL_2, + IMX6Q_GPR12_PCIE_CTL_2); + break; + case IMX7D: + reset_control_deassert(imx6_pcie->apps_reset); + } +} + static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) { struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; u32 tmp; @@ -558,15 +575,11 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1; dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp); /* Start LTSSM. */ - if (imx6_pcie->variant == IMX7D) - reset_control_deassert(imx6_pcie->apps_reset); - else - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6Q_GPR12_PCIE_CTL_2, 1 << 10); + imx6_pcie_ltssm_enable(dev); ret = imx6_pcie_wait_for_link(imx6_pcie); if (ret) goto err_reset_phy; @@ -681,10 +694,81 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, static const struct dw_pcie_ops dw_pcie_ops = { .link_up = imx6_pcie_link_up, }; +#ifdef CONFIG_PM_SLEEP +static void imx6_pcie_ltssm_disable(struct device *dev) +{ + struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + + switch (imx6_pcie->variant) { + case IMX6Q: + case IMX6SX: + case IMX6QP: + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX6Q_GPR12_PCIE_CTL_2, 0); + break; + case IMX7D: + reset_control_assert(imx6_pcie->apps_reset); + break; + } +} + +static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) +{ + clk_disable_unprepare(imx6_pcie->pcie); + clk_disable_unprepare(imx6_pcie->pcie_phy); + clk_disable_unprepare(imx6_pcie->pcie_bus); + + if (imx6_pcie->variant == IMX7D) { + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); + } +} + +static int imx6_pcie_suspend_noirq(struct device *dev) +{ + struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + + if (imx6_pcie->variant != IMX7D) + return 0; + + imx6_pcie_clk_disable(imx6_pcie); + imx6_pcie_ltssm_disable(dev); + + return 0; +} + +static int imx6_pcie_resume_noirq(struct device *dev) +{ + int ret = 0; + struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + struct pcie_port *pp = &imx6_pcie->pci->pp; + + if (imx6_pcie->variant != IMX7D) + return 0; + + imx6_pcie_assert_core_reset(imx6_pcie); + imx6_pcie_init_phy(imx6_pcie); + imx6_pcie_deassert_core_reset(imx6_pcie); + dw_pcie_setup_rc(pp); + + ret = imx6_pcie_establish_link(imx6_pcie); + if (ret < 0) + pr_err("pcie link is down after resume.\n"); + + return 0; +} +#endif + +static const struct dev_pm_ops imx6_pcie_pm_ops = { + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(imx6_pcie_suspend_noirq, + imx6_pcie_resume_noirq) +}; + static int imx6_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct dw_pcie *pci; struct imx6_pcie *imx6_pcie; @@ -847,10 +931,11 @@ static const struct of_device_id imx6_pcie_of_match[] = { static struct platform_driver imx6_pcie_driver = { .driver = { .name = "imx6q-pcie", .of_match_table = imx6_pcie_of_match, .suppress_bind_attrs = true, + .pm = &imx6_pcie_pm_ops, }, .probe = imx6_pcie_probe, .shutdown = imx6_pcie_shutdown, };