From patchwork Thu May 26 05:59:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po Liu X-Patchwork-Id: 626584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rFfjv6ktvz9s9W for ; Thu, 26 May 2016 16:43:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750852AbcEZGna (ORCPT ); Thu, 26 May 2016 02:43:30 -0400 Received: from mail-bl2on0067.outbound.protection.outlook.com ([65.55.169.67]:64370 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750828AbcEZGn2 (ORCPT ); Thu, 26 May 2016 02:43:28 -0400 X-Greylist: delayed 2050 seconds by postgrey-1.27 at vger.kernel.org; Thu, 26 May 2016 02:43:27 EDT Received: from BN3PR0301CA0061.namprd03.prod.outlook.com (10.160.152.157) by BN1PR0301MB0593.namprd03.prod.outlook.com (10.160.170.20) with Microsoft SMTP Server (TLS) id 15.1.492.11; Thu, 26 May 2016 06:09:15 +0000 Received: from BN1BFFO11FD006.protection.gbl (2a01:111:f400:7c10::1:115) by BN3PR0301CA0061.outlook.office365.com (2a01:111:e400:401e::29) with Microsoft SMTP Server (TLS) id 15.1.501.7 via Frontend Transport; Thu, 26 May 2016 06:09:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD006.mail.protection.outlook.com (10.58.144.69) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Thu, 26 May 2016 06:09:14 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u4Q697gA009552; Wed, 25 May 2016 23:09:09 -0700 From: Po Liu To: , , , CC: Shawn Guo , Marc Zyngier , "Rob Herring" , Roy Zang , Mingkai Hu , Stuart Yoder , Yang-Leo Li , Arnd Bergmann , Bjorn Helgaas , Minghuan Lian , Po Liu Subject: [PATCH 1/2] freescale/dts: add pcie aer interrupt-name property in the dts Date: Thu, 26 May 2016 13:59:09 +0800 Message-ID: <1464242349-15323-1-git-send-email-po.liu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131087165550122061; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(189998001)(36756003)(5008740100001)(8936002)(6806005)(104016004)(4326007)(50986999)(1220700001)(85426001)(81166006)(5003940100001)(87936001)(11100500001)(19580395003)(19580405001)(50226002)(586003)(2201001)(50466002)(106466001)(92566002)(2906002)(105606002)(5001770100001)(8676002)(77096005)(229853001)(33646002)(86362001)(47776003)(48376002)(8666003)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0593; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD006; 1:Xz2d7CPNMMu6DhLd2mxldMJgUIPJ4nYWajupy5RYVmmeEVW6FQdNCwoNn52qL2RwX5cIM8YV46/BAB4sHqcpUBi4WfjP4tuxmRgtCCoV71dMOOkG5UlT97ZYCIDDQsSVqFLwNEcMXrbNAwqiuEQY3JS3qGs8FgHvYAMjq9H89dMCUWeKGztflVRcW+6Ew5b8rCM+STvhragbHrdHePRD+3JdYOJ8FJ+R+gOudn4iiXLGMMZ4c2wK+ngys9RWMb/tkhogig6Ymc7MugIe7bZeXqfuchBA10dD/fibqpQiMeNawhjvdPCrEGoIufO5al0vuZZxQmtvOckm1d73lQrT6u68nKAMgqV7FqBmcem/lBE8DVUkrqwaiNqeeq8rYZalEJmnwPcJ8tmmQVmD43v0ZPQlQM3/7t9q30n16rIludkZLGuZv97dnYfYR3hqYaUNnn4+DCMc3rO2pgbOUocRj0zdBGlLRFSEy1kVZ8nXbq5N3XQOfg4L5DUghER7QYk8jfwdofgPaooPdAD/aAEbt74Erer3imgUhXAgKSfbF+LHGyPq2D+MQebqUsZHo50wnNKKzMk4jjLfy3Dyx83tDz52h9HKo0ZtIKWMESBHd45AAOEQtZrENoFE2D+VUuTuxkFgaS9uie+VbDSJimTlCQ2FvXoweUSOHfooKE+uKngQsCf7FE8PEjhNt8QXa7Ty5cAQCSDUxDSVOTkUTplADg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cb6ae579-ccbc-4413-f2ec-08d3852c43ae X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0593; 2:sc+WyXlTN3wCRxeT9jlvbvN/kmE7o0/MJZd6RkBXJouEO0tpCudFuY2q47TaoUG11h5pP2gqbMrFA4jFaWLovYB9oGqngaw0vfNnlDyQwRO+vCq1RVKfKhOAYbzEQ4PbiBt5QU6WMWbP5o7fsvJrJKmIh6Pjjlb/6n1ojYEsUoRjtSsIMnOpte29A+YJCpDp; 3:K/oOcLe+arBp/525dC4X7o63suIWVclq1erkLefcJVm1hSDk3xc/vnGetyMgkQbhTVZCOagZegTFpyiAjMFQduRHDJSXp7hfJDY5D5iOx7kVTdliu/D2b7l46MoUhDUa6ZKJhDcOgM1cLH73JmpIfakEAY0xWFVDKbtcEZ7WY1tRdBEwrLcVe2hSL8j5ScdlSQ+2Czms44YnbLV+GiDbtQm4/PZlDTjknpeGKeB1bpI=; 25:aXrRN7Npukoy9lEoRStqrGRKDW8HLTcZOsukqRdM7WiX4FFfDq60DNopmFp1VtrPDw7vigJMpPE7Xm6rvvEh3zAnirzc86ee/UuFmCcz57araxouI2R+w7mEWDsyCkJMxHM+MygxIXessWYugE8dItwLnRjy7bkOTXAyIl5z93np0BBT7cPawHMwawp9wYcBdDRMWDktuFWM9I1n3rv5AUhWmOVKA62t7cs+2HO55z6TpLO+khPs9pR5qV0vd7OKCN71pCipE9ZfHyK3GfFkLGW+4zRu3fQzRtHX6ssDHaEN4LjMOQ5LyjetvpqeOuB8fwCuGv73XYF+440DqOJSgbVRjoY8QBcHvqkYGsdAz9DHSedOD4WaWSPaWI+zytTXXJNSc1/m7pUa78aiFDU/+Q0tpufCaesnXh2Ixv/ZmEY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0593; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(5005006)(13023025)(8121501046)(13018025)(13024025)(13015025)(10201501046)(3002001)(6055026); SRVR:BN1PR0301MB0593; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0593; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0593; 4:1slEG2yBKjA1ovxJ2KFewFEG6Oc+nLkYw0iNfbkxWM3h/05lWPTuokVGqm/21mSEtlFiXoRXBFFnvhPqhM18E/bxI+rEGIMcx4xZJ7eyq4Ow5v9LvTCFqGkw31gJ6S/l3JDJUqRoO3G5uDTqfXHczFnPUKE9LkVU9CbuooXmtbgBPTfJZSCFVUYy852ZXzcf8mE6kgxQCLCZseM+U1xTeDz1jejI3klwpxbwWyiB4FkRpq7Rcn6hOtmzBHKTNnkhJisGCrq91vylCOvG6bp9dMohQ2JdPyPo/ECepa8p1+8SWEW1Z7IIVhjgNTTB/57eiQA+YFifXU4NlNvJLTF4fDj8lB241v5sPQP7mY0N/sO3COb4V3EGTKeG1I8LNINPNaBa7ON/U10VIEYpsXR9f54heLMADcMBC1y3xx3es1drLrCOKgCtJaqnG95yEUjzgcntrqr4MAFECpZWXHxeYgRtiLpohCA4wmbnK+qyAQBc6TMcuB/iOekxTDw7/qspOOr6VvD/p/PRFwb3PWezEw== X-Forefront-PRVS: 0954EE4910 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0593; 23:PUOgApLAV4ooIR3xipsTGO3IQQp/pOowuLXVjMy?= =?us-ascii?Q?unVDFctK9vBvboCr5Sm8fkaczux2wqTiT8nUK688LwBpDdl/S3a1Khm4CZDN?= =?us-ascii?Q?QoE2+v6x/3ERZFRJB19dCaDWnDvD1E0zg1w0sgmUFQ1un+1k1KQjihYPDKHd?= =?us-ascii?Q?Uu4Ptqy5z6HeMhf2LrTrveaTw8ybxOYXd1nqVXGJ7iVwSv2UvchjpsN/+xvM?= =?us-ascii?Q?uxnDq1SDkthep7dSlxSHsB4UK2byC2HCo/Q45UAjwXnel7Vb6Nwo+g/MenrD?= =?us-ascii?Q?5RchqaECIojMXaXjp0xZWMOq/8Kr7oNUzJCO1/uawppZ0xQoAeryhKdWmc+g?= =?us-ascii?Q?13HCFDMhHwyr+yFXMe6FcBkANPPUGcC+tJd1x/viTlnoYW3MWI1eWJD/j75I?= =?us-ascii?Q?iaHYGN2hfAdPWpAm0q1Hbvc9srnK4N8cESxXN9j878oF2meLBx6BUcEAPolq?= =?us-ascii?Q?GSL25p/0QyfvxL8QEQaMAygY1aN28znEOmUPFY1AxjnPvgK4OWvCgnVDd/SN?= =?us-ascii?Q?EMI+RWduBMuZoAGLvu6wedWdsccWTzvjDdULhhfNTwwmxA/EzjXdpT2zHLit?= =?us-ascii?Q?qgr9+OIEZ6LlvolLCSm7rXksqKsf5fYQc63omEs8e5TH+Mm7BjQhcNhzX6wO?= =?us-ascii?Q?Et4QG9Sks3z3b9QAMCcLK27YY8EXvEEm7VqD7eVkgNQaKBUgR3mnZapm++BN?= =?us-ascii?Q?HkjudDkWbikRiCU6e02m+WEQZotubSzDK9cUzCEeEsgDgD3JsuxuG4GEWZyP?= =?us-ascii?Q?dsjGrW+A4pEUVpdTOkP2IVi/SzkZVZqiJ+GJ9cpQCQsCn2V9c7GcHgXlUoG/?= =?us-ascii?Q?aq1JMmwx8m7XLhwDqIMDJERha1aVtzs3VaZTZ3RJ+o+/NUsyMgxd1iprxQlS?= =?us-ascii?Q?c10tuYZjjJYLfPM6BW39gXLiEVXuZagUQvfshia71zP5ju2T7WBdjMzqDj4p?= =?us-ascii?Q?dpIZTI9EpXAhqnyS+HZvY6f4nZpEuvYqKC4CKjjTyqFrq51KvpmFr/PV61KR?= =?us-ascii?Q?AoKVmDE98zSp/i/sec8ldn+iUa96hw2cTFfxiEs6TB9M31Hj9wKwMa7O1V34?= =?us-ascii?Q?QgWDi8Q2Yp8LhnV/ElAkJHcu25dyyT9nJxmTHabgqgj4uUT7xbQrpSYj9Se1?= =?us-ascii?Q?/Y6Z1xXpX7aM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0593; 5:+l1ym135uA10TTSUUY3dVQi4GTheVTn1pTrG0fn97g+VttSsnv5hZiGCStTk/1DvGgEtD7tLYRZhv8zWoroE4uoF+q52Q0egTX6Vr6h8llRYg4T1zpqsGqiY12yFyfVzCD3lbHkaRnIbFJdl0OY91ZVyvn9Qs+6K6dt4qZ54N3U=; 24:PMBjYl3FCv3EEr1HRM8oKlCKUUGx7YI9291OtNrXAKCFj4yaycJbmW1vl40yzLY7HnVDOWmOzU2TQZD+sjYRSCbrFhgciWeUedqbsYNiwP8=; 7:YXmyMol89LprY7iV4w5bREiMny4JKrOATTpvNsFXdPQrlyxXVsWH61gWRMOHnAC5hgUn25vrczcr4kyN+Dn6NBrRuqbdC6Sgg3mXVDN9kPIEyz5Z4Ryu0WVFk2Us3w3jMPiQXnuv+m1S92Q6HPPOslOLfiD0No8WZewGQ9+0zgk/twnL3nNuxgYMx4f8RZ8/ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2016 06:09:14.7626 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0593 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Freescale some platforms aer interrupt was not MSI/MSI-X/INTx but using interrupt line independently. This patch add a "aer" interrupt-names for aer interrupt. Signed-off-by: Po Liu --- .../devicetree/bindings/pci/layerscape-pci.txt | 2 +- arch/arm/boot/dts/ls1021a.dtsi | 6 ++++-- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++--------- arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 16 ++++++++-------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index ef683b2..858b407 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -19,7 +19,7 @@ Required properties: - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. - interrupt-names: Must include the following entries: - "intr": The interrupt that is asserted for controller interrupts + "aer" : The interrupt that is asserted for aer interrupts - fsl,pcie-scfg: Must include two entries. The first entry must be a link to the SCFG device node The second entry must be '0' or '1' based on physical PCIe controller index. diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 5ae8e92..b638697 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -633,7 +633,8 @@ reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = ; /* controller interrupt */ + interrupts = ; /* aer interrupt */ + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 0>; #address-cells = <3>; #size-cells = <2>; @@ -656,7 +657,8 @@ reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = ; + interrupts = ; /* aer interrupt */ + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 1>; #address-cells = <3>; #size-cells = <2>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index de0323b..4beb760 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -473,9 +473,9 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 118 0x4>, /* controller interrupt */ - <0 117 0x4>; /* PME interrupt */ - interrupt-names = "intr", "pme"; + interrupts = <0 117 0x4>, /* PME interrupt */ + <0 118 0x4>; /* aer interrupt */ + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -497,9 +497,9 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 128 0x4>, - <0 127 0x4>; - interrupt-names = "intr", "pme"; + interrupts = <0 127 0x4>, + <0 128 0x4>; + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -521,9 +521,9 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x50 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 162 0x4>, - <0 161 0x4>; - interrupt-names = "intr", "pme"; + interrupts = <0 161 0x4>, + <0 162 0x4>; + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index 3187c82..6edf24b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -559,8 +559,8 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x10 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 108 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 108 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -583,8 +583,8 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x12 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 113 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 113 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -607,8 +607,8 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x14 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 118 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 118 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -631,8 +631,8 @@ reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */ 0x16 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 123 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 123 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci";