From nobody Sat Apr 18 02:47:20 2026 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 D2F1BC433EF for ; Tue, 19 Jul 2022 15:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238614AbiGSPOi (ORCPT ); Tue, 19 Jul 2022 11:14:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238375AbiGSPOg (ORCPT ); Tue, 19 Jul 2022 11:14:36 -0400 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51B0A545D7 for ; Tue, 19 Jul 2022 08:14:35 -0700 (PDT) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-10bd4812c29so32199827fac.11 for ; Tue, 19 Jul 2022 08:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rJqWp+udTO0Z1cqQdPtymTtYII3QhZ3OpR+pl1jwWrE=; b=trQnNsFi5MMP/2ZUVE+WQv9ZDNEziTTNQ4NXmOisoEIALB3QuEo9709yC/mL+Bgwd6 +ouzArgrDE4/un3Ia7SYJz72n7qjcoy4LMo3QmuRZoJbdKQI1Ethrq/BWArnSlXcaaed RTqv+48j1p0kKO6YFvNRcdIGlyT/VBFPYs/pgEvVOkyLIafBdvwQFKp/p+1o+k1KvDD6 1NGEx6MxNxPF2xz/zbYRwoKwJnUjEAB0ULp73/OUFkw8q3MvKFBFtbxmxKH/JcVOG6xx L8ZlOu9XsrgdKaWPyHTQbvsEDS3xJpXIYZVaUTG/vhsFvmdLp3Ohv28qCmP7HcyepbCP 16Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rJqWp+udTO0Z1cqQdPtymTtYII3QhZ3OpR+pl1jwWrE=; b=ENGVDJu3jCX0tbht/SUZMVFKqL05CxdvIeG50698rXh/AUC0miXFNJW0S5bRlMF4xT YeBhEa8pG5nZalw7wfov07LoR1uM00bYKh/ky3dLkZHmn2m25unrFn+eO0+30w1/WkGf Pwv8tQDhgfpqO69xlsKkrkPcfrJX6PId492KO6ulLTsfXVGGNcYm1pBMosz5cCMioKyV mdTZVE3y8a93T664+ro/MSFFTVdOx4d39a/1mnpYUqyOsjUliPs17w7AIoH47UQQ8AJL juk/9S96SGPkgDHiQhydSZrRSOpdLhzc+kfrR36DU96D/f9lMvad5aksBNiftbcioSFb hSQg== X-Gm-Message-State: AJIora/7mY3ml2ls96n21GPjtQnQ/a0/e1c+xBjRiBDlC4JM0ORiqOIN wW3Qbfl2LOubgQFVtsexoNCc0Q== X-Google-Smtp-Source: AGRyM1smVDYloTBU9+bMDJbjj8L4wbqiVQW/Ylzxh6wc+zsCoDyplum0akn1CPfUmRN8KKJLJ+AWDQ== X-Received: by 2002:a05:6870:600b:b0:10b:94bc:61ad with SMTP id t11-20020a056870600b00b0010b94bc61admr20851656oaa.208.1658243674625; Tue, 19 Jul 2022 08:14:34 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:34 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , Paul Demetrotion Subject: [PATCH v4 1/6] gpio: ws16c48: Implement and utilize register structures Date: Tue, 19 Jul 2022 09:47:03 -0400 Message-Id: <68dbab857f380712e6d5bda2c57a5f11bb13e95f.1658236877.git.william.gray@linaro.org> X-Mailer: git-send-email 2.36.1 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" Reduce magic numbers and improve code readability by implementing and utilizing named register data structures. Reviewed-by: Linus Walleij Cc: Paul Demetrotion Signed-off-by: William Breathitt Gray --- Changes in v4: - Remove superfluous include drivers/gpio/gpio-ws16c48.c | 120 +++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 36 deletions(-) diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 5078631d8014..b098f2dc196b 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -4,7 +4,6 @@ * Copyright (C) 2016 William Breathitt Gray */ #include -#include #include #include #include @@ -17,8 +16,9 @@ #include #include #include +#include =20 -#define WS16C48_EXTENT 16 +#define WS16C48_EXTENT 10 #define MAX_NUM_WS16C48 max_num_isa_dev(WS16C48_EXTENT) =20 static unsigned int base[MAX_NUM_WS16C48]; @@ -30,6 +30,20 @@ static unsigned int irq[MAX_NUM_WS16C48]; module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line numbers"); =20 +/** + * struct ws16c48_reg - device register structure + * @port: Port 0 through 5 I/O + * @int_pending: Interrupt Pending + * @page_lock: Register page (Bits 7-6) and I/O port lock (Bits 5-0) + * @pol_enab_int_id: Interrupt polarity, enable, and ID + */ +struct ws16c48_reg { + u8 port[6]; + u8 int_pending; + u8 page_lock; + u8 pol_enab_int_id[3]; +}; + /** * struct ws16c48_gpio - GPIO device private data structure * @chip: instance of the gpio_chip @@ -38,7 +52,7 @@ MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line = numbers"); * @lock: synchronization lock to prevent I/O race conditions * @irq_mask: I/O bits affected by interrupts * @flow_mask: IRQ flow type mask for the respective I/O bits - * @base: base port address of the GPIO device + * @reg: I/O address offset for the device registers */ struct ws16c48_gpio { struct gpio_chip chip; @@ -47,7 +61,7 @@ struct ws16c48_gpio { raw_spinlock_t lock; unsigned long irq_mask; unsigned long flow_mask; - void __iomem *base; + struct ws16c48_reg __iomem *reg; }; =20 static int ws16c48_gpio_get_direction(struct gpio_chip *chip, unsigned off= set) @@ -73,7 +87,7 @@ static int ws16c48_gpio_direction_input(struct gpio_chip = *chip, unsigned offset) =20 ws16c48gpio->io_state[port] |=3D mask; ws16c48gpio->out_state[port] &=3D ~mask; - iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->base + port); + iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->reg->port + port); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); =20 @@ -95,7 +109,7 @@ static int ws16c48_gpio_direction_output(struct gpio_chi= p *chip, ws16c48gpio->out_state[port] |=3D mask; else ws16c48gpio->out_state[port] &=3D ~mask; - iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->base + port); + iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->reg->port + port); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); =20 @@ -118,7 +132,7 @@ static int ws16c48_gpio_get(struct gpio_chip *chip, uns= igned offset) return -EINVAL; } =20 - port_state =3D ioread8(ws16c48gpio->base + port); + port_state =3D ioread8(ws16c48gpio->reg->port + port); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); =20 @@ -131,14 +145,16 @@ static int ws16c48_gpio_get_multiple(struct gpio_chip= *chip, struct ws16c48_gpio *const ws16c48gpio =3D gpiochip_get_data(chip); unsigned long offset; unsigned long gpio_mask; - void __iomem *port_addr; + size_t index; + u8 __iomem *port_addr; unsigned long port_state; =20 /* clear bits array to a clean slate */ bitmap_zero(bits, chip->ngpio); =20 for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) { - port_addr =3D ws16c48gpio->base + offset / 8; + index =3D offset / 8; + port_addr =3D ws16c48gpio->reg->port + index; port_state =3D ioread8(port_addr) & gpio_mask; =20 bitmap_set_value8(bits, port_state, offset); @@ -166,7 +182,7 @@ static void ws16c48_gpio_set(struct gpio_chip *chip, un= signed offset, int value) ws16c48gpio->out_state[port] |=3D mask; else ws16c48gpio->out_state[port] &=3D ~mask; - iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->base + port); + iowrite8(ws16c48gpio->out_state[port], ws16c48gpio->reg->port + port); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); } @@ -178,13 +194,13 @@ static void ws16c48_gpio_set_multiple(struct gpio_chi= p *chip, unsigned long offset; unsigned long gpio_mask; size_t index; - void __iomem *port_addr; + u8 __iomem *port_addr; unsigned long bitmask; unsigned long flags; =20 for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) { index =3D offset / 8; - port_addr =3D ws16c48gpio->base + index; + port_addr =3D ws16c48gpio->reg->port + index; =20 /* mask out GPIO configured for input */ gpio_mask &=3D ~ws16c48gpio->io_state[index]; @@ -219,10 +235,15 @@ static void ws16c48_irq_ack(struct irq_data *data) =20 port_state =3D ws16c48gpio->irq_mask >> (8*port); =20 - iowrite8(0x80, ws16c48gpio->base + 7); - iowrite8(port_state & ~mask, ws16c48gpio->base + 8 + port); - iowrite8(port_state | mask, ws16c48gpio->base + 8 + port); - iowrite8(0xC0, ws16c48gpio->base + 7); + /* Select Register Page 2; Unlock all I/O ports */ + iowrite8(0x80, &ws16c48gpio->reg->page_lock); + + /* Clear pending interrupt */ + iowrite8(port_state & ~mask, ws16c48gpio->reg->pol_enab_int_id + port); + iowrite8(port_state | mask, ws16c48gpio->reg->pol_enab_int_id + port); + + /* Select Register Page 3; Unlock all I/O ports */ + iowrite8(0xC0, &ws16c48gpio->reg->page_lock); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); } @@ -235,6 +256,7 @@ static void ws16c48_irq_mask(struct irq_data *data) const unsigned long mask =3D BIT(offset); const unsigned port =3D offset / 8; unsigned long flags; + unsigned long port_state; =20 /* only the first 3 ports support interrupts */ if (port > 2) @@ -243,10 +265,16 @@ static void ws16c48_irq_mask(struct irq_data *data) raw_spin_lock_irqsave(&ws16c48gpio->lock, flags); =20 ws16c48gpio->irq_mask &=3D ~mask; + port_state =3D ws16c48gpio->irq_mask >> (8 * port); + + /* Select Register Page 2; Unlock all I/O ports */ + iowrite8(0x80, &ws16c48gpio->reg->page_lock); =20 - iowrite8(0x80, ws16c48gpio->base + 7); - iowrite8(ws16c48gpio->irq_mask >> (8*port), ws16c48gpio->base + 8 + port); - iowrite8(0xC0, ws16c48gpio->base + 7); + /* Disable interrupt */ + iowrite8(port_state, ws16c48gpio->reg->pol_enab_int_id + port); + + /* Select Register Page 3; Unlock all I/O ports */ + iowrite8(0xC0, &ws16c48gpio->reg->page_lock); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); } @@ -259,6 +287,7 @@ static void ws16c48_irq_unmask(struct irq_data *data) const unsigned long mask =3D BIT(offset); const unsigned port =3D offset / 8; unsigned long flags; + unsigned long port_state; =20 /* only the first 3 ports support interrupts */ if (port > 2) @@ -267,10 +296,16 @@ static void ws16c48_irq_unmask(struct irq_data *data) raw_spin_lock_irqsave(&ws16c48gpio->lock, flags); =20 ws16c48gpio->irq_mask |=3D mask; + port_state =3D ws16c48gpio->irq_mask >> (8 * port); + + /* Select Register Page 2; Unlock all I/O ports */ + iowrite8(0x80, &ws16c48gpio->reg->page_lock); =20 - iowrite8(0x80, ws16c48gpio->base + 7); - iowrite8(ws16c48gpio->irq_mask >> (8*port), ws16c48gpio->base + 8 + port); - iowrite8(0xC0, ws16c48gpio->base + 7); + /* Enable interrupt */ + iowrite8(port_state, ws16c48gpio->reg->pol_enab_int_id + port); + + /* Select Register Page 3; Unlock all I/O ports */ + iowrite8(0xC0, &ws16c48gpio->reg->page_lock); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); } @@ -283,6 +318,7 @@ static int ws16c48_irq_set_type(struct irq_data *data, = unsigned flow_type) const unsigned long mask =3D BIT(offset); const unsigned port =3D offset / 8; unsigned long flags; + unsigned long port_state; =20 /* only the first 3 ports support interrupts */ if (port > 2) @@ -304,9 +340,16 @@ static int ws16c48_irq_set_type(struct irq_data *data,= unsigned flow_type) return -EINVAL; } =20 - iowrite8(0x40, ws16c48gpio->base + 7); - iowrite8(ws16c48gpio->flow_mask >> (8*port), ws16c48gpio->base + 8 + port= ); - iowrite8(0xC0, ws16c48gpio->base + 7); + port_state =3D ws16c48gpio->flow_mask >> (8 * port); + + /* Select Register Page 1; Unlock all I/O ports */ + iowrite8(0x40, &ws16c48gpio->reg->page_lock); + + /* Set interrupt polarity */ + iowrite8(port_state, ws16c48gpio->reg->pol_enab_int_id + port); + + /* Select Register Page 3; Unlock all I/O ports */ + iowrite8(0xC0, &ws16c48gpio->reg->page_lock); =20 raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); =20 @@ -325,25 +368,26 @@ static irqreturn_t ws16c48_irq_handler(int irq, void = *dev_id) { struct ws16c48_gpio *const ws16c48gpio =3D dev_id; struct gpio_chip *const chip =3D &ws16c48gpio->chip; + struct ws16c48_reg __iomem *const reg =3D ws16c48gpio->reg; unsigned long int_pending; unsigned long port; unsigned long int_id; unsigned long gpio; =20 - int_pending =3D ioread8(ws16c48gpio->base + 6) & 0x7; + int_pending =3D ioread8(®->int_pending) & 0x7; if (!int_pending) return IRQ_NONE; =20 /* loop until all pending interrupts are handled */ do { for_each_set_bit(port, &int_pending, 3) { - int_id =3D ioread8(ws16c48gpio->base + 8 + port); + int_id =3D ioread8(reg->pol_enab_int_id + port); for_each_set_bit(gpio, &int_id, 8) generic_handle_domain_irq(chip->irq.domain, gpio + 8*port); } =20 - int_pending =3D ioread8(ws16c48gpio->base + 6) & 0x7; + int_pending =3D ioread8(®->int_pending) & 0x7; } while (int_pending); =20 return IRQ_HANDLED; @@ -369,12 +413,16 @@ static int ws16c48_irq_init_hw(struct gpio_chip *gc) { struct ws16c48_gpio *const ws16c48gpio =3D gpiochip_get_data(gc); =20 - /* Disable IRQ by default */ - iowrite8(0x80, ws16c48gpio->base + 7); - iowrite8(0, ws16c48gpio->base + 8); - iowrite8(0, ws16c48gpio->base + 9); - iowrite8(0, ws16c48gpio->base + 10); - iowrite8(0xC0, ws16c48gpio->base + 7); + /* Select Register Page 2; Unlock all I/O ports */ + iowrite8(0x80, &ws16c48gpio->reg->page_lock); + + /* Disable interrupts for all lines */ + iowrite8(0, &ws16c48gpio->reg->pol_enab_int_id[0]); + iowrite8(0, &ws16c48gpio->reg->pol_enab_int_id[1]); + iowrite8(0, &ws16c48gpio->reg->pol_enab_int_id[2]); + + /* Select Register Page 3; Unlock all I/O ports */ + iowrite8(0xC0, &ws16c48gpio->reg->page_lock); =20 return 0; } @@ -396,8 +444,8 @@ static int ws16c48_probe(struct device *dev, unsigned i= nt id) return -EBUSY; } =20 - ws16c48gpio->base =3D devm_ioport_map(dev, base[id], WS16C48_EXTENT); - if (!ws16c48gpio->base) + ws16c48gpio->reg =3D devm_ioport_map(dev, base[id], WS16C48_EXTENT); + if (!ws16c48gpio->reg) return -ENOMEM; =20 ws16c48gpio->chip.label =3D name; --=20 2.36.1 From nobody Sat Apr 18 02:47:20 2026 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 346D2C43334 for ; Tue, 19 Jul 2022 15:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238712AbiGSPOn (ORCPT ); Tue, 19 Jul 2022 11:14:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238576AbiGSPOh (ORCPT ); Tue, 19 Jul 2022 11:14:37 -0400 Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 626C2545D4 for ; Tue, 19 Jul 2022 08:14:36 -0700 (PDT) Received: by mail-oi1-x235.google.com with SMTP id p132so7122863oif.9 for ; Tue, 19 Jul 2022 08:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vlq7M6D1RgY2JkdmVKHZ7KjiNHRg1IRrY27s7K5hCY8=; b=CffoA8s3mtwv3QVe1eA44irMAvAyxVbNVLv6KEZ2Nswtj2AFsBxi7J/4kuj0t0/8Bt fI+hhFrNDc0A56e+b5zU75C++aWQLe7z3YNOksLI5r8VcZKF7Cc8v4qlCLUAUEziXDf5 5jSY7i91Ai3ZxMZtrSNpzgSPDYRq8MAj1CrGbCQJivBt+e/UrJxOx0wUzh3eY3aclLo3 9sNgtJtzKEq91qOm3HpOiYA9H3ixIs64y/WSn4hvPcrUEi4dGOwuNiVzey2LZAt+5ySH H7vAdqc+qGHX81XJWoZj+CxrHENAWyNjQEQLeBCsxqTtdCYowWgTvlYo9GBku31UfgZU tt3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vlq7M6D1RgY2JkdmVKHZ7KjiNHRg1IRrY27s7K5hCY8=; b=FQdtwtrbw9eWnQe0Bi4EAIs6R5GLlif/nLGlsJEDMpn+W8TWYG12K7BVOQH044CDFO 3/6uduCRjV1+XIh5UFWvidodzDApH+Z0QUGKZ/cwL5WSlBYn3riT39TkyPKBLRwfacI+ Gpa6lZlSoWZS0gbI/HWhWMNhjFH05Q3s4eFCOoGg9lRBKe8SQEThs6ZuJk++b819mpNo bteeFWeRMgcjDrngHP7nptVOeLUHivUd0q5owBxv2l9snnrTrlQ6Gq9k+cYBwr2wLZoO emMJlszJ53Nra8TBicdtZRQS+EgaDCeRd/u9SecTxBpjodQFam1FES5EjBuwNlc2Q7Bp EqOQ== X-Gm-Message-State: AJIora/2VA4DXkZC2/1hsJ8yGMl/wEdqbT9Rnl1/4j8adP/FmFH7IGTt 18Dfo6xXikI1WOSfFsmjGi04Ow== X-Google-Smtp-Source: AGRyM1uxxsiLHnk1zsDxEfiDhtwW0AjiV0sEgdV4ZAgk83uc7jd1Q2AxjRxI1gHkNGImo34nAgXBHA== X-Received: by 2002:a05:6808:1c0d:b0:32e:493b:1e2 with SMTP id ch13-20020a0568081c0d00b0032e493b01e2mr19404650oib.101.1658243675704; Tue, 19 Jul 2022 08:14:35 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:35 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , Fred Eckert , John Hentges , Jay Dolan Subject: [PATCH v4 2/6] gpio: 104-idio-16: Implement and utilize register structures Date: Tue, 19 Jul 2022 09:47:04 -0400 Message-Id: <6fb23e16f5cd9c0222e12c245a2b93d5b14d4b4b.1658236877.git.william.gray@linaro.org> X-Mailer: git-send-email 2.36.1 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" Reduce magic numbers and improve code readability by implementing and utilizing named register data structures. Tested-by: Fred Eckert Reviewed-by: Linus Walleij Cc: John Hentges Cc: Jay Dolan Signed-off-by: William Breathitt Gray --- Changes in v4: - Replace superfluous include with drivers/gpio/gpio-104-idio-16.c | 60 +++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-1= 6.c index 45f7ad8573e1..65a5f581d981 100644 --- a/drivers/gpio/gpio-104-idio-16.c +++ b/drivers/gpio/gpio-104-idio-16.c @@ -6,7 +6,7 @@ * This driver supports the following ACCES devices: 104-IDIO-16, * 104-IDIO-16E, 104-IDO-16, 104-IDIO-8, 104-IDIO-8E, and 104-IDO-8. */ -#include +#include #include #include #include @@ -19,6 +19,7 @@ #include #include #include +#include =20 #define IDIO_16_EXTENT 8 #define MAX_NUM_IDIO_16 max_num_isa_dev(IDIO_16_EXTENT) @@ -32,19 +33,42 @@ static unsigned int irq[MAX_NUM_IDIO_16]; module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDIO-16 interrupt line numbers"); =20 +/** + * struct idio_16_reg - device registers structure + * @out0_7: Read: N/A + * Write: FET Drive Outputs 0-7 + * @in0_7: Read: Isolated Inputs 0-7 + * Write: Clear Interrupt + * @irq_ctl: Read: Enable IRQ + * Write: Disable IRQ + * @unused: N/A + * @out8_15: Read: N/A + * Write: FET Drive Outputs 8-15 + * @in8_15: Read: Isolated Inputs 8-15 + * Write: N/A + */ +struct idio_16_reg { + u8 out0_7; + u8 in0_7; + u8 irq_ctl; + u8 unused; + u8 out8_15; + u8 in8_15; +}; + /** * struct idio_16_gpio - GPIO device private data structure * @chip: instance of the gpio_chip * @lock: synchronization lock to prevent I/O race conditions * @irq_mask: I/O bits affected by interrupts - * @base: base port address of the GPIO device + * @reg: I/O address offset for the device registers * @out_state: output bits state */ struct idio_16_gpio { struct gpio_chip chip; raw_spinlock_t lock; unsigned long irq_mask; - void __iomem *base; + struct idio_16_reg __iomem *reg; unsigned int out_state; }; =20 @@ -79,9 +103,9 @@ static int idio_16_gpio_get(struct gpio_chip *chip, unsi= gned int offset) return -EINVAL; =20 if (offset < 24) - return !!(ioread8(idio16gpio->base + 1) & mask); + return !!(ioread8(&idio16gpio->reg->in0_7) & mask); =20 - return !!(ioread8(idio16gpio->base + 5) & (mask>>8)); + return !!(ioread8(&idio16gpio->reg->in8_15) & (mask>>8)); } =20 static int idio_16_gpio_get_multiple(struct gpio_chip *chip, @@ -91,9 +115,9 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *c= hip, =20 *bits =3D 0; if (*mask & GENMASK(23, 16)) - *bits |=3D (unsigned long)ioread8(idio16gpio->base + 1) << 16; + *bits |=3D (unsigned long)ioread8(&idio16gpio->reg->in0_7) << 16; if (*mask & GENMASK(31, 24)) - *bits |=3D (unsigned long)ioread8(idio16gpio->base + 5) << 24; + *bits |=3D (unsigned long)ioread8(&idio16gpio->reg->in8_15) << 24; =20 return 0; } @@ -116,9 +140,9 @@ static void idio_16_gpio_set(struct gpio_chip *chip, un= signed int offset, idio16gpio->out_state &=3D ~mask; =20 if (offset > 7) - iowrite8(idio16gpio->out_state >> 8, idio16gpio->base + 4); + iowrite8(idio16gpio->out_state >> 8, &idio16gpio->reg->out8_15); else - iowrite8(idio16gpio->out_state, idio16gpio->base); + iowrite8(idio16gpio->out_state, &idio16gpio->reg->out0_7); =20 raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); } @@ -135,9 +159,9 @@ static void idio_16_gpio_set_multiple(struct gpio_chip = *chip, idio16gpio->out_state |=3D *mask & *bits; =20 if (*mask & 0xFF) - iowrite8(idio16gpio->out_state, idio16gpio->base); + iowrite8(idio16gpio->out_state, &idio16gpio->reg->out0_7); if ((*mask >> 8) & 0xFF) - iowrite8(idio16gpio->out_state >> 8, idio16gpio->base + 4); + iowrite8(idio16gpio->out_state >> 8, &idio16gpio->reg->out8_15); =20 raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); } @@ -158,7 +182,7 @@ static void idio_16_irq_mask(struct irq_data *data) if (!idio16gpio->irq_mask) { raw_spin_lock_irqsave(&idio16gpio->lock, flags); =20 - iowrite8(0, idio16gpio->base + 2); + iowrite8(0, &idio16gpio->reg->irq_ctl); =20 raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); } @@ -177,7 +201,7 @@ static void idio_16_irq_unmask(struct irq_data *data) if (!prev_irq_mask) { raw_spin_lock_irqsave(&idio16gpio->lock, flags); =20 - ioread8(idio16gpio->base + 2); + ioread8(&idio16gpio->reg->irq_ctl); =20 raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); } @@ -212,7 +236,7 @@ static irqreturn_t idio_16_irq_handler(int irq, void *d= ev_id) =20 raw_spin_lock(&idio16gpio->lock); =20 - iowrite8(0, idio16gpio->base + 1); + iowrite8(0, &idio16gpio->reg->in0_7); =20 raw_spin_unlock(&idio16gpio->lock); =20 @@ -232,8 +256,8 @@ static int idio_16_irq_init_hw(struct gpio_chip *gc) struct idio_16_gpio *const idio16gpio =3D gpiochip_get_data(gc); =20 /* Disable IRQ by default */ - iowrite8(0, idio16gpio->base + 2); - iowrite8(0, idio16gpio->base + 1); + iowrite8(0, &idio16gpio->reg->irq_ctl); + iowrite8(0, &idio16gpio->reg->in0_7); =20 return 0; } @@ -255,8 +279,8 @@ static int idio_16_probe(struct device *dev, unsigned i= nt id) return -EBUSY; } =20 - idio16gpio->base =3D devm_ioport_map(dev, base[id], IDIO_16_EXTENT); - if (!idio16gpio->base) + idio16gpio->reg =3D devm_ioport_map(dev, base[id], IDIO_16_EXTENT); + if (!idio16gpio->reg) return -ENOMEM; =20 idio16gpio->chip.label =3D name; --=20 2.36.1 From nobody Sat Apr 18 02:47:20 2026 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 53269C433EF for ; Tue, 19 Jul 2022 15:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237070AbiGSPOw (ORCPT ); Tue, 19 Jul 2022 11:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238699AbiGSPOk (ORCPT ); Tue, 19 Jul 2022 11:14:40 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B31BA545F0 for ; Tue, 19 Jul 2022 08:14:38 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id g20-20020a9d6a14000000b0061c84e679f5so9227343otn.2 for ; Tue, 19 Jul 2022 08:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lwrLoj/gsX8PV38VFaS+KpyLxwepep4eBGx1ozQcAj4=; b=Vl6qIyGbI+DdJS86cocejPMn5Da+eScp2l//VdMZdqJBXVmGT6alwLTZ+ZjuJhT6vw Kvl00zbJBokfAoDtLoaetNWLUT3aPEJwEGzR5+17v5RaJzDIN5ZaF2WaCNo7Qw25SGsr JGxiRIdHFAsgicUCt6UZfGsinij0eGi37GhY8mYzmuzZ4KQ/EeZ4Skf7CZPiGdSIJcNn IecuKW2UQc1fwj3JdNcTpmJ9LgaDaHxeU98JzB0tEwBgpcfKPhXgJVRR0tQRLwIbABjr ugeX9G6VsFOjFFXqT0EjJTtR+Oeofuwr0Bzojb0armPD8A1Naf85RLyv8gKUlHyXLFxZ AFSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lwrLoj/gsX8PV38VFaS+KpyLxwepep4eBGx1ozQcAj4=; b=weI/2EgDBnBiGE993a0mfY1ELUY2tSa8wRdVq231vNY33Ky8ephMTGom4aDPF7AvTf ooIaa5f9B2n20EWWUqZThmR635SIavbl1xxMxq5ZIZW3YQiC00Yyql3KegPAM+OaQdf5 Olc+ktjztQQ9eMdRVYA2GxH22/FK1uMn1jierHsenOUDp2s7hV9iDqsjimtT8o5SEBJM HKw6ct/63/+24FPktVltTZUQicSlqxc4k/A1TusW2CXs+up+zq8y/6eQ1ARPl3IVMuYO MBMoc8JtANendFpBupE4pEhrVJ33xe1hiI0UKuh6re0iv11aYykNEqwhlmOS/8XDmeKi DE9g== X-Gm-Message-State: AJIora9wBpjm9vi3td0aZv5HhETOoBrt8F3XEWpd5/V4r0dPssyDpyeL PLSiDCtObvPdiiqoHVXVBWidwg== X-Google-Smtp-Source: AGRyM1t+1vLDKEYnjN1Vzm4CSYiS4+TDvoCO0gQcGCawmEA07f1O9f3G47+PkDttwfm5BBD8RY126Q== X-Received: by 2002:a05:6830:209a:b0:61c:8167:7fc3 with SMTP id y26-20020a056830209a00b0061c81677fc3mr9707129otq.208.1658243677910; Tue, 19 Jul 2022 08:14:37 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:37 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , Fred Eckert , John Hentges , Jay Dolan , Andy Shevchenko Subject: [PATCH v4 3/6] gpio: i8255: Introduce the Intel 8255 interface library module Date: Tue, 19 Jul 2022 09:47:05 -0400 Message-Id: <8747727cba3e185c4906fd5dc3c9459d60c8dd31.1658236877.git.william.gray@linaro.org> X-Mailer: git-send-email 2.36.1 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" Exposes consumer library functions providing support for interfaces compatible with the venerable Intel 8255 Programmable Peripheral Interface (PPI). The Intel 8255 PPI first appeared in the early 1970s, initially for the Intel 8080 and later appearing in the original IBM-PC. The popularity of the original Intel 8255 chip led to many subsequent variants and clones of the interface in various chips and integrated circuits. Although still popular, interfaces compatible with the Intel 8255 PPI are nowdays typically found embedded in larger VLSI processing chips and FPGA components rather than as discrete ICs. A CONFIG_GPIO_I8255 Kconfig option is introduced by this patch. Modules wanting access to these i8255 library functions should select this Kconfig option, and import the I8255 symbol namespace. Tested-by: Fred Eckert Reviewed-by: Linus Walleij Cc: John Hentges Cc: Jay Dolan Cc: Andy Shevchenko Signed-off-by: William Breathitt Gray --- Changes in v4: - Add note to CONFIG_GPIO_I8255 Kconfig that if built as a module the name will be 'gpio-i8255' - Remove 'const' from '__iomem' pointers - Replace ambiguous 'group' terminology with more understandable 'bank' - Use more natural '>=3D 4' expression to represent upper nibble - Refactor i8255_set_port() to take more common pattern of mask and bits MAINTAINERS | 6 + drivers/gpio/Kconfig | 12 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-i8255.c | 287 ++++++++++++++++++++++++++++++++++++++ drivers/gpio/gpio-i8255.h | 46 ++++++ 5 files changed, 352 insertions(+) create mode 100644 drivers/gpio/gpio-i8255.c create mode 100644 drivers/gpio/gpio-i8255.h diff --git a/MAINTAINERS b/MAINTAINERS index a6d3bd9d2a8d..cca3059639e6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9799,6 +9799,12 @@ L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/fbdev/i810/ =20 +INTEL 8255 GPIO DRIVER +M: William Breathitt Gray +L: linux-gpio@vger.kernel.org +S: Maintained +F: drivers/gpio/gpio-i8255.c + INTEL ASoC DRIVERS M: Cezary Rojewski M: Pierre-Louis Bossart diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b01961999ced..d8e60e3fcf44 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -829,6 +829,18 @@ endmenu menu "Port-mapped I/O GPIO drivers" depends on X86 # Unconditional I/O space access =20 +config GPIO_I8255 + tristate + help + Enables support for the i8255 interface library functions. The i8255 + interface library provides functions to facilitate communication with + interfaces compatible with the venerable Intel 8255 Programmable + Peripheral Interface (PPI). The Intel 8255 PPI chip was first released + in the early 1970s but compatible interfaces are nowadays typically + found embedded in larger VLSI processing chips and FPGA components. + + If built as a module its name will be gpio-i8255. + config GPIO_104_DIO_48E tristate "ACCES 104-DIO-48E GPIO support" depends on PC104 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 14352f6dfe8e..06057e127949 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_GPIO_GW_PLD) +=3D gpio-gw-pld.o obj-$(CONFIG_GPIO_HISI) +=3D gpio-hisi.o obj-$(CONFIG_GPIO_HLWD) +=3D gpio-hlwd.o obj-$(CONFIG_HTC_EGPIO) +=3D gpio-htc-egpio.o +obj-$(CONFIG_GPIO_I8255) +=3D gpio-i8255.o obj-$(CONFIG_GPIO_ICH) +=3D gpio-ich.o obj-$(CONFIG_GPIO_IDT3243X) +=3D gpio-idt3243x.o obj-$(CONFIG_GPIO_IOP) +=3D gpio-iop.o diff --git a/drivers/gpio/gpio-i8255.c b/drivers/gpio/gpio-i8255.c new file mode 100644 index 000000000000..9b97db418df1 --- /dev/null +++ b/drivers/gpio/gpio-i8255.c @@ -0,0 +1,287 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Intel 8255 Programmable Peripheral Interface + * Copyright (C) 2022 William Breathitt Gray + */ +#include +#include +#include +#include +#include +#include +#include + +#include "gpio-i8255.h" + +#define I8255_CONTROL_PORTC_LOWER_DIRECTION BIT(0) +#define I8255_CONTROL_PORTB_DIRECTION BIT(1) +#define I8255_CONTROL_PORTC_UPPER_DIRECTION BIT(3) +#define I8255_CONTROL_PORTA_DIRECTION BIT(4) +#define I8255_CONTROL_MODE_SET BIT(7) +#define I8255_PORTA 0 +#define I8255_PORTB 1 +#define I8255_PORTC 2 + +static int i8255_get_port(struct i8255 __iomem *const ppi, + const unsigned long io_port, const unsigned long mask) +{ + const unsigned long bank =3D io_port / 3; + const unsigned long ppi_port =3D io_port % 3; + + return ioread8(&ppi[bank].port[ppi_port]) & mask; +} + +static u8 i8255_direction_mask(const unsigned long offset) +{ + const unsigned long port_offset =3D offset % 8; + const unsigned long io_port =3D offset / 8; + const unsigned long ppi_port =3D io_port % 3; + + switch (ppi_port) { + case I8255_PORTA: + return I8255_CONTROL_PORTA_DIRECTION; + case I8255_PORTB: + return I8255_CONTROL_PORTB_DIRECTION; + case I8255_PORTC: + /* Port C can be configured by nibble */ + if (port_offset >=3D 4) + return I8255_CONTROL_PORTC_UPPER_DIRECTION; + return I8255_CONTROL_PORTC_LOWER_DIRECTION; + default: + /* Should never reach this path */ + return 0; + } +} + +static void i8255_set_port(struct i8255 __iomem *const ppi, + struct i8255_state *const state, + const unsigned long io_port, + const unsigned long mask, const unsigned long bits) +{ + const unsigned long bank =3D io_port / 3; + const unsigned long ppi_port =3D io_port % 3; + unsigned long flags; + unsigned long out_state; + + spin_lock_irqsave(&state[bank].lock, flags); + + out_state =3D ioread8(&ppi[bank].port[ppi_port]); + out_state =3D (out_state & ~mask) | (bits & mask); + iowrite8(out_state, &ppi[bank].port[ppi_port]); + + spin_unlock_irqrestore(&state[bank].lock, flags); +} + +/** + * i8255_direction_input - configure signal offset as input + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @state: devices states of the respective PPI banks + * @offset: signal offset to configure as input + * + * Configures a signal @offset as input for the respective Intel 8255 + * Programmable Peripheral Interface (@ppi) banks. The @state control_state + * values are updated to reflect the new configuration. + */ +void i8255_direction_input(struct i8255 __iomem *const ppi, + struct i8255_state *const state, + const unsigned long offset) +{ + const unsigned long io_port =3D offset / 8; + const unsigned long bank =3D io_port / 3; + unsigned long flags; + + spin_lock_irqsave(&state[bank].lock, flags); + + state[bank].control_state |=3D I8255_CONTROL_MODE_SET; + state[bank].control_state |=3D i8255_direction_mask(offset); + + iowrite8(state[bank].control_state, &ppi[bank].control); + + spin_unlock_irqrestore(&state[bank].lock, flags); +} +EXPORT_SYMBOL_NS_GPL(i8255_direction_input, I8255); + +/** + * i8255_direction_output - configure signal offset as output + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @state: devices states of the respective PPI banks + * @offset: signal offset to configure as output + * @value: signal value to output + * + * Configures a signal @offset as output for the respective Intel 8255 + * Programmable Peripheral Interface (@ppi) banks and sets the respective = signal + * output to the desired @value. The @state control_state values are updat= ed to + * reflect the new configuration. + */ +void i8255_direction_output(struct i8255 __iomem *const ppi, + struct i8255_state *const state, + const unsigned long offset, + const unsigned long value) +{ + const unsigned long io_port =3D offset / 8; + const unsigned long bank =3D io_port / 3; + unsigned long flags; + + spin_lock_irqsave(&state[bank].lock, flags); + + state[bank].control_state |=3D I8255_CONTROL_MODE_SET; + state[bank].control_state &=3D ~i8255_direction_mask(offset); + + iowrite8(state[bank].control_state, &ppi[bank].control); + + spin_unlock_irqrestore(&state[bank].lock, flags); + + i8255_set(ppi, state, offset, value); +} +EXPORT_SYMBOL_NS_GPL(i8255_direction_output, I8255); + +/** + * i8255_get - get signal value at signal offset + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @offset: offset of signal to get + * + * Returns the signal value (0=3Dlow, 1=3Dhigh) for the signal at @offset = for the + * respective Intel 8255 Programmable Peripheral Interface (@ppi) banks. + */ +int i8255_get(struct i8255 __iomem *const ppi, const unsigned long offset) +{ + const unsigned long io_port =3D offset / 8; + const unsigned long offset_mask =3D BIT(offset % 8); + + return !!i8255_get_port(ppi, io_port, offset_mask); +} +EXPORT_SYMBOL_NS_GPL(i8255_get, I8255); + +/** + * i8255_get_direction - get the I/O direction for a signal offset + * @state: devices states of the respective PPI banks + * @offset: offset of signal to get direction + * + * Returns the signal direction (0=3Doutput, 1=3Dinput) for the signal at = @offset. + */ +int i8255_get_direction(const struct i8255_state *const state, + const unsigned long offset) +{ + const unsigned long io_port =3D offset / 8; + const unsigned long bank =3D io_port / 3; + + return !!(state[bank].control_state & i8255_direction_mask(offset)); +} +EXPORT_SYMBOL_NS_GPL(i8255_get_direction, I8255); + +/** + * i8255_get_multiple - get multiple signal values at multiple signal offs= ets + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @mask: mask of signals to get + * @bits: bitmap to store signal values + * @ngpio: number of GPIO signals of the respective PPI banks + * + * Stores in @bits the values (0=3Dlow, 1=3Dhigh) for the signals defined = by @mask + * for the respective Intel 8255 Programmable Peripheral Interface (@ppi) = banks. + */ +void i8255_get_multiple(struct i8255 __iomem *const ppi, + const unsigned long *const mask, + unsigned long *const bits, const unsigned long ngpio) +{ + unsigned long offset; + unsigned long port_mask; + unsigned long io_port; + unsigned long port_state; + + bitmap_zero(bits, ngpio); + + for_each_set_clump8(offset, port_mask, mask, ngpio) { + io_port =3D offset / 8; + port_state =3D i8255_get_port(ppi, io_port, port_mask); + + bitmap_set_value8(bits, port_state, offset); + } +} +EXPORT_SYMBOL_NS_GPL(i8255_get_multiple, I8255); + +/** + * i8255_mode0_output - configure all PPI ports to MODE 0 output mode + * @ppi: Intel 8255 Programmable Peripheral Interface bank + * + * Configures all Intel 8255 Programmable Peripheral Interface (@ppi) port= s to + * MODE 0 (Basic Input/Output) output mode. + */ +void i8255_mode0_output(struct i8255 __iomem *const ppi) +{ + iowrite8(I8255_CONTROL_MODE_SET, &ppi->control); +} +EXPORT_SYMBOL_NS_GPL(i8255_mode0_output, I8255); + +/** + * i8255_set - set signal value at signal offset + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @state: devices states of the respective PPI banks + * @offset: offset of signal to set + * @value: value of signal to set + * + * Assigns output @value for the signal at @offset for the respective Inte= l 8255 + * Programmable Peripheral Interface (@ppi) banks. + */ +void i8255_set(struct i8255 __iomem *const ppi, struct i8255_state *const = state, + const unsigned long offset, const unsigned long value) +{ + const unsigned long io_port =3D offset / 8; + const unsigned long port_offset =3D offset % 8; + const unsigned long mask =3D BIT(port_offset); + const unsigned long bits =3D value << port_offset; + + i8255_set_port(ppi, state, io_port, mask, bits); +} +EXPORT_SYMBOL_NS_GPL(i8255_set, I8255); + +/** + * i8255_set_multiple - set signal values at multiple signal offsets + * @ppi: Intel 8255 Programmable Peripheral Interface banks + * @state: devices states of the respective PPI banks + * @mask: mask of signals to set + * @bits: bitmap of signal output values + * @ngpio: number of GPIO signals of the respective PPI banks + * + * Assigns output values defined by @bits for the signals defined by @mask= for + * the respective Intel 8255 Programmable Peripheral Interface (@ppi) bank= s. + */ +void i8255_set_multiple(struct i8255 __iomem *const ppi, + struct i8255_state *const state, + const unsigned long *const mask, + const unsigned long *const bits, + const unsigned long ngpio) +{ + unsigned long offset; + unsigned long port_mask; + unsigned long io_port; + unsigned long value; + + for_each_set_clump8(offset, port_mask, mask, ngpio) { + io_port =3D offset / 8; + value =3D bitmap_get_value8(bits, offset); + i8255_set_port(ppi, state, io_port, port_mask, value); + } +} +EXPORT_SYMBOL_NS_GPL(i8255_set_multiple, I8255); + +/** + * i8255_state_init - initialize i8255_state structure + * @state: devices states of the respective PPI banks + * @nbanks: number of Intel 8255 Programmable Peripheral Interface banks + * + * Initializes the @state of each Intel 8255 Programmable Peripheral Inter= face + * bank for use in i8255 library functions. + */ +void i8255_state_init(struct i8255_state *const state, + const unsigned long nbanks) +{ + unsigned long bank; + + for (bank =3D 0; bank < nbanks; bank++) + spin_lock_init(&state[bank].lock); +} +EXPORT_SYMBOL_NS_GPL(i8255_state_init, I8255); + +MODULE_AUTHOR("William Breathitt Gray"); +MODULE_DESCRIPTION("Intel 8255 Programmable Peripheral Interface"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/gpio-i8255.h b/drivers/gpio/gpio-i8255.h new file mode 100644 index 000000000000..d9084aae9446 --- /dev/null +++ b/drivers/gpio/gpio-i8255.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright 2022 William Breathitt Gray */ +#ifndef _I8255_H_ +#define _I8255_H_ + +#include +#include + +/** + * struct i8255 - Intel 8255 register structure + * @port: Port A, B, and C + * @control: Control register + */ +struct i8255 { + u8 port[3]; + u8 control; +}; + +/** + * struct i8255_state - Intel 8255 state structure + * @lock: synchronization lock for accessing device state + * @control_state: Control register state + */ +struct i8255_state { + spinlock_t lock; + u8 control_state; +}; + +void i8255_direction_input(struct i8255 __iomem *ppi, struct i8255_state *= state, + unsigned long offset); +void i8255_direction_output(struct i8255 __iomem *ppi, + struct i8255_state *state, unsigned long offset, + unsigned long value); +int i8255_get(struct i8255 __iomem *ppi, unsigned long offset); +int i8255_get_direction(const struct i8255_state *state, unsigned long off= set); +void i8255_get_multiple(struct i8255 __iomem *ppi, const unsigned long *ma= sk, + unsigned long *bits, unsigned long ngpio); +void i8255_mode0_output(struct i8255 __iomem *const ppi); +void i8255_set(struct i8255 __iomem *ppi, struct i8255_state *state, + unsigned long offset, unsigned long value); +void i8255_set_multiple(struct i8255 __iomem *ppi, struct i8255_state *sta= te, + const unsigned long *mask, const unsigned long *bits, + unsigned long ngpio); +void i8255_state_init(struct i8255_state *const state, unsigned long nbank= s); + +#endif /* _I8255_H_ */ --=20 2.36.1 From nobody Sat Apr 18 02:47:20 2026 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 D4D3CCCA481 for ; Tue, 19 Jul 2022 15:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238918AbiGSPOr (ORCPT ); Tue, 19 Jul 2022 11:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238741AbiGSPOn (ORCPT ); Tue, 19 Jul 2022 11:14:43 -0400 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EFDA545F5 for ; Tue, 19 Jul 2022 08:14:39 -0700 (PDT) Received: by mail-oi1-x22d.google.com with SMTP id i126so7150434oih.4 for ; Tue, 19 Jul 2022 08:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6D/kvPA2xe//LpW+V9rkLzeZ30wuiSplXvWOw30wQ3Y=; b=T7djuIh/ceMC3r6oeQG0qw1v1SgWyg7Zb9nKcdRcF90Op71yMT/w50344X0fiBZSty GkgMtNL1D9ryLTqJM4ZygwbTN2IlYu/AIlp+8md+GXmuSr3Y8UkgL3rwPfbftHtZhXMZ 3wThuPnh5D+HcP6BJqkAqfzrUOF4N555oTsm1DJTBccGjcezvPVF/qjpUYLyl8Ixug2S bkPc30qrhzSjOVMBqeROwtCWwbSrJnzjnSyQFqF8r1Z0qNoB+bbXBaUlt5NmsScMLcpN QsJwxYu7H6gCm37vGptRzgF3W2K4N+6/ynI3XTo3h1nfX+aKL+n4fJXEzn71EjqfOAdE q1Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6D/kvPA2xe//LpW+V9rkLzeZ30wuiSplXvWOw30wQ3Y=; b=N8DxCP8gxSTniZ3ZNtHK8Me58LaCBSFQ1+kRe73vrKZA+LZYc3++tnuHSWl0U+7Kf7 MJekmgr0fzI8pCJcCDVBeG+V3fknGU4qPTe6Ix261+CYPsNM3oPZLh19vhqPPYx4iYSt pWTjShs4juTBuqXpXru1fuzV74GOE/oZ9vedMV1JQgz87pRFPbVQDYcd4zS4d4j6jHrb R3a3/TVMsysdyC+K9G3OxhJFIQCDNc5rGfBp2KBxYV/HGDkXzVMEwyotsHd3vLkywDVG jkSwr5/3vQUsLtP5ONAMSf71BXgcx3CnmPsi6SBCQ91LWN+70RED9FofGnoggRelhs/G +V5w== X-Gm-Message-State: AJIora8TlFWM/BtnOfct1Z8HbuBdcGxdo2P/nYWPy/1fwA9/z5cPfvDp Ggesy4SMQrPd++mL++X/7fwWnYgwCAQ7rw== X-Google-Smtp-Source: AGRyM1sChudgq+FkBFiBvxXQ2wHQ2M1ajA3L9ULj+49zZT92rM7ie7EyzjOVaPzcKO6IjRqL33XRUQ== X-Received: by 2002:a05:6808:10d5:b0:339:f385:9699 with SMTP id s21-20020a05680810d500b00339f3859699mr18266326ois.227.1658243678719; Tue, 19 Jul 2022 08:14:38 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:38 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , John Hentges , Jay Dolan Subject: [PATCH v4 4/6] gpio: 104-dio-48e: Implement and utilize register structures Date: Tue, 19 Jul 2022 09:47:06 -0400 Message-Id: <56643f7d6e9487c814997eb8816abba6e38c0b2e.1658236877.git.william.gray@linaro.org> X-Mailer: git-send-email 2.36.1 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" Reduce magic numbers and improve code readability by implementing and utilizing named register data structures. The 104-DIO-48E device features an Intel 8255 compatible GPIO interface, so the i8255 GPIO module is selected and utilized as well. Reviewed-by: Linus Walleij Cc: John Hentges Cc: Jay Dolan Signed-off-by: William Breathitt Gray --- Changes in v4: - Remove superfluous include drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-104-dio-48e.c | 249 ++++++++++---------------------- 2 files changed, 75 insertions(+), 175 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d8e60e3fcf44..f15ef610c707 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -846,6 +846,7 @@ config GPIO_104_DIO_48E depends on PC104 select ISA_BUS_API select GPIOLIB_IRQCHIP + select GPIO_I8255 help Enables GPIO support for the ACCES 104-DIO-48E series (104-DIO-48E, 104-DIO-24E). The base port addresses for the devices may be diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48= e.c index f118ad9bcd33..a41551870759 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -6,8 +6,7 @@ * This driver supports the following ACCES devices: 104-DIO-48E and * 104-DIO-24E. */ -#include -#include +#include #include #include #include @@ -20,6 +19,11 @@ #include #include #include +#include + +#include "gpio-i8255.h" + +MODULE_IMPORT_NS(I8255); =20 #define DIO48E_EXTENT 16 #define MAX_NUM_DIO48E max_num_isa_dev(DIO48E_EXTENT) @@ -33,34 +37,54 @@ static unsigned int irq[MAX_NUM_DIO48E]; module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers"); =20 +#define DIO48E_NUM_PPI 2 + +/** + * struct dio48e_reg - device register structure + * @ppi: Programmable Peripheral Interface groups + * @enable_buffer: Enable/Disable Buffer groups + * @unused1: Unused + * @enable_interrupt: Write: Enable Interrupt + * Read: Disable Interrupt + * @unused2: Unused + * @enable_counter: Write: Enable Counter/Timer Addressing + * Read: Disable Counter/Timer Addressing + * @unused3: Unused + * @clear_interrupt: Clear Interrupt + */ +struct dio48e_reg { + struct i8255 ppi[DIO48E_NUM_PPI]; + u8 enable_buffer[DIO48E_NUM_PPI]; + u8 unused1; + u8 enable_interrupt; + u8 unused2; + u8 enable_counter; + u8 unused3; + u8 clear_interrupt; +}; + /** * struct dio48e_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @io_state: bit I/O state (whether bit is set to input or output) - * @out_state: output bits state - * @control: Control registers state - * @lock: synchronization lock to prevent I/O race conditions - * @base: base port address of the GPIO device - * @irq_mask: I/O bits affected by interrupts + * @chip: instance of the gpio_chip + * @ppi_state: PPI device states + * @lock: synchronization lock to prevent I/O race conditions + * @reg: I/O address offset for the device registers + * @irq_mask: I/O bits affected by interrupts */ struct dio48e_gpio { struct gpio_chip chip; - unsigned char io_state[6]; - unsigned char out_state[6]; - unsigned char control[2]; + struct i8255_state ppi_state[DIO48E_NUM_PPI]; raw_spinlock_t lock; - void __iomem *base; + struct dio48e_reg __iomem *reg; unsigned char irq_mask; }; =20 static int dio48e_gpio_get_direction(struct gpio_chip *chip, unsigned int = offset) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); =20 - if (dio48egpio->io_state[port] & mask) - return GPIO_LINE_DIRECTION_IN; + if (i8255_get_direction(dio48egpio->ppi_state, offset)) + return GPIO_LINE_DIRECTION_IN; =20 return GPIO_LINE_DIRECTION_OUT; } @@ -68,38 +92,9 @@ static int dio48e_gpio_get_direction(struct gpio_chip *c= hip, unsigned int offset static int dio48e_gpio_direction_input(struct gpio_chip *chip, unsigned in= t offset) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned int io_port =3D offset / 8; - const unsigned int control_port =3D io_port / 3; - void __iomem *const control_addr =3D dio48egpio->base + 3 + control_port = * 4; - unsigned long flags; - unsigned int control; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); =20 - /* Check if configuring Port C */ - if (io_port =3D=3D 2 || io_port =3D=3D 5) { - /* Port C can be configured by nibble */ - if (offset % 8 > 3) { - dio48egpio->io_state[io_port] |=3D 0xF0; - dio48egpio->control[control_port] |=3D BIT(3); - } else { - dio48egpio->io_state[io_port] |=3D 0x0F; - dio48egpio->control[control_port] |=3D BIT(0); - } - } else { - dio48egpio->io_state[io_port] |=3D 0xFF; - if (io_port =3D=3D 0 || io_port =3D=3D 3) - dio48egpio->control[control_port] |=3D BIT(4); - else - dio48egpio->control[control_port] |=3D BIT(1); - } - - control =3D BIT(7) | dio48egpio->control[control_port]; - iowrite8(control, control_addr); - control &=3D ~BIT(7); - iowrite8(control, control_addr); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); + i8255_direction_input(dio48egpio->reg->ppi, dio48egpio->ppi_state, + offset); =20 return 0; } @@ -108,48 +103,9 @@ static int dio48e_gpio_direction_output(struct gpio_ch= ip *chip, unsigned int off int value) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned int io_port =3D offset / 8; - const unsigned int control_port =3D io_port / 3; - const unsigned int mask =3D BIT(offset % 8); - void __iomem *const control_addr =3D dio48egpio->base + 3 + control_port = * 4; - const unsigned int out_port =3D (io_port > 2) ? io_port + 1 : io_port; - unsigned long flags; - unsigned int control; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); - - /* Check if configuring Port C */ - if (io_port =3D=3D 2 || io_port =3D=3D 5) { - /* Port C can be configured by nibble */ - if (offset % 8 > 3) { - dio48egpio->io_state[io_port] &=3D 0x0F; - dio48egpio->control[control_port] &=3D ~BIT(3); - } else { - dio48egpio->io_state[io_port] &=3D 0xF0; - dio48egpio->control[control_port] &=3D ~BIT(0); - } - } else { - dio48egpio->io_state[io_port] &=3D 0x00; - if (io_port =3D=3D 0 || io_port =3D=3D 3) - dio48egpio->control[control_port] &=3D ~BIT(4); - else - dio48egpio->control[control_port] &=3D ~BIT(1); - } - - if (value) - dio48egpio->out_state[io_port] |=3D mask; - else - dio48egpio->out_state[io_port] &=3D ~mask; =20 - control =3D BIT(7) | dio48egpio->control[control_port]; - iowrite8(control, control_addr); - - iowrite8(dio48egpio->out_state[io_port], dio48egpio->base + out_port); - - control &=3D ~BIT(7); - iowrite8(control, control_addr); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); + i8255_direction_output(dio48egpio->reg->ppi, dio48egpio->ppi_state, + offset, value); =20 return 0; } @@ -157,47 +113,16 @@ static int dio48e_gpio_direction_output(struct gpio_c= hip *chip, unsigned int off static int dio48e_gpio_get(struct gpio_chip *chip, unsigned int offset) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); - const unsigned int in_port =3D (port > 2) ? port + 1 : port; - unsigned long flags; - unsigned int port_state; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); =20 - /* ensure that GPIO is set for input */ - if (!(dio48egpio->io_state[port] & mask)) { - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); - return -EINVAL; - } - - port_state =3D ioread8(dio48egpio->base + in_port); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); - - return !!(port_state & mask); + return i8255_get(dio48egpio->reg->ppi, offset); } =20 -static const size_t ports[] =3D { 0, 1, 2, 4, 5, 6 }; - static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, unsigned long *bits) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - unsigned long offset; - unsigned long gpio_mask; - void __iomem *port_addr; - unsigned long port_state; =20 - /* clear bits array to a clean slate */ - bitmap_zero(bits, chip->ngpio); - - for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) { - port_addr =3D dio48egpio->base + ports[offset / 8]; - port_state =3D ioread8(port_addr) & gpio_mask; - - bitmap_set_value8(bits, port_state, offset); - } + i8255_get_multiple(dio48egpio->reg->ppi, mask, bits, chip->ngpio); =20 return 0; } @@ -205,49 +130,17 @@ static int dio48e_gpio_get_multiple(struct gpio_chip = *chip, unsigned long *mask, static void dio48e_gpio_set(struct gpio_chip *chip, unsigned int offset, i= nt value) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); - const unsigned int out_port =3D (port > 2) ? port + 1 : port; - unsigned long flags; =20 - raw_spin_lock_irqsave(&dio48egpio->lock, flags); - - if (value) - dio48egpio->out_state[port] |=3D mask; - else - dio48egpio->out_state[port] &=3D ~mask; - - iowrite8(dio48egpio->out_state[port], dio48egpio->base + out_port); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); + i8255_set(dio48egpio->reg->ppi, dio48egpio->ppi_state, offset, value); } =20 static void dio48e_gpio_set_multiple(struct gpio_chip *chip, unsigned long *mask, unsigned long *bits) { struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - unsigned long offset; - unsigned long gpio_mask; - size_t index; - void __iomem *port_addr; - unsigned long bitmask; - unsigned long flags; - - for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) { - index =3D offset / 8; - port_addr =3D dio48egpio->base + ports[index]; - - bitmask =3D bitmap_get_value8(bits, offset) & gpio_mask; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); =20 - /* update output state data and set device gpio register */ - dio48egpio->out_state[index] &=3D ~gpio_mask; - dio48egpio->out_state[index] |=3D bitmask; - iowrite8(dio48egpio->out_state[index], port_addr); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); - } + i8255_set_multiple(dio48egpio->reg->ppi, dio48egpio->ppi_state, mask, + bits, chip->ngpio); } =20 static void dio48e_irq_ack(struct irq_data *data) @@ -274,7 +167,7 @@ static void dio48e_irq_mask(struct irq_data *data) =20 if (!dio48egpio->irq_mask) /* disable interrupts */ - ioread8(dio48egpio->base + 0xB); + ioread8(&dio48egpio->reg->enable_interrupt); =20 raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); } @@ -294,8 +187,8 @@ static void dio48e_irq_unmask(struct irq_data *data) =20 if (!dio48egpio->irq_mask) { /* enable interrupts */ - iowrite8(0x00, dio48egpio->base + 0xF); - iowrite8(0x00, dio48egpio->base + 0xB); + iowrite8(0x00, &dio48egpio->reg->clear_interrupt); + iowrite8(0x00, &dio48egpio->reg->enable_interrupt); } =20 if (offset =3D=3D 19) @@ -341,7 +234,7 @@ static irqreturn_t dio48e_irq_handler(int irq, void *de= v_id) =20 raw_spin_lock(&dio48egpio->lock); =20 - iowrite8(0x00, dio48egpio->base + 0xF); + iowrite8(0x00, &dio48egpio->reg->clear_interrupt); =20 raw_spin_unlock(&dio48egpio->lock); =20 @@ -373,11 +266,26 @@ static int dio48e_irq_init_hw(struct gpio_chip *gc) struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(gc); =20 /* Disable IRQ by default */ - ioread8(dio48egpio->base + 0xB); + ioread8(&dio48egpio->reg->enable_interrupt); =20 return 0; } =20 +static void dio48e_init_ppi(struct i8255 __iomem *const ppi, + struct i8255_state *const ppi_state) +{ + const unsigned long ngpio =3D 24; + const unsigned long mask =3D GENMASK(ngpio - 1, 0); + const unsigned long bits =3D 0; + unsigned long i; + + /* Initialize all GPIO to output 0 */ + for (i =3D 0; i < DIO48E_NUM_PPI; i++) { + i8255_mode0_output(&ppi[i]); + i8255_set_multiple(&ppi[i], &ppi_state[i], &mask, &bits, ngpio); + } +} + static int dio48e_probe(struct device *dev, unsigned int id) { struct dio48e_gpio *dio48egpio; @@ -395,8 +303,8 @@ static int dio48e_probe(struct device *dev, unsigned in= t id) return -EBUSY; } =20 - dio48egpio->base =3D devm_ioport_map(dev, base[id], DIO48E_EXTENT); - if (!dio48egpio->base) + dio48egpio->reg =3D devm_ioport_map(dev, base[id], DIO48E_EXTENT); + if (!dio48egpio->reg) return -ENOMEM; =20 dio48egpio->chip.label =3D name; @@ -425,17 +333,8 @@ static int dio48e_probe(struct device *dev, unsigned i= nt id) =20 raw_spin_lock_init(&dio48egpio->lock); =20 - /* initialize all GPIO as output */ - iowrite8(0x80, dio48egpio->base + 3); - iowrite8(0x00, dio48egpio->base); - iowrite8(0x00, dio48egpio->base + 1); - iowrite8(0x00, dio48egpio->base + 2); - iowrite8(0x00, dio48egpio->base + 3); - iowrite8(0x80, dio48egpio->base + 7); - iowrite8(0x00, dio48egpio->base + 4); - iowrite8(0x00, dio48egpio->base + 5); - iowrite8(0x00, dio48egpio->base + 6); - iowrite8(0x00, dio48egpio->base + 7); + i8255_state_init(dio48egpio->ppi_state, DIO48E_NUM_PPI); + dio48e_init_ppi(dio48egpio->reg->ppi, dio48egpio->ppi_state); =20 err =3D devm_gpiochip_add_data(dev, &dio48egpio->chip, dio48egpio); if (err) { --=20 2.36.1 From nobody Sat Apr 18 02:47:20 2026 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 AA4D1C43334 for ; Tue, 19 Jul 2022 15:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238634AbiGSPOz (ORCPT ); Tue, 19 Jul 2022 11:14:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238764AbiGSPOn (ORCPT ); Tue, 19 Jul 2022 11:14:43 -0400 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64B4C545F7 for ; Tue, 19 Jul 2022 08:14:40 -0700 (PDT) Received: by mail-ot1-x32a.google.com with SMTP id r22-20020a056830419600b0061c6edc5dcfso11871341otu.12 for ; Tue, 19 Jul 2022 08:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Z03UtWSINjB+dIw2TTd4epOc1K6Q+nK1Fs4WXqWLoE=; b=HndgDsMYfdMhLLZoeeFx8B4n8sE3Gtd1sJ7ejhJkgM85Z1mzCY9K7ELYGIwPCFDUjk E/e7AVpPO6p/UXXMosrdeiR/6h2dHk2oRPzrcdcRMsTN//XVKRHPliprUT1I2hNpkEZI X9UdSfZHc4yqaWkcIQtRGfSsI++NmB+Ypjvb1l02tSyVRtzvm0IrgVfS6Zlm6be4FiRa NVbIYQZcgWT9WiA+v6M2Ujy9DVacRj2RwZEXHd4Gpo4rN3KdhXnpzWjZ4ic4jOXWLq+S s9PmGnEnFdGIrDKhqAkr2pK7RgH29Jv+xKYotF81CQtpjTFl6Bzrc1hwrpkv4ituwhPu IKDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1Z03UtWSINjB+dIw2TTd4epOc1K6Q+nK1Fs4WXqWLoE=; b=x1YciQC7MCFoLDdg1m35zZtZjXafFCWlEjIUFzWsa6C7nMT4m/iaTrEVYS6am1Nzuf g1ssXhiKoIsGphJ6DRDwI93BKpE/ejPHWeo6zavL+nul3pXdggvcxQrs8uAe1xAunbk7 bK+PSbrR4vj1kIwjwzUL+SRQZIdQbXrgc2rKZ7QQkvep3kw0LOVC2YBna83oUZDVxOpz exPFPm2EI1fdssVNzwb9+ZoXhdbnZkXmTdnp8teATEsvxD0GqqhcL9aXjucYUiHJAqpq +DyZ/YlkgdBznoLOAvcdAUj8PTSVj2bswCWlUTp+us6Fb1qKCOG5Adz2hDeflHwV4xKy V0qw== X-Gm-Message-State: AJIora8ggr/QL4BbPpqg/kWQyPE8kIVOORut0qVFomc0uexGF+wUP7pZ eyB6hinOMQWucWPsGJ4IasvsTA== X-Google-Smtp-Source: AGRyM1v4zXn5xJ52GxGebYlqbfqWgsKcS4808siunrSKppeMnFIhLHD75+NuyOhkwYNNNa4lQbYaiw== X-Received: by 2002:a05:6830:1e31:b0:61c:ac69:94ce with SMTP id t17-20020a0568301e3100b0061cac6994cemr3215268otr.282.1658243680071; Tue, 19 Jul 2022 08:14:40 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:39 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , John Hentges , Jay Dolan Subject: [PATCH v4 5/6] gpio: 104-idi-48: Implement and utilize register structures Date: Tue, 19 Jul 2022 09:47:07 -0400 Message-Id: X-Mailer: git-send-email 2.36.1 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" Reduce magic numbers and improve code readability by implementing and utilizing named register data structures. The 104-IDI-48 device features an Intel 8255 compatible GPIO interface, so the i8255 GPIO module is selected and utilized as well. Reviewed-by: Linus Walleij Cc: John Hentges Cc: Jay Dolan Signed-off-by: William Breathitt Gray --- Changes in v4: - Replace superfluous include with - Remove 'const' from '__iomem' pointers drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-104-idi-48.c | 143 ++++++++++++++------------------- 2 files changed, 61 insertions(+), 83 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index f15ef610c707..23112f10d905 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -870,6 +870,7 @@ config GPIO_104_IDI_48 depends on PC104 select ISA_BUS_API select GPIOLIB_IRQCHIP + select GPIO_I8255 help Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A, 104-IDI-48AC, 104-IDI-48B, 104-IDI-48BC). The base port addresses for diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 9521ece3ebef..353fe4eb4001 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -6,8 +6,7 @@ * This driver supports the following ACCES devices: 104-IDI-48A, * 104-IDI-48AC, 104-IDI-48B, and 104-IDI-48BC. */ -#include -#include +#include #include #include #include @@ -20,6 +19,11 @@ #include #include #include +#include + +#include "gpio-i8255.h" + +MODULE_IMPORT_NS(I8255); =20 #define IDI_48_EXTENT 8 #define MAX_NUM_IDI_48 max_num_isa_dev(IDI_48_EXTENT) @@ -33,21 +37,34 @@ static unsigned int irq[MAX_NUM_IDI_48]; module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers"); =20 +/** + * struct idi_48_reg - device register structure + * @port0: Port 0 Inputs + * @unused: Unused + * @port1: Port 1 Inputs + * @irq: Read: IRQ Status Register/IRQ Clear + * Write: IRQ Enable/Disable + */ +struct idi_48_reg { + u8 port0[3]; + u8 unused; + u8 port1[3]; + u8 irq; +}; + /** * struct idi_48_gpio - GPIO device private data structure * @chip: instance of the gpio_chip * @lock: synchronization lock to prevent I/O race conditions - * @ack_lock: synchronization lock to prevent IRQ handler race conditions * @irq_mask: input bits affected by interrupts - * @base: base port address of the GPIO device + * @reg: I/O address offset for the device registers * @cos_enb: Change-Of-State IRQ enable boundaries mask */ struct idi_48_gpio { struct gpio_chip chip; - raw_spinlock_t lock; - spinlock_t ack_lock; + spinlock_t lock; unsigned char irq_mask[6]; - void __iomem *base; + struct idi_48_reg __iomem *reg; unsigned char cos_enb; }; =20 @@ -64,42 +81,18 @@ static int idi_48_gpio_direction_input(struct gpio_chip= *chip, unsigned offset) static int idi_48_gpio_get(struct gpio_chip *chip, unsigned offset) { struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - unsigned i; - static const unsigned int register_offset[6] =3D { 0, 1, 2, 4, 5, 6 }; - void __iomem *port_addr; - unsigned mask; - - for (i =3D 0; i < 48; i +=3D 8) - if (offset < i + 8) { - port_addr =3D idi48gpio->base + register_offset[i / 8]; - mask =3D BIT(offset - i); - - return !!(ioread8(port_addr) & mask); - } + void __iomem *const ppi =3D idi48gpio->reg; =20 - /* The following line should never execute since offset < 48 */ - return 0; + return i8255_get(ppi, offset); } =20 static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, unsigned long *bits) { struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - unsigned long offset; - unsigned long gpio_mask; - static const size_t ports[] =3D { 0, 1, 2, 4, 5, 6 }; - void __iomem *port_addr; - unsigned long port_state; - - /* clear bits array to a clean slate */ - bitmap_zero(bits, chip->ngpio); + void __iomem *const ppi =3D idi48gpio->reg; =20 - for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) { - port_addr =3D idi48gpio->base + ports[offset / 8]; - port_state =3D ioread8(port_addr) & gpio_mask; - - bitmap_set_value8(bits, port_state, offset); - } + i8255_get_multiple(ppi, mask, bits, chip->ngpio); =20 return 0; } @@ -113,30 +106,24 @@ static void idi_48_irq_mask(struct irq_data *data) struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); const unsigned offset =3D irqd_to_hwirq(data); - unsigned i; - unsigned mask; - unsigned boundary; + const unsigned long boundary =3D offset / 8; + const unsigned long mask =3D BIT(offset % 8); unsigned long flags; =20 - for (i =3D 0; i < 48; i +=3D 8) - if (offset < i + 8) { - mask =3D BIT(offset - i); - boundary =3D i / 8; - - idi48gpio->irq_mask[boundary] &=3D ~mask; + spin_lock_irqsave(&idi48gpio->lock, flags); =20 - if (!idi48gpio->irq_mask[boundary]) { - idi48gpio->cos_enb &=3D ~BIT(boundary); + idi48gpio->irq_mask[boundary] &=3D ~mask; =20 - raw_spin_lock_irqsave(&idi48gpio->lock, flags); + /* Exit early if there are still input lines with IRQ unmasked */ + if (idi48gpio->irq_mask[boundary]) + goto exit; =20 - iowrite8(idi48gpio->cos_enb, idi48gpio->base + 7); + idi48gpio->cos_enb &=3D ~BIT(boundary); =20 - raw_spin_unlock_irqrestore(&idi48gpio->lock, flags); - } + iowrite8(idi48gpio->cos_enb, &idi48gpio->reg->irq); =20 - return; - } +exit: + spin_unlock_irqrestore(&idi48gpio->lock, flags); } =20 static void idi_48_irq_unmask(struct irq_data *data) @@ -144,32 +131,27 @@ static void idi_48_irq_unmask(struct irq_data *data) struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); const unsigned offset =3D irqd_to_hwirq(data); - unsigned i; - unsigned mask; - unsigned boundary; + const unsigned long boundary =3D offset / 8; + const unsigned long mask =3D BIT(offset % 8); unsigned prev_irq_mask; unsigned long flags; =20 - for (i =3D 0; i < 48; i +=3D 8) - if (offset < i + 8) { - mask =3D BIT(offset - i); - boundary =3D i / 8; - prev_irq_mask =3D idi48gpio->irq_mask[boundary]; + spin_lock_irqsave(&idi48gpio->lock, flags); =20 - idi48gpio->irq_mask[boundary] |=3D mask; + prev_irq_mask =3D idi48gpio->irq_mask[boundary]; =20 - if (!prev_irq_mask) { - idi48gpio->cos_enb |=3D BIT(boundary); + idi48gpio->irq_mask[boundary] |=3D mask; =20 - raw_spin_lock_irqsave(&idi48gpio->lock, flags); + /* Exit early if IRQ was already unmasked for this boundary */ + if (prev_irq_mask) + goto exit; =20 - iowrite8(idi48gpio->cos_enb, idi48gpio->base + 7); + idi48gpio->cos_enb |=3D BIT(boundary); =20 - raw_spin_unlock_irqrestore(&idi48gpio->lock, flags); - } + iowrite8(idi48gpio->cos_enb, &idi48gpio->reg->irq); =20 - return; - } +exit: + spin_unlock_irqrestore(&idi48gpio->lock, flags); } =20 static int idi_48_irq_set_type(struct irq_data *data, unsigned flow_type) @@ -200,17 +182,13 @@ static irqreturn_t idi_48_irq_handler(int irq, void *= dev_id) unsigned long gpio; struct gpio_chip *const chip =3D &idi48gpio->chip; =20 - spin_lock(&idi48gpio->ack_lock); - - raw_spin_lock(&idi48gpio->lock); - - cos_status =3D ioread8(idi48gpio->base + 7); + spin_lock(&idi48gpio->lock); =20 - raw_spin_unlock(&idi48gpio->lock); + cos_status =3D ioread8(&idi48gpio->reg->irq); =20 /* IRQ Status (bit 6) is active low (0 =3D IRQ generated by device) */ if (cos_status & BIT(6)) { - spin_unlock(&idi48gpio->ack_lock); + spin_unlock(&idi48gpio->lock); return IRQ_NONE; } =20 @@ -228,7 +206,7 @@ static irqreturn_t idi_48_irq_handler(int irq, void *de= v_id) } } =20 - spin_unlock(&idi48gpio->ack_lock); + spin_unlock(&idi48gpio->lock); =20 return IRQ_HANDLED; } @@ -250,8 +228,8 @@ static int idi_48_irq_init_hw(struct gpio_chip *gc) struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(gc); =20 /* Disable IRQ by default */ - iowrite8(0, idi48gpio->base + 7); - ioread8(idi48gpio->base + 7); + iowrite8(0, &idi48gpio->reg->irq); + ioread8(&idi48gpio->reg->irq); =20 return 0; } @@ -273,8 +251,8 @@ static int idi_48_probe(struct device *dev, unsigned in= t id) return -EBUSY; } =20 - idi48gpio->base =3D devm_ioport_map(dev, base[id], IDI_48_EXTENT); - if (!idi48gpio->base) + idi48gpio->reg =3D devm_ioport_map(dev, base[id], IDI_48_EXTENT); + if (!idi48gpio->reg) return -ENOMEM; =20 idi48gpio->chip.label =3D name; @@ -298,8 +276,7 @@ static int idi_48_probe(struct device *dev, unsigned in= t id) girq->handler =3D handle_edge_irq; girq->init_hw =3D idi_48_irq_init_hw; =20 - raw_spin_lock_init(&idi48gpio->lock); - spin_lock_init(&idi48gpio->ack_lock); + spin_lock_init(&idi48gpio->lock); =20 err =3D devm_gpiochip_add_data(dev, &idi48gpio->chip, idi48gpio); if (err) { --=20 2.36.1 From nobody Sat Apr 18 02:47:20 2026 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 11F68C43334 for ; Tue, 19 Jul 2022 15:15:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238855AbiGSPPA (ORCPT ); Tue, 19 Jul 2022 11:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238375AbiGSPOo (ORCPT ); Tue, 19 Jul 2022 11:14:44 -0400 Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5A8F545D6 for ; Tue, 19 Jul 2022 08:14:42 -0700 (PDT) Received: by mail-ot1-x32b.google.com with SMTP id br15-20020a056830390f00b0061c9d73b8bdso5792261otb.6 for ; Tue, 19 Jul 2022 08:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q7OijwyGP0BradGngSYjF3yMqE6shEfRTU0u1M722s4=; b=YCueJbkeSoo+JYND3F71lGHPb+di95NhpqSWx+LBsHvaaQkFhrGyHZ61ZvKmNyN5pX WppaWTaZy1QPDS7PCgJ0wdakXK400ALRkWMvjbHx8K1kXVbjtbhtEF7oYS8Dd0Xqowib D0nSd0LVzejqQhm3jN7cBZqVjEBRaevB1xtoyj7bpnq5p2GWTeJQdDXJjYZr+MpZ5sc0 84YtMOYez+mNxLyX0xygKxVNiMZrWy4aVDBu+y+WfOoo38ZZldZjt+zbkECej0EzMQ8J 7GfQNE6V4A0+iXzNh9DjOVg1phuL8RJVK7D0v4SN3r//jO84ql4c/h0oOHwTQf2nO8aV HnFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q7OijwyGP0BradGngSYjF3yMqE6shEfRTU0u1M722s4=; b=47kGO8Yi8JUKX4NptA4xahzg6F8EZVh+GyiHC7O442BGRvghK5bv25vJfimoI48Xzd 1oaOHHlcA0mB+h1JH/1GrutWAamTn1RS+rHs6ednhwezSrm2z9Fo5sGGICwN07NOQ+Ll ZPI/u982/TD5NC+Rtoq6G7eeOnnvaLNixni44eEpU0ObJBL88TAuvQts0YaP0qoibvwP HUPdIA+j4t0D6DgNbO6Tg4j3AAbSv5earRTD3vtPG7qFkwBqwow3DY/xKtLWZMsKSqF4 fZaf465AtyRzJsuYyKNQCLz22Ft8Wawq/mAJR61+SMslTxjcig28YEFPoluZhmzIK58l 7CmQ== X-Gm-Message-State: AJIora8C32U3ilv7yRasrgIkeZf7ZV+P9W2j4v/vKVV67KILLMCtx6nz X3hWcsDq5wFWBOytqWT0bXVoNr9NueaTcQ== X-Google-Smtp-Source: AGRyM1uOD+55T3fUPfYQ5AMJd+CPKWWnIlRXTWFOZ1n4T0XUevwrtKibd9mq6OIuzo09W9kjpKTBag== X-Received: by 2002:a05:6830:20c2:b0:61c:81ee:4482 with SMTP id z2-20020a05683020c200b0061c81ee4482mr9287578otq.24.1658243681802; Tue, 19 Jul 2022 08:14:41 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id l24-20020a056830155800b0061c8bca21d8sm2334308otp.2.2022.07.19.08.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:14:41 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , Fred Eckert Subject: [PATCH v4 6/6] gpio: gpio-mm: Implement and utilize register structures Date: Tue, 19 Jul 2022 09:47:08 -0400 Message-Id: X-Mailer: git-send-email 2.36.1 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" Reduce magic numbers and improve code readability by implementing and utilizing named register data structures. The GPIO-MM device features an Intel 8255 compatible GPIO interface, so the i8255 GPIO module is selected and utilized as well. Tested-by: Fred Eckert Reviewed-by: Linus Walleij Signed-off-by: William Breathitt Gray --- Changes in v4: - Remove superfluous and includes drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-gpio-mm.c | 202 +++++++----------------------------- 2 files changed, 40 insertions(+), 163 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 23112f10d905..e1bf941cfe3d 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -891,6 +891,7 @@ config GPIO_GPIO_MM tristate "Diamond Systems GPIO-MM GPIO support" depends on PC104 select ISA_BUS_API + select GPIO_I8255 help Enables GPIO support for the Diamond Systems GPIO-MM and GPIO-MM-12. =20 diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c index 097a06463d01..2689671b6b01 100644 --- a/drivers/gpio/gpio-gpio-mm.c +++ b/drivers/gpio/gpio-gpio-mm.c @@ -6,8 +6,6 @@ * This driver supports the following Diamond Systems devices: GPIO-MM and * GPIO-MM-12. */ -#include -#include #include #include #include @@ -17,7 +15,10 @@ #include #include #include -#include + +#include "gpio-i8255.h" + +MODULE_IMPORT_NS(I8255); =20 #define GPIOMM_EXTENT 8 #define MAX_NUM_GPIOMM max_num_isa_dev(GPIOMM_EXTENT) @@ -27,32 +28,26 @@ static unsigned int num_gpiomm; module_param_hw_array(base, uint, ioport, &num_gpiomm, 0); MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base addresses"); =20 +#define GPIOMM_NUM_PPI 2 + /** * struct gpiomm_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @io_state: bit I/O state (whether bit is set to input or output) - * @out_state: output bits state - * @control: Control registers state - * @lock: synchronization lock to prevent I/O race conditions - * @base: base port address of the GPIO device + * @chip: instance of the gpio_chip + * @ppi_state: Programmable Peripheral Interface group states + * @ppi: Programmable Peripheral Interface groups */ struct gpiomm_gpio { struct gpio_chip chip; - unsigned char io_state[6]; - unsigned char out_state[6]; - unsigned char control[2]; - spinlock_t lock; - void __iomem *base; + struct i8255_state ppi_state[GPIOMM_NUM_PPI]; + struct i8255 __iomem *ppi; }; =20 static int gpiomm_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); =20 - if (gpiommgpio->io_state[port] & mask) + if (i8255_get_direction(gpiommgpio->ppi_state, offset)) return GPIO_LINE_DIRECTION_IN; =20 return GPIO_LINE_DIRECTION_OUT; @@ -62,35 +57,8 @@ static int gpiomm_gpio_direction_input(struct gpio_chip = *chip, unsigned int offset) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - const unsigned int io_port =3D offset / 8; - const unsigned int control_port =3D io_port / 3; - unsigned long flags; - unsigned int control; - - spin_lock_irqsave(&gpiommgpio->lock, flags); - - /* Check if configuring Port C */ - if (io_port =3D=3D 2 || io_port =3D=3D 5) { - /* Port C can be configured by nibble */ - if (offset % 8 > 3) { - gpiommgpio->io_state[io_port] |=3D 0xF0; - gpiommgpio->control[control_port] |=3D BIT(3); - } else { - gpiommgpio->io_state[io_port] |=3D 0x0F; - gpiommgpio->control[control_port] |=3D BIT(0); - } - } else { - gpiommgpio->io_state[io_port] |=3D 0xFF; - if (io_port =3D=3D 0 || io_port =3D=3D 3) - gpiommgpio->control[control_port] |=3D BIT(4); - else - gpiommgpio->control[control_port] |=3D BIT(1); - } =20 - control =3D BIT(7) | gpiommgpio->control[control_port]; - iowrite8(control, gpiommgpio->base + 3 + control_port*4); - - spin_unlock_irqrestore(&gpiommgpio->lock, flags); + i8255_direction_input(gpiommgpio->ppi, gpiommgpio->ppi_state, offset); =20 return 0; } @@ -99,44 +67,9 @@ static int gpiomm_gpio_direction_output(struct gpio_chip= *chip, unsigned int offset, int value) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - const unsigned int io_port =3D offset / 8; - const unsigned int control_port =3D io_port / 3; - const unsigned int mask =3D BIT(offset % 8); - const unsigned int out_port =3D (io_port > 2) ? io_port + 1 : io_port; - unsigned long flags; - unsigned int control; - - spin_lock_irqsave(&gpiommgpio->lock, flags); - - /* Check if configuring Port C */ - if (io_port =3D=3D 2 || io_port =3D=3D 5) { - /* Port C can be configured by nibble */ - if (offset % 8 > 3) { - gpiommgpio->io_state[io_port] &=3D 0x0F; - gpiommgpio->control[control_port] &=3D ~BIT(3); - } else { - gpiommgpio->io_state[io_port] &=3D 0xF0; - gpiommgpio->control[control_port] &=3D ~BIT(0); - } - } else { - gpiommgpio->io_state[io_port] &=3D 0x00; - if (io_port =3D=3D 0 || io_port =3D=3D 3) - gpiommgpio->control[control_port] &=3D ~BIT(4); - else - gpiommgpio->control[control_port] &=3D ~BIT(1); - } - - if (value) - gpiommgpio->out_state[io_port] |=3D mask; - else - gpiommgpio->out_state[io_port] &=3D ~mask; - - control =3D BIT(7) | gpiommgpio->control[control_port]; - iowrite8(control, gpiommgpio->base + 3 + control_port*4); =20 - iowrite8(gpiommgpio->out_state[io_port], gpiommgpio->base + out_port); - - spin_unlock_irqrestore(&gpiommgpio->lock, flags); + i8255_direction_output(gpiommgpio->ppi, gpiommgpio->ppi_state, offset, + value); =20 return 0; } @@ -144,47 +77,16 @@ static int gpiomm_gpio_direction_output(struct gpio_ch= ip *chip, static int gpiomm_gpio_get(struct gpio_chip *chip, unsigned int offset) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); - const unsigned int in_port =3D (port > 2) ? port + 1 : port; - unsigned long flags; - unsigned int port_state; - - spin_lock_irqsave(&gpiommgpio->lock, flags); - - /* ensure that GPIO is set for input */ - if (!(gpiommgpio->io_state[port] & mask)) { - spin_unlock_irqrestore(&gpiommgpio->lock, flags); - return -EINVAL; - } - - port_state =3D ioread8(gpiommgpio->base + in_port); - - spin_unlock_irqrestore(&gpiommgpio->lock, flags); =20 - return !!(port_state & mask); + return i8255_get(gpiommgpio->ppi, offset); } =20 -static const size_t ports[] =3D { 0, 1, 2, 4, 5, 6 }; - static int gpiomm_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, unsigned long *bits) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - unsigned long offset; - unsigned long gpio_mask; - void __iomem *port_addr; - unsigned long port_state; - - /* clear bits array to a clean slate */ - bitmap_zero(bits, chip->ngpio); =20 - for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) { - port_addr =3D gpiommgpio->base + ports[offset / 8]; - port_state =3D ioread8(port_addr) & gpio_mask; - - bitmap_set_value8(bits, port_state, offset); - } + i8255_get_multiple(gpiommgpio->ppi, mask, bits, chip->ngpio); =20 return 0; } @@ -193,49 +95,17 @@ static void gpiomm_gpio_set(struct gpio_chip *chip, un= signed int offset, int value) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - const unsigned int port =3D offset / 8; - const unsigned int mask =3D BIT(offset % 8); - const unsigned int out_port =3D (port > 2) ? port + 1 : port; - unsigned long flags; - - spin_lock_irqsave(&gpiommgpio->lock, flags); - - if (value) - gpiommgpio->out_state[port] |=3D mask; - else - gpiommgpio->out_state[port] &=3D ~mask; - - iowrite8(gpiommgpio->out_state[port], gpiommgpio->base + out_port); =20 - spin_unlock_irqrestore(&gpiommgpio->lock, flags); + i8255_set(gpiommgpio->ppi, gpiommgpio->ppi_state, offset, value); } =20 static void gpiomm_gpio_set_multiple(struct gpio_chip *chip, unsigned long *mask, unsigned long *bits) { struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - unsigned long offset; - unsigned long gpio_mask; - size_t index; - void __iomem *port_addr; - unsigned long bitmask; - unsigned long flags; - - for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) { - index =3D offset / 8; - port_addr =3D gpiommgpio->base + ports[index]; - - bitmask =3D bitmap_get_value8(bits, offset) & gpio_mask; - - spin_lock_irqsave(&gpiommgpio->lock, flags); =20 - /* update output state data and set device gpio register */ - gpiommgpio->out_state[index] &=3D ~gpio_mask; - gpiommgpio->out_state[index] |=3D bitmask; - iowrite8(gpiommgpio->out_state[index], port_addr); - - spin_unlock_irqrestore(&gpiommgpio->lock, flags); - } + i8255_set_multiple(gpiommgpio->ppi, gpiommgpio->ppi_state, mask, bits, + chip->ngpio); } =20 #define GPIOMM_NGPIO 48 @@ -250,6 +120,21 @@ static const char *gpiomm_names[GPIOMM_NGPIO] =3D { "Port 2C2", "Port 2C3", "Port 2C4", "Port 2C5", "Port 2C6", "Port 2C7", }; =20 +static void gpiomm_init_dio(struct i8255 __iomem *const ppi, + struct i8255_state *const ppi_state) +{ + const unsigned long ngpio =3D 24; + const unsigned long mask =3D GENMASK(ngpio - 1, 0); + const unsigned long bits =3D 0; + unsigned long i; + + /* Initialize all GPIO to output 0 */ + for (i =3D 0; i < GPIOMM_NUM_PPI; i++) { + i8255_mode0_output(&ppi[i]); + i8255_set_multiple(&ppi[i], &ppi_state[i], &mask, &bits, ngpio); + } +} + static int gpiomm_probe(struct device *dev, unsigned int id) { struct gpiomm_gpio *gpiommgpio; @@ -266,8 +151,8 @@ static int gpiomm_probe(struct device *dev, unsigned in= t id) return -EBUSY; } =20 - gpiommgpio->base =3D devm_ioport_map(dev, base[id], GPIOMM_EXTENT); - if (!gpiommgpio->base) + gpiommgpio->ppi =3D devm_ioport_map(dev, base[id], GPIOMM_EXTENT); + if (!gpiommgpio->ppi) return -ENOMEM; =20 gpiommgpio->chip.label =3D name; @@ -284,7 +169,8 @@ static int gpiomm_probe(struct device *dev, unsigned in= t id) gpiommgpio->chip.set =3D gpiomm_gpio_set; gpiommgpio->chip.set_multiple =3D gpiomm_gpio_set_multiple; =20 - spin_lock_init(&gpiommgpio->lock); + i8255_state_init(gpiommgpio->ppi_state, GPIOMM_NUM_PPI); + gpiomm_init_dio(gpiommgpio->ppi, gpiommgpio->ppi_state); =20 err =3D devm_gpiochip_add_data(dev, &gpiommgpio->chip, gpiommgpio); if (err) { @@ -292,16 +178,6 @@ static int gpiomm_probe(struct device *dev, unsigned i= nt id) return err; } =20 - /* initialize all GPIO as output */ - iowrite8(0x80, gpiommgpio->base + 3); - iowrite8(0x00, gpiommgpio->base); - iowrite8(0x00, gpiommgpio->base + 1); - iowrite8(0x00, gpiommgpio->base + 2); - iowrite8(0x80, gpiommgpio->base + 7); - iowrite8(0x00, gpiommgpio->base + 4); - iowrite8(0x00, gpiommgpio->base + 5); - iowrite8(0x00, gpiommgpio->base + 6); - return 0; } =20 --=20 2.36.1