From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964858AbdKJDuV (ORCPT ); Thu, 9 Nov 2017 22:50:21 -0500 Received: from mail-by2nam03on0053.outbound.protection.outlook.com ([104.47.42.53]:32256 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964788AbdKJDuQ (ORCPT ); Thu, 9 Nov 2017 22:50:16 -0500 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=fail action=none header.from=nxp.com; From: Zhao Qiang To: , , CC: , Zhao Qiang Subject: [Patch v13 4/4] irqchip/qeic: remove PPCisms for QEIC Date: Fri, 10 Nov 2017 11:31:25 +0800 Message-ID: <20171110033125.991-5-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171110033125.991-1-qiang.zhao@nxp.com> References: <20171110033125.991-1-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131547594135930635;(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)(336005)(7966004)(346002)(376002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(50944005)(47776003)(54906003)(110136005)(104016004)(33646002)(16586007)(2201001)(316002)(85426001)(50226002)(2906002)(68736007)(36756003)(50986999)(76176999)(1076002)(498600001)(53936002)(81156014)(8676002)(77096006)(81166006)(8656006)(5660300001)(86362001)(575784001)(5003940100001)(6666003)(2950100002)(97736004)(105606002)(106466001)(8936002)(305945005)(189998001)(50466002)(48376002)(4326008)(356003)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB2364;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD039;1:xqVES+FcEt5gzvZM4uFikIkoo2uoRzh0UVYyjfuKUaOx+/NueZ3Z7F3FgXU59CHP7T8h4jb2PwzG+4KIa7/aDKDZ6xTkV2eM8+G9vakASRaonchPIZ1/eewXtxa5dccQ MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ed3084c-8edf-4a30-25aa-08d527ee25fc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603256);SRVR:CY1PR03MB2364; X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2364;3:BmQfTO/o1dH6XTPpSY0WtRjiUOhJg0yvd1K4du89VQLMovcCB7NAMyvDiWhc7IDewXCENAV9c/osRETnUWprvkpeAdow8+6R9yo3vYOKHhNk+u0PpgwWX7VxBTPljM2C5IMjtZJ9P7OJTDr43i/Wg4Dji1AUYPSq4iVQOCdX0XmlrgwunksKpGhv5G6yP3hoX+DlSN0qC2Z9KHZBVznZIpPJBOYcTCZm8O2Wk80matFYmwkhdubK3+SIkd4C5AJZ9e067MvuhLi2vKDCuQRMyD9QG9p1QyDmJy5DIwXvAuPwEuSrhM3J3FW9/vRXlXR/VbfStJxwvvVTCA2ZaPHSwXBlnTSIdo69DGdnbLWhOhI=;25:4eiBA8dyBdjYr3IssihwYkYgJLV0BOMXOnYC3o37nK5RlIaXD/WqRgDUOa+fQavZ72uYuc8lCKI/8jclOZzRNp0T1X4uQXkGHdDGAkVo6N1XEb+SoXkXjbaW7hhHD+cLh1dKyBF1bEyTkjgNfxLCppCFEnS19V81HCbSGMw6XP8RcO6PnAyoBukJRkpgdY8CSgWZbQfj8crQQ7nF1qOXCKp5jE11q4TIae+jdDbillKx1xRRw9TsQOkJrX9Ye/QI/T5Y/U0KGz0pTa0wNJ9sc6sD/XpdR3w6Sep9inOkHgGkfuhp7wdyn1MH6JNvUmHEuwqY3aPZQtnWobW4o8LhDw== X-MS-TrafficTypeDiagnostic: CY1PR03MB2364: X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2364;31:iA0bAD0xwiTQ6yohTnMNgr0Xvw3dAEB0HdnVuXWI0jukt4D4MRIgOxWnKoVxd/kIFctrvMz3k0mrVN80nc3en/nYAIHQi8o8X5IdRbTlF63lQuDtuRK+L66n6wopZUTSBO8Gydt+qLL3kCaT2rSwmD+xxH9gZcOg2KvxzMN52S5BdwBkQ8S7yS/aq9YSP8JfftyCMDnflT4dUUv+qalD57NU9TanFg0lSpY9r6VrkvQ=;4:LtoIEbCdI38dCO//awhRPGFzOmqnQK1kVF0kjL/kVMFN0+AQ1iYUz0N8uP2umppteUYQdeJ7VB+lDXQYosQiI0Mib6eB+5ChhMMdUpaQT9rOzXLd85stCZaZcw+fwrCmLKw9u5uKlwDJ9p3u6o1gsvGMlwEB7LBWdRvMFxydwofXiV08o7+dj16LDJnAy7suDoQtGtAwicb4JDMalTHbBb1tF8J5N8ndyzdEW1zDg+qQIE1GFE39+1S8dbEsWZ0WjhwQ5Dla+1ryxFnCcrJQH3k5Ogyai2mJ2nWUo+P9Wmw/ZTEIP8wdeZmBLYli1m7vW85Mtb8IKquFw4Zzw0Yb1sKHLV7zp6FCKy7VaziNz1c= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123561025)(20161123565025)(20161123556025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY1PR03MB2364;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY1PR03MB2364; X-Forefront-PRVS: 0487C0DB7E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR03MB2364;23:d8yx721baUiNgaGObnV/i0X/gHwDwr+4pmte7ViHC?= =?us-ascii?Q?DIJtvFiWUS7nt4DdABzTA7F///9nloD9xTYlHI+fIrvk0/927+l8WyI58Idm?= =?us-ascii?Q?5Kohu57oR7ps2Ei1umLpn8pmac6fRUUbuff0aBT4+IwTwdRL+SzSrsQBV3QT?= =?us-ascii?Q?JAAraJ4AZMSl4kHW2mTjL7FIAUtx/1AgdD2tbdINnIuUwEATw0nW1VZszAIk?= =?us-ascii?Q?pTJO68HR7lUhPNgiJlcOmeUuqD7ZPAHNCNGa7pfTWj5NnCizLCFMluPa7ykO?= =?us-ascii?Q?30QKBwXt5l4Ctv+CvDfSwOEW6KFfYtrGKSzuiJSbvIhVdTPc/J+ZwnHOF0hb?= =?us-ascii?Q?U1Vk/FsDlqOR19rGjioUq/v+9EffRzmIqxtm+xZWGk6e2EhF6IKG3JFrw3Ho?= =?us-ascii?Q?U30yAPtDMXWZSZq6YgrSkZUkTQls4NNQe8apsQWVJjf5JP5lQL4n2AOzzjyY?= =?us-ascii?Q?UJcAz+VIzdOeKIRAy5kXAQVpb8grKW2OV+3P4BaNdKLI6/dErw0+UMz6eTZn?= =?us-ascii?Q?0SwK6c96s3TsSJB1vx0VEIzkmTmDC27BxTP5JMW5oWGvnsBJdNBSAsANWRvH?= =?us-ascii?Q?m9A1v21t9PaEP+5qKsdqwMvfb6mQtAe6BGK2K8uxgullhKyf7xx671P+f08O?= =?us-ascii?Q?4+cguQhfHEWYhdeU1hVLkrw5K8DehtDrhd/DzroNANmVgServw4bGnFe8SiO?= =?us-ascii?Q?9JF8XKPScUHncWDJTbnByMwktdJ8eoDqs+1JL3KnUX2DnWZXxJq+uHZ9dDh0?= =?us-ascii?Q?gDpI039amrAKDfqNPDqR/QPK1yPUvtf49WVb0OnrriyBKzQrqJySYL0dH/k6?= =?us-ascii?Q?lL5hgCjPC9tvQtVcnGGp8Mnjveh4tUxGYYQOM1f64N1JXU08euNeyA4+1ydj?= =?us-ascii?Q?jnpG3TmMQQ8DFL09J3KIGVHWMwOwD/nTEjmyAX5JK4I17pOpvbMK4VMncjOP?= =?us-ascii?Q?UekGljUPm9gsjR8CyJfvGRgVKUvT45R5LPCbxfjYsrIYXQbQWeJfwZmehklb?= =?us-ascii?Q?zpTufbrEE7Y9OpHo79+hkPgifS+g0zMK+7EwSz2C7Wn+REbvXUVeHoz5WFll?= =?us-ascii?Q?NkfmPUU2//s9LWowBeEmO0hB2xCSod2B9b0gOL7W1JPInHhMB1f4q2Ex0O8P?= =?us-ascii?Q?UsBasOmir1gnRZ4KrfUXTnK3CnDTNiFuqocZ2t5fct2TI+5InZyn6Pr4PXZN?= =?us-ascii?Q?aC7Ia1w8KpPPqQyajj7capFBT6OneOaWcoxroV3hrgeJTbWTW+cyiWN6lcHV?= =?us-ascii?Q?qZa0A250J9/gdbT5XFQeBiIGbl7k3y5jYcHGWyB?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2364;6:MBI+Kjj2HxKCKyr7vu45+SBJMdNwrUidjLSfRUR1kqohW0t1kK+dzCvaQDRZuiftzy/EjK5PQNfBLrzpvuojNRuwQws7HeISiBEOKCc3X6EEdRL6pqziNuaoM79Xw9+G3MaNcSUAPn3WusUkmuUjYRoW5yGP9xRBtD7Mb9TuKV6DHJuRMEN710J4a6QyPi/EXGUhA9nDOcs2JOgZcG0QaDYGCgxbzN119+G7jP4L5d7AUbPxToTPGJx+Nfp4Nu+NoXO5XLcJNrvKQJAn9jFPN2cAJcDqTVC/8BzqwJYj/jy+yUIECoAIMLhxSd9P1vZ+GEBgOHhfFrp+sm+7rDcd4c6X39KVr1ooeG3nJ9Sr4pU=;5:KU7XQcaFFQPOyiYXdY32/K77996QzinsGDiwe7eyQlsFpOBSKb8ybLvic7VcDfI2ZkQzbP8LNm+U6kFjqx7k3kJN8slj1Aj7ZhDc73HHe4Yc/OjZUoyY9G8OpOGwk3ExaOhHeY6ZKXe0x2+DJhPvhHcjp7DGPTCngftLDdblKMY=;24:kxP2HHmAeZwf/aOj+pHDwTG1zXX0WOqESeWpmvs7CvfGdVk17GbR2f8z1e+jiy8scE3qEXvsfFtwgAzLbcFLg+UgmhkgB1eUs/eyMtYVxR0=;7:lB0yH2JNEqaWG2m6h+Jtt7CkECkzNxq3DH+6v+IzHJK7fA4x8yzzvfWBPbY+TTN4I/mY10tt1vYE+nxZvOuCiMnkp8No0LKVLFWvm2KEFTVuJGjfoieIBIaeBrPc0OjvF7fOktR6amvLAzNgiTpvXgWBqp9Csu/yhqw+ISKqMoG5WxcCf8b8aheoA86Xq/Fk83W5YWZUSG0a3Q5BbUaxGdkmh29+ml58Io3757h1uR5zxrTKMzVa1r5xuc/1i3Vo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2017 03:50:13.4058 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ed3084c-8edf-4a30-25aa-08d527ee25fc 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: CY1PR03MB2364 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org QEIC was supported on PowerPC, and dependent on PPC, Now it is supported on other platforms, so remove PPCisms. Signed-off-by: Zhao Qiang --- arch/powerpc/platforms/83xx/km83xx.c | 1 - arch/powerpc/platforms/83xx/misc.c | 1 - arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 - arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 - arch/powerpc/platforms/85xx/corenet_generic.c | 1 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 1 - arch/powerpc/platforms/85xx/twr_p102x.c | 1 - drivers/irqchip/irq-qeic.c | 188 +++++++++++--------------- include/soc/fsl/qe/qe_ic.h | 132 ------------------ 12 files changed, 80 insertions(+), 250 deletions(-) delete mode 100644 include/soc/fsl/qe/qe_ic.h diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index d8642a4afc74..b1cef0ac5507 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index c09a13532c89..07a0e6128ad2 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index bb7b25acf26f..a1cadf4a695b 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -37,7 +37,6 @@ #include #include #include -#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index a4539c5accb0..2fb1464a02a7 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 4fc3051c2b2e..9234d635f5ca 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c @@ -45,7 +45,6 @@ #include #include #include -#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c index 93f024fd9b45..82fa344a9125 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 1b385acbf4dd..9ca27b1403ce 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 06f34a99152e..8102e5f7cb98 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include "smp.h" diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 000d385933af..f806b6bbf3a3 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 6be9b337035a..4f620f2f9f64 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/drivers/irqchip/irq-qeic.c b/drivers/irqchip/irq-qeic.c index 0bfd12ed6550..d35862b792e5 100644 --- a/drivers/irqchip/irq-qeic.c +++ b/drivers/irqchip/irq-qeic.c @@ -18,8 +18,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -27,9 +30,8 @@ #include #include #include -#include +#include #include -#include #define NR_QE_IC_INTS 64 @@ -87,6 +89,43 @@ #define SIGNAL_HIGH 2 #define SIGNAL_LOW 0 +#define NUM_OF_QE_IC_GROUPS 6 + +/* Flags when we init the QE IC */ +#define QE_IC_SPREADMODE_GRP_W BIT(0) +#define QE_IC_SPREADMODE_GRP_X BIT(1) +#define QE_IC_SPREADMODE_GRP_Y BIT(2) +#define QE_IC_SPREADMODE_GRP_Z BIT(3) +#define QE_IC_SPREADMODE_GRP_RISCA BIT(4) +#define QE_IC_SPREADMODE_GRP_RISCB BIT(5) + +#define QE_IC_LOW_SIGNAL BIT(8) +#define QE_IC_HIGH_SIGNAL BIT(9) + +#define QE_IC_GRP_W_PRI0_DEST_SIGNAL_HIGH BIT(12) +#define QE_IC_GRP_W_PRI1_DEST_SIGNAL_HIGH BIT(13) +#define QE_IC_GRP_X_PRI0_DEST_SIGNAL_HIGH BIT(14) +#define QE_IC_GRP_X_PRI1_DEST_SIGNAL_HIGH BIT(15) +#define QE_IC_GRP_Y_PRI0_DEST_SIGNAL_HIGH BIT(16) +#define QE_IC_GRP_Y_PRI1_DEST_SIGNAL_HIGH BIT(17) +#define QE_IC_GRP_Z_PRI0_DEST_SIGNAL_HIGH BIT(18) +#define QE_IC_GRP_Z_PRI1_DEST_SIGNAL_HIGH BIT(19) +#define QE_IC_GRP_RISCA_PRI0_DEST_SIGNAL_HIGH BIT(20) +#define QE_IC_GRP_RISCA_PRI1_DEST_SIGNAL_HIGH BIT(21) +#define QE_IC_GRP_RISCB_PRI0_DEST_SIGNAL_HIGH BIT(22) +#define QE_IC_GRP_RISCB_PRI1_DEST_SIGNAL_HIGH BIT(23) +#define QE_IC_GRP_W_DEST_SIGNAL_SHIFT (12) + +/* QE interrupt sources groups */ +enum qe_ic_grp_id { + QE_IC_GRP_W = 0, /* QE interrupt controller group W */ + QE_IC_GRP_X, /* QE interrupt controller group X */ + QE_IC_GRP_Y, /* QE interrupt controller group Y */ + QE_IC_GRP_Z, /* QE interrupt controller group Z */ + QE_IC_GRP_RISCA, /* QE interrupt controller RISC group A */ + QE_IC_GRP_RISCB /* QE interrupt controller RISC group B */ +}; + struct qe_ic { /* Control registers offset */ u32 __iomem *regs; @@ -265,15 +304,15 @@ static struct qe_ic_info qe_ic_info[] = { }, }; -static inline u32 qe_ic_read(volatile __be32 __iomem * base, unsigned int reg) +static u32 qe_ic_read(__be32 __iomem *base, unsigned int reg) { - return in_be32(base + (reg >> 2)); + return ioread32be(base + (reg >> 2)); } -static inline void qe_ic_write(volatile __be32 __iomem * base, unsigned int reg, +static void qe_ic_write(__be32 __iomem *base, unsigned int reg, u32 value) { - out_be32(base + (reg >> 2), value); + iowrite32be(value, base + (reg >> 2)); } static inline struct qe_ic *qe_ic_from_irq(unsigned int virq) @@ -375,8 +414,8 @@ static const struct irq_domain_ops qe_ic_host_ops = { .xlate = irq_domain_xlate_onetwocell, }; -/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */ -unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic) +/* Return an interrupt vector or 0 if no interrupt is pending. */ +static unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic) { int irq; @@ -386,13 +425,13 @@ unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic) irq = qe_ic_read(qe_ic->regs, QEIC_CIVEC) >> 26; if (irq == 0) - return NO_IRQ; + return 0; return irq_linear_revmap(qe_ic->irqhost, irq); } -/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */ -unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) +/* Return an interrupt vector or 0 if no interrupt is pending. */ +static unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) { int irq; @@ -402,11 +441,38 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) irq = qe_ic_read(qe_ic->regs, QEIC_CHIVEC) >> 26; if (irq == 0) - return NO_IRQ; + return 0; return irq_linear_revmap(qe_ic->irqhost, irq); } +static void qe_ic_cascade_mpic(struct irq_desc *desc, int is_high) +{ + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); + unsigned int cascade_irq; + + if (is_high) + cascade_irq = qe_ic_get_high_irq(qe_ic); + else + cascade_irq = qe_ic_get_low_irq(qe_ic); + + if (cascade_irq != 0) + generic_handle_irq(cascade_irq); + + chip->irq_eoi(&desc->irq_data); +} + +static void qe_ic_cascade_low_mpic(struct irq_desc *desc) +{ + qe_ic_cascade_mpic(desc, 0); +} + +static void qe_ic_cascade_high_mpic(struct irq_desc *desc) +{ + qe_ic_cascade_mpic(desc, 1); +} + static int __init qe_ic_init(struct device_node *node, struct device_node *parent) { struct qe_ic *qe_ic; @@ -439,7 +505,7 @@ static int __init qe_ic_init(struct device_node *node, struct device_node *paren qe_ic->virq_high = irq_of_parse_and_map(node, 0); qe_ic->virq_low = irq_of_parse_and_map(node, 1); - if (qe_ic->virq_low == NO_IRQ) { + if (qe_ic->virq_low == 0) { pr_err("Failed to map QE_IC low IRQ\n"); ret = -ENOMEM; goto err_domain_remove; @@ -448,7 +514,7 @@ static int __init qe_ic_init(struct device_node *node, struct device_node *paren irq_set_handler_data(qe_ic->virq_low, qe_ic); irq_set_chained_handler(qe_ic->virq_low, qe_ic_cascade_low_mpic); - if (qe_ic->virq_high != NO_IRQ && + if (qe_ic->virq_high != 0 && qe_ic->virq_high != qe_ic->virq_low) { irq_set_handler_data(qe_ic->virq_high, qe_ic); irq_set_chained_handler(qe_ic->virq_high, @@ -466,98 +532,4 @@ static int __init qe_ic_init(struct device_node *node, struct device_node *paren return ret; } -void qe_ic_set_highest_priority(unsigned int virq, int high) -{ - struct qe_ic *qe_ic = qe_ic_from_irq(virq); - unsigned int src = virq_to_hw(virq); - u32 temp = 0; - - temp = qe_ic_read(qe_ic->regs, QEIC_CICR); - - temp &= ~CICR_HP_MASK; - temp |= src << CICR_HP_SHIFT; - - temp &= ~CICR_HPIT_MASK; - temp |= (high ? SIGNAL_HIGH : SIGNAL_LOW) << CICR_HPIT_SHIFT; - - qe_ic_write(qe_ic->regs, QEIC_CICR, temp); -} - -/* Set Priority level within its group, from 1 to 8 */ -int qe_ic_set_priority(unsigned int virq, unsigned int priority) -{ - struct qe_ic *qe_ic = qe_ic_from_irq(virq); - unsigned int src = virq_to_hw(virq); - u32 temp; - - if (priority > 8 || priority == 0) - return -EINVAL; - if (WARN_ONCE(src >= ARRAY_SIZE(qe_ic_info), - "%s: Invalid hw irq number for QEIC\n", __func__)) - return -EINVAL; - if (qe_ic_info[src].pri_reg == 0) - return -EINVAL; - - temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].pri_reg); - - if (priority < 4) { - temp &= ~(0x7 << (32 - priority * 3)); - temp |= qe_ic_info[src].pri_code << (32 - priority * 3); - } else { - temp &= ~(0x7 << (24 - priority * 3)); - temp |= qe_ic_info[src].pri_code << (24 - priority * 3); - } - - qe_ic_write(qe_ic->regs, qe_ic_info[src].pri_reg, temp); - - return 0; -} - -/* Set a QE priority to use high irq, only priority 1~2 can use high irq */ -int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high) -{ - struct qe_ic *qe_ic = qe_ic_from_irq(virq); - unsigned int src = virq_to_hw(virq); - u32 temp, control_reg = QEIC_CICNR, shift = 0; - - if (priority > 2 || priority == 0) - return -EINVAL; - if (WARN_ONCE(src >= ARRAY_SIZE(qe_ic_info), - "%s: Invalid hw irq number for QEIC\n", __func__)) - return -EINVAL; - - switch (qe_ic_info[src].pri_reg) { - case QEIC_CIPZCC: - shift = CICNR_ZCC1T_SHIFT; - break; - case QEIC_CIPWCC: - shift = CICNR_WCC1T_SHIFT; - break; - case QEIC_CIPYCC: - shift = CICNR_YCC1T_SHIFT; - break; - case QEIC_CIPXCC: - shift = CICNR_XCC1T_SHIFT; - break; - case QEIC_CIPRTA: - shift = CRICR_RTA1T_SHIFT; - control_reg = QEIC_CRICR; - break; - case QEIC_CIPRTB: - shift = CRICR_RTB1T_SHIFT; - control_reg = QEIC_CRICR; - break; - default: - return -EINVAL; - } - - shift += (2 - priority) * 2; - temp = qe_ic_read(qe_ic->regs, control_reg); - temp &= ~(SIGNAL_MASK << shift); - temp |= (high ? SIGNAL_HIGH : SIGNAL_LOW) << shift; - qe_ic_write(qe_ic->regs, control_reg, temp); - - return 0; -} - IRQCHIP_DECLARE(qeic, "fsl,qe-ic", qe_ic_init); diff --git a/include/soc/fsl/qe/qe_ic.h b/include/soc/fsl/qe/qe_ic.h deleted file mode 100644 index 611369904f6e..000000000000 --- a/include/soc/fsl/qe/qe_ic.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved. - * - * Authors: Shlomi Gridish - * Li Yang - * - * Description: - * QE IC external definitions and structure. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#ifndef _ASM_POWERPC_QE_IC_H -#define _ASM_POWERPC_QE_IC_H - -#include - -struct device_node; -struct qe_ic; - -#define NUM_OF_QE_IC_GROUPS 6 - -/* Flags when we init the QE IC */ -#define QE_IC_SPREADMODE_GRP_W 0x00000001 -#define QE_IC_SPREADMODE_GRP_X 0x00000002 -#define QE_IC_SPREADMODE_GRP_Y 0x00000004 -#define QE_IC_SPREADMODE_GRP_Z 0x00000008 -#define QE_IC_SPREADMODE_GRP_RISCA 0x00000010 -#define QE_IC_SPREADMODE_GRP_RISCB 0x00000020 - -#define QE_IC_LOW_SIGNAL 0x00000100 -#define QE_IC_HIGH_SIGNAL 0x00000200 - -#define QE_IC_GRP_W_PRI0_DEST_SIGNAL_HIGH 0x00001000 -#define QE_IC_GRP_W_PRI1_DEST_SIGNAL_HIGH 0x00002000 -#define QE_IC_GRP_X_PRI0_DEST_SIGNAL_HIGH 0x00004000 -#define QE_IC_GRP_X_PRI1_DEST_SIGNAL_HIGH 0x00008000 -#define QE_IC_GRP_Y_PRI0_DEST_SIGNAL_HIGH 0x00010000 -#define QE_IC_GRP_Y_PRI1_DEST_SIGNAL_HIGH 0x00020000 -#define QE_IC_GRP_Z_PRI0_DEST_SIGNAL_HIGH 0x00040000 -#define QE_IC_GRP_Z_PRI1_DEST_SIGNAL_HIGH 0x00080000 -#define QE_IC_GRP_RISCA_PRI0_DEST_SIGNAL_HIGH 0x00100000 -#define QE_IC_GRP_RISCA_PRI1_DEST_SIGNAL_HIGH 0x00200000 -#define QE_IC_GRP_RISCB_PRI0_DEST_SIGNAL_HIGH 0x00400000 -#define QE_IC_GRP_RISCB_PRI1_DEST_SIGNAL_HIGH 0x00800000 -#define QE_IC_GRP_W_DEST_SIGNAL_SHIFT (12) - -/* QE interrupt sources groups */ -enum qe_ic_grp_id { - QE_IC_GRP_W = 0, /* QE interrupt controller group W */ - QE_IC_GRP_X, /* QE interrupt controller group X */ - QE_IC_GRP_Y, /* QE interrupt controller group Y */ - QE_IC_GRP_Z, /* QE interrupt controller group Z */ - QE_IC_GRP_RISCA, /* QE interrupt controller RISC group A */ - QE_IC_GRP_RISCB /* QE interrupt controller RISC group B */ -}; - -#ifdef CONFIG_QUICC_ENGINE -unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic); -unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic); -#else -static inline unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic) -{ return 0; } -static inline unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) -{ return 0; } -#endif /* CONFIG_QUICC_ENGINE */ - -void qe_ic_set_highest_priority(unsigned int virq, int high); -int qe_ic_set_priority(unsigned int virq, unsigned int priority); -int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high); - -static inline void qe_ic_cascade_low_ipic(struct irq_desc *desc) -{ - struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); - unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); -} - -static inline void qe_ic_cascade_high_ipic(struct irq_desc *desc) -{ - struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); - unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); -} - -static inline void qe_ic_cascade_low_mpic(struct irq_desc *desc) -{ - struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); - unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); - struct irq_chip *chip = irq_desc_get_chip(desc); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); - - chip->irq_eoi(&desc->irq_data); -} - -static inline void qe_ic_cascade_high_mpic(struct irq_desc *desc) -{ - struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); - unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); - struct irq_chip *chip = irq_desc_get_chip(desc); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); - - chip->irq_eoi(&desc->irq_data); -} - -static inline void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) -{ - struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); - unsigned int cascade_irq; - struct irq_chip *chip = irq_desc_get_chip(desc); - - cascade_irq = qe_ic_get_high_irq(qe_ic); - if (cascade_irq == NO_IRQ) - cascade_irq = qe_ic_get_low_irq(qe_ic); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); - - chip->irq_eoi(&desc->irq_data); -} - -#endif /* _ASM_POWERPC_QE_IC_H */ -- 2.14.1