From patchwork Fri Dec 16 04:17:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cixi Geng X-Patchwork-Id: 634896 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47206C4332F for ; Fri, 16 Dec 2022 04:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiLPE0V (ORCPT ); Thu, 15 Dec 2022 23:26:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229726AbiLPE0T (ORCPT ); Thu, 15 Dec 2022 23:26:19 -0500 X-Greylist: delayed 521 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 15 Dec 2022 20:26:17 PST Received: from out-77.mta0.migadu.com (out-77.mta0.migadu.com [IPv6:2001:41d0:1004:224b::4d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDA7E6036C for ; Thu, 15 Dec 2022 20:26:17 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1671164255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UGBLh9DAaCubl0iR5/VhBqErDCfa1wpAZno7Lj8I1vQ=; b=i9itX9UC8z+pZqiL6AKDm0ZaIFmVLa+2t+R4rq697k8wYExxyWN5L2L6vXMBoP7zveIs/d q8bQb5KgAFzo0BsF1oPKsKgVYGZ/Tjnk7q12M6zHUPZEPW57kJQbuq9dASKDwUWps556jc woucGuahZfg5d6Z0UNvNTYYltqGyFWY= From: Cixi Geng To: linus.walleij@linaro.org, brgl@bgdev.pl, orsonzhai@gmail.com, baolin.wang@linux.alibaba.com, zhang.lyra@gmail.com, gengcixi@gmail.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] gpio: sprd: Make irq_chip immutable Date: Fri, 16 Dec 2022 12:17:08 +0800 Message-Id: <20221216041708.32768-1-cixi.geng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Cixi Geng Kernel warns about mutable irq_chips: "not an immutable chip, please consider fixing!" Make the struct irq_chip const, flag it as IRQCHIP_IMMUTABLE, add the new helper functions, and call the appropriate gpiolib functions. Signed-off-by: Cixi Geng --- drivers/gpio/gpio-eic-sprd.c | 4 ++-- drivers/gpio/gpio-pmic-eic-sprd.c | 4 ++-- drivers/gpio/gpio-sprd.c | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c index 8d722e026e9c..07b9099f2a6d 100644 --- a/drivers/gpio/gpio-eic-sprd.c +++ b/drivers/gpio/gpio-eic-sprd.c @@ -631,10 +631,10 @@ static int sprd_eic_probe(struct platform_device *pdev) sprd_eic->intc.irq_mask = sprd_eic_irq_mask; sprd_eic->intc.irq_unmask = sprd_eic_irq_unmask; sprd_eic->intc.irq_set_type = sprd_eic_irq_set_type; - sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE; + sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE; irq = &sprd_eic->chip.irq; - irq->chip = &sprd_eic->intc; + gpio_irq_chip_set_chip(irq, &sprd_eic->intc); irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; irq->parent_handler = sprd_eic_irq_handler; diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-eic-sprd.c index e518490c4b68..d96604ea10e7 100644 --- a/drivers/gpio/gpio-pmic-eic-sprd.c +++ b/drivers/gpio/gpio-pmic-eic-sprd.c @@ -344,10 +344,10 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) pmic_eic->intc.irq_set_type = sprd_pmic_eic_irq_set_type; pmic_eic->intc.irq_bus_lock = sprd_pmic_eic_bus_lock; pmic_eic->intc.irq_bus_sync_unlock = sprd_pmic_eic_bus_sync_unlock; - pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE; + pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE; irq = &pmic_eic->chip.irq; - irq->chip = &pmic_eic->intc; + gpio_irq_chip_set_chip(irq, &pmic_eic->intc); irq->threaded = true; ret = devm_gpiochip_add_data(&pdev->dev, &pmic_eic->chip, pmic_eic); diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c index 9bff63990eee..8398f9707ec0 100644 --- a/drivers/gpio/gpio-sprd.c +++ b/drivers/gpio/gpio-sprd.c @@ -64,6 +64,11 @@ static void sprd_gpio_update(struct gpio_chip *chip, unsigned int offset, writel_relaxed(tmp, base + reg); spin_unlock_irqrestore(&sprd_gpio->lock, flags); + + if (reg == SPRD_GPIO_IE && val == 1) + gpiochip_enable_irq(chip, offset); + else if (reg == SPRD_GPIO_IE && val == 0) + gpiochip_disable_irq(chip, offset); } static int sprd_gpio_read(struct gpio_chip *chip, unsigned int offset, u16 reg) @@ -205,13 +210,15 @@ static void sprd_gpio_irq_handler(struct irq_desc *desc) chained_irq_exit(ic, desc); } -static struct irq_chip sprd_gpio_irqchip = { +static const struct irq_chip sprd_gpio_irqchip = { .name = "sprd-gpio", .irq_ack = sprd_gpio_irq_ack, .irq_mask = sprd_gpio_irq_mask, .irq_unmask = sprd_gpio_irq_unmask, .irq_set_type = sprd_gpio_irq_set_type, .flags = IRQCHIP_SKIP_SET_WAKE, + .flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; static int sprd_gpio_probe(struct platform_device *pdev) @@ -245,7 +252,7 @@ static int sprd_gpio_probe(struct platform_device *pdev) sprd_gpio->chip.direction_output = sprd_gpio_direction_output; irq = &sprd_gpio->chip.irq; - irq->chip = &sprd_gpio_irqchip; + gpio_irq_chip_set_chip(irq, &sprd_gpio_irqchip); irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; irq->parent_handler = sprd_gpio_irq_handler;