From patchwork Thu Oct 20 07:35:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 6008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp117680wrs; Thu, 20 Oct 2022 00:41:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5qG3AIH4AWu1StguG1cUKtmX1U+/LcNtaNzF4Uz9OfzQ/KYrqpZYNvYRXnFuYPs0O7BshX X-Received: by 2002:a63:43c2:0:b0:46a:eec8:9430 with SMTP id q185-20020a6343c2000000b0046aeec89430mr10645629pga.6.1666251665434; Thu, 20 Oct 2022 00:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666251665; cv=none; d=google.com; s=arc-20160816; b=Lw4RN7G30GkaohQ1XEO/M+V0vmUXC9EY3Oa4I3Sw3wkl8MGDiAskr6lqYdO5SaxPom FDoKPkDKjMpw7xsbi2cjprhvq90OYd87+1cClItycvaettTAa8Xlu3d3LwIm411jDRxN m6ZqzEWcxIfuCJTQwtgIWhzjsii3JvFtLtuRGm/qM6P9UQ2tKfcSm0Nc6b/0pP8lV/je uEsA7hQmhPeiYhU50VtiLzXf0SkMXhfe+4AyPbCQa0NaoM9dP3mXaqCoowhj3D3JwCJk JBe4OETwBmU+BlRSHjn+KqQdtrpJZjetF4W20c6s9Qnx0bC0Zw33BL2sLCVA6S65MtH0 PyGg== 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; bh=VmDUfwRl6pZb2Hk6jbdKw99hJuBQjS3mJMrKKrYPThE=; b=vJe+XLasomrurtFmzhFg8LVydM3Ew80+Ef4O1LJ+yQkFnj1JbIHzNsAGBusf3UofT4 /pdQ8LfSQaJDewT2bVcF7LoKA8IuY3ev1Qc17HihlYmZ4BsPQK5gI50ZOr4N3ON14Rh1 BMBgJEl5Lucbl2d9CM+Uzrk0HxszPR6I2AuRu8DnkIxCd3sldyRwJVk9FA3PXgv+y/zv kSQC4uQ/ATLp2qOBy82bCFy+AJ5hMXXmCVlueWZ1b4wVyPKRZxVrrSU5hmPWoTvheX/C bZce6y4EowKe+hDknHB+iK8R3yB2Fm1Ua+zLsfZ0FS1SI1Xl1nCrfvc0Lt8/RSI7x9pK Sj6g== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d4-20020a170902854400b0017dafc02313si20776767plo.92.2022.10.20.00.40.51; Thu, 20 Oct 2022 00:41:05 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229742AbiJTHiG (ORCPT + 99 others); Thu, 20 Oct 2022 03:38:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229961AbiJTHiF (ORCPT ); Thu, 20 Oct 2022 03:38:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 728F2170DF8 for ; Thu, 20 Oct 2022 00:38:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 058E1619E1 for ; Thu, 20 Oct 2022 07:38:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E3A9C433C1; Thu, 20 Oct 2022 07:38:01 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH V2 1/4] irqchip/loongson-htvec: Add suspend/resume support Date: Thu, 20 Oct 2022 15:35:24 +0800 Message-Id: <20221020073527.541845-2-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221020073527.541845-1-chenhuacai@loongson.cn> References: <20221020073527.541845-1-chenhuacai@loongson.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1747191506803513364?= X-GMAIL-MSGID: =?utf-8?q?1747191506803513364?= Add suspend/resume support for HTVEC irqchip, which is needed for upcoming suspend/hibernation. Signed-off-by: Huacai Chen --- drivers/irqchip/irq-loongson-htvec.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c index 1f72bde2fff5..11289ffa07e4 100644 --- a/drivers/irqchip/irq-loongson-htvec.c +++ b/drivers/irqchip/irq-loongson-htvec.c @@ -16,6 +16,7 @@ #include #include #include +#include /* Registers */ #define HTVEC_EN_OFF 0x20 @@ -29,6 +30,7 @@ struct htvec { void __iomem *base; struct irq_domain *htvec_domain; raw_spinlock_t htvec_lock; + u32 saved_vec_en[HTVEC_MAX_PARENT_IRQ]; }; static struct htvec *htvec_priv; @@ -156,6 +158,29 @@ static void htvec_reset(struct htvec *priv) } } +static int htvec_suspend(void) +{ + int i; + + for (i = 0; i < htvec_priv->num_parents; i++) + htvec_priv->saved_vec_en[i] = readl(htvec_priv->base + HTVEC_EN_OFF + 4 * i); + + return 0; +} + +static void htvec_resume(void) +{ + int i; + + for (i = 0; i < htvec_priv->num_parents; i++) + writel(htvec_priv->saved_vec_en[i], htvec_priv->base + HTVEC_EN_OFF + 4 * i); +} + +static struct syscore_ops htvec_syscore_ops = { + .suspend = htvec_suspend, + .resume = htvec_resume, +}; + static int htvec_init(phys_addr_t addr, unsigned long size, int num_parents, int parent_irq[], struct fwnode_handle *domain_handle) { @@ -188,6 +213,8 @@ static int htvec_init(phys_addr_t addr, unsigned long size, htvec_priv = priv; + register_syscore_ops(&htvec_syscore_ops); + return 0; iounmap_base: From patchwork Thu Oct 20 07:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 6010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp118422wrs; Thu, 20 Oct 2022 00:43:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LnWJ+Xhw6ad0EqKLZoE1WeSVf0izr27Bupn30DR2Q9E50RKvegNHCDA/1YEBQE1q69w44 X-Received: by 2002:a17:90b:1d8a:b0:20f:95f9:ff34 with SMTP id pf10-20020a17090b1d8a00b0020f95f9ff34mr14062183pjb.227.1666251784544; Thu, 20 Oct 2022 00:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666251784; cv=none; d=google.com; s=arc-20160816; b=vAYJb6vN10Ttstf5WKQVPxYPZm09Jld48xUSAbb0BaD+wdzMAZ3XP1OIKREdERSye9 jG+GjF30TtL2H0Q4LClx3X3olxMLITt0rGzsPMcx4J8OnSWw/dehQ5QOd7iKsAZqQ5lc UY2Oxk8VnzCZyVOucx1DZk1ZDk9IDq+rD1yEuzmvL5Py0VqOi3PlH3uFO5qkyHw/DmLa JaEvQAy7j8AIUWjVnVqcn7zmqqmdpMZWTvXXflUVgA6GJLGXfhTGkEN2kc5FbC//SIXz wsV4kQbIKTWIgjwjD2QBM/yPyE1cz6WJHJtdMMY2GHKABZRDzqc18HQs0WbXJamuYRwp L+5A== 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; bh=Ip4zOCNr5BPBIVtRhOQUvSxHGrSXUqEw16dJm2BRt00=; b=b+rvFihrZaDbOfDf+/mbpQ1oqkfjpIXUEc0eFt0aw5cKXmroi8PtRxXTmiVTbB7y3m 2zd/0r1lyi/7rnum7X5h0fmJtUmq1RKUIVTJZVfUZ8/Olxw2gioYV4t0ek3o0QVffVj1 OrQzdxz74t32wpU53ee3EMRdUfF9QsNliC/So/JdfVhMmz6O+WJg0tn9kPwWzazIU5Xs lVLGetLQyUKcRQYgR3foSCc5V3EeqRU7K9t7pdfdSF/HBAH3re7QUEKk+sGu65jdR7oV fLfvPgQ86B1GWXGzvAsDiiz6nTQt1moVZy8Uy1vqAg91ynWp750ahNcegifNQbQxBkY3 qH/Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020a170902e74200b00174665bbc29si24591749plf.161.2022.10.20.00.42.52; Thu, 20 Oct 2022 00:43:04 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbiJTHi2 (ORCPT + 99 others); Thu, 20 Oct 2022 03:38:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230335AbiJTHiX (ORCPT ); Thu, 20 Oct 2022 03:38:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 334DC16EA09 for ; Thu, 20 Oct 2022 00:38:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E5F73B8265D for ; Thu, 20 Oct 2022 07:38:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE588C433D6; Thu, 20 Oct 2022 07:38:16 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH V2 2/4] irqchip/loongson-eiointc: Add suspend/resume support Date: Thu, 20 Oct 2022 15:35:25 +0800 Message-Id: <20221020073527.541845-3-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221020073527.541845-1-chenhuacai@loongson.cn> References: <20221020073527.541845-1-chenhuacai@loongson.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1747191631310815277?= X-GMAIL-MSGID: =?utf-8?q?1747191631310815277?= Add suspend/resume support for EIOINTC irqchip, which is needed for upcoming suspend/hibernation. Signed-off-by: Huacai Chen --- drivers/irqchip/irq-loongson-eiointc.c | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c index efead0bfb1ca..fa2f99d30c08 100644 --- a/drivers/irqchip/irq-loongson-eiointc.c +++ b/drivers/irqchip/irq-loongson-eiointc.c @@ -17,6 +17,7 @@ #include #include #include +#include #define EIOINTC_REG_NODEMAP 0x14a0 #define EIOINTC_REG_IPMAP 0x14c0 @@ -301,6 +302,37 @@ static struct irq_domain *acpi_get_vec_parent(int node, struct acpi_vector_group return NULL; } +static int eiointc_suspend(void) +{ + return 0; +} + +static void eiointc_resume(void) +{ + int i, j; + struct irq_desc *desc; + struct irq_data *irq_data; + + eiointc_router_init(0); + + for (i = 0; i < nr_pics; i++) { + for (j = 0; j < VEC_COUNT; j++) { + 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; + eiointc_set_irq_affinity(irq_data, irq_data->common->affinity, 0); + raw_spin_unlock(&desc->lock); + } + } + } +} + +static struct syscore_ops eiointc_syscore_ops = { + .suspend = eiointc_suspend, + .resume = eiointc_resume, +}; + static int __init pch_pic_parse_madt(union acpi_subtable_headers *header, const unsigned long end) { @@ -375,6 +407,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent, parent_irq = irq_create_mapping(parent, acpi_eiointc->cascade); irq_set_chained_handler_and_data(parent_irq, eiointc_irq_dispatch, priv); + register_syscore_ops(&eiointc_syscore_ops); cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_LOONGARCH_STARTING, "irqchip/loongarch/intc:starting", eiointc_router_init, NULL); From patchwork Thu Oct 20 07:35:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 6012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp118568wrs; Thu, 20 Oct 2022 00:43:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6G5qf8kkeK/Nyc2rK7oKBKvT9yqLljwoAjvX9jKwvGve6A1Wm4cOxieVmdevrFZsLRFo5S X-Received: by 2002:a17:903:1081:b0:185:51a2:2360 with SMTP id u1-20020a170903108100b0018551a22360mr12623810pld.47.1666251805232; Thu, 20 Oct 2022 00:43:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666251805; cv=none; d=google.com; s=arc-20160816; b=xpmtV2YXowX3U5lSuh+e2drJBZk5i74+36zIZaS3mSN+KGJezlT0H2mRFAGkzwrqur cJhO2Sh5e805XKdzAVBmerbGac/v4BArOLyZRoPdVkPgmAArgS0/uxK3mV+0G91VUaFb myy+xNUQrtFpTCiGsMKJBxFgf/PwT6UZlPl2WYiQLw4URnTLNNAHNh8asBtGP/eDxA/f ynvTmLq05jkKoIROf24hM7460/XvgX+iI2EjmHIZ2D1VKIcDBjgMVNoncy25N4hIYEHo dLE9mGT8zcXaCrvRQ2JtVqAFaJRBZC3dqkmfeBqqJIbQVGlTssHh1SVmxVx9bTkGcOYi eX5A== 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; bh=dfzm/1tze6rwqgVt9jHOwFuqty4GFL7J2MnySzS6DBo=; b=KacRenkRwBrbuanRpTbLyg3J3f809Qu0FWm2oCNHitX27u7MwESknKpQcImNzcsUX2 U5sZb+Ac6O+TQNyr6+3/y5vschtZGxFw+dbEcFeI1mg0korCqjI6583LsHbu9I4myacm HoYQKIlMIo7PyK2UrGlqAgRGpGj2eHQ0afTHFTp5cjKvomVnjyziVN582Wb+SDcl0QhP X5ma74IRu++LZCgtkKrh9rYKy0doZ49KvOSoN9ioW5AIOhd+g+IqHKqOXehyBq2eZo7/ Ti1UpQg4uFpNarVfiUBsN9uU1KfXWa8RfHTHB++t7N645Kq+2Xt/s9cJU6HgsrZV/Gg2 IKeg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k71-20020a63844a000000b00463cd99cdb5si20572063pgd.256.2022.10.20.00.43.12; Thu, 20 Oct 2022 00:43:25 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229452AbiJTHir (ORCPT + 99 others); Thu, 20 Oct 2022 03:38:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230139AbiJTHio (ORCPT ); Thu, 20 Oct 2022 03:38:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEAA6175345 for ; Thu, 20 Oct 2022 00:38:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B2639B8265F for ; Thu, 20 Oct 2022 07:38:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84CB4C433C1; Thu, 20 Oct 2022 07:38:38 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH V2 3/4] irqchip/loongson-pch-pic: Add suspend/resume support Date: Thu, 20 Oct 2022 15:35:26 +0800 Message-Id: <20221020073527.541845-4-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221020073527.541845-1-chenhuacai@loongson.cn> References: <20221020073527.541845-1-chenhuacai@loongson.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1747191653011654523?= X-GMAIL-MSGID: =?utf-8?q?1747191653011654523?= Add suspend/resume support for PCH-PIC irqchip, which is needed for upcoming suspend/hibernation. Signed-off-by: Huacai Chen --- drivers/irqchip/irq-loongson-pch-pic.c | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c index d2cf54a87bee..ef3d54e3eb72 100644 --- a/drivers/irqchip/irq-loongson-pch-pic.c +++ b/drivers/irqchip/irq-loongson-pch-pic.c @@ -15,6 +15,7 @@ #include #include #include +#include /* Registers */ #define PCH_PIC_MASK 0x20 @@ -42,6 +43,9 @@ struct pch_pic { raw_spinlock_t pic_lock; u32 vec_count; u32 gsi_base; + u32 saved_vec_en[PIC_REG_COUNT]; + u32 saved_vec_pol[PIC_REG_COUNT]; + u32 saved_vec_edge[PIC_REG_COUNT]; }; static struct pch_pic *pch_pic_priv[MAX_IO_PICS]; @@ -145,6 +149,7 @@ static struct irq_chip pch_pic_irq_chip = { .irq_ack = pch_pic_ack_irq, .irq_set_affinity = irq_chip_set_affinity_parent, .irq_set_type = pch_pic_set_type, + .flags = IRQCHIP_SKIP_SET_WAKE, }; static int pch_pic_domain_translate(struct irq_domain *d, @@ -228,6 +233,46 @@ static void pch_pic_reset(struct pch_pic *priv) } } +static int pch_pic_suspend(void) +{ + int i, j; + + for (i = 0; i < nr_pics; i++) { + for (j = 0; j < PIC_REG_COUNT; j++) { + pch_pic_priv[i]->saved_vec_pol[j] = + readl(pch_pic_priv[i]->base + PCH_PIC_POL + 4 * j); + pch_pic_priv[i]->saved_vec_edge[j] = + readl(pch_pic_priv[i]->base + PCH_PIC_EDGE + 4 * j); + pch_pic_priv[i]->saved_vec_en[j] = + readl(pch_pic_priv[i]->base + PCH_PIC_MASK + 4 * j); + } + } + + return 0; +} + +static void pch_pic_resume(void) +{ + int i, j; + + for (i = 0; i < nr_pics; i++) { + pch_pic_reset(pch_pic_priv[i]); + for (j = 0; j < PIC_REG_COUNT; j++) { + writel(pch_pic_priv[i]->saved_vec_pol[j], + pch_pic_priv[i]->base + PCH_PIC_POL + 4 * j); + writel(pch_pic_priv[i]->saved_vec_edge[j], + pch_pic_priv[i]->base + PCH_PIC_EDGE + 4 * j); + writel(pch_pic_priv[i]->saved_vec_en[j], + pch_pic_priv[i]->base + PCH_PIC_MASK + 4 * j); + } + } +} + +static struct syscore_ops pch_pic_syscore_ops = { + .suspend = pch_pic_suspend, + .resume = pch_pic_resume, +}; + static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base, struct irq_domain *parent_domain, struct fwnode_handle *domain_handle, u32 gsi_base) @@ -260,6 +305,8 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base, pch_pic_handle[nr_pics] = domain_handle; pch_pic_priv[nr_pics++] = priv; + register_syscore_ops(&pch_pic_syscore_ops); + return 0; iounmap_base: From patchwork Thu Oct 20 07:35:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 6011 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp118436wrs; Thu, 20 Oct 2022 00:43:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pQFhSTxBT3NVCs9SQDO24/CNgFttW5GfVr812KHOS8Fob6U2/spuILwJQDFheHtwl2eoH X-Received: by 2002:a62:8495:0:b0:563:321a:913c with SMTP id k143-20020a628495000000b00563321a913cmr12745321pfd.55.1666251785849; Thu, 20 Oct 2022 00:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666251785; cv=none; d=google.com; s=arc-20160816; b=r3Ip2BKrUvzgSwYSR62DvF7d+oO22ogyHZyVNWfm/XNzFztGf68V5PU7+vVxNLnMHO UGL3SSc3NObQIFLShyQRMXJ5bfKTH5yCCulQh2mBtFFYxxyKpNR9ObeQbPwAMDkp5Xxe L3A2ul4j/qfLi9RTr3FxmCJn+6Bzn2FA8DYt7xUqcL9jjL2rgWP5Tq89iEJyP1DnOVyJ 6n484bfWGywznbiVsSvQw/ibfndrgTYxeEttdU9aJrEEc5mih0W5Mp4l60FLpysyuW+W lSApQ1r6exi5S499vGgCXWOFaqC4X2FrwI8j0R0yzfvQ5vo/qeNQSEHhb0Ggm8LLi7H6 VsTQ== 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; bh=6XifCLeTLId+XvzcE54Os8NYWc1ajxnAOQrjmExoOyg=; b=ZCg436pN1UJykBWkztMdmAF3NV9UwJ7xGyoW6/nV8HJT5QAe+moFhWRbHzpUH5kVvd U6m8iCKjF8sBRulWLfy5ukCeoiBvnCQz1I2hDmnRjGcNeamzVrix+oO4GtT3p/csAsNd 3WeeGrO2LtSc/3u4DZ51Dc+R1osY2J6O4VhvlD23jns92cq+zgdAdWpIZidbvCRqGji5 XJ1SXH6v++LTuKNfvdM17hhqspuHeGjPJYgQFVH7fXVIqRHLZYqIxe9rQPwas9rEw9WS oZYLbYGbBmQ7iXJ4j2+uX1QpMX2jnO6WLoznD2FVJqBj0Tf9fhr2T1Z+FpDcd73L02hm 65nQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d4-20020a170902854400b0017dafc02313si20776767plo.92.2022.10.20.00.42.52; Thu, 20 Oct 2022 00:43:05 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230376AbiJTHjU (ORCPT + 99 others); Thu, 20 Oct 2022 03:39:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230388AbiJTHjH (ORCPT ); Thu, 20 Oct 2022 03:39:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 639F0175362 for ; Thu, 20 Oct 2022 00:39:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EE14A61A3E for ; Thu, 20 Oct 2022 07:39:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69D01C433D6; Thu, 20 Oct 2022 07:39:03 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH V2 4/4] irqchip/loongson-pch-lpc: Add suspend/resume support Date: Thu, 20 Oct 2022 15:35:27 +0800 Message-Id: <20221020073527.541845-5-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221020073527.541845-1-chenhuacai@loongson.cn> References: <20221020073527.541845-1-chenhuacai@loongson.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1747191632963605235?= X-GMAIL-MSGID: =?utf-8?q?1747191632963605235?= Add suspend/resume support for PCH-LPC irqchip, which is needed for upcoming suspend/hibernation. Signed-off-by: Huacai Chen --- drivers/irqchip/irq-loongson-pch-lpc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/irqchip/irq-loongson-pch-lpc.c b/drivers/irqchip/irq-loongson-pch-lpc.c index bf2324910a75..9b35492fb6be 100644 --- a/drivers/irqchip/irq-loongson-pch-lpc.c +++ b/drivers/irqchip/irq-loongson-pch-lpc.c @@ -13,6 +13,7 @@ #include #include #include +#include /* Registers */ #define LPC_INT_CTL 0x00 @@ -34,6 +35,7 @@ struct pch_lpc { u32 saved_reg_pol; }; +static struct pch_lpc *pch_lpc_priv; struct fwnode_handle *pch_lpc_handle; static void lpc_irq_ack(struct irq_data *d) @@ -147,6 +149,26 @@ static int pch_lpc_disabled(struct pch_lpc *priv) (readl(priv->base + LPC_INT_STS) == 0xffffffff); } +static int pch_lpc_suspend(void) +{ + pch_lpc_priv->saved_reg_ctl = readl(pch_lpc_priv->base + LPC_INT_CTL); + pch_lpc_priv->saved_reg_ena = readl(pch_lpc_priv->base + LPC_INT_ENA); + pch_lpc_priv->saved_reg_pol = readl(pch_lpc_priv->base + LPC_INT_POL); + return 0; +} + +static void pch_lpc_resume(void) +{ + writel(pch_lpc_priv->saved_reg_ctl, pch_lpc_priv->base + LPC_INT_CTL); + writel(pch_lpc_priv->saved_reg_ena, pch_lpc_priv->base + LPC_INT_ENA); + writel(pch_lpc_priv->saved_reg_pol, pch_lpc_priv->base + LPC_INT_POL); +} + +static struct syscore_ops pch_lpc_syscore_ops = { + .suspend = pch_lpc_suspend, + .resume = pch_lpc_resume, +}; + int __init pch_lpc_acpi_init(struct irq_domain *parent, struct acpi_madt_lpc_pic *acpi_pchlpc) { @@ -191,7 +213,10 @@ int __init pch_lpc_acpi_init(struct irq_domain *parent, parent_irq = irq_create_fwspec_mapping(&fwspec); irq_set_chained_handler_and_data(parent_irq, lpc_irq_dispatch, priv); + pch_lpc_priv = priv; pch_lpc_handle = irq_handle; + register_syscore_ops(&pch_lpc_syscore_ops); + return 0; free_irq_handle: