From patchwork Mon Aug 12 04:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 11089281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 42DE713B1 for ; Mon, 12 Aug 2019 04:22:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34E9227F4B for ; Mon, 12 Aug 2019 04:22:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 293F327F94; Mon, 12 Aug 2019 04:22:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B34E027F4B for ; Mon, 12 Aug 2019 04:22:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726358AbfHLEWW (ORCPT ); Mon, 12 Aug 2019 00:22:22 -0400 Received: from mail-eopbgr40052.outbound.protection.outlook.com ([40.107.4.52]:41425 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726185AbfHLEWV (ORCPT ); Mon, 12 Aug 2019 00:22:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsF7YDn4UMkgmO7EvsuLs6UkisyVu0l67sBdJnm2nApD05joUeZNr1L+uHnLR7XTW3iEQgoZPHwFUp5sF8GaF6yk/hGEXal96Gupvb4RyUBtHmpcvO4tCv0kZTvhoobZ7rV03TQWcVRsr68nWCt2ooslPAEJDyhn4BQf8PozDGlComjMvHkN+pMyyLod3mg12ZkU5HRSASJuADS1BhnX3KBiIulQb7VQmAE70z7NjdR3efpt0J0WAjqB2hDYgHKFxCnDghbDFntaq313XCR+lrpRfpbd2P515oOSQRB4HIOsVjC5n/33etvFabu6Qp6wz6PzDr6Va9X3VU1fNJcfEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EG700lrQm+MfmR0ADwb4ksaoTp9Dv3tRaZ4l1aDvzFw=; b=Gnn69kP3Em2dMYZy1iWb6cBFc/H1wIr/Xj8vtHHd6CpCNfR75yk3NNiOTPpxb/CB32W9IRAB3SUsH3p/wmwlyHuRbeDKGVkEe5CkYBp49t+604hggo7hnHuG4D1NPK0tRZLiVJPm/FTsIXFouTELdjem3Ry1B1MgYPyRCiUnKVNkG2yDAy5Qu464krXG7wWAtt8DYGNoebmNrGkZCEDvxYxrLQw5+VTmBnRsN+LDQqTcN0hl294b7AH14n1FNS+DsOzJmCnFi2MzVLHo9ZKE/lhHLNfpydYuRPD8HErn60ZgINpfWLDNhu/pVW694IdVMSBuawfqt6bsHSL5BfoKKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EG700lrQm+MfmR0ADwb4ksaoTp9Dv3tRaZ4l1aDvzFw=; b=JXD0SZ3FC4PrwS9I/YIZLqm3RhfSUINtbm4JzvMLF1tvH5Nl3e0Q/pStNcQkpJRlVMu9eSn5HD4T5AMUTsLuvq/9RxIlWG6up5fTqheWm4BHRzRVn3kkoIk8UiwXlmsh3fMYAP3sxu6+zCU5iYv8vZyGplMPu1VL1LUZtboK+LE= Received: from DB8PR04MB6747.eurprd04.prod.outlook.com (20.179.250.159) by DB8PR04MB5931.eurprd04.prod.outlook.com (20.179.11.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.23; Mon, 12 Aug 2019 04:22:17 +0000 Received: from DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb]) by DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb%3]) with mapi id 15.20.2157.015; Mon, 12 Aug 2019 04:22:16 +0000 From: "Z.q. Hou" To: "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "gustavo.pimentel@synopsys.com" , "jingoohan1@gmail.com" , "bhelgaas@google.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "shawnguo@kernel.org" , Leo Li , "lorenzo.pieralisi@arm.com" CC: "M.h. Lian" , "Z.q. Hou" Subject: [PATCH 1/4] dt-bingings: PCI: Remove the num-lanes from Required properties Thread-Topic: [PATCH 1/4] dt-bingings: PCI: Remove the num-lanes from Required properties Thread-Index: AQHVUMWGvFlksd6l7UqMedZRUuiO6A== Date: Mon, 12 Aug 2019 04:22:16 +0000 Message-ID: <20190812042435.25102-2-Zhiqiang.Hou@nxp.com> References: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0060.apcprd03.prod.outlook.com (2603:1096:203:52::24) To DB8PR04MB6747.eurprd04.prod.outlook.com (2603:10a6:10:10b::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5e06ed89-0d88-40d7-3be3-08d71edca876 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:DB8PR04MB5931; x-ms-traffictypediagnostic: DB8PR04MB5931: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(376002)(39860400002)(396003)(366004)(189003)(199004)(6436002)(256004)(25786009)(14444005)(66476007)(66556008)(66946007)(50226002)(2616005)(476003)(64756008)(186003)(11346002)(446003)(486006)(6486002)(66066001)(66446008)(53936002)(7416002)(71190400001)(6512007)(71200400001)(2501003)(8936002)(4326008)(8676002)(6116002)(3846002)(76176011)(52116002)(110136005)(54906003)(305945005)(7736002)(1076003)(81166006)(81156014)(86362001)(5660300002)(14454004)(26005)(478600001)(36756003)(2201001)(2906002)(386003)(6506007)(102836004)(99286004)(316002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR04MB5931;H:DB8PR04MB6747.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: u6FWg3+Qd4iFxajy3eOCHG9ZgqmDrn3cEVCB5vZl1D0RcBtsYbZNN/NQyKMR2QtVHrOPVm4WTONCEcGp1Caqhh9U1Y3B/ZcAj4Pet5XWN4GqO/UpLwEFyCDD1zGEcgzxVIhd6YlZkd9er710IGGA+mBHVwQKO7+y5dpYeTLUkGHnHm2k2WNh1K7BZcntR/3Mcmqk0h5AYrd5y9ejdy/UnvK9cRoiuL4j/tryBTarkbU+cWxGP0vOsxw+43N+G+Itf9hlHP4KTa62rfGfdwafLyMz/lP71/xlHyWEfK1in76573X3ceEG+GSTcMUrAEh+D8UfYFITRZsaXxhn7/X/UjvH8ByhzYINYxF2y9ILqayT853pP/Ef2S1oAvrkBiOBnYy1qZyCAvqiakBlCVpEx5FY65pHsdT2Qwlprip3bnU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e06ed89-0d88-40d7-3be3-08d71edca876 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 04:22:16.8301 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 22x7u6ULxGDAAuV3q5LGQEtMiD9sIcaW6R+1KFjrYIC8uK6a/gHKbYnR8jeg5znjuAVagME98N8gUP5F1LYzcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5931 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hou Zhiqiang The num-lanes is not a mandatory property, e.g. on FSL Layerscape SoCs, the PCIe link training is completed automatically base on the selected SerDes protocol, it doesn't need the num-lanes to set-up the link width. It has been added in the Optional properties. This patch is to remove it from the Required properties. Signed-off-by: Hou Zhiqiang --- Documentation/devicetree/bindings/pci/designware-pcie.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt index 5561a1c060d0..bd880df39a79 100644 --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt +++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt @@ -11,7 +11,6 @@ Required properties: the ATU address space. (The old way of getting the configuration address space from "ranges" is deprecated and should be avoided.) -- num-lanes: number of lanes to use RC mode: - #address-cells: set to <3> - #size-cells: set to <2> From patchwork Mon Aug 12 04:22:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 11089275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A724A112C for ; Mon, 12 Aug 2019 04:22:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9775C228C9 for ; Mon, 12 Aug 2019 04:22:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AB0F27F8E; Mon, 12 Aug 2019 04:22:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22FD7228C9 for ; Mon, 12 Aug 2019 04:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbfHLEW3 (ORCPT ); Mon, 12 Aug 2019 00:22:29 -0400 Received: from mail-eopbgr10050.outbound.protection.outlook.com ([40.107.1.50]:13314 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726805AbfHLEW0 (ORCPT ); Mon, 12 Aug 2019 00:22:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VwuKDL1uNvC73N2CGHktEKw6eatEBCTnqEepCecgl+rkfb0CUvVOIpQuW1b4ue/q71s6qFpHHdPC4z4N07o022Nsmc+8vAQ0JXPSYh9vqMHJimiiCCksN0RKH03hdEs3Tf/N4Xb2l1/jqxZ9qMSUpnb4D7fE+oiew5PkmTVFyMwJgWB8K0YmBgwMo9CbsjT3C9+wj3XDUp4uoI7SUOa3cbEbo/5w5Jbi/9THJ9hQuINrLEZEZpyzwd+ztB48LVVxcaT0s2mF7zv5m7ro+9C1k5sYNaQBqN6Co9YHDvUfxAmoVVUrSM9bdsbCiUN0IBJ9L5Zzf9W+g9/Xpuo4DDW0Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EuPR9USDNJ0zLmZcNYBKTTfUb0Pc5v0J9W0qbSDkliw=; b=H9KqFHVIoJD0ub40fu0QuUM1t4DRiEj000cZ6SOIkyOr2PkLayM4pczZkZsXcuCTLm0FPGqcxlRH4OLi6dObCyy4lcoKkbP0piAGaAQSyJoB3cvE64A1yRJ6iXV616N7YEZ866dCiKYKzRIrlV4U2tam//6Iiv2+xdSTqJWsH6cE3aaSB93IX6OlJbD7ndkAtCn9MUoKBxmEFtYTF+wvpTVuj6f4mMqsnhcQWp+sIb/d4gb865/+YW28W9tc2A4T+QzoZX+Dim+wXLKdYgt6OmVP81NAcxHw4P1saNfgm0HWfD92SNiogm4AWBHyBsdam16bttyNGOK57lm8Tk5zVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EuPR9USDNJ0zLmZcNYBKTTfUb0Pc5v0J9W0qbSDkliw=; b=gTy/agJMlNfZVJGl+WFBrFAO1/Qn2eztHrCbDCzOGk5W0ZlwUIVCapAS175Z7W8U7TVYAn3pzwliszW5iutRKVxGzeyzMwAP4oLvYaH+F1iDBNI1/QwIWPVZvT2uJ8KCzP9lrVLd7bvCMijKhlURDzkjxZ1v5uRBZjwfYEg3wEA= Received: from DB8PR04MB6747.eurprd04.prod.outlook.com (20.179.250.159) by DB8PR04MB5931.eurprd04.prod.outlook.com (20.179.11.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.23; Mon, 12 Aug 2019 04:22:23 +0000 Received: from DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb]) by DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb%3]) with mapi id 15.20.2157.015; Mon, 12 Aug 2019 04:22:23 +0000 From: "Z.q. Hou" To: "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "gustavo.pimentel@synopsys.com" , "jingoohan1@gmail.com" , "bhelgaas@google.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "shawnguo@kernel.org" , Leo Li , "lorenzo.pieralisi@arm.com" CC: "M.h. Lian" , "Z.q. Hou" Subject: [PATCH 2/4] PCI: dwc: Return directly when num-lanes is not found Thread-Topic: [PATCH 2/4] PCI: dwc: Return directly when num-lanes is not found Thread-Index: AQHVUMWJYdzIy46VokSNj8ZzDl4Zng== Date: Mon, 12 Aug 2019 04:22:22 +0000 Message-ID: <20190812042435.25102-3-Zhiqiang.Hou@nxp.com> References: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0060.apcprd03.prod.outlook.com (2603:1096:203:52::24) To DB8PR04MB6747.eurprd04.prod.outlook.com (2603:10a6:10:10b::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ec292f5f-ba13-49dc-c1a8-08d71edcac25 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:DB8PR04MB5931; x-ms-traffictypediagnostic: DB8PR04MB5931: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2331; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(376002)(39860400002)(396003)(366004)(189003)(199004)(6436002)(256004)(25786009)(66476007)(66556008)(66946007)(50226002)(2616005)(476003)(64756008)(186003)(11346002)(446003)(486006)(6486002)(66066001)(66446008)(53936002)(7416002)(71190400001)(6512007)(71200400001)(2501003)(8936002)(4326008)(4744005)(8676002)(6116002)(3846002)(76176011)(52116002)(110136005)(54906003)(305945005)(7736002)(1076003)(81166006)(81156014)(86362001)(5660300002)(14454004)(26005)(478600001)(36756003)(2201001)(2906002)(386003)(6506007)(102836004)(99286004)(316002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR04MB5931;H:DB8PR04MB6747.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: tR8ohjz6E/Rp1PIl5yJlCWk20lbro7Diom+951JzfB6MhRkNAm2RlHY2SO9O7XQxmFoWA3s14CNCMIiJ5bqW6XPW2/s4i4d3CS5hu962WfY+r4kT+xEJiH1dQRcWUsSGzPvel2xr/m/9sCj3nV9XEaKXJ+O1ch/GZKTygG1oy6XFshbUay6btZzQF4Tf/E4VFr/BNf62G8Eu0Rl5geNHxJJT/vjw0mqffChClSURSHaSAMOHF8Ecjtit/PwtTn4ExRlfP+tLDR9UDciet//KF/zw17OVWXUgfCf2ByecLVlLD9ZZvc+OXijlid1ykStFMzmqC3DCr1/dMRD1LqRGTocSaLQ6b7926cbnQRC6kyXHtgPy6setSCwrvZjpKyelVeqy5e3Psn6QOY9Kcn/1SrBu4lOoTjl7yHk0lqRrH6I= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec292f5f-ba13-49dc-c1a8-08d71edcac25 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 04:22:22.9676 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ujcgmYEeyLeE1sc/ZYUQHrsZuoQSQZtPTYOfHtYekD/078USWxQOWYQAEM5dcEP4gJGkboecxGpjliDVaAL2qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5931 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hou Zhiqiang The num-lanes is optional, so probably it isn't added on some platforms. The subsequent programming is base on the num-lanes, hence return when it is not found. Signed-off-by: Hou Zhiqiang Reviewed-by: Andrew Murray --- drivers/pci/controller/dwc/pcie-designware.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 7d25102c304c..0a89bfd1636e 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -423,8 +423,10 @@ void dw_pcie_setup(struct dw_pcie *pci) ret = of_property_read_u32(np, "num-lanes", &lanes); - if (ret) - lanes = 0; + if (ret) { + dev_dbg(pci->dev, "property num-lanes isn't found\n"); + return; + } /* Set the number of lanes */ val = dw_pcie_readl_dbi(pci, PCIE_PORT_LINK_CONTROL); From patchwork Mon Aug 12 04:22:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 11089277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF031112C for ; Mon, 12 Aug 2019 04:22:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF533228C9 for ; Mon, 12 Aug 2019 04:22:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C31B027F8E; Mon, 12 Aug 2019 04:22:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 633A5228C9 for ; Mon, 12 Aug 2019 04:22:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbfHLEWd (ORCPT ); Mon, 12 Aug 2019 00:22:33 -0400 Received: from mail-eopbgr10050.outbound.protection.outlook.com ([40.107.1.50]:13314 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726842AbfHLEWa (ORCPT ); Mon, 12 Aug 2019 00:22:30 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HBGfAQxPdqZ+qFu1Ht+3zS8sRoGxL/0JDZsB6hY9FtuTQKshOAyGAZjue4JCe8rTSB0Sa1YbFtZi/C/f3b+tPQ3hIAiHHoym+BWnJsYszf5iavwmAk6dXLwMyoDanmkFZjWhoEuJxst8mPtZgCff9veovNHrPkQzdHAJhY6SzZczid4XUSGb+jQj5kGiWwhEyTmAFZwezOR7sUJVDcS8NJmoBedZYzhXujm3gDYSix8k4vsxup3FOPQHf/1COyMMqLnVcgAbhEOQPdZGk7R74Oey6hicYm734LCEUzXa+WCDjQGZuxmKp0k+fGKROTsavo7ror9XPYOrMibHyVzLrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NlsvvGeC0t2U8knoO4OapukZYA+UnLsvvJuxHIgblvg=; b=dovUMCdT/NjgHXN3wNCux5yaTTpLrffrNKgpFNgK3hRwbEywXedY+wRxiGue8Oavbu+H5Zp91nz+0m/omT9PpJ0Y83xtYH0D+juD4rJwioxz+4NLpMJ1API61WvmC90yJUNQ3M/gjl2vr3X8Sg8hhDFF7QWwobhvoV0O9J++qWG5haQELLO8POclLp3jbEoQOzC1vN4QMVm56HxFWK8QAPKp1Jf/bQnZ/tB7KeKpKCTrtbV+nFrlwKH4494dJrYQNESoSZ3xLqWBCJKYaBxWidR6ElxqVbXdaiAgp6exeNc/TN02JnpYP5TTNIruJ5qvwP0Rp5/Kr+8eQl2UUpPSXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NlsvvGeC0t2U8knoO4OapukZYA+UnLsvvJuxHIgblvg=; b=fSYnsV2a9ddXriAJ1+Z/2FNrlW0RSuWNyR9te+ynm7jhm2AKPsybC0K5XQJWvBqUDGHFnapm8ihBLifyPs699UFipSxHJb4gJB66hJTIr37Ej+cQ4Q+VwwdcshyY4YQE508e+txB8h2v1hJN2la2Uc35XzkByraxlykmt6Tkxs4= Received: from DB8PR04MB6747.eurprd04.prod.outlook.com (20.179.250.159) by DB8PR04MB5931.eurprd04.prod.outlook.com (20.179.11.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.23; Mon, 12 Aug 2019 04:22:28 +0000 Received: from DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb]) by DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb%3]) with mapi id 15.20.2157.015; Mon, 12 Aug 2019 04:22:28 +0000 From: "Z.q. Hou" To: "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "gustavo.pimentel@synopsys.com" , "jingoohan1@gmail.com" , "bhelgaas@google.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "shawnguo@kernel.org" , Leo Li , "lorenzo.pieralisi@arm.com" CC: "M.h. Lian" , "Z.q. Hou" Subject: [PATCH 3/4] ARM: dts: ls1021a: Remove num-lanes property from PCIe nodes Thread-Topic: [PATCH 3/4] ARM: dts: ls1021a: Remove num-lanes property from PCIe nodes Thread-Index: AQHVUMWMZFwmX+djskari+UjmO8phQ== Date: Mon, 12 Aug 2019 04:22:27 +0000 Message-ID: <20190812042435.25102-4-Zhiqiang.Hou@nxp.com> References: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0060.apcprd03.prod.outlook.com (2603:1096:203:52::24) To DB8PR04MB6747.eurprd04.prod.outlook.com (2603:10a6:10:10b::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f6120ed1-5f45-4a36-acf5-08d71edcaf3f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:DB8PR04MB5931; x-ms-traffictypediagnostic: DB8PR04MB5931: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(376002)(39860400002)(396003)(366004)(189003)(199004)(6436002)(256004)(25786009)(66476007)(66556008)(66946007)(50226002)(2616005)(476003)(64756008)(186003)(11346002)(446003)(486006)(6486002)(66066001)(66446008)(53936002)(7416002)(71190400001)(6512007)(71200400001)(2501003)(8936002)(4326008)(8676002)(6116002)(3846002)(76176011)(52116002)(110136005)(54906003)(305945005)(7736002)(1076003)(81166006)(81156014)(86362001)(5660300002)(14454004)(26005)(478600001)(36756003)(2201001)(2906002)(386003)(6506007)(102836004)(99286004)(316002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR04MB5931;H:DB8PR04MB6747.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 84ZGIlDtgggiLlHjtCbZHUAcTdm/ALZLYTPfb+U6z2gMUycQMOzFv6C41Y/iQW5BImRlfWuE3Q1OxXLN7z5fWi4Lgt8hFrCoxh8jiSSoZSe4MntPyp159Ab1hkRl01IY5XcQDovbszG7jChfZKpHQal3M3/lRAumYwG1kAHQbRDZnxXOSW9NAWNTKsE88Xm+Cx8BliCMnJjW0GkmIbMAy9YcfJr3GqJK8tdjqP8OuFTXqV+Tiegn1y1mm8HEcMAmU1UbeKI2nij85PCU9CWM7U+28A3dAgnS4gwQ1UBfX2IMELg43NJVnLVhm0E3MLwdf9QU+dvB1QuoOHEpJW84t+UwQNFOG3ww+Kl7kqOXzHzgWGn67dXnoaIEyszBUyzAasUpQFJWSwolt/6hWq6CUpAJW1tJZaLa/XbCtKl1Lsg= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6120ed1-5f45-4a36-acf5-08d71edcaf3f X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 04:22:27.9847 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9YE+GaB51KNIVKKIiE7FMwazgRHCCWxWnBG6AYdBBRQb9/4dcYcDnCQL7r0DKNdeVMqYuVTLjnQ5e2bRpo6dCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5931 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hou Zhiqiang On FSL Layerscape SoCs, the number of lanes assigned to PCIe controller is not fixed, it is determined by the selected SerDes protocol in the RCW (Reset Configuration Word), and the PCIe link training is completed automatically base on the selected SerDes protocol, and the link width set-up is updated by hardware. So the num-lanes is not needed to specify the link width. The current num-lanes indicates the max lanes PCIe controller can support up to, instead of the lanes assigned to the PCIe controller. This can result in PCIe link training fail after hot-reset. So remove the num-lanes to avoid set-up to incorrect link width. Signed-off-by: Hou Zhiqiang Reviewed-by: Andrew Murray --- arch/arm/boot/dts/ls1021a.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 464df4290ffc..2f6977ada447 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -874,7 +874,6 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -899,7 +898,6 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ From patchwork Mon Aug 12 04:22:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 11089279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 16DEB13B1 for ; Mon, 12 Aug 2019 04:22:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 069A4228C9 for ; Mon, 12 Aug 2019 04:22:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EEA1727F8E; Mon, 12 Aug 2019 04:22:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E0CF228C9 for ; Mon, 12 Aug 2019 04:22:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726842AbfHLEWi (ORCPT ); Mon, 12 Aug 2019 00:22:38 -0400 Received: from mail-eopbgr40052.outbound.protection.outlook.com ([40.107.4.52]:15436 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726885AbfHLEWh (ORCPT ); Mon, 12 Aug 2019 00:22:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LoDAdPlfeA7j6Z10FBc3rUZntnY5d9CH7DKmY8w0e6n3wxJy8SOxVUO4VXocrkBcpZEUsCcDydeW744XeH4QlbH0YnaBiRwSIW3QV/Ak+XnBj6+CmZJJc0owEPvHi/xQc8kbA4WoGPLmcBYYNqvXnK4V3o/uOQTB5mxNGOX6YJwkT8n/KJ8RM6gfoElBrta4B83NWoKwEFU+81m5ZsJqoS2P1Y05uKFhJBFlsiMBM0FHtjFc9K0PJOhR0ujJsQNFnPFl7YmZRTvfT5ted5MiMfJKZ71ZYPWSL/CIvS52E++rrkWoh1X5ZALjGz94lZc0m+suEppG9W6+WuiEU7yMAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BIXsOqPz424V2pYO6OHn9ImT4VL1Xd2sF5UJOiAHijk=; b=e12yV56G8susTfM4JbABxi+REVGzQCUL1OxmhHRCar+hO9hKqfLj3vsLREP+pV08TubHtCYfyNPwBfzs0QV+U1DotHI6UKVSfoXy2vgWUXvB+p5fuegXBuSZnOy1rCZ2B6f9H7nSfqJhE3O133PR/mN7eFdhlz/rzXkqx6QF1AwEsaJNjBXfrrALRhpEGEnrq8DGIghgAInMJs00KVkUua3OjvhOhKmD7to/pnvQrsmkej6UC3HiiyBj/1YWMsxg4WyR6se2wBC8NeoZEEtFYnvIqrhRdNZA4WvKrkBArNKlVw2U9RF/utqhUJy0IAb2LCKbgFG85/GllAcEzh36CQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BIXsOqPz424V2pYO6OHn9ImT4VL1Xd2sF5UJOiAHijk=; b=S91QHO6Xd+SGnoFxD0KrhLCGaSyYTT7izNLugrTeuXjZKP5vobypanvmOUO2WYiEblqQQMwtIE01hY2/c09vEjLo5QNjEA46rUMdZYj50f4LRLQH7K3+nw3na9DZ2u/nPHIWVyAnKLK0ACrMU6CAaaZp8TNSToK1vrrmPQa/lCc= Received: from DB8PR04MB6747.eurprd04.prod.outlook.com (20.179.250.159) by DB8PR04MB5931.eurprd04.prod.outlook.com (20.179.11.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.23; Mon, 12 Aug 2019 04:22:33 +0000 Received: from DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb]) by DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::19ec:cddf:5e07:37eb%3]) with mapi id 15.20.2157.015; Mon, 12 Aug 2019 04:22:33 +0000 From: "Z.q. Hou" To: "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "gustavo.pimentel@synopsys.com" , "jingoohan1@gmail.com" , "bhelgaas@google.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "shawnguo@kernel.org" , Leo Li , "lorenzo.pieralisi@arm.com" CC: "M.h. Lian" , "Z.q. Hou" Subject: [PATCH 4/4] arm64: dts: fsl: Remove num-lanes property from PCIe nodes Thread-Topic: [PATCH 4/4] arm64: dts: fsl: Remove num-lanes property from PCIe nodes Thread-Index: AQHVUMWQPzBEI52VGku2HzYmow0ewA== Date: Mon, 12 Aug 2019 04:22:33 +0000 Message-ID: <20190812042435.25102-5-Zhiqiang.Hou@nxp.com> References: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190812042435.25102-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0060.apcprd03.prod.outlook.com (2603:1096:203:52::24) To DB8PR04MB6747.eurprd04.prod.outlook.com (2603:10a6:10:10b::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 96a2a906-eea2-41ab-5ade-08d71edcb263 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:DB8PR04MB5931; x-ms-traffictypediagnostic: DB8PR04MB5931: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(376002)(39860400002)(396003)(366004)(189003)(199004)(6436002)(256004)(25786009)(14444005)(66476007)(66556008)(66946007)(50226002)(2616005)(476003)(64756008)(186003)(11346002)(446003)(486006)(6486002)(66066001)(66446008)(53936002)(7416002)(71190400001)(6512007)(71200400001)(2501003)(8936002)(4326008)(8676002)(6116002)(3846002)(76176011)(52116002)(110136005)(54906003)(305945005)(7736002)(1076003)(81166006)(81156014)(86362001)(5660300002)(14454004)(26005)(478600001)(36756003)(2201001)(2906002)(386003)(6506007)(102836004)(99286004)(316002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR04MB5931;H:DB8PR04MB6747.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 1WhzR79aG9J+pFa5WE592cE4qaJ4a26AZ9oVYAgfuAPRmWLyWwGHJcwMDKDliqe/ld2h104in5zyBAvKe2iitJ9HZisZzjkVK7O38nY/A+g2YzAd3NQZvq15oa9gDeFXk19N4LpV+T0KjViUvFOr+SoJSQXAb/Zl/DNK3GLE9/PXtduHWc6KNHhFwCV8IcTAAnRLSxwGetDlzRKxGQH9vZvQ9hGsNcNdWBAaGAa0x0umMxlbsrdVJzmaC5cEQRNwRoGtNtYA2bJPgTqXZtk7K9rsfDoVK6fXHqL/uIWBDUNWexXfcSfjSepF3WvfWEPEiH2K6nUFm2lH6DN5JiGQxH7OrK5W/4/DBjiCqFPE5tnDRCpQp7prD9+P2jip5I1NOcjXqc/xqXG9sVosTF8J3d2jureyGOdCHw0+SemFyVU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96a2a906-eea2-41ab-5ade-08d71edcb263 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 04:22:33.3806 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vxxaul0mRZtXK+zkVuUgt6cMd0Gm3JeogzPBqPuyXuW2weNevw/5iOQEkyNmt39Idmlm6loXxne3sut/CWDiMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5931 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hou Zhiqiang On FSL Layerscape SoCs, the number of lanes assigned to PCIe controller is not fixed, it is determined by the selected SerDes protocol in the RCW (Reset Configuration Word), and the PCIe link training is completed automatically base on the selected SerDes protocol, and the link width set-up is updated by hardware. So the num-lanes is not needed to specify the link width. The current num-lanes indicates the max lanes PCIe controller can support up to, instead of the lanes assigned to the PCIe controller. This can result in PCIe link training fail after hot-reset. So remove the num-lanes to avoid set-up to incorrect link width. Signed-off-by: Hou Zhiqiang Reviewed-by: Andrew Murray --- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 - arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 --- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 ------ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 3 --- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 ---- 5 files changed, 17 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi index ec6257a5b251..119c597ca867 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi @@ -486,7 +486,6 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - num-lanes = <4>; num-viewport = <2>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 71d9ed9ff985..c084c7a4b6a6 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -677,7 +677,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -704,7 +703,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <2>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -731,7 +729,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <2>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */ diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index b0ef08b090dd..d4c1da3d4bde 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -649,7 +649,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <8>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -671,7 +670,6 @@ reg-names = "regs", "addr_space"; num-ib-windows = <6>; num-ob-windows = <8>; - num-lanes = <2>; status = "disabled"; }; @@ -687,7 +685,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <2>; num-viewport = <8>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -709,7 +706,6 @@ reg-names = "regs", "addr_space"; num-ib-windows = <6>; num-ob-windows = <8>; - num-lanes = <2>; status = "disabled"; }; @@ -725,7 +721,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <2>; num-viewport = <8>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -747,7 +742,6 @@ reg-names = "regs", "addr_space"; num-ib-windows = <6>; num-ob-windows = <8>; - num-lanes = <2>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi index dfbead405783..76c87afeba1e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -456,7 +456,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <256>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x20 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -482,7 +481,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x28 0x00010000 0x0 0x00010000 /* downstream I/O */ @@ -508,7 +506,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <8>; num-viewport = <6>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x30 0x00010000 0x0 0x00010000 /* downstream I/O */ diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index 64101c9962ce..7a0be8eaa84a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -639,7 +639,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -661,7 +660,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -683,7 +681,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <8>; num-viewport = <256>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -705,7 +702,6 @@ #size-cells = <2>; device_type = "pci"; dma-coherent; - num-lanes = <4>; num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>;