From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535AbcFNGiJ (ORCPT ); Tue, 14 Jun 2016 02:38:09 -0400 Received: from mail-by2on0054.outbound.protection.outlook.com ([207.46.100.54]:9219 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751062AbcFNGiG (ORCPT ); Tue, 14 Jun 2016 02:38:06 -0400 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;nxp.com; dkim=none (message not signed) header.d=none; From: Po Liu To: , , , CC: Bjorn Helgaas , Shawn Guo , "Marc Zyngier" , Rob Herring , Roy Zang , Mingkai Hu , Stuart Yoder , Yang-Leo Li , Arnd Bergmann , Minghuan Lian , Murali Karicheri , Po Liu Subject: [PATCH v2 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Date: Tue, 14 Jun 2016 14:12:26 +0800 Message-ID: <1465884747-1517-1-git-send-email-po.liu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1464242406-20203-1-git-send-email-po.liu@nxp.com> References: <1464242406-20203-1-git-send-email-po.liu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131103589796047774;(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)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(92566002)(19580395003)(189998001)(33646002)(106466001)(5001770100001)(97736004)(36756003)(229853001)(68736007)(19580405001)(85426001)(105606002)(87936001)(2906002)(4326007)(8676002)(5003940100001)(81156014)(356003)(81166006)(47776003)(6806005)(86362001)(5008740100001)(11100500001)(8666004)(104016004)(2950100001)(77096005)(48376002)(50466002)(50986999)(8936002)(2201001)(586003)(50226002)(76176999)(7059030)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1625;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;CAT:NONE;LANG:en;CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC008;1:w3opqBlujHlX0pw76R+CsgJcyseNht7yq0MfTfFF7z9T+Uh9uxv/Z8k2UFpIDb8n8bn1ibtY4E4EpKHZSpPnNVHCLXL2dzxq4UfIFayEfJ2pFkum7Cqjkxr1sZ1Mv+GhK4JpnuGcPhd7e5PHlPhAMPoDfp2nVf5Xvc1UKduvTooKSWDsepXTgT0rGxO0j5Ra1BgCuDmCRcKmR7/oKFE8qTlvBYaz39R4AmSrTe3/pU5H2vyZHHF2GiwZJ42+VX5DMS0k7k93m1bcYioQ1LflrI8qC8p7AlRoiCfAgjcPRLrN0RNVHGuXdrQ0jXIqXUpBMuCfGitDZxVz2zjRDwFASfMaWFSxkBiEM/JNuqOsrj5U+M8Y+AptAc5MOK0EL6sHBmxWsaL76ewFL8fRHe3ZFIw7p5QUPVj4souCsEbs2ui5tosS1MrIygD3kWwx4IfdBl/v46iSGV4J++WZp9ROi+ICj44p+WcT5htX8qbWmhJsUFcmnAjlqqojDkhKYnPEMBohteDlVA6R8gBIfiqnLVBtdby9IaeRB+gqJupv1OFm/8Z+RQS12DbTSoSReme4QLZQJgyGxL3dB31aS/8FQiWTnndBBz2p3qF9MnqdAkWxVWAaZdARYPNeFMnDpR+8uOFHJVBGUSGJVbquOdfFVsbxyMHy7UfwaHA57F9Kff4PMNXUQwlgpvSXHdB6fIWjvcIAxE4978r8pQEOaGEtSn0CDz6TvSFjNJeeUWk7xb8= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: f824116b-6ef5-4aff-6b9e-08d3941c5509 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;2:qQXg/7AGJCwLQdPZ4zPjZwgyfxX7uOInQ6/S96sYGl1ZIbKh6Z4zjj6PUqCP5kLuFlLXwD86bIs7sHZgLfncBkDt77OjB+4V7nDUUKGJPXJyNu0bsA/V9ARzZfuiN5q/1b5RXXhUdfbiJGp2aLod7hk/JSI5f2eLLYCqSkXH4etOQucUXoWeDOXWS+9PF40O;3:xqqeIiJa7TGGPgvnDOtQSt+aacOQwGbLVnPlqZ7H2LaIo+FVye9mF39ovl/C6tZM4pBpv7ECFw06R9J0UUf0Hd7IdNMp7JgG5d5eNmqAVhihmmepLGUQNX5wUOrGzja3zXOZlpfyog/Yn3DLieT6dhnAqU5UWsoocmTLb2XSl9n2wYv7gVjYTKgh+aNYwDLJLxDR9eL7N8PfmspBQmNNfWCxx8dtM8/SffnhlgZeBiY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1625; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;25:1MKRfhqgWrv0LlU4rjEbl9P34iz0lihHK2VGLaAc0iWROwEBqyF1/9EEvZ6jk/fSFja51/slIazf9djuPn61mcmkKTs28KExMvgo7daZmShOf3zIKkQCndO7zc9OObZnj8WsMmLgHgMOkHCXRvZIiKi81InDQ8eu/ngq1eW9jOLxisIyHWsOA4Rn9kCDzxKDTlWfmgHRFBJookrg5EHueerYH+gAqdzy8ic5PxRikzsdWit+pMZg9mlU9gmFv1KuDEFbqfB76fNl/VxKvietJTnUVKAZDStfdNmtLrfa5XjuEynh2mJyFj0L2ZD8i9YGKC+JPa9yiiywjatNyFlf3t1xNGei1cl942yp3wZsp/mTmCzjOIdoEeMW4N1HNsmm7C1KQRh7sRAkZX0im1mUUmVBKQBTxn3Uqq2NzfhTY0S/LeXO7XDYheOuK7InGKIbmqTfiJyOR6DPDITaTyy1oSmoKaJoVazfHOYyA3pZqwY9hRoMkBbZewOSUeBLxgxNy8siEzwm9H8NywAz4BoUlMdm0XXK9dUaE30zFaiJZv2f8Ys0LsnXNM3BkZIax6EJ//nQ+PDK+ZVN+cVjWd7flP1DxwN7tzRnVUk6hGTXczJT1/2BJMSnC3pAofv7xowlx/Qa2IyaphTHjodg+FbpvJGjuhb6wivLrsdWh8QehEu8vwYJ6VBC4ki3i7BWegOofE3M7XpajnGVXalgtomGp+TyIsH4FblVi2NxHMAMoZMv4OyuA/tX9O21aA/jj5lJ 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)(13024025)(13018025)(13015025)(8121501046)(3002001)(10201501046)(6055026);SRVR:CY1PR0301MB1625;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB1625; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;4:Qa3SOIqan+c2EKzn69jD5ww1U23SGEdz4Y77k2zAo5t7Nvy0Nd4q8Jm+DP9T0gLAY6s2ZPLCdn6oTquz+KSyGU0VoCX1wcYp/9PSedqs78+HAm+oXOKhW+ImvScnV5Io2KNFAc7vyEyzovwhhR3vw/Rd78R9Iw8631IwC1xNK4ace+SebGqmHMp5kc3u2C84j8s74McajsVtdi+HqwKdBrQPj3BTuLIDc0lsbNwJ4NpkMz2FcBGc+fYYQ45xJPzNw3W6x9IMEKItS//UaknrWpQnn7aXEjiebvE8kKlu0wyf+z6ksApwa3/KH0FRCfe0Xa5jxtsNt4simicqOnkF+fOP9EIbflbGjwy2uAwks4BFmN/3Hv2Io/oItxg/Ia3XWy3NAfM9xtT3+2Eup0LE8abv2LeWtSbrekcSrB6EAc6YC4SN+f+6ISkXSCkWUz6Qz4cnZ1t3NxL5Iu7hRgLuMh4fTE6gemaAK0IE+toxuoCwGeKkMhFrk9lluVP+ROLtuTja9/6wvJR2lPllIihOvQ== X-Forefront-PRVS: 09730BD177 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1625;23:OHGVmuORtb+YtwaXMTWDGr83PLGmVAONlKzk5ze?= =?us-ascii?Q?Kn5twEDScTGi8hVKYCEE+0V6PtF4fKe3GyWEjsVPBn2r8J98eN9dc64LKKxC?= =?us-ascii?Q?g+pvg/QIqgqDoIU5HRLbb1+W/Tb4xkvLaMAgvWnW1CVP94hf07001mq3k7gK?= =?us-ascii?Q?W/jHRXnrzUB/Xo0SkNZwDw4IWJ3a2FqFdAYoB3hIM71SPlGyFmB/vBoAGjI+?= =?us-ascii?Q?7huWv3oLpKCJHsB+zQ2PfNju/z+TPFxx7UfK2cVCeoTdyWZ5eLdwClbx48ZH?= =?us-ascii?Q?pJYAvQKomJGhkWZsPxSvfV5ZxNhQDSNjeBG9iDCNrum5O8Ji7cq6siXLHHhq?= =?us-ascii?Q?2l6vz1EDm2ZgqJbik4YGHozgH6KftKpAx2ASuDZzN7vlAsl+sFUsonrQQ2gJ?= =?us-ascii?Q?YyCNqB4gKacomZvxk3OPIt6eBInxFhpLFs22nHT1DGyNLhvxZAXNxNHLtn7I?= =?us-ascii?Q?fI/gcJH6w0gJTRBoalhR4zN5GSYeJ9R2/5GmMxyZNwoEut5f3qndIoDfoPkX?= =?us-ascii?Q?a20Rsh0qvH0bx4L+vk1Fkjym+63fIbwJO8/Pgj+FyhgA/eYhBNdDzs+3l/9b?= =?us-ascii?Q?wS05DyWf1Xl4jR2exqjy6sm0/S/2eHBSLqDJxNYyIn/NZITW2hDQFwQqHp63?= =?us-ascii?Q?PCJpilx0bNJd3MOBAfsG2AJxZPU4S6bI5mYiuTO/eqa3vvBa5uryFLSbG1Ek?= =?us-ascii?Q?VbalGh+BPA1WKOnBGIGWFUC0onu5pPFbPcTTN3sRTwV+NtSh5aeHKsFT+Ax6?= =?us-ascii?Q?U28+g8JkUNVhtCkNjyMRJzaFNi8R8gkrz+M4Ry8C/rw4Y3V4WPRrXMnDpS/3?= =?us-ascii?Q?AqeX8EaN5LgQrujzVmM8thS/B/EaX29EILLNwHki15OqCWGaJouGm8Ztvj2U?= =?us-ascii?Q?HQ9ztgejsDA+ccm/5oQTax0YarD8tdoAE0L7bUmqnsQ5i76T9eDotnOobQLs?= =?us-ascii?Q?I6fT9noZxsvaIRWVgFwhGIZISTC2RBJ4e4Zo05UGHZlllvFElT8GB3JXJ+Nj?= =?us-ascii?Q?JXnZZxT1UUOu2JypennPsjS/pBbiTLaHdsRvXHhJ0klF5T0KED23DhcuWIoK?= =?us-ascii?Q?wWNRrzKs9HvFtL9fEOFKHNy2oDuUu9QPKluVMDa/GHWXZgcieZGKOYjEKLbJ?= =?us-ascii?Q?oN7E7a70NdryRpyNJ+4PORuTXfdJ/EMwmsciKnqMkLdWd8Ywf/kN8sD/5FX3?= =?us-ascii?Q?EwrUpXHEx0lqLGlxjXb1h1tyVJs1vD2BrFokd?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;6:CkWeelhsxq/bdyf5wbHGTKqG2X8YA8bZvbnZ3HXiXi4fMvOxUTdgnrjMsBCcmqEnU1WDY5RzKh0Jwv3v+MHHgv/HCZUyG4yBhSYyp7DXUrTD7neTvvl0vGfENvfNrTdIvvcdbUbv0Yrx9Pk/XH3dZKcWh5Lnx1yyPV2PwkqLP8+FIptmY9mnpAan7Kr+fkKIBXdH95d8idU3NtDz8C5y3M3tSsow2vUnWknhluWDLv2iN1F3dW4iM9cCHlKdqziKcoaoMbtxUDgQHk5ogyc02w==;5:2pXGPkajneK42b0KQ/hxAXk4uIr5BvRASWTQLuY/qLTJnuxp0s2C5Ue7QyXjEgIUMgzKnqJ1wbwq+I/ymwif1+XjviFnhK+r3Z/OCvXbuZSVFT3vIVi2QbmRcS40QkT9khG+CK1s/rvMYtr8vsRKZus9Zdt9I8Yo4UpxJ0QH5Vc=;24:B5K8pTxnD0EWUVusNAY/SZ7hq5LGC1ROmwYLWjKXaqfs+35BTs+IYsyiCLtmf37wmj5XP8RZ6hjYdxog9QcyXwh8xHUGcMy21jSOfwvCz/I=;7:DsDAxjR+RR7rh0sphrirOiqQIpt5DnOaD7i6AER8lduYxvUYUHoJWvl2/bqW7+NlsE+Z3Nu+ITA0kQp5MkZPy4oIui49eYnJBirP1E9sPFs7VZeJw/5WXAHN6Clq4gxXbwX+Rk6/Hz7RAxhLUBbJnUK+/XldG+GW7E8E5gzTEPMHLhSZkR6HplSPR3VQatEG9+VzcM7cqsNAnIQShSQz1Q== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2016 06:22:59.3395 (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: CY1PR0301MB1625 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org NXP 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 --- Changes for V2: - None. .../devicetree/bindings/pci/layerscape-pci.txt | 4 ++-- 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, 23 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index ef683b2..d27973a 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. @@ -33,7 +33,7 @@ Example: 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; interrupts = ; /* controller interrupt */ - interrupt-names = "intr"; + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 0>; #address-cells = <3>; #size-cells = <2>; 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"; -- 2.1.0.27.g96db324