From nobody Wed Sep 10 13:15:33 2025 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 DF9E8C64ED6 for ; Mon, 27 Feb 2023 16:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbjB0Qyn (ORCPT ); Mon, 27 Feb 2023 11:54:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbjB0Qyc (ORCPT ); Mon, 27 Feb 2023 11:54:32 -0500 Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A55AC234E9 for ; Mon, 27 Feb 2023 08:54:28 -0800 (PST) Received: by mail-qv1-xf2c.google.com with SMTP id op8so4836369qvb.11 for ; Mon, 27 Feb 2023 08:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LseiSkDjgFUeeLsW5ySWz0Cr15UMsNbK138ZZwZLJrM=; b=RvUH3d8qLsmdhfmCXadvW3dPWPSLsD+y5AMn+AlHwW6h7BhuwPBWXdAnxPN3c76Cyr 5j683VOiCY+thjyuJQWnWPsR5QDZIvthHDzys8tMjwm0FuYDXWB2e0w9im3PaiUpDThu nh5mrmVIbS4/UIZuI/7sz/Rcq/EhDlW5xcr3pQ4fjddf/QQADJdLWO5XjYUzoyVV3tXB 71XPw1FtQ38xJKbjXUVNcgOetzL3Sk5eEhf950vTWCK9UulSVxv0lf7sREXoESAkYKFg YlHcoFqAEkq7wCFtIbMvnijFJfd2i2t9b/pY6B6pIxqi+SQv2Glhq0JrOPpjoBX+r/Tm l5XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LseiSkDjgFUeeLsW5ySWz0Cr15UMsNbK138ZZwZLJrM=; b=pNTN6PvXKcxnwMBOeW4Nxv+nnNv1gZtqsiwPEDmDpBSy/ZuMM+x7/XVZMzVeqWUZT4 W7FVFWftdHwXKRf8Wg+/utv+D+3jX96Z2BieHqjTlqg81iVAQ4a6Ht/Ohb8alTb1g+aR psTqVdiJ73u+swXVqJaSK28OiNGsokwHiU9UVxamRDq/JAq6BmUCIdlCBZMsFaSJf5Hc TdmHDDlFoGpjZg7LsOnxEfqbxgE+y1kNbDhCgXf7UTCDGUCxhlaWhh2p5gR9YgCr3eIr Pu71J0uGtvYK+92QV1Q/pimAZOjqpJSz2FxtWLj5o3de+vBINb4EWx0yzuvYAx5q+X5p Z5jg== X-Gm-Message-State: AO0yUKVNQ/KjXpUElblhKR5AeV26DByq01qAx1QEQJWjYtUwd3o/ABxJ 3mUhgC13FZDohw3jZ4WkdE0uAg== X-Google-Smtp-Source: AK7set9WntM+P0ff5ceP1vCordsEV6h/do9AQHJu7VoA8CQ0bJFx9+7E3Cg5vzta6gXKwzvSRt82rw== X-Received: by 2002:a05:6214:2aa6:b0:56e:a96b:a3a1 with SMTP id js6-20020a0562142aa600b0056ea96ba3a1mr281586qvb.7.1677516867708; Mon, 27 Feb 2023 08:54:27 -0800 (PST) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id x15-20020a05620a098f00b0073b929d0371sm5238714qkx.4.2023.02.27.08.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 08:54:27 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: broonie@kernel.org, andriy.shevchenko@linux.intel.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray Subject: [PATCH v2 5/6] gpio: pci-idio-16: Migrate to the regmap API Date: Mon, 27 Feb 2023 11:45:26 -0500 Message-Id: <16c8b165d84df82dd6f1230d14fb6ecf27b5363b.1677515341.git.william.gray@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The regmap API supports IO port accessors so we can take advantage of regmap abstractions rather than handling access to the device registers directly in the driver. Migrate the pci-idio-16 module to the new idio-16 library interface leveraging the gpio-regmap API. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- Changes in v2: - Set io_port to true in idio_16_regmap_config drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-pci-idio-16.c | 296 ++++++++------------------------ 2 files changed, 70 insertions(+), 228 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 8eb1f21c019e..e57744df2160 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1571,7 +1571,7 @@ config GPIO_PCH =20 config GPIO_PCI_IDIO_16 tristate "ACCES PCI-IDIO-16 GPIO support" - select GPIOLIB_IRQCHIP + select REGMAP_MMIO select GPIO_IDIO_16 help Enables GPIO support for the ACCES PCI-IDIO-16. An interrupt is diff --git a/drivers/gpio/gpio-pci-idio-16.c b/drivers/gpio/gpio-pci-idio-1= 6.c index a86ce748384b..5b024157a10f 100644 --- a/drivers/gpio/gpio-pci-idio-16.c +++ b/drivers/gpio/gpio-pci-idio-16.c @@ -5,208 +5,82 @@ */ #include #include -#include -#include -#include -#include +#include +#include #include #include #include -#include +#include #include =20 #include "gpio-idio-16.h" =20 -/** - * struct idio_16_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @lock: synchronization lock to prevent I/O race conditions - * @reg: I/O address offset for the GPIO device registers - * @state: ACCES IDIO-16 device state - * @irq_mask: I/O bits affected by interrupts - */ -struct idio_16_gpio { - struct gpio_chip chip; - raw_spinlock_t lock; - struct idio_16 __iomem *reg; - struct idio_16_state state; - unsigned long irq_mask; +static const struct regmap_range idio_16_wr_ranges[] =3D { + regmap_reg_range(0x0, 0x2), regmap_reg_range(0x3, 0x4), }; - -static int idio_16_gpio_get_direction(struct gpio_chip *chip, - unsigned int offset) -{ - if (idio_16_get_direction(offset)) - return GPIO_LINE_DIRECTION_IN; - - return GPIO_LINE_DIRECTION_OUT; -} - -static int idio_16_gpio_direction_input(struct gpio_chip *chip, - unsigned int offset) -{ - return 0; -} - -static int idio_16_gpio_direction_output(struct gpio_chip *chip, - unsigned int offset, int value) -{ - chip->set(chip, offset, value); - return 0; -} - -static int idio_16_gpio_get(struct gpio_chip *chip, unsigned int offset) -{ - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - - return idio_16_get(idio16gpio->reg, &idio16gpio->state, offset); -} - -static int idio_16_gpio_get_multiple(struct gpio_chip *chip, - unsigned long *mask, unsigned long *bits) -{ - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - - idio_16_get_multiple(idio16gpio->reg, &idio16gpio->state, mask, bits); - return 0; -} - -static void idio_16_gpio_set(struct gpio_chip *chip, unsigned int offset, - int value) -{ - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - - idio_16_set(idio16gpio->reg, &idio16gpio->state, offset, value); -} - -static void idio_16_gpio_set_multiple(struct gpio_chip *chip, - unsigned long *mask, unsigned long *bits) -{ - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - - idio_16_set_multiple(idio16gpio->reg, &idio16gpio->state, mask, bits); -} - -static void idio_16_irq_ack(struct irq_data *data) -{ -} - -static void idio_16_irq_mask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - const unsigned long mask =3D BIT(irqd_to_hwirq(data)); - unsigned long flags; - - idio16gpio->irq_mask &=3D ~mask; - - if (!idio16gpio->irq_mask) { - raw_spin_lock_irqsave(&idio16gpio->lock, flags); - - iowrite8(0, &idio16gpio->reg->irq_ctl); - - raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); - } -} - -static void idio_16_irq_unmask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(chip); - const unsigned long mask =3D BIT(irqd_to_hwirq(data)); - const unsigned long prev_irq_mask =3D idio16gpio->irq_mask; - unsigned long flags; - - idio16gpio->irq_mask |=3D mask; - - if (!prev_irq_mask) { - raw_spin_lock_irqsave(&idio16gpio->lock, flags); - - ioread8(&idio16gpio->reg->irq_ctl); - - raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); - } -} - -static int idio_16_irq_set_type(struct irq_data *data, unsigned int flow_t= ype) -{ - /* The only valid irq types are none and both-edges */ - if (flow_type !=3D IRQ_TYPE_NONE && - (flow_type & IRQ_TYPE_EDGE_BOTH) !=3D IRQ_TYPE_EDGE_BOTH) - return -EINVAL; - - return 0; -} - -static struct irq_chip idio_16_irqchip =3D { - .name =3D "pci-idio-16", - .irq_ack =3D idio_16_irq_ack, - .irq_mask =3D idio_16_irq_mask, - .irq_unmask =3D idio_16_irq_unmask, - .irq_set_type =3D idio_16_irq_set_type +static const struct regmap_range idio_16_rd_ranges[] =3D { + regmap_reg_range(0x1, 0x2), regmap_reg_range(0x5, 0x6), }; - -static irqreturn_t idio_16_irq_handler(int irq, void *dev_id) -{ - struct idio_16_gpio *const idio16gpio =3D dev_id; - unsigned int irq_status; - struct gpio_chip *const chip =3D &idio16gpio->chip; - int gpio; - - raw_spin_lock(&idio16gpio->lock); - - irq_status =3D ioread8(&idio16gpio->reg->irq_status); - - raw_spin_unlock(&idio16gpio->lock); - - /* Make sure our device generated IRQ */ - if (!(irq_status & 0x3) || !(irq_status & 0x4)) - return IRQ_NONE; - - for_each_set_bit(gpio, &idio16gpio->irq_mask, chip->ngpio) - generic_handle_domain_irq(chip->irq.domain, gpio); - - raw_spin_lock(&idio16gpio->lock); - - /* Clear interrupt */ - iowrite8(0, &idio16gpio->reg->in0_7); - - raw_spin_unlock(&idio16gpio->lock); - - return IRQ_HANDLED; -} - -#define IDIO_16_NGPIO 32 -static const char *idio_16_names[IDIO_16_NGPIO] =3D { - "OUT0", "OUT1", "OUT2", "OUT3", "OUT4", "OUT5", "OUT6", "OUT7", - "OUT8", "OUT9", "OUT10", "OUT11", "OUT12", "OUT13", "OUT14", "OUT15", - "IIN0", "IIN1", "IIN2", "IIN3", "IIN4", "IIN5", "IIN6", "IIN7", - "IIN8", "IIN9", "IIN10", "IIN11", "IIN12", "IIN13", "IIN14", "IIN15" +static const struct regmap_range idio_16_volatile_ranges[] =3D { + regmap_reg_range(0x1, 0x2), regmap_reg_range(0x5, 0x6), +}; +static const struct regmap_range idio_16_precious_ranges[] =3D { + regmap_reg_range(0x2, 0x2), +}; +static const struct regmap_access_table idio_16_wr_table =3D { + .yes_ranges =3D idio_16_wr_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idio_16_wr_ranges), +}; +static const struct regmap_access_table idio_16_rd_table =3D { + .yes_ranges =3D idio_16_rd_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idio_16_rd_ranges), +}; +static const struct regmap_access_table idio_16_volatile_table =3D { + .yes_ranges =3D idio_16_volatile_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idio_16_volatile_ranges), +}; +static const struct regmap_access_table idio_16_precious_table =3D { + .yes_ranges =3D idio_16_precious_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idio_16_precious_ranges), +}; +static const struct regmap_config idio_16_regmap_config =3D { + .reg_bits =3D 8, + .reg_stride =3D 1, + .val_bits =3D 8, + .io_port =3D true, + .max_register =3D 0x6, + .wr_table =3D &idio_16_wr_table, + .rd_table =3D &idio_16_rd_table, + .volatile_table =3D &idio_16_volatile_table, + .precious_table =3D &idio_16_precious_table, + .cache_type =3D REGCACHE_FLAT, }; =20 -static int idio_16_irq_init_hw(struct gpio_chip *gc) -{ - struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(gc); - - /* Disable IRQ by default and clear any pending interrupt */ - iowrite8(0, &idio16gpio->reg->irq_ctl); - iowrite8(0, &idio16gpio->reg->in0_7); +/* Only input lines (GPIO 16-31) support interrupts */ +#define IDIO_16_REGMAP_IRQ(_id) \ + [16 + _id] =3D { \ + .mask =3D BIT(2), \ + .type =3D { .types_supported =3D IRQ_TYPE_EDGE_BOTH }, \ + } =20 - return 0; -} +static const struct regmap_irq idio_16_regmap_irqs[] =3D { + IDIO_16_REGMAP_IRQ(0), IDIO_16_REGMAP_IRQ(1), IDIO_16_REGMAP_IRQ(2), /* 0= -2 */ + IDIO_16_REGMAP_IRQ(3), IDIO_16_REGMAP_IRQ(4), IDIO_16_REGMAP_IRQ(5), /* 3= -5 */ + IDIO_16_REGMAP_IRQ(6), IDIO_16_REGMAP_IRQ(7), IDIO_16_REGMAP_IRQ(8), /* 6= -8 */ + IDIO_16_REGMAP_IRQ(9), IDIO_16_REGMAP_IRQ(10), IDIO_16_REGMAP_IRQ(11), /*= 9-11 */ + IDIO_16_REGMAP_IRQ(12), IDIO_16_REGMAP_IRQ(13), IDIO_16_REGMAP_IRQ(14), /= * 12-14 */ + IDIO_16_REGMAP_IRQ(15), /* 15 */ +}; =20 static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id = *id) { struct device *const dev =3D &pdev->dev; - struct idio_16_gpio *idio16gpio; int err; const size_t pci_bar_index =3D 2; const char *const name =3D pci_name(pdev); - struct gpio_irq_chip *girq; - - idio16gpio =3D devm_kzalloc(dev, sizeof(*idio16gpio), GFP_KERNEL); - if (!idio16gpio) - return -ENOMEM; + struct idio_16_regmap_config config =3D {}; + void __iomem *regs; + struct regmap *map; =20 err =3D pcim_enable_device(pdev); if (err) { @@ -220,53 +94,21 @@ static int idio_16_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) return err; } =20 - idio16gpio->reg =3D pcim_iomap_table(pdev)[pci_bar_index]; + regs =3D pcim_iomap_table(pdev)[pci_bar_index]; =20 - /* Deactivate input filters */ - iowrite8(0, &idio16gpio->reg->filter_ctl); + map =3D devm_regmap_init_mmio(dev, regs, &idio_16_regmap_config); + if (IS_ERR(map)) + return dev_err_probe(dev, PTR_ERR(map), + "Unable to initialize register map\n"); =20 - idio16gpio->chip.label =3D name; - idio16gpio->chip.parent =3D dev; - idio16gpio->chip.owner =3D THIS_MODULE; - idio16gpio->chip.base =3D -1; - idio16gpio->chip.ngpio =3D IDIO_16_NGPIO; - idio16gpio->chip.names =3D idio_16_names; - idio16gpio->chip.get_direction =3D idio_16_gpio_get_direction; - idio16gpio->chip.direction_input =3D idio_16_gpio_direction_input; - idio16gpio->chip.direction_output =3D idio_16_gpio_direction_output; - idio16gpio->chip.get =3D idio_16_gpio_get; - idio16gpio->chip.get_multiple =3D idio_16_gpio_get_multiple; - idio16gpio->chip.set =3D idio_16_gpio_set; - idio16gpio->chip.set_multiple =3D idio_16_gpio_set_multiple; - - idio_16_state_init(&idio16gpio->state); - - girq =3D &idio16gpio->chip.irq; - girq->chip =3D &idio_16_irqchip; - /* This will let us handle the parent IRQ in the driver */ - girq->parent_handler =3D NULL; - girq->num_parents =3D 0; - girq->parents =3D NULL; - girq->default_type =3D IRQ_TYPE_NONE; - girq->handler =3D handle_edge_irq; - girq->init_hw =3D idio_16_irq_init_hw; - - raw_spin_lock_init(&idio16gpio->lock); - - err =3D devm_gpiochip_add_data(dev, &idio16gpio->chip, idio16gpio); - if (err) { - dev_err(dev, "GPIO registering failed (%d)\n", err); - return err; - } - - err =3D devm_request_irq(dev, pdev->irq, idio_16_irq_handler, IRQF_SHARED, - name, idio16gpio); - if (err) { - dev_err(dev, "IRQ handler registering failed (%d)\n", err); - return err; - } + config.parent =3D dev; + config.map =3D map; + config.regmap_irqs =3D idio_16_regmap_irqs; + config.num_regmap_irqs =3D ARRAY_SIZE(idio_16_regmap_irqs); + config.irq =3D pdev->irq; + config.filters =3D true; =20 - return 0; + return devm_idio_16_regmap_register(dev, &config); } =20 static const struct pci_device_id idio_16_pci_dev_id[] =3D { --=20 2.39.2