From patchwork Wed May 27 16:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11573549 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 2061060D for ; Wed, 27 May 2020 16:40:36 +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 E13442065C for ; Wed, 27 May 2020 16:40:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Hatg2N3s"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="ptX7rsY0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E13442065C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=oZOSAn1UbuWcDk/xEUFPqJbsXndEW1zMyAVYqPCJI/M=; b=Hatg2N3sbTAkfN hfGLwVRxV/8F0ImRRJE4xbceIlhF+EdzGUXaj2F04Eu/VWJfZ3nZt0vrGeAIGBSwRvwDYBM3yqJOS bMXVQMdHNhPkcCPld0CAwUjPWTmSs5C/1JfIP+0TF9d5SL5WYyzJ6hEIL8j+nVcB0NWXM2iUUiStL hVJsJt7TxGDgl9+5fuEycZfxjrIdrsVfKWuw3BCeruFqOnxeIILcDqCRd1kZRuZgb3BHQKoo2W5sf JPnUAKYKd8oyueUXdfyLFcxMaU3wsZHPf0uRPf4wjW6FdppcBYf2GNy4jcwqkkulv5IfBaXETE05g +Ej8Kwn10XNb4tQA9WfQ==; 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 1jdz6X-0004Ve-Oc; Wed, 27 May 2020 16:40:33 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdykb-0007ou-1o for linux-mediatek@lists.infradead.org; Wed, 27 May 2020 16:18:19 +0000 Received: by mail-wr1-x441.google.com with SMTP id y17so16205859wrn.11 for ; Wed, 27 May 2020 09:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qSgUFPU/lmBJj5c376kcW/aHDA5eHqQfL3OqaeYjnYo=; b=ptX7rsY0ZtKBP9iNOKmKbnieslpshoIG/AuK/vjmExfbtz91dlVxapurUhIt8TSL2m HToH7PGQncAnPCXVB22Wt5lTZpNNph3feLKP7ck5Hlsc3UkBkIjPa9ik8UcCQqzUbJ+/ 9rLZ+0kpIxzsVKEkFdZGSFY8PWDa0fEm5/nUjbSrO9CCHUYyzjBzFpPrYv4Fedkfg9sf p55JFi3GQ9zxbfrNcP0trL1zs+e7Fk5JpTrCGS3yt/tc4gONsA1umQxkFTirQM9YNDg2 dmgNSyiytQQCRM4GcZhEM+6u74vyWbyZ0VnrSZ8+iN6AJ33YV/9sD8BiZecdK1u1ceNy OOCQ== 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:mime-version :content-transfer-encoding; bh=qSgUFPU/lmBJj5c376kcW/aHDA5eHqQfL3OqaeYjnYo=; b=KI864LMXzN/XWrO+icLYhSis/TemfD1An5FMDQ2zBnevA6kfnAXkTr7y3ANpUQn+MP kHhO9JTAUESBWCVVLaQjdHsAYbC0YsGLJxdGyWp/ctOZc0hbzeyzUqpqf/UEgnBNe9Sl gfnt7HxfIpHKXvsrPlm0OpuCdLIYlp/uK0CCFES+CZ3+77WJOFWVPfrhY59DV85azuJ7 iaaOuUbfFhJr8zEKSJc3r5zj1ZvwH6ymU00GSZ2ZhTZwwtWaGT0/QoJDVkPQYrsSyxeY rgYFiaZgfZ8pBmQ0zyI2wzLr5NPufAynAgUPdBSBwSe4iPJqgI3SOVYR99zH712PIo6u b/EA== X-Gm-Message-State: AOAM532NafMXzruGgGHOo7fndjOxzlzUdqJpDSafQyvl63UrNgovNM8y JiqnPBX8UTP4xDYiPrUJm2BtAQ== X-Google-Smtp-Source: ABdhPJwkfI8vfcy2wHmTP3rC760TSjRdMUEuJibRF0yfB2ObnbADS8LUP77SQMPqRpunP/H6g3ssJg== X-Received: by 2002:adf:e751:: with SMTP id c17mr10340714wrn.134.1590596271251; Wed, 27 May 2020 09:17:51 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-65-232.w2-15.abo.wanadoo.fr. [2.15.156.232]) by smtp.gmail.com with ESMTPSA id w12sm3364038wmk.12.2020.05.27.09.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 09:17:50 -0700 (PDT) From: Bartosz Golaszewski To: Thomas Gleixner , Jason Cooper , Marc Zyngier , Matthias Brugger Subject: [PATCH] irqchip/irq-mtk-sysirq: drop unnecessary spinlock Date: Wed, 27 May 2020 18:17:43 +0200 Message-Id: <20200527161743.15972-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200527_091753_105220_EA6CF7D4 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephane Le Provost , Bartosz Golaszewski , Pedro Tsai , linux-kernel@vger.kernel.org, Fabien Parent , linux-mediatek@lists.infradead.org, Andrew Perepech , linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: Bartosz Golaszewski This driver takes a regular spinlock when a raw spinlock is already taken which results in the following lockdep splat: ============================= [ BUG: Invalid wait context ] 5.7.0-rc6-02446-gb9827c0a9fe7-dirty #1 Not tainted ----------------------------- swapper/0/0 is trying to lock: ffffff800303b798 (&chip_data->lock){....}-{3:3}, at: mtk_sysirq_set_type+0x48/0xc0 other info that might help us debug this: context-{5:5} 2 locks held by swapper/0/0: #0: ffffff800302ee68 (&desc->request_mutex){....}-{4:4}, at: __setup_irq+0xc4/0x8a0 #1: ffffff800302ecf0 (&irq_desc_lock_class){....}-{2:2}, at: __setup_irq+0xe4/0x8a0 stack backtrace: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc6-02446-gb9827c0a9fe7-dirty #1 Hardware name: Pumpkin MT8516 (DT) Call trace: dump_backtrace+0x0/0x180 show_stack+0x14/0x20 dump_stack+0xd0/0x118 __lock_acquire+0x8c8/0x2270 lock_acquire+0xf8/0x470 _raw_spin_lock_irqsave+0x50/0x78 mtk_sysirq_set_type+0x48/0xc0 __irq_set_trigger+0x58/0x170 __setup_irq+0x420/0x8a0 request_threaded_irq+0xd8/0x190 timer_of_init+0x1e8/0x2c4 mtk_gpt_init+0x5c/0x1dc timer_probe+0x74/0xf4 time_init+0x14/0x44 start_kernel+0x394/0x4f0 We don't need the spinlock here - the irq_set_type() callback is always called with the irq_desc->lock taken. This removes the spinlock entirely. Signed-off-by: Bartosz Golaszewski --- drivers/irqchip/irq-mtk-sysirq.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c index 73eae5966a40..da2fc4809222 100644 --- a/drivers/irqchip/irq-mtk-sysirq.c +++ b/drivers/irqchip/irq-mtk-sysirq.c @@ -12,10 +12,8 @@ #include #include #include -#include struct mtk_sysirq_chip_data { - spinlock_t lock; u32 nr_intpol_bases; void __iomem **intpol_bases; u32 *intpol_words; @@ -30,14 +28,12 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) u8 intpol_idx = chip_data->intpol_idx[hwirq]; void __iomem *base; u32 offset, reg_index, value; - unsigned long flags; int ret; base = chip_data->intpol_bases[intpol_idx]; reg_index = chip_data->which_word[hwirq]; offset = hwirq & 0x1f; - spin_lock_irqsave(&chip_data->lock, flags); value = readl_relaxed(base + reg_index * 4); if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_EDGE_FALLING) { if (type == IRQ_TYPE_LEVEL_LOW) @@ -53,7 +49,6 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) data = data->parent_data; ret = data->chip->irq_set_type(data, type); - spin_unlock_irqrestore(&chip_data->lock, flags); return ret; } @@ -212,7 +207,6 @@ static int __init mtk_sysirq_of_init(struct device_node *node, ret = -ENOMEM; goto out_free_which_word; } - spin_lock_init(&chip_data->lock); return 0;