From patchwork Fri Jun 16 12:03:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 109094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1309913vqr; Fri, 16 Jun 2023 05:37:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7tpadkjLYKB/UVq92RbMfUULL6XYF/Ge8pK24gXKxPvpTDYunlhqDyNBk1NGjOOojBCPSV X-Received: by 2002:a05:6a00:1309:b0:63a:ea82:b7b7 with SMTP id j9-20020a056a00130900b0063aea82b7b7mr2025098pfu.28.1686919069678; Fri, 16 Jun 2023 05:37:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686919069; cv=none; d=google.com; s=arc-20160816; b=a46QJuoSdody+E0KrmbW/JPwWjRAudJUPWXYA4l2XafsNrFdsjwoKQMXR367Xq703F 8sk/RdXmlZfbKVGmZT8g+XNBUdhJzhAgjbXfvAILJCVrTlXHmAgXd6SR7MmwCPwPKY92 vsnzHPcvBvZWN8+DVMb+/4VHAlKu7tVQQWkGOI8kgXVAvMYuicOprZbpEK9/iGwanm/w GzgW5A0KCsspFV2NjwxoZYAicDa1yhDZOnkUr0/4hRZia1iQbxoz3uurS6+FDY2DyTyz DTeUMGiQ4uG/2ddJhouEqeXL1VMXcGp9vsBCNURj7mGw/ChIEnWYwSXwFQg5G/BKcbOI ADOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=qslilxqb17Qg1KdD9iaupjHB/4/PR5d5YA9RfgkQbcA=; b=MzPzCh4ujQcG1Z+Zx28swDnjjxTmT2HVEUuRzMqVbRw9ivcDgXt9MLCKL6lblQJ3Ih WUNDZYOFVfyJx99ZJzGrl2lmt2qPCtO0AW9FPraaU60T524z4iRCdzsGvgdDmpMP3U7s m5ddFfeC0ZUEkfDYSsMpk/GIE1/oXGdYfPL6syEIEcZq73gYRFLtQDgGe/vfvYzUVJBV SMMcG3eN+uZ6gPBkdRpz/3x0jfU1cy9mH8lYTbmfooJUa7lANgrys1TDUj+UB/FVmNa1 L0LDxwK30jNYItCPY6/yW8+GHvlu996rGS/ibXEEgUw5/i2fguAnvQZT2oQiYG2SLxA6 RZmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iqLKCxJX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NJF665p6; 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=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y16-20020aa79430000000b00666ae58fd0dsi2050308pfo.89.2023.06.16.05.37.37; Fri, 16 Jun 2023 05:37:49 -0700 (PDT) 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=@linutronix.de header.s=2020 header.b=iqLKCxJX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NJF665p6; 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=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344870AbjFPMDN (ORCPT + 99 others); Fri, 16 Jun 2023 08:03:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233955AbjFPMDL (ORCPT ); Fri, 16 Jun 2023 08:03:11 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 151BE2D69 for ; Fri, 16 Jun 2023 05:03:10 -0700 (PDT) Date: Fri, 16 Jun 2023 12:03:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686916988; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qslilxqb17Qg1KdD9iaupjHB/4/PR5d5YA9RfgkQbcA=; b=iqLKCxJXJ3nP394LZUEqtpH3hQ1wmmD3OyVO/f9zy7x+4cpmYO/n7jy60iOn9pHg6y/cOK Y++rnMoKK96KZc9nOT9WyL/FaKC8ud3JFU/6UxdhNYQRnb74tEUxIfWAp686lG/G4h0XLy AtRicUMINyfPiXgZEMLTKEDPEsav3wy10yubR1V/4CslCSwkl+6fuauw6MLoBSenLR1jbt qhjKJ+0tma4FbtV0Ppg0s5OgFdQo4mBNMIOJyykInlMP8Dyrzbx/2SkcZ2R8W8MtgIZhg+ 6XzPOsuTHn+oCHaqL56Vchj2D+Tmedm05NIdi/WPup1VRJmNGwaZphNGM1PSEw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686916988; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qslilxqb17Qg1KdD9iaupjHB/4/PR5d5YA9RfgkQbcA=; b=NJF665p6u0dRI+g27pJdl9Ng/TnrEhPNhtf/PSkQcE+K8ahAhKaXL34fLI4RJ7ucfScmtk 01pb/g9J9XuxtMCA== From: "irqchip-bot for Jianmin Lv" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqchip/loongson-eiointc: Fix irq affinity setting during resume Cc: yangqiming , Jianmin Lv , Marc Zyngier , tglx@linutronix.de In-Reply-To: <20230614115936.5950-6-lvjianmin@loongson.cn> References: <20230614115936.5950-6-lvjianmin@loongson.cn> MIME-Version: 1.0 Message-ID: <168691698801.404.17071829234884391281.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768680275597210038?= X-GMAIL-MSGID: =?utf-8?q?1768862850245868255?= The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: fb07b8f83441febeb0daf199b5f18c6de9bbab03 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/fb07b8f83441febeb0daf199b5f18c6de9bbab03 Author: Jianmin Lv AuthorDate: Wed, 14 Jun 2023 19:59:36 +08:00 Committer: Marc Zyngier CommitterDate: Fri, 16 Jun 2023 12:59:28 +01:00 irqchip/loongson-eiointc: Fix irq affinity setting during resume The hierarchy of PCH PIC, PCH PCI MSI and EIONTC is as following: PCH PIC ------->| |---->EIOINTC PCH PCI MSI --->| so the irq_data list of irq_desc for IRQs on PCH PIC and PCH PCI MSI is like this: irq_desc->irq_data(domain: PCH PIC)->parent_data(domain: EIOINTC) irq_desc->irq_data(domain: PCH PCI MSI)->parent_data(domain: EIOINTC) In eiointc_resume(), the irq_data passed into eiointc_set_irq_affinity() should be matched to EIOINTC domain instead of PCH PIC or PCH PCI MSI domain, so fix it. Fixes: a90335c2dfb4 ("irqchip/loongson-eiointc: Add suspend/resume support") Reported-by: yangqiming Signed-off-by: Jianmin Lv Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230614115936.5950-6-lvjianmin@loongson.cn --- drivers/irqchip/irq-loongson-eiointc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c index 71ef19f..a7fcde3 100644 --- a/drivers/irqchip/irq-loongson-eiointc.c +++ b/drivers/irqchip/irq-loongson-eiointc.c @@ -314,7 +314,7 @@ static void eiointc_resume(void) desc = irq_resolve_mapping(eiointc_priv[i]->eiointc_domain, j); if (desc && desc->handle_irq && desc->handle_irq != handle_bad_irq) { raw_spin_lock(&desc->lock); - irq_data = &desc->irq_data; + irq_data = irq_domain_get_irq_data(eiointc_priv[i]->eiointc_domain, irq_desc_get_irq(desc)); eiointc_set_irq_affinity(irq_data, irq_data->common->affinity, 0); raw_spin_unlock(&desc->lock); }