From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>,
Srinivas Neeli <srinivas.neeli@xilinx.com>,
Michal Simek <michal.simek@xilinx.com>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Syed Nayyar Waris <syednwaris@gmail.com>,
vilhelm.gray@gmail.com
Subject: [PATCH 1/1] drivers/gpio/gpio-xilinx.c (updated): bitmap-fix
Date: Thu, 8 Apr 2021 18:31:08 +0300 [thread overview]
Message-ID: <20210408153108.81738-1-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <YG8cWBkcF8ulHW0D@smile.fi.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpio-xilinx.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
index d5a08dcdd677..109b32104867 100644
--- a/drivers/gpio/gpio-xilinx.c
+++ b/drivers/gpio/gpio-xilinx.c
@@ -75,9 +75,14 @@ struct xgpio_instance {
struct clk *clk;
};
+static inline int xgpio_from_bit(struct xgpio_instance *chip, int bit)
+{
+ return bitmap_bitremap(bit, chip->hw_map, chip->sw_map, 64);
+}
+
static inline int xgpio_to_bit(struct xgpio_instance *chip, int gpio)
{
- return bitmap_bitremap(gpio, chip->sw_map, chip->hw_map, chip->gc.ngpio);
+ return bitmap_bitremap(gpio, chip->sw_map, chip->hw_map, 64);
}
static inline u32 xgpio_get_value32(const unsigned long *map, int bit)
@@ -207,11 +212,11 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
spin_lock_irqsave(&chip->gpio_lock, flags);
- bitmap_replace(state, chip->state, hw_bits, hw_mask, gc->ngpio);
+ bitmap_replace(state, chip->state, hw_bits, hw_mask, 64);
xgpio_write_ch_all(chip, XGPIO_DATA_OFFSET, state);
- bitmap_copy(chip->state, state, gc->ngpio);
+ bitmap_copy(chip->state, state, 64);
spin_unlock_irqrestore(&chip->gpio_lock, flags);
}
@@ -501,6 +506,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
DECLARE_BITMAP(rising, 64);
DECLARE_BITMAP(falling, 64);
DECLARE_BITMAP(all, 64);
+ int irq_offset;
u32 status;
u32 bit;
@@ -530,8 +536,10 @@ static void xgpio_irqhandler(struct irq_desc *desc)
dev_dbg(gc->parent, "IRQ rising %*pb falling %*pb\n", 64, rising, 64, falling);
- for_each_set_bit(bit, all, 64)
- generic_handle_irq(irq_find_mapping(gc->irq.domain, bit));
+ for_each_set_bit(bit, all, 64) {
+ irq_offset = xgpio_from_bit(chip, bit);
+ generic_handle_irq(irq_find_mapping(gc->irq.domain, irq_offset));
+ }
chained_irq_exit(irqchip, desc);
}
--
2.30.2
next prev parent reply other threads:[~2021-04-08 15:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 14:55 [RFT, PATCH v1 0/5] gpio: xilinx: convert to use bitmap API Andy Shevchenko
2021-04-08 14:55 ` [PATCH v1 1/5] bitmap: Make bitmap_remap() and bitmap_bitremap() available to users Andy Shevchenko
2021-04-08 16:52 ` Yury Norov
2021-04-08 14:55 ` [PATCH v1 2/5] gpio: xilinx: Correct kernel doc for xgpio_probe() Andy Shevchenko
2021-04-08 16:16 ` Michal Simek
2021-04-08 14:55 ` [PATCH v1 3/5] gpio: xilinx: Introduce xgpio_read_chan() / xgpio_write_chan() Andy Shevchenko
2021-04-08 14:56 ` [PATCH v1 4/5] gpio: xilinx: Switch to use bitmap APIs Andy Shevchenko
2021-04-08 15:08 ` Andy Shevchenko
2021-04-08 15:31 ` Andy Shevchenko [this message]
2021-04-08 14:56 ` [PATCH v1 5/5] gpio: xilinx: No need to disable IRQs in the handler Andy Shevchenko
2021-04-23 20:41 ` [RFT, PATCH v1 0/5] gpio: xilinx: convert to use bitmap API Bartosz Golaszewski
2021-04-24 11:08 ` Andy Shevchenko
2021-04-24 11:14 ` Andy Shevchenko
2021-04-29 13:59 ` Srinivas Neeli
2021-04-29 14:30 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210408153108.81738-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=shubhrajyoti.datta@xilinx.com \
--cc=srinivas.neeli@xilinx.com \
--cc=syednwaris@gmail.com \
--cc=vilhelm.gray@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).