From patchwork Wed Jan 30 13:05:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 10788541 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 91D3D13B5 for ; Wed, 30 Jan 2019 13:06:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E2D92ECB6 for ; Wed, 30 Jan 2019 13:06:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 727622ECBE; Wed, 30 Jan 2019 13:06:19 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D0422ECB6 for ; Wed, 30 Jan 2019 13:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=txt40ehX88hemDpHZ1LEk3x+xNamEht161aAVa8bENw=; b=LGqRkItB3j1kLW ozKBqM1yQLLDwppormhF6Mj37Lexke7Oud0InwvV1KwtL0prKhh8kGWjXfl/LAoXQsltv1XXa7gkJ +if+T5lQ+AWiwhEDQTL6rCk0Xr6nVaYncNoYj4kp5xLD3/4J74Z+EwhFBTyJWehPHuEl/YY9qoE+n 06Fcrke6OpZkFUMHeNh4UP1fljMUHiTwSpKoYVM9Fs0+kPqS59NgShVyZ13I4WXFluShrHpOEab4Z dnye9MXOm0i7uQJkZJvIiv6R/9O8kskcPNRnPINm3Lw4C+H0tSuLM3wZliQ5yNwvUH38vZwLD0Osc WGzo9Xy9LzJ/lhffcj8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZH-0004Xm-3c; Wed, 30 Jan 2019 13:06:15 +0000 Received: from mail-eopbgr40055.outbound.protection.outlook.com ([40.107.4.55] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZ1-0004Ij-8M for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2019 13:06:00 +0000 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=lXxyazSZWTDE5DNLBMqpFIiE4wO6XqRVk6ersIC8OlA=; b=VPkTURWjKCGUYFMHD6YMPTWXbkbqaQdadSnJ//xpy6oI1JtFpTn75hxviIx8C2JcwlsGq+z9m7nExuYKKJauNV4ZXyH+66RX9hT8DPhQ9IT9bAsCkbxXp3Xff631cc57NG+/cxpm3pRxOWrGrP7C5ROTcLCY8atGP2V+iij0K1g= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.16; Wed, 30 Jan 2019 13:05:55 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51%2]) with mapi id 15.20.1580.017; Wed, 30 Jan 2019 13:05:55 +0000 From: Aisheng Dong To: "linux-kernel@vger.kernel.org" Subject: [PATCH V2 1/4] dt-binding: irq: imx-irqsteer: use irq number instead of group number Thread-Topic: [PATCH V2 1/4] dt-binding: irq: imx-irqsteer: use irq number instead of group number Thread-Index: AQHUuJyI2fEUmpKRtEa26OM/xF2qWQ== Date: Wed, 30 Jan 2019 13:05:55 +0000 Message-ID: <1548853196-11447-2-git-send-email-aisheng.dong@nxp.com> References: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:203:92::33) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4211; 6:VooOpG7gO8iK4iWu0znXj8xrnC9u0+cDb+SXprIvKPFwO7xYsEilJ59m4Izccn0r+trC5q4Bm2hQhSlNtTZr6ROa1OCsldt8kz51cQ5aNKc2sGtLKul5c7m/raOwzEc9V8MzC6rV4R7ksNLMR2aeMlqcEPFrtTdySwR8C+9NHt/6RSdp3rpnd6oDZTODEqyTH4vofmL3q3H20Me6mDSdzaakYntY5Nd0almM5OkaMZdEHycBOszyUPTLSE38dr1kFWRU2f19+hceraYmKG1j5pnJ/YCoiVZ28Hp0wRqNin2d3TD6ImkVHT3gIRuisI0djlZz6eVQsx/gCYQa9NA56uUHsyrhKrjliNXV0Xm0nI64tA4qQirXC8AmeWJ2PA6e//yCqV/d47Dt8fogDrlj5NTxiwj0NjSryT9xkpGtWX/f1ALAvKm2pa4g0xgAtmoFdQQ84PSyac3XK18ivLkTvw==; 5:TeTVxbSOieoRcQJKTNtIt2hP6BVoxcjpECupWfb/VHorL9XXWY0d4ecKeLTcV3l2kyiRH/a3yhPpxeTEFEhNjAGhlM3FwupX5CG6RWK+DX3wdDCvBZqPIus6+6ZitrH9OPlpZAomPC4msYIUhl19cDsqAFCXYpC2LL6WQd9oM18pmEAHAl//1gIP7vFnReKrjQTLVva2+AZkNkZ35FqmJg==; 7:KvAq7Bk9+vKRebpweqZ5f/04WGFEGAImLtnH9EgxOQziF9BuT7mLuly4+V27IIy18KnQLrVaCcpJKQSjUNrJbUmYrrn7Ug6hG9/O/C9fgIPE1WsIeIlcYV4zOauDY90X/6usqISSSuOZpN3Ymiuwkw== x-ms-office365-filtering-correlation-id: 0203df92-921d-4c06-16d7-08d686b3ab43 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4211; x-ms-traffictypediagnostic: AM0PR04MB4211: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(136003)(396003)(376002)(366004)(54534003)(199004)(189003)(2906002)(54906003)(53936002)(478600001)(71190400001)(71200400001)(6916009)(52116002)(6486002)(14454004)(50226002)(6436002)(7736002)(305945005)(2501003)(105586002)(106356001)(97736004)(2351001)(6116002)(3846002)(186003)(256004)(386003)(26005)(6506007)(86362001)(76176011)(102836004)(316002)(99286004)(66066001)(36756003)(2616005)(11346002)(5640700003)(25786009)(486006)(446003)(476003)(44832011)(6512007)(8676002)(68736007)(8936002)(81156014)(81166006)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4211; H:AM0PR04MB4211.eurprd04.prod.outlook.com; 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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 2MFrC5vlo9xpEix1YM09uVnwnhUEsafDl7rsmqdSCpTssSXbzpKr6FNuLCvJDWQ2sW//mnWr8pcK+jU68MT4HDX567bCUnvnNqFJrz/u4L5ONxj7nU6AZfBb2THZc7RWPqaHTZbpNoRlVrdhWVwO0Y6p1dRkZ0mdK/26QyOu06x1f2pqOY4rPLtwbVrEMNomacm8optyYEll5Iw0ze7SCEbtrpba5A60IlhjjWtSFFRwLlBU/DEVdfpFnaauiQf4541A+rCJ0sSbwHTDKb/J9hu13f3yZs90jvw/GNofkxSWKuGrODILeGIeL7ynhA3N0IqIlBffnsUJbEK5ciZ8VhH3ZKayYqZ2TByv7kLWAxeukCg3uEnK0EVPUeJfH+rrGyWeOYrIP6q/ga4Gts2OkOjJlo+q3Q+hgoRET3Z2rgM= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0203df92-921d-4c06-16d7-08d686b3ab43 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:05:51.7579 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4211 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190130_050559_296548_124CB6AC X-CRM114-Status: GOOD ( 10.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , "devicetree@vger.kernel.org" , Marc Zyngier , "robh+dt@kernel.org" , dl-linux-imx , "tglx@linutronix.de" , "shawnguo@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Not all 64 interrupts may be used in one group. e.g. most irqsteer in imx8qxp and imx8qm subsystems supports only 32 interrupts. As the IP integration parameters are Channel number and interrupts number, let's use fsl,num-irqs to represents how many interrupts supported by this irqsteer channel. Cc: Marc Zyngier Cc: Rob Herring Cc: Lucas Stach Cc: Shawn Guo Cc: devicetree@vger.kernel.org Signed-off-by: Dong Aisheng Reviewed-by: Lucas Stach --- ChangeLog: v1->v2: * change property name fsl,irqs-per-chan to fsl,num-irqs. --- .../devicetree/bindings/interrupt-controller/fsl,irqsteer.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt index 45790ce..6d0a41b 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt @@ -16,8 +16,8 @@ Required properties: - #interrupt-cells: Specifies the number of cells needed to encode an interrupt source. The value must be 1. - fsl,channel: The output channel that all input IRQs should be steered into. -- fsl,irq-groups: Number of IRQ groups managed by this controller instance. - Each group manages 64 input interrupts. +- fsl,num-irqs: Number of input interrupts of this channel. + Should be multiple of 32 input interrupts and up to 512 interrupts. Example: @@ -28,7 +28,7 @@ Example: clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; clock-names = "ipg"; fsl,channel = <0>; - fsl,irq-groups = <1>; + fsl,num-irqs = <64>; interrupt-controller; #interrupt-cells = <1>; }; From patchwork Wed Jan 30 13:05:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 10788543 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 38DCC13B5 for ; Wed, 30 Jan 2019 13:06:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23AC22ECB6 for ; Wed, 30 Jan 2019 13:06:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 182C02ECBE; Wed, 30 Jan 2019 13:06:36 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 102122ECB6 for ; Wed, 30 Jan 2019 13:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fqwpu8KALG7zjo9qD7XqorlegDo4Zfzj/Lbi9cyZdCQ=; b=YKJJk9qa4w6gvU 8IvX6pAlnWiYii1Zx65VTFNn/IDmArJHZfzxe2SBJ8yohJLthIyrCJTG2VG0VjShka2FjNqor3de2 u7e78nCscbGvCupduDFR+D3BENQQPWTsWtA0auWWNIXnBOOEarAMHTWkRepDmDSttDtk8OrmnGCYL o39dfGslLY/RyYrIySGBFTkSyFm1YHpBum2K3Gh00+LonHlh1MjIl9f7czgZN1qriotM/63BoMked Yu93YKNw5jDVhbcLy8v408wkEvzyfdngMeRLLwLtL/8BgH+iCrxRQwoEpDTPVCYYeEIqx438boXMu 0zk/9csqX3g4z6pyrM8w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZW-0004m7-Tv; Wed, 30 Jan 2019 13:06:30 +0000 Received: from mail-eopbgr40055.outbound.protection.outlook.com ([40.107.4.55] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZ3-0004Ij-6v for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2019 13:06:10 +0000 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=O4kP5XK8jTLymvBHBnpKTFPhjBNQXKJHVrntRhOn7tw=; b=RwTCYRg3byvGhTWby+gwmpTk9GuWjPGAyR2PfktdvEgrSHH8gOE1IZ76orldbeTtt0samW1IjjmNnxwf/9MOs+jcsSCJzPK5+QydsuM7IzFWURX1xedUQ16TFqoQXlsnHSp8A0uJae3LQglcjn7/kbUPIlgh83DhhUhzdyns7rI= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.16; Wed, 30 Jan 2019 13:05:59 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51%2]) with mapi id 15.20.1580.017; Wed, 30 Jan 2019 13:05:59 +0000 From: Aisheng Dong To: "linux-kernel@vger.kernel.org" Subject: [PATCH V2 2/4] dt-bindings: irq: imx-irqsteer: add multi output interrupts support Thread-Topic: [PATCH V2 2/4] dt-bindings: irq: imx-irqsteer: add multi output interrupts support Thread-Index: AQHUuJyLKEGaOiVVBU20WR00FlnBPg== Date: Wed, 30 Jan 2019 13:05:59 +0000 Message-ID: <1548853196-11447-3-git-send-email-aisheng.dong@nxp.com> References: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:203:92::33) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4211; 6:44GO/P1FYGlY65v00ZlXltAi+jf+XCk7D4bcudBemow2nfehDt/WaBqTJbTzcwQs0BiKNHGUQegRs+i4kH9Z9iIEo6VvazIT00yBIWG4OPlyytj1CzAbCXTVyql+8s4LZHZTZfRFmnWFhidyUd9/PYmBBiHs+h86MFNpZ10rb0ttdvDq2fw4G5Ooh5TDBxuyMZfrYaOhDUeblMSRAAOix4rlvtG5pF/JtZ9KuscWNXISpBXUzfKq0fXtjrHwuIVs8QIC7a49TddxWWJ1JJQQcCL3slwBSguPrNbsj8XkA/hRlV1NOZM7JG7FdU3qnsqY2XgaPJ0SL0ivQlsSTf+5LJ108z4ASVsa+UEPd/rceDWxsTS7asrKET4sLXbqrKjCOSCWB4sVfMiFYIRjgb0NsAZdbs7v3lzWRFCgvDYgU/8SvSZv4EFvu2p9bPmWkZs+Ljw7wt97GtDInSJCoRBxxA==; 5:r8kMGDU3Mp6MDJPXUFMIOyLNkkLHhXe5Aj5i49dLy/UpvkZexpw8zWcUjpb9EqKmy6surlwvlHPzdP8ypD0+pYpcRUuAD9rhn7IX/HVy77gDpulI1eQaYDg3Mhqwm7z2TyCCMnglUioHFhUd/VWopIe43Ts0gXdYWUqCU2qztZru6r0nyEaBJlQCKT3zcYQCpEWUXhG/0v071h6UK95y6A==; 7:q7UrirLQflBJvaYjtnwToZRqlagItn32CNGyqlxKzneL8HwTgWwM6++AlIX68pR7Ym9ki/M4eCVfJHzEVPJ88Ed+z4W2Kbk+S01t6sQaqo8cTecCWFEGAvFiW2iFOzND9kyCxo+gGxZqJXqmVQgllg== x-ms-office365-filtering-correlation-id: d84c4e91-bf29-4686-8408-08d686b3ada2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4211; x-ms-traffictypediagnostic: AM0PR04MB4211: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(136003)(396003)(376002)(366004)(54534003)(199004)(189003)(2906002)(54906003)(53936002)(478600001)(71190400001)(71200400001)(6916009)(52116002)(6486002)(14454004)(50226002)(6436002)(7736002)(305945005)(2501003)(105586002)(106356001)(97736004)(2351001)(6116002)(3846002)(186003)(256004)(386003)(26005)(6506007)(86362001)(76176011)(102836004)(316002)(99286004)(66066001)(36756003)(2616005)(11346002)(5640700003)(25786009)(486006)(446003)(476003)(44832011)(6512007)(8676002)(68736007)(8936002)(81156014)(81166006)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4211; H:AM0PR04MB4211.eurprd04.prod.outlook.com; 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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: itf1FLj/pTT0okp+J3uhIXF6O9v3XGbXeQKhiHBPGu38PhFuQmYG3q1GUXQV5roaG9vtX5fqjGKOs7JC2hESHZRhvLrwejCiUIMuBJo+WQzcP2dgEAOw383FsKyS+Y1If6ed6iL+acEP/7G8wDdTATG3HyiyBzw9Htwg9g6R4K12B4w//Rv0Ckaecl/oCIvnNhgN0DwlGlPCSVIe/l0CmFo/u6l4631ziH5nWeE7KQzWVQTGR+QBBtjZkeh4eTsZVvzgATRDGwKfbtuK8XW6gfjPn62u55lcwuZvZoVmsdws9dKyrx6OxTSoGjX137RhGAmRiSM967xSlMsDQk3/fmwGQ7ghv6zk1ni5bWlSYGzUq87ZoaVFhw3aj1wm5bssX6KM8KZ7qbMHN+aXt9IqTI//FMNsd4ZMQ3kuBB29kI8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d84c4e91-bf29-4686-8408-08d686b3ada2 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:05:55.7277 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4211 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190130_050601_729204_52150529 X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , "devicetree@vger.kernel.org" , Marc Zyngier , "robh+dt@kernel.org" , dl-linux-imx , "tglx@linutronix.de" , "shawnguo@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP One irqsteer channel can support up to 8 output interrupts. Cc: Marc Zyngier Cc: Rob Herring Cc: Lucas Stach Cc: Shawn Guo Cc: devicetree@vger.kernel.org Signed-off-by: Dong Aisheng --- ChangeLog: v1->v2: * remove one unnecessary note. --- .../devicetree/bindings/interrupt-controller/fsl,irqsteer.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt index 6d0a41b..984ab92 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt @@ -6,8 +6,9 @@ Required properties: - "fsl,imx8m-irqsteer" - "fsl,imx-irqsteer" - reg: Physical base address and size of registers. -- interrupts: Should contain the parent interrupt line used to multiplex the - input interrupts. +- interrupts: Should contain the up to 8 parent interrupt lines used to + multiplex the input interrupts. They should be sepcified seqencially + from output 0 to 7. - clocks: Should contain one clock for entry in clock-names see Documentation/devicetree/bindings/clock/clock-bindings.txt - clock-names: From patchwork Wed Jan 30 13:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 10788545 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 CF9F113B5 for ; Wed, 30 Jan 2019 13:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB8662EC76 for ; Wed, 30 Jan 2019 13:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACF682ECB7; Wed, 30 Jan 2019 13:06:51 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 962E92EC76 for ; Wed, 30 Jan 2019 13:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GLMxlUbtDCB4eVF6QU7x6O05HmFLhaZUkelJpEUp4M8=; b=tgvmZn0QuMy+mN ZD7qJ/luXvwkMXGFRS9p6IHpMAnDOcWvmRq/iw+UwerWtkfWbCM9IAWY6dEezXZBwwus6h1wXbedk /uFwXmkU8R89QMTw33N73AJIkX8p9KWRDT8EEig0fuVCl0CiBCUaeyW1aRA4mbRd0nhfKL+MSYkKj rxBKzdXW2oj37NHghcUGx1Uv+SBbP+04frMBi6a0gFzc1YqzG/eY8IQnb62iKY+5PrfXdBpTr1JZn tUV63WUOGJPE/tlQrlbMlNRMs1uqasBZJuHGRUrKx3DvS/KGJbKBGJAE0eUAmEoCEtoW5ckl2CxIZ fCc7jIWuj8IhnYb+fhgA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZo-00051z-D0; Wed, 30 Jan 2019 13:06:48 +0000 Received: from mail-eopbgr10072.outbound.protection.outlook.com ([40.107.1.72] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZ8-0004Nx-TU for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2019 13:06:12 +0000 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=7msFvan8Dl/n0+dabE4fBcDUeL4umXBPtYx/wRZvyYM=; b=xBkkq1QbYnvuTXEG6qxvyL6A8/bJsazpVOmbNhdeIH3WReoispjxDOPSq4Sd3UEC9VNt1cMEHST4+dmO7CAN1yPH5S+71ZqHhXwr3OyMfNW0rLYqSw/arcIjEvESCil08sRZVbND+7ahe/cMGNEmuHSvIRailwF/b3vX8rl/6O8= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB6033.eurprd04.prod.outlook.com (20.179.32.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.20; Wed, 30 Jan 2019 13:06:03 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51%2]) with mapi id 15.20.1580.017; Wed, 30 Jan 2019 13:06:03 +0000 From: Aisheng Dong To: "linux-kernel@vger.kernel.org" Subject: [PATCH V2 3/4] irq: imx-irqsteer: change to use reg_num instead of irq_group Thread-Topic: [PATCH V2 3/4] irq: imx-irqsteer: change to use reg_num instead of irq_group Thread-Index: AQHUuJyNnC/wXmpemEueUk0sVv7qiw== Date: Wed, 30 Jan 2019 13:06:03 +0000 Message-ID: <1548853196-11447-4-git-send-email-aisheng.dong@nxp.com> References: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:203:92::33) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB6033; 6:pjYCmkkG5fMbxvRlzrXhHgg8AH5YSq8w+hMdvMGC0aVk97ed9UOW9pN/BzV+NRpZDts+gJ/w0HM7i7WLs9a79GI6LfhREnx6hsnCBBAd4u4Zlx0crRPEvEK9p/dPs7iuo9sOzwXyN+c8V5kKyKtufp4/6B1yYFnqqT38JRxjUKm7HvqUhNbmuna4eBmKq25TSyXwsZeue6YeMzPDskIEgBKx9ZdaTKRfTtBD0N+qxxAMFUoekrL4s5AkdCAORJFC/OvWo9IsN1qsRWb6E+2T/jc8s1dJF2z9SnNh+Q+lVtUfSQMFHPYAB4OIpnDWr6FpwzH00wA19DuOQ9nP6acPNgZkzU/Q/Iay5NEpQVBOAHWvocFusg24S9fyZg9CS7MRKpf5QF+UDfvahkmvfR5R2gXxOsB5zwuFKyi8scJ4Wrc0kodN7DkMvvOK27j4Ey6FtLc672/Q8ek8IwQ6nmnX7A==; 5:GqVur9JycZT3JA+hSMO5HBtmH8TYHyteGcSXUm0XRx3E7NgiHTbswQpJ33GsCw8vG34+gGdGCk24K6iRCgxO83Rbpgv0fSE+27limBT1W8RO1DjWzVPZqeJS/fdzuj9o2bfJWsY7oFYGS8+bJDkcw9nb+qN8xUbBsJ3mx6XBX6LerXRtpydnm5Eqsxeqi5JpgYINlojXj2gBlqBw/TWchg==; 7:txhLYWmODbcvVOzSCoEFMzGNQwUK3wWTxdWxzfPohZlykaWJAWIOIZ4gXWoyFMMCb9naJrwNQxDEMeYmYAIRbSOWadhT44ugDjD25ewwdXhK+8q8GORVNEpsHNxFFDdqmER5+vNZyC7V+MgtZOPa8Q== x-ms-office365-filtering-correlation-id: c77d88e5-92d6-4402-67f3-08d686b3aff7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB6033; x-ms-traffictypediagnostic: AM0PR04MB6033: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(346002)(39860400002)(189003)(199004)(316002)(81156014)(50226002)(2351001)(106356001)(71190400001)(44832011)(486006)(68736007)(52116002)(186003)(71200400001)(4326008)(25786009)(26005)(105586002)(478600001)(86362001)(76176011)(102836004)(386003)(6506007)(81166006)(2906002)(8676002)(476003)(97736004)(6916009)(6512007)(53936002)(66066001)(2616005)(14444005)(8936002)(6436002)(7736002)(305945005)(14454004)(36756003)(54906003)(2501003)(6116002)(6486002)(446003)(11346002)(3846002)(5640700003)(256004)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6033; H:AM0PR04MB4211.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: y0nEhO05NV+/CLIvG/b7E46gk1UiCAbJ4iaKfwkFwJGqzCNSVtrnLXFpSHWKVZwKfX23ek/JHMtrdlRFTC2+YeBRM+7ENGF5MXz9Krt6sCmlZoUNoMRd0b/+qjWc+yQNlBF6am6JwkiOpd7sj5xQLjuN1Vs9HxVWqyPvrMnu3oPBl6TjYYFkBpLV2ABMIc6RIMBTdk1G6B7m9VGZKL5DqpWbahy84z0yxTRHaXPlfyWx/+qTGJ7TyjD+6hYy1Log/ru+UXNnpNN2QZ/j2HjtGa3BuZvTtQ82Rt464rjA33Q+ChdrSVGTnBUCpFJeoTf91rv3KwU0k79KiNNfgv4XYVHLBZAUFyUKKWnQuRmpcNdHh92SOF/bT+V0yTmIn9e4ERpVXhhyQYJsgIPeu5t4rz6mSsdk4Z00ys7FcFCTXX8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c77d88e5-92d6-4402-67f3-08d686b3aff7 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:05:59.6335 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6033 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190130_050607_432029_16DADEB5 X-CRM114-Status: GOOD ( 15.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , "devicetree@vger.kernel.org" , Marc Zyngier , "robh+dt@kernel.org" , dl-linux-imx , "tglx@linutronix.de" , "shawnguo@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP One group can manage 64 interrupts by using two registers (e.g. STATUS/SET). However, the integrated irqsteer may support only 32 interrupts which needs only one register in a group. But the current driver assume there's a mininum of two registers in a group which result in a wrong register map for 32 interrupts per channel irqsteer. Let's use the reg_num caculated by interrupts per channel instead of irq_group to cover this case. Cc: Marc Zyngier Cc: Rob Herring Cc: Lucas Stach Cc: Shawn Guo Signed-off-by: Dong Aisheng Reviewed-by: Lucas Stach --- v1->v2: * The using of property name updated accordingly --- drivers/irqchip/irq-imx-irqsteer.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c index 5b3f1d7..67ed862 100644 --- a/drivers/irqchip/irq-imx-irqsteer.c +++ b/drivers/irqchip/irq-imx-irqsteer.c @@ -13,7 +13,7 @@ #include #include -#define CTRL_STRIDE_OFF(_t, _r) (_t * 8 * _r) +#define CTRL_STRIDE_OFF(_t, _r) (_t * 4 * _r) #define CHANCTRL 0x0 #define CHANMASK(n, t) (CTRL_STRIDE_OFF(t, 0) + 0x4 * (n) + 0x4) #define CHANSET(n, t) (CTRL_STRIDE_OFF(t, 1) + 0x4 * (n) + 0x4) @@ -26,7 +26,7 @@ struct irqsteer_data { struct clk *ipg_clk; int irq; raw_spinlock_t lock; - int irq_groups; + int reg_num; int channel; struct irq_domain *domain; u32 *saved_reg; @@ -35,7 +35,7 @@ struct irqsteer_data { static int imx_irqsteer_get_reg_index(struct irqsteer_data *data, unsigned long irqnum) { - return (data->irq_groups * 2 - irqnum / 32 - 1); + return (data->reg_num - irqnum / 32 - 1); } static void imx_irqsteer_irq_unmask(struct irq_data *d) @@ -46,9 +46,9 @@ static void imx_irqsteer_irq_unmask(struct irq_data *d) u32 val; raw_spin_lock_irqsave(&data->lock, flags); - val = readl_relaxed(data->regs + CHANMASK(idx, data->irq_groups)); + val = readl_relaxed(data->regs + CHANMASK(idx, data->reg_num)); val |= BIT(d->hwirq % 32); - writel_relaxed(val, data->regs + CHANMASK(idx, data->irq_groups)); + writel_relaxed(val, data->regs + CHANMASK(idx, data->reg_num)); raw_spin_unlock_irqrestore(&data->lock, flags); } @@ -60,9 +60,9 @@ static void imx_irqsteer_irq_mask(struct irq_data *d) u32 val; raw_spin_lock_irqsave(&data->lock, flags); - val = readl_relaxed(data->regs + CHANMASK(idx, data->irq_groups)); + val = readl_relaxed(data->regs + CHANMASK(idx, data->reg_num)); val &= ~BIT(d->hwirq % 32); - writel_relaxed(val, data->regs + CHANMASK(idx, data->irq_groups)); + writel_relaxed(val, data->regs + CHANMASK(idx, data->reg_num)); raw_spin_unlock_irqrestore(&data->lock, flags); } @@ -94,13 +94,13 @@ static void imx_irqsteer_irq_handler(struct irq_desc *desc) chained_irq_enter(irq_desc_get_chip(desc), desc); - for (i = 0; i < data->irq_groups * 64; i += 32) { + for (i = 0; i < data->reg_num * 32; i += 32) { int idx = imx_irqsteer_get_reg_index(data, i); unsigned long irqmap; int pos, virq; irqmap = readl_relaxed(data->regs + - CHANSTATUS(idx, data->irq_groups)); + CHANSTATUS(idx, data->reg_num)); for_each_set_bit(pos, &irqmap, 32) { virq = irq_find_mapping(data->domain, pos + i); @@ -146,12 +146,15 @@ static int imx_irqsteer_probe(struct platform_device *pdev) raw_spin_lock_init(&data->lock); - of_property_read_u32(np, "fsl,irq-groups", &data->irq_groups); + of_property_read_u32(np, "fsl,num-irqs", &data->reg_num); of_property_read_u32(np, "fsl,channel", &data->channel); + /* one register bit map represents 32 input interrupts */ + data->reg_num /= 32; + if (IS_ENABLED(CONFIG_PM_SLEEP)) { data->saved_reg = devm_kzalloc(&pdev->dev, - sizeof(u32) * data->irq_groups * 2, + sizeof(u32) * data->reg_num, GFP_KERNEL); if (!data->saved_reg) return -ENOMEM; @@ -166,7 +169,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev) /* steer all IRQs into configured channel */ writel_relaxed(BIT(data->channel), data->regs + CHANCTRL); - data->domain = irq_domain_add_linear(np, data->irq_groups * 64, + data->domain = irq_domain_add_linear(np, data->reg_num * 32, &imx_irqsteer_domain_ops, data); if (!data->domain) { dev_err(&pdev->dev, "failed to create IRQ domain\n"); @@ -199,9 +202,9 @@ static void imx_irqsteer_save_regs(struct irqsteer_data *data) { int i; - for (i = 0; i < data->irq_groups * 2; i++) + for (i = 0; i < data->reg_num; i++) data->saved_reg[i] = readl_relaxed(data->regs + - CHANMASK(i, data->irq_groups)); + CHANMASK(i, data->reg_num)); } static void imx_irqsteer_restore_regs(struct irqsteer_data *data) @@ -209,9 +212,9 @@ static void imx_irqsteer_restore_regs(struct irqsteer_data *data) int i; writel_relaxed(BIT(data->channel), data->regs + CHANCTRL); - for (i = 0; i < data->irq_groups * 2; i++) + for (i = 0; i < data->reg_num; i++) writel_relaxed(data->saved_reg[i], - data->regs + CHANMASK(i, data->irq_groups)); + data->regs + CHANMASK(i, data->reg_num)); } static int imx_irqsteer_suspend(struct device *dev) From patchwork Wed Jan 30 13:06:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 10788547 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 B9A5713B5 for ; Wed, 30 Jan 2019 13:07:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5FD62EC65 for ; Wed, 30 Jan 2019 13:07:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 998DA2EC82; Wed, 30 Jan 2019 13:07: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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0ADC42EC65 for ; Wed, 30 Jan 2019 13:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JLFeYL+0Giz5yPmbIeO+FB3OZ8DMhE1RFQiwR4uPNSI=; b=ciZFskZCNbuW7k x/nsbnF+4E9WligKgPlss+fPmWAdyUVULo1AZWf1yiGCg6F5C/VQOSeBZkcs7HYYS2say/uxGtlBW P81SE29LLfamovbV50jTT31QjWiJ25Y+B4RGfhuRd2d6bhhSHIZ3/SFs5LWk5T1Kx+XLb71B4i6Js tpXduulnR2Oo9Xn2G0pu4sWgN3WwA7K4vmCq0Tz0mnIyP5uK2geKnTysWaz8nn4RXXd8XlnfSlVje ncRWSZ93RhvVdGzzfidu6YgpY0EpVZj+bBwY6XJZIoXjUp2vdXgBbKcCGZKDx/nGIXFwBPxL1o35n n55IViJHJyoerPY+HUcA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopaT-0005RH-Gk; Wed, 30 Jan 2019 13:07:29 +0000 Received: from mail-eopbgr10072.outbound.protection.outlook.com ([40.107.1.72] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gopZE-0004Nx-L4 for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2019 13:06:22 +0000 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=9iZyEx8VlcbHp8pVhJaRGjm6MZIDXJlNrzKc7nU2heo=; b=Zh9OgPv+oov330x0/pE6iuJ4WW7X4Mq8D2d/EOLC3x9IN6helNrgUyEEm+zkUnfmSRxEjVlpYy0r75X/ow40AZ3I5GLoSgILB1kwbPFdCoUT6goW71FTCGUuvxeSwi37tTnkIxLoBAHwvf25h8kjRiTM3Cn+H/j383SnrnfcsAE= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB6033.eurprd04.prod.outlook.com (20.179.32.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.20; Wed, 30 Jan 2019 13:06:07 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::bd44:e001:ab8d:1c51%2]) with mapi id 15.20.1580.017; Wed, 30 Jan 2019 13:06:07 +0000 From: Aisheng Dong To: "linux-kernel@vger.kernel.org" Subject: [PATCH V2 4/4] irq: imx: irqsteer: add multi output interrupts support Thread-Topic: [PATCH V2 4/4] irq: imx: irqsteer: add multi output interrupts support Thread-Index: AQHUuJyQDrz3jPZXTky6ZbN3eVmsCA== Date: Wed, 30 Jan 2019 13:06:07 +0000 Message-ID: <1548853196-11447-5-git-send-email-aisheng.dong@nxp.com> References: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1548853196-11447-1-git-send-email-aisheng.dong@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:203:92::33) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB6033; 6:kLCcIYEpCAphVf+zSpB4imF4zgKuC4L6xKDRzwfAeq5iyikPlzbl4YYTMXdQSa2iMReXvOiZyWOriSorZcnY+SRMcjmjGRsgSOW6V4fWl9ziHIKEoWxmq8lulA/EawmmZzLccpIpYMSXudNqY+1AWU5JzFhH5QHaD7YPRmWD8Pv3EkfUYTe9xFUaf+PrfDafyupexQeUWAaR6Tbbz2UML/mZt0quqIeBL80chKpAi8pLc6NnZt33Rbcz1jHdA7zaPHs7kjIdv7y6j7NmZYC/otKay4ElCtXU8Sav7kiGi6PVjwKUVC9TRUZ3aAiASeqmDHYPHJIUBBzfPaNLVfS9Y64sSpmwh8dyLXQWDgW8WcMXi0c5YGmZH9k5bW8tYLsxQv5rZhfQQxAGsZrYA+kZ2C+G5mIpyA5CSf897QvowO2mbwa6D79ahFEu6srVDgrE+Q4KGqHClieV6qaVYB1m4A==; 5:/2DzkUBRRrU1FJXt8NV0B+Pa6Q3kO1phc2mgbQ9ahRiQ859kppyrozF6LihHgGuGlZW7veCXO+Ov2fpdZzurZsyqUREip5UdlOM4hi0g/VkpBMoMDQPl6vCXBe0pSgqUI7uculXvrE/xBNQfD0Zw1XAACfbnZZukEwB51xWxikhO9kXT+Hk2OTMxWpnt1ns2wuM2hks/UbGlGJwcdOKyWQ==; 7:IUoQp9wDzhMX+e/pznwQw0n48fueNcmmQMZ/Q+v2I5XxDOdI/9x9nNe6DIt+LCdkJJfLRaA4nNCdfCmfVKtNRtqeP9Ylz6T/hzFt1tJoHxTYST5FR3VTTm98QhpeSnAY4iosHt0Q/UbeoiBzLNciTw== x-ms-office365-filtering-correlation-id: 68a71300-6f91-4fb9-a334-08d686b3b23d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB6033; x-ms-traffictypediagnostic: AM0PR04MB6033: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(346002)(39860400002)(189003)(199004)(54534003)(316002)(81156014)(50226002)(2351001)(106356001)(71190400001)(44832011)(486006)(68736007)(52116002)(186003)(71200400001)(4326008)(25786009)(26005)(105586002)(478600001)(86362001)(76176011)(102836004)(386003)(6506007)(81166006)(2906002)(8676002)(476003)(97736004)(6916009)(6512007)(53936002)(66066001)(2616005)(14444005)(8936002)(6436002)(7736002)(305945005)(14454004)(36756003)(54906003)(2501003)(6116002)(6486002)(446003)(11346002)(3846002)(5640700003)(256004)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6033; H:AM0PR04MB4211.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: v2FVSBbHVn6K37lroBNqIXfPM22AmOrpLk6Atpt3f2sdUJ8NnbZSTtsC/OlzcoxGT6KqNZkLM84zYkmFIJbB4yj1s6wKa7BAo/zGMxBFonvzq/8hrMWW38kxk4n4m3kTxQXMeL5Nr1/9vqUtBWEDKtCOuhoVUmVR3sQVkBCrMCXwdBNXYqzZA8DjWIOUIzkq/Lb6yJdMCCQIYZ4RfoLNqqe7LGCMCXjTkoLWA0pwtLJW0MF2crrYBPCFUmXZvPfroVh4C1MMAavFFrRigHd3SnsuA8Q+K1lEEGRfLsTuNmDqgF+FGZ7IfXhEKRlmWsEarVCTzsaJ2P4mV/UZ9Q60+AjdH75qb1916uxLPIE3X8qgpCBC0nBXO4f8MWQWzE3BnzAf7ca/8PlmDlPJkXU0Wu72q3J/fopzV0pRBpNqWKw= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68a71300-6f91-4fb9-a334-08d686b3b23d X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:06:03.4482 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6033 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190130_050613_086679_770B1C40 X-CRM114-Status: GOOD ( 16.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , "devicetree@vger.kernel.org" , Marc Zyngier , "robh+dt@kernel.org" , dl-linux-imx , "tglx@linutronix.de" , "shawnguo@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP One irqsteer channel can support up to 8 output interrupts. Cc: Marc Zyngier Cc: Lucas Stach Cc: Shawn Guo Signed-off-by: Dong Aisheng --- ChangeLog: v1->v2: * calculate irq_count by fsl,num-irqs instead of parsing interrupts property from devicetree to match the input interrupts and outputs * improve output interrupt handler by searching only two registers withint the same group --- drivers/irqchip/irq-imx-irqsteer.c | 76 +++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c index 67ed862..cc40039 100644 --- a/drivers/irqchip/irq-imx-irqsteer.c +++ b/drivers/irqchip/irq-imx-irqsteer.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -21,10 +22,13 @@ #define CHAN_MINTDIS(t) (CTRL_STRIDE_OFF(t, 3) + 0x4) #define CHAN_MASTRSTAT(t) (CTRL_STRIDE_OFF(t, 3) + 0x8) +#define CHAN_MAX_OUTPUT_INT 0x8 + struct irqsteer_data { void __iomem *regs; struct clk *ipg_clk; - int irq; + int irq[CHAN_MAX_OUTPUT_INT]; + int irq_count; raw_spinlock_t lock; int reg_num; int channel; @@ -87,26 +91,45 @@ static const struct irq_domain_ops imx_irqsteer_domain_ops = { .xlate = irq_domain_xlate_onecell, }; +static int imx_irqsteer_get_hwirq_base(struct irqsteer_data *data, u32 irq) +{ + int i; + + for (i = 0; i < data->irq_count; i++) { + if (data->irq[i] == irq) + break; + } + + return i * 64; +} + static void imx_irqsteer_irq_handler(struct irq_desc *desc) { struct irqsteer_data *data = irq_desc_get_handler_data(desc); + int hwirq; int i; chained_irq_enter(irq_desc_get_chip(desc), desc); - for (i = 0; i < data->reg_num * 32; i += 32) { - int idx = imx_irqsteer_get_reg_index(data, i); + hwirq = imx_irqsteer_get_hwirq_base(data, irq_desc_get_irq(desc)); + + for (i = 0; i < 2; i++) { + int idx = imx_irqsteer_get_reg_index(data, hwirq); unsigned long irqmap; int pos, virq; + if (hwirq >= data->reg_num * 32) + break; + irqmap = readl_relaxed(data->regs + CHANSTATUS(idx, data->reg_num)); for_each_set_bit(pos, &irqmap, 32) { - virq = irq_find_mapping(data->domain, pos + i); + virq = irq_find_mapping(data->domain, pos + hwirq); if (virq) generic_handle_irq(virq); } + hwirq += 32; } chained_irq_exit(irq_desc_get_chip(desc), desc); @@ -117,7 +140,8 @@ static int imx_irqsteer_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct irqsteer_data *data; struct resource *res; - int ret; + u32 irqs_num; + int i, ret; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -130,12 +154,6 @@ static int imx_irqsteer_probe(struct platform_device *pdev) return PTR_ERR(data->regs); } - data->irq = platform_get_irq(pdev, 0); - if (data->irq <= 0) { - dev_err(&pdev->dev, "failed to get irq\n"); - return -ENODEV; - } - data->ipg_clk = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(data->ipg_clk)) { ret = PTR_ERR(data->ipg_clk); @@ -146,11 +164,17 @@ static int imx_irqsteer_probe(struct platform_device *pdev) raw_spin_lock_init(&data->lock); - of_property_read_u32(np, "fsl,num-irqs", &data->reg_num); + of_property_read_u32(np, "fsl,num-irqs", &irqs_num); of_property_read_u32(np, "fsl,channel", &data->channel); - /* one register bit map represents 32 input interrupts */ - data->reg_num /= 32; + /* + * There is one output irqs for each group of 64 inputs. + * One register bit map can represent 32 input interrupts. + */ + data->irq_count = irqs_num / 64; + if (irqs_num % 64) + data->irq_count += 1; + data->reg_num = irqs_num / 32; if (IS_ENABLED(CONFIG_PM_SLEEP)) { data->saved_reg = devm_kzalloc(&pdev->dev, @@ -177,8 +201,22 @@ static int imx_irqsteer_probe(struct platform_device *pdev) return -ENOMEM; } - irq_set_chained_handler_and_data(data->irq, imx_irqsteer_irq_handler, - data); + if (!data->irq_count || data->irq_count > CHAN_MAX_OUTPUT_INT) { + clk_disable_unprepare(data->ipg_clk); + return -EINVAL; + } + + for (i = 0; i < data->irq_count; i++) { + data->irq[i] = irq_of_parse_and_map(np, i); + if (!data->irq[i]) { + clk_disable_unprepare(data->ipg_clk); + return -EINVAL; + } + + irq_set_chained_handler_and_data(data->irq[i], + imx_irqsteer_irq_handler, + data); + } platform_set_drvdata(pdev, data); @@ -188,8 +226,12 @@ static int imx_irqsteer_probe(struct platform_device *pdev) static int imx_irqsteer_remove(struct platform_device *pdev) { struct irqsteer_data *irqsteer_data = platform_get_drvdata(pdev); + int i; + + for (i = 0; i < irqsteer_data->irq_count; i++) + irq_set_chained_handler_and_data(irqsteer_data->irq[i], + NULL, NULL); - irq_set_chained_handler_and_data(irqsteer_data->irq, NULL, NULL); irq_domain_remove(irqsteer_data->domain); clk_disable_unprepare(irqsteer_data->ipg_clk);