From patchwork Mon Oct 17 03:39:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 3200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1253579wrs; Sun, 16 Oct 2022 20:42:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/UZV7lVRRNevPeDjrf6WfPo2BjfamxoTljnRfJg+OgoZTAhywHt4XzUlSX6h021D4kp+e X-Received: by 2002:aa7:c751:0:b0:459:b0e1:4ad7 with SMTP id c17-20020aa7c751000000b00459b0e14ad7mr8484977eds.193.1665978140701; Sun, 16 Oct 2022 20:42:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665978140; cv=none; d=google.com; s=arc-20160816; b=s9leplamWlJckGOFwIkr5uUTgHlq4oKHllz5qn0xF59pxUkzksM12TjsCbGc37asCA J9mvdmRR3lOF2AhpVSZwyjvaIoy8jPxRTOot1GUuWESm/xaa6GmIJjjaZ4sE5JTv3lPf 1GZ0PP/xVlf5O99BsOSkp+LsI1Yub/VnXTKPs4O7Dqr0IAfYvj0pRIfchwr1xCZUl0Cy mnvVx8HWWU4Ondb4RNKD4BCaW3X/uynIUy08EayBgRg6SiY2zBtDisXTL0aTb0Pxd8HE W2SfDiidlk+bP4y3TocUq4Zh/2qZHSuvXFnD9QFKpy4HzHMfCbRHYkt8JGbLudjXVXjl XLlw== 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=YhDlhfzmvmUu/uhEF9hQWwp4cDIAjeW8aJwk5TTNUkE=; b=TYWNK4ev7rQZuCASiu4YyZZcRtBQ9eaavMgOjN4xO4Qv1Af9HlBWfZnB9x3FW0he2X W7loscoOvLut7EygKAr1/omXHds9iW1cgFzXeA5/BF/L1hYF0Ow3GhflRWmZ4XPZGude 7kmAGq4Oza3+f3sSCj6xlvo5o5Gxw7+XasmOwHIgHcoJdxPm1SrvEUwg2ltMhK8qAk8p 4gmqtdpd+eWFT+GhQp9xMrDy+brUEOR46DSUACO0s58f5HxrIwO6dsJj1W3zNfGsZbAp DSuuby7NGNQoQLhcOwUhcGUvHpR5jwwugh2AnTQ6dBh/PZvLwvY4HKEbjb4ePlOCOnG5 ypWg== 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 hv19-20020a17090760d300b0078d83fb6672si8478599ejc.118.2022.10.16.20.41.56; Sun, 16 Oct 2022 20:42:20 -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 S232570AbiJQDls (ORCPT + 99 others); Sun, 16 Oct 2022 23:41:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232559AbiJQDlo (ORCPT ); Sun, 16 Oct 2022 23:41: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 8290E50051 for ; Sun, 16 Oct 2022 20:41: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 40EE5B80D4B for ; Mon, 17 Oct 2022 03:41:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B7CEC433D7; Mon, 17 Oct 2022 03:41:39 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH 1/4] irqchip/loongson-htvec: Add suspend/resume support Date: Mon, 17 Oct 2022 11:39:01 +0800 Message-Id: <20221017033904.2421723-2-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221017033904.2421723-1-chenhuacai@loongson.cn> References: <20221017033904.2421723-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?1746904694985040886?= X-GMAIL-MSGID: =?utf-8?q?1746904694985040886?= 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 1bb414ec6e78..cd4f1a0a1ea8 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 Mon Oct 17 03:39:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 3201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1253775wrs; Sun, 16 Oct 2022 20:43:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Bi4ROXwDSdGRXJWYfAQct7aOvedqmqq4iW/Hvva8+Sb1w8lfPjE4ySdwxoF2ckwLNFcUg X-Received: by 2002:a17:906:4bd3:b0:731:3bdf:b95c with SMTP id x19-20020a1709064bd300b007313bdfb95cmr7228746ejv.677.1665978204879; Sun, 16 Oct 2022 20:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665978204; cv=none; d=google.com; s=arc-20160816; b=WK/3Puc1ccuKFU94z/dBL3a2E6LhT0rrskA8HMU0cSH6CT9CVkBtZV6IAOqqb9mCqg 2BW20xelxkbedtmIFr/zpkO6ZcGhPQnOg5DprKfHUN2FUZHC5cofkT5WNiiSBqCUAVsW TMZKIr/FUMZzQITic/2oJW4aDJZgM9EGmr2YbRorZY5VF2ZXvKXde4WuHf+7DTr74nhp huwPqg0vozRYJ+97moaZPkxJypkiBtsxqwsqFNpc/abK81m7JoqRaLu2eQIEuTqnx06C J0F7yq7G0ZxgJEwjpAzP8ocnjETkVbOtZKptYHAirv0TwjCR48uo/go+G/O89po9QkYO rIJQ== 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=bvQXAIkMpmpoxwdll78lC1X/2Xoz4gY6jvG143u98hg=; b=FVWQ2tdje7rZC1Dj4KDo5j5uK5reKe7pUooKgNFc0fCWhIzCaMkyoUXLRrtrJJOu3K KYxmbANZl6BbT+id+ulcWCClAX/sT5ThbxXPO8Zex5yhbzO5glUv3pvO9UnLYiKww+EL 5uCFXtASFOfUWs187sczLCXdporR3Db7F9NpFe5tdzuWInZ5djmwxm7grjUl+BJ2HlYT 8R7zFSKVmx1Iknti7IjG96rfxi0t9ACJ1Cdsps7VFnRVSy0Q/6gCQOlZrLmV4mK+A90O +SdlAnUqHRTH6JQzM6vIM/gg7HbAGV2OAKWGHuB+aFubr4OMvbkqLPBZMxgNYrE8tJ9Q pcFQ== 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 m14-20020a056402510e00b0045da888ea6asi600090edd.65.2022.10.16.20.43.00; Sun, 16 Oct 2022 20:43:24 -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 S232583AbiJQDm3 (ORCPT + 99 others); Sun, 16 Oct 2022 23:42:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232590AbiJQDm0 (ORCPT ); Sun, 16 Oct 2022 23:42:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF86C50072 for ; Sun, 16 Oct 2022 20:42:25 -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 4C7E460F1A for ; Mon, 17 Oct 2022 03:42:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEBB6C433C1; Mon, 17 Oct 2022 03:42:22 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH 2/4] irqchip/loongson-eiointc: Add suspend/resume support Date: Mon, 17 Oct 2022 11:39:02 +0800 Message-Id: <20221017033904.2421723-3-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221017033904.2421723-1-chenhuacai@loongson.cn> References: <20221017033904.2421723-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?1746904762228641859?= X-GMAIL-MSGID: =?utf-8?q?1746904762228641859?= 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 | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c index 16e9af8d8b1e..c68f8de3ae09 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,35 @@ 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) { + irq_data = &desc->irq_data; + eiointc_set_irq_affinity(irq_data, irq_data->common->affinity, 0); + } + } + } +} + +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) @@ -380,6 +410,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 Mon Oct 17 03:39:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 3202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1253961wrs; Sun, 16 Oct 2022 20:44:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM445fpTQmuR7UlAD03Xh1VSsjvBkBTnHYLtC8NcCMO8L69Dj5RPMaCcYAWbji1vzQWBLF0k X-Received: by 2002:a05:6402:414d:b0:451:73f0:e113 with SMTP id x13-20020a056402414d00b0045173f0e113mr8435396eda.207.1665978250074; Sun, 16 Oct 2022 20:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665978250; cv=none; d=google.com; s=arc-20160816; b=QGM8YAYyLlKg/yHlFpsPghUpPA4u9ruXafcC9VBG+3HK2wvajnPjcSnJZgs0uaPyzM FFZK8FS1D438Ft5qFCpnexj2OHMQnCnz5QP4MzZMLw8Cf82UC/sNYep7Fy1H6OiTmdZ5 1ziak1KT8PGbyRXRRAu3oib7yW8X1/r2XJN4AupBtfuIAGBPzGu2aRxjp/Xz3O9xR4fR WsDQpjH6g+GWm2XOL9DUhnd7rjnWEyrXOoiZdPAn08pMSxBBduTIc3Xghw4HnVFY+q22 veTqSDNNtRaoOXh4g0w07WK6U36f8omMKUIx/Kf274ZGbs8YTAierpQJLPM1PHuNW8Ck AKGA== 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=P6Y6Xz85wIVC+DGN6M/r4suVX8AkX4m/jnV2wIgF4uU=; b=FCxrMGi2XhCUGzFIt6rN5zVc2Eu38Rm89gcUh+JbiJ3LKjlIaPVbwlP2Wkq1FmVn2N O83082cyYE7xPDD/Bwl/XS7DltsbPz9nIEdQY8Wc/TsOLWDIAY+ILmrTs4FUGXgN9+YN +F/IKsU737D26ObNMTmY1zJdXl8vUV0SDBGpJPhXtPGLiEqXKYIhCamUzSHfw4ZcZwmC 3CMQclctNLW5QTcZ1L++sznDMKj3KjxpEcJaXuaHmoQP6QVqUtImnOdi9nwTFpaEXzju pGcaPUYct0CwaEtFIEfKqRTHYIlAx9csOmBsbqi7wCiaRl1jChHO12JtMFkjh5qOqSQE cw6A== 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 hc11-20020a170907168b00b007269ef1872esi9594933ejc.897.2022.10.16.20.43.45; Sun, 16 Oct 2022 20:44:10 -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 S232619AbiJQDnL (ORCPT + 99 others); Sun, 16 Oct 2022 23:43:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbiJQDnJ (ORCPT ); Sun, 16 Oct 2022 23:43:09 -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 D7D5850197 for ; Sun, 16 Oct 2022 20:43:07 -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 94066B80CC2 for ; Mon, 17 Oct 2022 03:43:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86C06C433C1; Mon, 17 Oct 2022 03:43:03 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH 3/4] irqchip/loongson-pch-pic: Add suspend/resume support Date: Mon, 17 Oct 2022 11:39:03 +0800 Message-Id: <20221017033904.2421723-4-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221017033904.2421723-1-chenhuacai@loongson.cn> References: <20221017033904.2421723-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?1746904809425508649?= X-GMAIL-MSGID: =?utf-8?q?1746904809425508649?= 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 c01b9c257005..217513d74664 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 Mon Oct 17 03:39:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 3203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1254025wrs; Sun, 16 Oct 2022 20:44:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ZFM6na5nyH7Mh9Qp8r5L6I0g7UOo0t9lM/qKVcZFHz17LGBhntQQ6REohCoLbZlZIc+Gz X-Received: by 2002:a17:906:dac8:b0:741:545b:796a with SMTP id xi8-20020a170906dac800b00741545b796amr6952946ejb.240.1665978264048; Sun, 16 Oct 2022 20:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665978264; cv=none; d=google.com; s=arc-20160816; b=1ISo7fxixXTd3HPB4yIa23Ty6hfyjdhfTmiME/ScfIJZHcA1EkkU/hdzONE9GvoM5H 6IT4+u2HRHZCLFmNTgxTmLVPu/eYKDP6VhBGR9NX1Ej9gUS8G2hiUMPAmYziIY6zCx6l OWJMWx1+baA6TMvqTF9w3VT9UxV8jnDiSEQSDTMYJ2C4U3uOXhowjs3J0WTWFrEacuA4 maPl5Cx7E50VG4dxMDruuj9Ap+g5VZa8NaI+N2QVHGZIMNjLD61wnouNi9wKNqEVJxn2 3mTELsX1cve2+D64wTRNZ2rWd2YNhaNKQZheqzqowcItaU9Ph5yLeWwGRQrzr7Iyo8De tQvw== 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=Dh579BIIWeonP3fyKhzqMkfHSNnKdAS32tgTDoWuLoTVTzV/LXVwpyY8BCUgXFG8gG y7WB1XvBK1JDuSVOLZCMvxHO8EycOqO4pf1j6rIfsAJkObKZAX4q5VGqeVxS/c541ePW r+zzBjqek8Qzt6/LmglqRVewZsSWm4JLXdei4gquNQsBxtVPqPi8gcBQ4/fdRDaiJ06v hJHUOO3kjaVBrgBi8KUdvTOLvT0dPZYRzGv+40wW8pU9ow3xiDqpj+fKyOYEaV+0rNUW DMUnvjIGM9ZlZ1ji5x2F9PeO3rmIagYcawoye4wfAXQKKajFjOE9vfJIIp5qea/UHWml lJhA== 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 i21-20020a1709061cd500b007825bd02a6asi6715496ejh.54.2022.10.16.20.43.59; Sun, 16 Oct 2022 20:44:24 -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 S232642AbiJQDnv (ORCPT + 99 others); Sun, 16 Oct 2022 23:43:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232627AbiJQDnl (ORCPT ); Sun, 16 Oct 2022 23:43:41 -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 8F8E95050F for ; Sun, 16 Oct 2022 20:43:40 -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 45042B80CC2 for ; Mon, 17 Oct 2022 03:43:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26BEAC433B5; Mon, 17 Oct 2022 03:43:35 +0000 (UTC) From: Huacai Chen To: Thomas Gleixner , Marc Zyngier Cc: linux-kernel@vger.kernel.org, Xuefeng Li , Huacai Chen , Jiaxun Yang , Huacai Chen Subject: [PATCH 4/4] irqchip/loongson-pch-lpc: Add suspend/resume support Date: Mon, 17 Oct 2022 11:39:04 +0800 Message-Id: <20221017033904.2421723-5-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221017033904.2421723-1-chenhuacai@loongson.cn> References: <20221017033904.2421723-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?1746904823921898878?= X-GMAIL-MSGID: =?utf-8?q?1746904823921898878?= 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: