From patchwork Fri Dec 16 23:09:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 34122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1249289wrn; Fri, 16 Dec 2022 15:17:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXudolv/o4xneV91Sj76vhXCu3pQoS3X1nvAK43/xL/3HnLfTyxqCX2vvdHlfIzGTkgKzEAX X-Received: by 2002:a17:907:76b3:b0:7c4:fa17:7203 with SMTP id jw19-20020a17090776b300b007c4fa177203mr9292538ejc.63.1671232628195; Fri, 16 Dec 2022 15:17:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671232628; cv=none; d=google.com; s=arc-20160816; b=PjIRMKtitGCPFZb9740FjH6aJLF2QkeeudxP4OwTX6ydtJibJ68oVuIcc0ao58BPbs A3kjgjqE8DSwoFvnOpd6k2NetRRhxp/4/xK1IHoNi02A9vFvRDjcAK9YXlgyM1H6Q48I v0oibEH1BVN3RJW+x+dKO8y4ARy2PtckNhEwWvPW+Le9nqoKXbhaCt4sUBU7zxKf1By6 hM5VZMXMkbH8NUMXgTDJl9hpPoSG8lnc2bdIDu0126fX4wA087nTzDQuVGIpwkvOTHHW VX7IAgWC8GXjKCdg9oylg7fWrYjN08WMtuGR51iICWxp0TM4LTwuUR/pnIxasjEtySou hFXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vegG20gk25+T6XBaIrE5g3xcbsYjjWiBuzRZ3BiRMhg=; b=wXaXOy6VMo1vpnfRfgtVMoCVLj1jgvdqcAVUDmwXv8btUJOZ8HciPiSKPT33lfDOBk mNyfTlrQ4tEjHHQvUe4dSfKFV1G9jV/3NDgkaIuPXRVFxZ1R9D75SSGQZ4DQD2Ydm7n+ jwExPjfrrnGBDvHQFSSO1EVNM632KNraZhRzoE0CW1QDUk5EewOJcsjhChTgxSLFtcdm 0LYswGGHfMaMypS2orylpseYNAGpffuDweHOX/VspoisDP5Yhio7PbauOBW949Hngtb3 kG5oXNDXbPZySFzeiT82xUl6rJTFsqab85eTst12SoR7mtRHRw88llo29Mk5q/4ABKyT kkYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hTtlGn5Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gz18-20020a170907a05200b007b8d4fbca9fsi3028181ejc.899.2022.12.16.15.16.44; Fri, 16 Dec 2022 15:17:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hTtlGn5Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbiLPXKu (ORCPT + 99 others); Fri, 16 Dec 2022 18:10:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbiLPXJt (ORCPT ); Fri, 16 Dec 2022 18:09:49 -0500 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2BC272610; Fri, 16 Dec 2022 15:09:47 -0800 (PST) Received: by mail-qt1-x82c.google.com with SMTP id h26so128219qtu.2; Fri, 16 Dec 2022 15:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vegG20gk25+T6XBaIrE5g3xcbsYjjWiBuzRZ3BiRMhg=; b=hTtlGn5Z88jIg4MDGLOBdsmPvZRZ69YLFOI8b7PxRoYJOWABWocgDG2zEsE6Zt6Q7u F5+l9kWyYNZN8UlHm9fQkB1RhyPM0SfySuXAZcVB+4EGvdr3jQMEBej9FaoNtmDGmCtt 7DlclyIVFt6jmyJK31XXLsNdpXYJEgqF0kMDwMnCiaCKqopVkvEAL2QQphAopqJjf6/u /FwrN+I7qjsQLUd1uwjwt0vG6Mb3V3sfGoSS9QcnhK6pNfbbyBejPLVM6/vBCYqCtHhT s5AaG+YkAyH0y0FxkQgTEyvPEj1YyuVt05/E3PJvlPc+3aPirlZvwDc3NPtgkMZWvGfS jDHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vegG20gk25+T6XBaIrE5g3xcbsYjjWiBuzRZ3BiRMhg=; b=33dysJLZy/BQye9nJmLI/bNMfUB9u6CWEBss2ToMFRq52gCu5buwaFemw+jNd4KQyE mDyhnkilxYmye+J5iIiFzbtIH7zFm6Ei68yKD5NWLeIDUOon0zy9Ed1Qulx7n3thS3ZF FAwoGmmdWF0214NOb0pIvOjMWOh+cYceujEozqPCaUz6FSkhT1NYX7pupJo5ntUC/I90 zVMaR7JmJMLt3eAhtBUmCmkCeRalEy2izKIZ0FPOZFecTaH/TYwiPYZzsb1MRfea8PBb sOUSSatmCiHCwtnamjhCto3HgqXr3rS0Sy9I3kMp3WZUqdi27BIlk3Ddhpt3fnisJCjK 6Trw== X-Gm-Message-State: ANoB5pkbKYn58vCLoqC7ehM0pf3dblDkY7OEpDxIxdLlNyKfwbeR1Tki UQ1K8bfeG3Tijgdizyearu4MlGpEu8Aexw== X-Received: by 2002:a05:622a:5a13:b0:3a8:102c:9be4 with SMTP id fy19-20020a05622a5a1300b003a8102c9be4mr38486882qtb.9.1671232186365; Fri, 16 Dec 2022 15:09:46 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o70-20020a374149000000b006e702033b15sm2360386qka.66.2022.12.16.15.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 15:09:45 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Broadcom internal kernel review list , Thomas Gleixner , Marc Zyngier , Rob Herring , Doug Berger , Jason Cooper , linux-mips@vger.kernel.org (open list:BROADCOM BMIPS MIPS ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE) Subject: [PATCH 1/2] irqchip/irq-brcmstb-l2: Set IRQ_LEVEL for level triggered interrupts Date: Fri, 16 Dec 2022 15:09:33 -0800 Message-Id: <20221216230934.2478345-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221216230934.2478345-1-f.fainelli@gmail.com> References: <20221216230934.2478345-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752414424211640878?= X-GMAIL-MSGID: =?utf-8?q?1752414424211640878?= When support for the level triggered interrupt controller flavor was added with c0ca7262088e, we forgot to update the flags to be set to contain IRQ_LEVEL. While the flow handler is correct, the output from /proc/interrupts does not show such interrupts as being level triggered when they are, correct that. Fixes: c0ca7262088e ("irqchip/brcmstb-l2: Add support for the BCM7271 L2 controller") Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-brcmstb-l2.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index e4efc08ac594..091b0fe7e324 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c @@ -161,6 +161,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, *init_params) { unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; + unsigned int set = 0; struct brcmstb_l2_intc_data *data; struct irq_chip_type *ct; int ret; @@ -208,9 +209,12 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) flags |= IRQ_GC_BE_IO; + if (init_params->handler == handle_level_irq) + set |= IRQ_LEVEL; + /* Allocate a single Generic IRQ chip for this node */ ret = irq_alloc_domain_generic_chips(data->domain, 32, 1, - np->full_name, init_params->handler, clr, 0, flags); + np->full_name, init_params->handler, clr, set, flags); if (ret) { pr_err("failed to allocate generic irq chip\n"); goto out_free_domain; From patchwork Fri Dec 16 23:09:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 34123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1249876wrn; Fri, 16 Dec 2022 15:18:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ajTyibnOJkE9nZDC6+huoIHduXoWdIXdUr80K5U3UIdmPZTu7jwYBosuaLy4a9dftZ/h0 X-Received: by 2002:a17:906:2993:b0:7c0:f7b0:95d3 with SMTP id x19-20020a170906299300b007c0f7b095d3mr26544231eje.36.1671232727340; Fri, 16 Dec 2022 15:18:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671232727; cv=none; d=google.com; s=arc-20160816; b=kVOOv57iNfYUYRWpJAAsck5URLd2S57Y38CPKTqA54UiBVlT9lvJ+4j1Ol20hdwIg0 8pxaYkBrZQbCyGy1VSDEzgN9vP/2yxK1qSU/Kx2TwXO9zaJLtKyOGrQq21ObpAmctl8b GuT17E4nJP0a5/DSPnpuEhBd/dUjF6aY3Zu9qtpTYz6cUlVivrOVMybhTsltFHUBK+UE JTYQOmz48+FMFuCpWdbAAVJeKOYwFdxH46zpX3Z8wrT4kiB+RfI2u8hMs6rRo+npj4wa Gbp9DG6NNPDOkHS1eq9u1Ze8+TxZTKMh56YLFPipZoFQP+alcy1TLWvc4RLxL6Ce6fag VBJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UugoAidNNYW+/CXvjRvb99KLwBcAHRyGStJd35EDpa4=; b=CKTrmM/7lFpNJdQRYEEc5D7KOHcksUfCQn673dL5g3BD+9iu+aXIUQQ2lbibAQMMcq VOjTXVWilyD8bUu9kPR0Qyg6LJRDhUP0HJ84anTrnaXleK4MISFY8d3BzgDQtqQqXfIC 975MS0DrVMW1CRJsLPH5DBjQC7ijWbTCbT3erLTBqW0Krfr7f1uQ0GGuBtqCkFzTlmXC 6zqsuXHHPDQeNE1m+AFAy+EShXDiVWIJXuHUozvpV2ZrFsW67pa41SeTp4hvXrSG4grG qAFnmhH329VA8k5mHoe+Y5En7kXBHIuiKDBaM/3Bp8by4TExmhziwnI+eLEqF1CGVLMA q/AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YXIJ5oGh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cr21-20020a170906d55500b007c083c69ec3si4069751ejc.155.2022.12.16.15.18.23; Fri, 16 Dec 2022 15:18:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YXIJ5oGh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230265AbiLPXLG (ORCPT + 99 others); Fri, 16 Dec 2022 18:11:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbiLPXJv (ORCPT ); Fri, 16 Dec 2022 18:09:51 -0500 Received: from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com [IPv6:2607:f8b0:4864:20::e2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFEBE72628; Fri, 16 Dec 2022 15:09:49 -0800 (PST) Received: by mail-vs1-xe2c.google.com with SMTP id m2so3712599vsv.9; Fri, 16 Dec 2022 15:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UugoAidNNYW+/CXvjRvb99KLwBcAHRyGStJd35EDpa4=; b=YXIJ5oGh1anfAjpXkOlz3FbnDTLc7H3yDdpRZSCiF3MEYRn1G9tTNvNS7jwuq4++9J FVNLmMIK6eF6Cx/gLLiwT7HBPKv7+sEbt39hBC+Sen6GqlnarPA1Afxd/BtV4rf0bDb+ dARNG03mclHQpABHjAXM0IqRcWiqRYp8eqE3DAbYv377QuNBJva7TTDbxZTaAeP3SEfu PI20Ewyz/BcmzRZC+8+rDxT0fR5uWGlQlGHki86f4otgbSjdyOMobtpPEc/5ZKI1a95u CW92TN8NXIwTiKTsUbVPqoBwOcaTFRHk4J6tKKhIef533JU4Et8LN53wunSJgb4tsQ+D Kodg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UugoAidNNYW+/CXvjRvb99KLwBcAHRyGStJd35EDpa4=; b=G5GH+6Y0bZ5a4t1g45EgTC7MZ6fAw2biD1629YlVQNLN91OVfXoAP6nBK+phk8lgbH MtJcahYFbfxZKVDAx9wlhyPDVDNHjuuy2VbBo8KIl9VGkr3sYlbFlK2h1fa+mTkfQvIK ob9ao1CKcGMh1+f+I1pHYVkYk0cciST2j08zJ528vktU1P0mlbtGPKkK0LQr+9gUUUtV XwIa69b4xuYw+nD4UHbSg28AUT2juP+gOsseTAacZfymxnuOapMEwqbcJmfj1usqCIlz zxoKOw3YH/6CBvHNJJ2P5WkaESAx5AxeMRI9dukn5kt3zZyKavpCTqxaMku53v2v71hb rCEw== X-Gm-Message-State: ANoB5pnwB8VzOdYmkV6VyHgnTVqOoOFdrKuyTNzuHVsdDMHDQYvqboMN QmO0qHDSjzyrVvLGX8TP20nd58g8CMF7PA== X-Received: by 2002:a05:6102:4ad:b0:3b5:1c66:8462 with SMTP id r13-20020a05610204ad00b003b51c668462mr11414787vsa.12.1671232188367; Fri, 16 Dec 2022 15:09:48 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o70-20020a374149000000b006e702033b15sm2360386qka.66.2022.12.16.15.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 15:09:47 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Broadcom internal kernel review list , Thomas Gleixner , Marc Zyngier , Rob Herring , Doug Berger , Jason Cooper , linux-mips@vger.kernel.org (open list:BROADCOM BMIPS MIPS ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE) Subject: [PATCH 2/2] irqchip/irq-bcm7120-l2: Set IRQ_LEVEL for level triggered interrupts Date: Fri, 16 Dec 2022 15:09:34 -0800 Message-Id: <20221216230934.2478345-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221216230934.2478345-1-f.fainelli@gmail.com> References: <20221216230934.2478345-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752414528413286267?= X-GMAIL-MSGID: =?utf-8?q?1752414528413286267?= When support for the interrupt controller was added with a5042de2688d, we forgot to update the flags to be set to contain IRQ_LEVEL. While the flow handler is correct, the output from /proc/interrupts does not show such interrupts as being level triggered when they are, correct that. Fixes: a5042de2688d ("irqchip: bcm7120-l2: Add Broadcom BCM7120-style Level 2 interrupt controller") Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7120-l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index bb6609cebdbc..1e9dab6e0d86 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c @@ -279,7 +279,8 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, flags |= IRQ_GC_BE_IO; ret = irq_alloc_domain_generic_chips(data->domain, IRQS_PER_WORD, 1, - dn->full_name, handle_level_irq, clr, 0, flags); + dn->full_name, handle_level_irq, clr, + IRQ_LEVEL, flags); if (ret) { pr_err("failed to allocate generic irq chip\n"); goto out_free_domain;