From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D87150AC23; Thu, 15 Oct 2026 10:54:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792061672; cv=none; b=ub8NQY3rlsX7tNgq0RgvT6BUpeNHuWI7bfy5oz74Di2wtVXdhaXRJhd3gC9RFtVPLVnM0WegxSKf3W2VEH/XFjrBNnFDhOYSFqaTZ8DRtdGyyut3PlI9nEssr7FIOiZWCoY8N4Nj3WqlnJ/NGisHjwLPC3opOOEJsN7Dc9BFYqQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792061672; c=relaxed/simple; bh=m/IF1yavu/yv3xgoTwPHRt5huOW159TNF5iAC5BPYuo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lcPl2rTM3SeUlmkdF0Jld0uSeaCzNzAhdc4+mvzKbfISHrIGN12Rx3Rfl6TYWLgCf0PCER3gCSxwuHudCYeRLq1zGUL6pjPQHW2Zk7+cKEWS1biMb+vjFN/um92+E6eEGxMlAXPVfzbtt/xLoq9WWSYRbfIIoC+6NwvZauAeu7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hZ7OtaZb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hZ7OtaZb" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6E3A9C2BCFF; Thu, 15 Oct 2026 10:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1792061672; bh=m/IF1yavu/yv3xgoTwPHRt5huOW159TNF5iAC5BPYuo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=hZ7OtaZbnC/bWgtNscPyOz9HUvhwYVPQoKCR/XEyWFz9d07UVgD5/yxhg0qgxPrxz UGySfncgebY4FuWHuvlrkhtds6OSPS1tp3zjcLs7HoESRXyfVcDhuWFquMPbfgwxON hhGSCy4smbb3OnA5YUXrByZxr7a0z77UJYhalFdwsWxnZKuFIuAt4b8mpSYgvm6OWF Fgv8kZKW38U43j+r+O/Ftimogww99CyT8uTemZUGvlnD0B1TJ6KfEYexXMe19SzIUE A9sAlha4pSBQjlsb/xHzvezVOREY37iXAIMUqGbhptAp/VFUFQIPPVYIn2u17Q+8x5 Ncs/kCQ+EIOLQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58E09CC6B3A; Thu, 15 Oct 2026 10:54:32 +0000 (UTC) From: Long Zhao via B4 Relay Date: Thu, 15 Oct 2026 18:53:34 +0800 Subject: [PATCH v10 7/8] gpio: pl061: switch data path to gpio-regmap Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261015-cv75-gpio-v10-7-3fe3eb315a55@ambarella.com> References: <20261015-cv75-gpio-v10-0-3fe3eb315a55@ambarella.com> In-Reply-To: <20261015-cv75-gpio-v10-0-3fe3eb315a55@ambarella.com> To: Bartosz Golaszewski , linux-gpio@vger.kernel.org Cc: Linus Walleij , Michael Walle , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Krzysztof Kozlowski , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Long Zhao , Long Zhao , linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1792061669; l=21469; i=longzhao@ambarella.com; s=20260730; h=from:subject:message-id; bh=wjAZtLCh6iy9YYqcPSXznZjyn8A3GgknDoMElD3mRic=; b=OqTdnjFF0pgJSDWMpWUQZ6vTI5X0GROwGa/IzRemLPFKseqswdCQBNUopBXPLDV8Ma2BYAQts 8WyeihJxEQQCIbBd7VWDZGnr3YBGPhGb5DxFm1toCVdqjZE0P5nnM0h X-Developer-Key: i=longzhao@ambarella.com; a=ed25519; pk=/xGhPTOX0/eYsyTWzyjjgAIW1Z/YD+IlnOnvcdRozow= X-Endpoint-Received: by B4 Relay for longzhao@ambarella.com/20260730 with auth_id=903 X-Original-From: Long Zhao Reply-To: longzhao@ambarella.com From: Long Zhao Move get, set and direction onto gpio-regmap. ARM PL061 sets GPIO_REGMAP_QUIRK_SET_AFTER_DIR so the output value is written after the direction change. Keep a custom irqchip and irq domain. Create the domain with the PL061 private data and let gpio-regmap attach it. Check the chained-handler regmap_read() return and always run chained_irq_exit(). irq_type still ignores MMIO write returns. irq_set_parent() nests the GPIO irq_desc under the AMBA parent for irq_set_wake() and lockdep; checked with PROVE_LOCKING on CV75. Signed-off-by: Long Zhao --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-pl061.c | 458 ++++++++++++++++++++++++++-------------------- 2 files changed, 264 insertions(+), 195 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 2a1487bd1a94..55a129836158 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -583,6 +583,7 @@ config GPIO_PL061 depends on ARM_AMBA || COMPILE_TEST select IRQ_DOMAIN select GPIOLIB_IRQCHIP + select GPIO_REGMAP select REGMAP_MMIO help Say yes here to support the PrimeCell PL061 GPIO device. diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index 5c6d4209dc8e..3822faa3e276 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -12,52 +12,67 @@ #include #include #include -#include -#include -#include +#include +#include #include #include #include #include #include +#include #include #include -#include #include #include #include -#include #include -#define GPIODIR 0x400 -#define GPIOIS 0x404 -#define GPIOIBE 0x408 -#define GPIOIEV 0x40C -#define GPIOIE 0x410 -#define GPIORIS 0x414 -#define GPIOMIS 0x418 -#define GPIOIC 0x41C - #define PL061_GPIO_NR 8 #define PL061_DATA_OFFSET 2 -struct pl061_context_save_regs { - u8 gpio_data; - u8 gpio_dir; - u8 gpio_is; - u8 gpio_ibe; - u8 gpio_iev; - u8 gpio_ie; +#define PL061_DIR 0x400 +#define PL061_IS 0x404 +#define PL061_IBE 0x408 +#define PL061_IEV 0x40c +#define PL061_IE 0x410 +#define PL061_MIS 0x418 +#define PL061_IC 0x41c + +struct pl061_regs { + unsigned int dat; + unsigned int dir; + unsigned int is; + unsigned int ibe; + unsigned int iev; + unsigned int ie; + unsigned int mis; + unsigned int ic; + unsigned int mask; + unsigned int enable; +}; + +struct pl061_drvdata { + const struct regmap_config *regmap_config; + const struct pl061_regs *regs; + unsigned int ngpio; + unsigned long quirks; + bool clear_irq_on_type; + bool pm; + int (*reg_mask_xlate)(struct gpio_regmap *gpio, unsigned int base, + unsigned int offset, unsigned int *reg, + unsigned int *mask); }; struct pl061 { raw_spinlock_t lock; + struct device *dev; struct regmap *regmap; - struct gpio_chip gc; + const struct pl061_drvdata *data; + struct irq_domain *irq_domain; int parent_irq; - struct pl061_context_save_regs csave_regs; + u32 saved_dat; }; static bool pl061_arm_is_data_reg(unsigned int reg) @@ -70,8 +85,8 @@ static bool pl061_arm_is_data_reg(unsigned int reg) static bool pl061_arm_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { - case GPIOMIS: - case GPIOIC: + case PL061_MIS: + case PL061_IC: return true; default: return pl061_arm_is_data_reg(reg); @@ -82,94 +97,45 @@ static const struct regmap_config pl061_arm_regmap_config = { .reg_bits = 16, .val_bits = 8, .reg_stride = 4, - .max_register = GPIOIC, + .max_register = PL061_IC, .volatile_reg = pl061_arm_volatile_reg, .cache_type = REGCACHE_FLAT_S, .use_raw_spinlock = true, }; -static int pl061_get_direction(struct gpio_chip *gc, unsigned offset) -{ - struct pl061 *pl061 = gpiochip_get_data(gc); - int ret; - - ret = regmap_test_bits(pl061->regmap, GPIODIR, BIT(offset)); - if (ret < 0) - return ret; - - if (ret) - return GPIO_LINE_DIRECTION_OUT; - - return GPIO_LINE_DIRECTION_IN; -} - -static int pl061_direction_input(struct gpio_chip *gc, unsigned offset) -{ - struct pl061 *pl061 = gpiochip_get_data(gc); - - guard(raw_spinlock_irqsave)(&pl061->lock); - - regmap_clear_bits(pl061->regmap, GPIODIR, BIT(offset)); - - return 0; -} - -static int pl061_direction_output(struct gpio_chip *gc, unsigned offset, - int value) -{ - struct pl061 *pl061 = gpiochip_get_data(gc); - unsigned int mask = BIT(offset); - - guard(raw_spinlock_irqsave)(&pl061->lock); - - regmap_assign_bits(pl061->regmap, BIT(offset + PL061_DATA_OFFSET), - BIT(offset), value); - regmap_set_bits(pl061->regmap, GPIODIR, mask); - - /* - * gpio value is set again, because pl061 doesn't allow to set value of - * a gpio pin before configuring it in OUT mode. - */ - regmap_assign_bits(pl061->regmap, BIT(offset + PL061_DATA_OFFSET), - BIT(offset), value); - - return 0; -} - -static int pl061_get_value(struct gpio_chip *gc, unsigned offset) +static unsigned int pl061_line_mask(struct pl061 *pl061, irq_hw_number_t hwirq) { - struct pl061 *pl061 = gpiochip_get_data(gc); - - return regmap_test_bits(pl061->regmap, - BIT(offset + PL061_DATA_OFFSET), - BIT(offset)); + return BIT(hwirq % pl061->data->ngpio); } -static int pl061_set_value(struct gpio_chip *gc, unsigned int offset, int value) +static int pl061_arm_reg_mask_xlate(struct gpio_regmap *gpio, unsigned int base, + unsigned int offset, unsigned int *reg, + unsigned int *mask) { - struct pl061 *pl061 = gpiochip_get_data(gc); - - regmap_assign_bits(pl061->regmap, BIT(offset + PL061_DATA_OFFSET), - BIT(offset), value); + if (base == 0) + *reg = BIT(offset + PL061_DATA_OFFSET); + else + *reg = base; + *mask = BIT(offset); return 0; } static int pl061_irq_type(struct irq_data *d, unsigned trigger) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(d); - struct pl061 *pl061 = gpiochip_get_data(gc); + struct pl061 *pl061 = irq_data_get_irq_chip_data(d); + const struct pl061_regs *regs = pl061->data->regs; int offset = irqd_to_hwirq(d); unsigned int gpioiev = 0; unsigned int gpioibe = 0; unsigned int gpiois = 0; unsigned int bit = BIT(offset); - if (offset < 0 || offset >= PL061_GPIO_NR) + if (offset < 0 || offset >= pl061->data->ngpio) return -EINVAL; if ((trigger & IRQ_TYPE_LEVEL_MASK) && (trigger & IRQ_TYPE_EDGE_BOTH)) { - dev_err(gc->parent, + dev_err(pl061->dev, "trying to configure line %d for both level and edge " "detection, choose one!\n", offset); @@ -178,9 +144,9 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) guard(raw_spinlock_irqsave)(&pl061->lock); - regmap_read(pl061->regmap, GPIOIEV, &gpioiev); - regmap_read(pl061->regmap, GPIOIS, &gpiois); - regmap_read(pl061->regmap, GPIOIBE, &gpioibe); + regmap_read(pl061->regmap, regs->iev, &gpioiev); + regmap_read(pl061->regmap, regs->is, &gpiois); + regmap_read(pl061->regmap, regs->ibe, &gpioibe); if (trigger & IRQ_TYPE_LEVEL_MASK) { bool polarity = trigger & IRQ_TYPE_LEVEL_HIGH; @@ -195,7 +161,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) else gpioiev &= ~bit; irq_set_handler_locked(d, handle_level_irq); - dev_dbg(gc->parent, "line %d: IRQ on %s level\n", + dev_dbg(pl061->dev, "line %d: IRQ on %s level\n", offset, polarity ? "HIGH" : "LOW"); } else if ((trigger & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH) { @@ -204,7 +170,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) /* Select both edges, setting this makes GPIOEV be ignored */ gpioibe |= bit; irq_set_handler_locked(d, handle_edge_irq); - dev_dbg(gc->parent, "line %d: IRQ on both edges\n", offset); + dev_dbg(pl061->dev, "line %d: IRQ on both edges\n", offset); } else if ((trigger & IRQ_TYPE_EDGE_RISING) || (trigger & IRQ_TYPE_EDGE_FALLING)) { bool rising = trigger & IRQ_TYPE_EDGE_RISING; @@ -219,7 +185,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) else gpioiev &= ~bit; irq_set_handler_locked(d, handle_edge_irq); - dev_dbg(gc->parent, "line %d: IRQ on %s edge\n", + dev_dbg(pl061->dev, "line %d: IRQ on %s edge\n", offset, rising ? "RISING" : "FALLING"); } else { @@ -228,61 +194,56 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) gpioibe &= ~bit; gpioiev &= ~bit; irq_set_handler_locked(d, handle_bad_irq); - dev_warn(gc->parent, "no trigger selected for line %d\n", + dev_warn(pl061->dev, "no trigger selected for line %d\n", offset); } - regmap_write(pl061->regmap, GPIOIS, gpiois); - regmap_write(pl061->regmap, GPIOIBE, gpioibe); - regmap_write(pl061->regmap, GPIOIEV, gpioiev); + regmap_write(pl061->regmap, regs->is, gpiois); + regmap_write(pl061->regmap, regs->ibe, gpioibe); + regmap_write(pl061->regmap, regs->iev, gpioiev); + if (pl061->data->clear_irq_on_type) + regmap_write(pl061->regmap, regs->ic, bit); return 0; } static void pl061_irq_handler(struct irq_desc *desc) { + struct pl061 *pl061 = irq_desc_get_handler_data(desc); + struct irq_chip *irqchip = irq_desc_get_chip(desc); unsigned long pending; unsigned int mis = 0; int offset; - struct gpio_chip *gc = irq_desc_get_handler_data(desc); - struct pl061 *pl061 = gpiochip_get_data(gc); - struct irq_chip *irqchip = irq_desc_get_chip(desc); + int ret; chained_irq_enter(irqchip, desc); - regmap_read(pl061->regmap, GPIOMIS, &mis); + ret = regmap_read(pl061->regmap, pl061->data->regs->mis, &mis); + if (ret) + goto out; + pending = mis; - for_each_set_bit(offset, &pending, PL061_GPIO_NR) - generic_handle_domain_irq(gc->irq.domain, - offset); + for_each_set_bit(offset, &pending, pl061->data->ngpio) + generic_handle_domain_irq(pl061->irq_domain, offset); +out: chained_irq_exit(irqchip, desc); } static void pl061_irq_mask(struct irq_data *d) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(d); - struct pl061 *pl061 = gpiochip_get_data(gc); - u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); - - guard(raw_spinlock)(&pl061->lock); + struct pl061 *pl061 = irq_data_get_irq_chip_data(d); + unsigned int mask = pl061_line_mask(pl061, irqd_to_hwirq(d)); - regmap_clear_bits(pl061->regmap, GPIOIE, mask); - - gpiochip_disable_irq(gc, d->hwirq); + regmap_clear_bits(pl061->regmap, pl061->data->regs->ie, mask); } static void pl061_irq_unmask(struct irq_data *d) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(d); - struct pl061 *pl061 = gpiochip_get_data(gc); - u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); - - gpiochip_enable_irq(gc, d->hwirq); - - guard(raw_spinlock)(&pl061->lock); + struct pl061 *pl061 = irq_data_get_irq_chip_data(d); + unsigned int mask = pl061_line_mask(pl061, irqd_to_hwirq(d)); - regmap_set_bits(pl061->regmap, GPIOIE, mask); + regmap_set_bits(pl061->regmap, pl061->data->regs->ie, mask); } /** @@ -295,26 +256,24 @@ static void pl061_irq_unmask(struct irq_data *d) */ static void pl061_irq_ack(struct irq_data *d) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(d); - struct pl061 *pl061 = gpiochip_get_data(gc); - u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); + struct pl061 *pl061 = irq_data_get_irq_chip_data(d); + unsigned int mask = pl061_line_mask(pl061, irqd_to_hwirq(d)); - regmap_write(pl061->regmap, GPIOIC, mask); + regmap_write(pl061->regmap, pl061->data->regs->ic, mask); } static int pl061_irq_set_wake(struct irq_data *d, unsigned int state) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(d); - struct pl061 *pl061 = gpiochip_get_data(gc); + struct pl061 *pl061 = irq_data_get_irq_chip_data(d); return irq_set_irq_wake(pl061->parent_irq, state); } static void pl061_irq_print_chip(struct irq_data *data, struct seq_file *p) { - struct gpio_chip *gc = irq_data_get_irq_chip_data(data); + struct pl061 *pl061 = irq_data_get_irq_chip_data(data); - seq_puts(p, dev_name(gc->parent)); + seq_puts(p, dev_name(pl061->dev)); } static const struct irq_chip pl061_irq_chip = { @@ -325,67 +284,159 @@ static const struct irq_chip pl061_irq_chip = { .irq_set_wake = pl061_irq_set_wake, .irq_print_chip = pl061_irq_print_chip, .flags = IRQCHIP_IMMUTABLE, - GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + +static int pl061_irq_domain_map(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hwirq) +{ + struct pl061 *pl061 = d->host_data; + + irq_set_chip_data(virq, pl061); + irq_set_chip_and_handler(virq, &pl061_irq_chip, handle_bad_irq); + irq_set_noprobe(virq); + irq_set_parent(virq, pl061->parent_irq); + + return 0; +} + +static void pl061_irq_domain_unmap(struct irq_domain *d, unsigned int virq) +{ + irq_set_chip_and_handler(virq, NULL, NULL); + irq_set_chip_data(virq, NULL); +} + +static const struct irq_domain_ops pl061_irq_domain_ops = { + .map = pl061_irq_domain_map, + .unmap = pl061_irq_domain_unmap, + .xlate = irq_domain_xlate_twothreecell, +}; + +static void pl061_remove_irq(void *data) +{ + struct pl061 *pl061 = data; + + irq_set_chained_handler_and_data(pl061->parent_irq, NULL, NULL); + + for (unsigned int i = 0; i < pl061->data->ngpio; i++) { + unsigned int virq; + + virq = irq_find_mapping(pl061->irq_domain, i); + if (virq) + irq_dispose_mapping(virq); + } + + irq_domain_remove(pl061->irq_domain); +} + +static const struct pl061_regs pl061_arm_regs = { + .dir = PL061_DIR, + .is = PL061_IS, + .ibe = PL061_IBE, + .iev = PL061_IEV, + .ie = PL061_IE, + .mis = PL061_MIS, + .ic = PL061_IC, +}; + +static const struct pl061_drvdata pl061_arm = { + .regmap_config = &pl061_arm_regmap_config, + .regs = &pl061_arm_regs, + .ngpio = PL061_GPIO_NR, + .quirks = GPIO_REGMAP_QUIRK_SET_AFTER_DIR, + .pm = true, + .reg_mask_xlate = pl061_arm_reg_mask_xlate, }; static int pl061_probe(struct amba_device *adev, const struct amba_id *id) { + struct gpio_regmap_config config = {}; + const struct pl061_drvdata *data; struct device *dev = &adev->dev; + struct gpio_regmap *gpio_regmap; + const struct pl061_regs *regs; struct pl061 *pl061; - struct gpio_irq_chip *girq; void __iomem *base; - int ret, irq; + int ret; + int irq; + + data = id->data; + if (!data) + return -ENODATA; + + regs = data->regs; pl061 = devm_kzalloc(dev, sizeof(*pl061), GFP_KERNEL); if (pl061 == NULL) return -ENOMEM; + pl061->dev = dev; + pl061->data = data; + base = devm_ioremap_resource(dev, &adev->res); if (IS_ERR(base)) return PTR_ERR(base); - pl061->regmap = devm_regmap_init_mmio(dev, base, &pl061_arm_regmap_config); + pl061->regmap = devm_regmap_init_mmio(dev, base, data->regmap_config); if (IS_ERR(pl061->regmap)) return PTR_ERR(pl061->regmap); raw_spin_lock_init(&pl061->lock); - pl061->gc.request = gpiochip_generic_request; - pl061->gc.free = gpiochip_generic_free; - pl061->gc.base = -1; - pl061->gc.get_direction = pl061_get_direction; - pl061->gc.direction_input = pl061_direction_input; - pl061->gc.direction_output = pl061_direction_output; - pl061->gc.get = pl061_get_value; - pl061->gc.set = pl061_set_value; - pl061->gc.ngpio = PL061_GPIO_NR; - pl061->gc.label = dev_name(dev); - pl061->gc.parent = dev; - pl061->gc.owner = THIS_MODULE; + + if (regs->enable) { + ret = regmap_write(pl061->regmap, regs->enable, ~0U); + if (ret) + return ret; + } + if (regs->mask) { + ret = regmap_write(pl061->regmap, regs->mask, ~0U); + if (ret) + return ret; + } /* * irq_chip support */ - regmap_write(pl061->regmap, GPIOIE, 0); /* disable irqs */ + regmap_write(pl061->regmap, regs->ie, 0); /* disable irqs */ + irq = adev->irq[0]; if (!irq) - dev_warn(&adev->dev, "IRQ support disabled\n"); + dev_warn(dev, "IRQ support disabled\n"); pl061->parent_irq = irq; - girq = &pl061->gc.irq; - gpio_irq_chip_set_chip(girq, &pl061_irq_chip); - girq->parent_handler = pl061_irq_handler; - girq->num_parents = 1; - girq->parents = devm_kcalloc(dev, 1, sizeof(*girq->parents), - GFP_KERNEL); - if (!girq->parents) - return -ENOMEM; - girq->parents[0] = irq; - girq->default_type = IRQ_TYPE_NONE; - girq->handler = handle_bad_irq; + if (irq) { + pl061->irq_domain = irq_domain_create_linear(dev_fwnode(dev), + data->ngpio, + &pl061_irq_domain_ops, + pl061); + if (!pl061->irq_domain) + return -ENOMEM; + } - ret = devm_gpiochip_add_data(dev, &pl061->gc, pl061); - if (ret) - return ret; + config.parent = dev; + config.regmap = pl061->regmap; + config.ngpio = data->ngpio; + config.reg_dat_base = GPIO_REGMAP_ADDR(regs->dat); + config.reg_set_base = GPIO_REGMAP_ADDR(regs->dat); + config.reg_dir_out_base = GPIO_REGMAP_ADDR(regs->dir); + config.reg_mask_xlate = data->reg_mask_xlate; + config.quirks = data->quirks; + config.irq_domain = pl061->irq_domain; + config.drvdata = pl061; + + gpio_regmap = devm_gpio_regmap_register(dev, &config); + if (IS_ERR(gpio_regmap)) { + if (pl061->irq_domain) + irq_domain_remove(pl061->irq_domain); + return PTR_ERR(gpio_regmap); + } + + if (irq) { + ret = devm_add_action_or_reset(dev, pl061_remove_irq, pl061); + if (ret) + return ret; + + irq_set_chained_handler_and_data(irq, pl061_irq_handler, pl061); + } amba_set_drvdata(adev, pl061); dev_info(dev, "PL061 GPIO chip registered\n"); @@ -393,28 +444,39 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) return 0; } +static void pl061_cache_ctrl_regs(struct pl061 *pl061, unsigned int *dir) +{ + const struct pl061_regs *regs = pl061->data->regs; + unsigned int val; + + regmap_read(pl061->regmap, regs->dir, dir); + regmap_read(pl061->regmap, regs->is, &val); + regmap_read(pl061->regmap, regs->ibe, &val); + regmap_read(pl061->regmap, regs->iev, &val); + regmap_read(pl061->regmap, regs->ie, &val); +} + static int pl061_suspend(struct device *dev) { struct pl061 *pl061 = dev_get_drvdata(dev); - unsigned int val = 0; - int offset; - - pl061->csave_regs.gpio_data = 0; - regmap_read(pl061->regmap, GPIODIR, &val); - pl061->csave_regs.gpio_dir = val; - regmap_read(pl061->regmap, GPIOIS, &val); - pl061->csave_regs.gpio_is = val; - regmap_read(pl061->regmap, GPIOIBE, &val); - pl061->csave_regs.gpio_ibe = val; - regmap_read(pl061->regmap, GPIOIEV, &val); - pl061->csave_regs.gpio_iev = val; - regmap_read(pl061->regmap, GPIOIE, &val); - pl061->csave_regs.gpio_ie = val; - - for (offset = 0; offset < PL061_GPIO_NR; offset++) { - if (pl061->csave_regs.gpio_dir & (BIT(offset))) - pl061->csave_regs.gpio_data |= - pl061_get_value(&pl061->gc, offset) << offset; + unsigned long dir_mask; + unsigned int dir = 0; + unsigned int offset; + unsigned int val; + + if (!pl061->data->pm) + return 0; + + pl061_cache_ctrl_regs(pl061, &dir); + + pl061->saved_dat = 0; + dir_mask = dir; + for_each_set_bit(offset, &dir_mask, pl061->data->ngpio) { + val = 0; + regmap_read_bypassed(pl061->regmap, + BIT(offset + PL061_DATA_OFFSET), + &val); + pl061->saved_dat |= val; } return 0; @@ -423,23 +485,28 @@ static int pl061_suspend(struct device *dev) static int pl061_resume(struct device *dev) { struct pl061 *pl061 = dev_get_drvdata(dev); - int offset; + const struct pl061_regs *regs; + unsigned long dir_mask; + unsigned int dir = 0; + unsigned int offset; - for (offset = 0; offset < PL061_GPIO_NR; offset++) { - if (pl061->csave_regs.gpio_dir & (BIT(offset))) - pl061_direction_output(&pl061->gc, offset, - pl061->csave_regs.gpio_data & - (BIT(offset))); - else - pl061_direction_input(&pl061->gc, offset); - } + if (!pl061->data->pm) + return 0; - regmap_write(pl061->regmap, GPIOIS, pl061->csave_regs.gpio_is); - regmap_write(pl061->regmap, GPIOIBE, pl061->csave_regs.gpio_ibe); - regmap_write(pl061->regmap, GPIOIEV, pl061->csave_regs.gpio_iev); - regmap_write(pl061->regmap, GPIOIE, pl061->csave_regs.gpio_ie); + regs = pl061->data->regs; - return 0; + regmap_read(pl061->regmap, regs->dir, &dir); + + regcache_mark_dirty(pl061->regmap); + regcache_sync_region(pl061->regmap, regs->dir, regs->dir); + + dir_mask = dir; + for_each_set_bit(offset, &dir_mask, pl061->data->ngpio) + regmap_write(pl061->regmap, + BIT(offset + PL061_DATA_OFFSET), + !!(pl061->saved_dat & BIT(offset)) << offset); + + return regcache_sync_region(pl061->regmap, regs->is, regs->ie); } static DEFINE_SIMPLE_DEV_PM_OPS(pl061_dev_pm_ops, pl061_suspend, pl061_resume); @@ -448,6 +515,7 @@ static const struct amba_id pl061_ids[] = { { .id = 0x00041061, .mask = 0x000fffff, + .data = (void *)&pl061_arm, }, { 0, 0 }, }; -- 2.34.1