From patchwork Wed Mar 11 16:06:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: afzal mohammed X-Patchwork-Id: 11432061 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F6AC1392 for ; Wed, 11 Mar 2020 16:06:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6AF8B206E7 for ; Wed, 11 Mar 2020 16:06:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GZqEPfV8"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WOsUbe29" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AF8B206E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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=CuImBEUhkenokPPxZcHHUkuPwyL2eQGeNIH8Dl8iF0s=; b=GZqEPfV82tLVVqX2+BcfExQXiP asCi0eeOrx9Idk8AF37696AkAJPZ6WG2QGWHPLi3WB+Mmuq1DrdEZrcfjdzVZH8NWNowzJ/pksFiZ s6WCZE6neNHzcWKG0+eTDK0C8Ejp2WNu8Jh98nJZ8uHFeKmM3xuvQUCE3BiNG0EfskCuwc9mRoUlb 2U9jpb/wS/mi9ufqmvPnHqe5BNAdoANyL/hOA6glc7eto8Vd8MqtbxKpo0o/HOIuVtFtWr/B2RXcR NACGwQS0mIyMeekmCCx8qJvqJd0uFLmZVwucTvUzmangNGYdJY6YkKGA9vDXNCXlpr+Vv2i0H679X tC+1eh3w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jC3sC-0007EI-49; Wed, 11 Mar 2020 16:06:20 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jC3s9-0007Dn-16 for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2020 16:06:18 +0000 Received: by mail-pj1-x1043.google.com with SMTP id gv19so1254055pjb.5 for ; Wed, 11 Mar 2020 09:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+j/nM3vIVr6PLm68eH7IHhh9AMZDOol9S36ENlD9mUc=; b=WOsUbe29X2GerEydzZ1EnEHD35WKJoISv38Kh2WIhRruhfRj+taon96EHJJtGL4bgr 2WPyewyYEN8/O0z+Z6OuMmw/a4Uq9YlydVIAGKQzgAK1ujWKlHMssNOWMHylm6BiNcOE ChatkW0oXBhFd4nWyxeuT0cf9K859X51A7Rzan6fgM8bze8qM1laWqr0GxNsnPMtvyDw hXmWPrH47BmxmI/SVIwuSjyZmrv4R88B9MjLfO3pdV9G8CEvIkG21kyeuDoZspbOi0Wg 3MmsWG+BHNeYe8+leRQuga9jDceZVp18944FiM75nv3J9qPOoogjhbw5l5tRaws6WfTH dSyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+j/nM3vIVr6PLm68eH7IHhh9AMZDOol9S36ENlD9mUc=; b=AM1tSXIQA4g3Ca+Ox+ZtOfvPbui04L0Jh5T/fM27vp3PE6kep8TSi7V8OILOu2CtJH 9s4lGMB0fLqYIGyG17A14nOQu14YB9cSatJb7A5Bd3oYm9A6JZQ8LzPo5WCGlSeM64m3 eqMOpBJUmkSIsLnqtI3X8o2Vi1mz0rXl3wPNngqYtSUKmqo1+BE9Np77tD1dZNOSFqG9 lU+Np7VYH5DvBaZRG88qV5vqUfbLOg1lQjquCkPnIao8sIqgHtgLnoeywn6PxApYlMpz hHrEUJ7HX+XULyeafyktv6kQLotWCGYsGf2/+PegsubjqXJIEFh82SY0CAom0nsr6jUk aAAg== X-Gm-Message-State: ANhLgQ3LpDo5+WFZtp+5UnzRIGVNE4w2VgnqxMR81S8ToZ/Pu2cMCGKW 57Z2RDtA3ief5OT/SvBgTXk= X-Google-Smtp-Source: ADFU+vufZ9CjDwf//AylLU2Lwn1Y/vS7+uckC0mMPnPCPET+mGy+kXfSfFgcA/2M7tZYVKEBRp27pQ== X-Received: by 2002:a17:90a:c218:: with SMTP id e24mr4107597pjt.64.1583942776095; Wed, 11 Mar 2020 09:06:16 -0700 (PDT) Received: from localhost.localdomain ([106.51.232.35]) by smtp.gmail.com with ESMTPSA id cm2sm6215000pjb.23.2020.03.11.09.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2020 09:06:15 -0700 (PDT) From: afzal mohammed To: Thomas Bogendoerfer Subject: [PATCH] MIPS: pass non-NULL dev_id on shared request_irq() Date: Wed, 11 Mar 2020 21:36:02 +0530 Message-Id: <20200311160602.3571-1-afzal.mohd.ma@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200311104217.GA10615@alpha.franken.de> References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200311_090617_095023_AFB6126F X-CRM114-Status: GOOD ( 13.26 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1043 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [afzal.mohd.ma[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , Paul Burton , Keguang Zhang , linux-mips@vger.kernel.org, Ralf Baechle , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Jiaxun Yang , "Maciej W. Rozycki" , John Crispin , Huacai Chen , Nathan Chancellor , Afzal Mohammed , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Recently all usages of setup_irq() was replaced by request_irq(). request_irq() does a few sanity checks that were not done in setup_irq(), if they fail irq registration will fail. One of the check is to ensure that non-NULL dev_id is passed in the case of shared irq. This caused malta on qemu to hang. Fix it by passing a dev_id to all request_irq()'s that are shared. Fixes: ac8fd122e070 ("MIPS: Replace setup_irq() by request_irq()") Reported-by: Nathan Chancellor Signed-off-by: afzal mohammed --- [ resending since in the archives not seen, apologies if duplicate ] Hi Thomas, i am assuming your next tree is immutable, hence referring to the SHA-ID of the original commit in your tree. Else if you prefer a fixup'ed patch, let me know, i will send v5 with this fixup over v4. REgards afzal arch/mips/dec/setup.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/loongson2ef/lemote-2f/irq.c | 2 +- arch/mips/pmcs-msp71xx/msp_time.c | 2 +- arch/mips/sni/a20r.c | 2 +- arch/mips/sni/pcit.c | 4 ++-- arch/mips/sni/rm200.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index c8bbac0c5051..cbbb27fbab19 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c @@ -758,7 +758,7 @@ void __init arch_init_irq(void) /* Register the bus error interrupt. */ if (dec_interrupt[DEC_IRQ_BUS] >= 0 && busirq_handler) { if (request_irq(dec_interrupt[DEC_IRQ_BUS], busirq_handler, - busirq_flags, "bus error", NULL)) + busirq_flags, "bus error", "bus error")) pr_err("Failed to register bus error interrupt\n"); } /* Register the HALT interrupt. */ diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index 64e917dfe6b2..4b19810c67d4 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -292,7 +292,7 @@ int r4k_clockevent_init(void) cp0_timer_irq_installed = 1; - if (request_irq(irq, c0_compare_interrupt, flags, "timer", NULL)) + if (request_irq(irq, c0_compare_interrupt, flags, "timer", cd)) pr_err("Failed to request irq %d (timer)\n", irq); return 0; diff --git a/arch/mips/loongson2ef/lemote-2f/irq.c b/arch/mips/loongson2ef/lemote-2f/irq.c index 34e15e8b7a8f..1c99e83cabae 100644 --- a/arch/mips/loongson2ef/lemote-2f/irq.c +++ b/arch/mips/loongson2ef/lemote-2f/irq.c @@ -109,7 +109,7 @@ void __init mach_init_irq(void) /* setup north bridge irq (bonito) */ if (request_irq(LOONGSON_NORTH_BRIDGE_IRQ, ip6_action, - IRQF_SHARED | IRQF_NO_THREAD, "cascade", NULL)) + IRQF_SHARED | IRQF_NO_THREAD, "cascade", "cascade")) pr_err("Failed to register north bridge cascade interrupt\n"); /* setup source bridge irq (i8259) */ if (request_irq(LOONGSON_SOUTH_BRIDGE_IRQ, no_action, diff --git a/arch/mips/pmcs-msp71xx/msp_time.c b/arch/mips/pmcs-msp71xx/msp_time.c index baf0da8b4c98..0601a3f7f8f6 100644 --- a/arch/mips/pmcs-msp71xx/msp_time.c +++ b/arch/mips/pmcs-msp71xx/msp_time.c @@ -81,7 +81,7 @@ unsigned int get_c0_compare_int(void) /* MIPS_MT modes may want timer for second VPE */ if ((get_current_vpe()) && !tim_installed) { if (request_irq(MSP_INT_VPE1_TIMER, c0_compare_interrupt, flags, - "timer", NULL)) + "timer", "timer")) pr_err("Failed to register timer interrupt\n"); tim_installed++; } diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c index ba966d62fb4b..1bfea4aae124 100644 --- a/arch/mips/sni/a20r.c +++ b/arch/mips/sni/a20r.c @@ -223,7 +223,7 @@ void __init sni_a20r_irq_init(void) sni_hwint = a20r_hwint; change_c0_status(ST0_IM, IE_IRQ0); if (request_irq(SNI_A20R_IRQ_BASE + 3, sni_isa_irq_handler, - IRQF_SHARED, "ISA", NULL)) + IRQF_SHARED, "ISA", "ISA")) pr_err("Failed to register ISA interrupt\n"); } diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 4a850ab03398..15080155cc9a 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c @@ -245,7 +245,7 @@ void __init sni_pcit_irq_init(void) sni_hwint = sni_pcit_hwint; change_c0_status(ST0_IM, IE_IRQ1); if (request_irq(SNI_PCIT_INT_START + 6, sni_isa_irq_handler, - IRQF_SHARED, "ISA", NULL)) + IRQF_SHARED, "ISA", "ISA")) pr_err("Failed to register ISA interrupt\n"); } @@ -260,7 +260,7 @@ void __init sni_pcit_cplus_irq_init(void) sni_hwint = sni_pcit_hwint_cplus; change_c0_status(ST0_IM, IE_IRQ0); if (request_irq(MIPS_CPU_IRQ_BASE + 3, sni_isa_irq_handler, - IRQF_SHARED, "ISA", NULL)) + IRQF_SHARED, "ISA", "ISA")) pr_err("Failed to register ISA interrupt\n"); } diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index ba1f2fc6a43e..2b4a6448b428 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c @@ -473,10 +473,10 @@ void __init sni_rm200_irq_init(void) sni_hwint = sni_rm200_hwint; change_c0_status(ST0_IM, IE_IRQ0); if (request_irq(SNI_RM200_INT_START + 0, sni_rm200_i8259A_irq_handler, - IRQF_SHARED, "onboard ISA", NULL)) + IRQF_SHARED, "onboard ISA", "onboard ISA")) pr_err("Failed to register onboard ISA interrupt\n"); if (request_irq(SNI_RM200_INT_START + 1, sni_isa_irq_handler, - IRQF_SHARED, "ISA", NULL)) + IRQF_SHARED, "ISA", "ISA")) pr_err("Failed to register ISA interrupt\n"); }