From patchwork Fri Apr 24 12:34:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Syed Nayyar Waris X-Patchwork-Id: 207015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6C2BC54FCB for ; Fri, 24 Apr 2020 12:35:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6F1F20700 for ; Fri, 24 Apr 2020 12:35:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Puhfz38A" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726793AbgDXMe6 (ORCPT ); Fri, 24 Apr 2020 08:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726289AbgDXMe6 (ORCPT ); Fri, 24 Apr 2020 08:34:58 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA39FC09B045; Fri, 24 Apr 2020 05:34:57 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id mq3so3824496pjb.1; Fri, 24 Apr 2020 05:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=IYsx8ReGBE0SZMDMShZd8d3kGF4vInj33KNUOojIGFk=; b=Puhfz38A8No47Vs11emtioczpZqvcxI/PrK8TNvQu9KDF5oGG9NMDnZybFfYwgNoc8 xH7R9QJ5nmcGuoEgeRHeLq20vNKEc57pJNravW0ShDtDejbt5a3qvClLubWtv4UghDnS wQqz9K72Y4ooTkMBTDvBM1L6Oo4aKjGI4cPGfkwsGRZvMvDkg94bR6v6hQJ0aJf8SQLx RFecgornk5SIVj966SLdvpvFnPA+jVINaUoxlPKrbR7K5JWtAe826dlHgwlE04Jmv1KC 2azO5BE7feh/B3ju5/cQZzSAPvEOoaaJTe8vLLXBfyFC4jnElUKG76+7XIBPC1PXvlRD oJDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=IYsx8ReGBE0SZMDMShZd8d3kGF4vInj33KNUOojIGFk=; b=WpuWd0VdsO3oAQsBM5xKOfQQh5RbQcqhDGonsuTJ0qWl3JSiRUhu2t5Kdbol2AmPF9 2OD3bBy6OdEIA9WSZQgJ78LAD+e1j8eRexobTxQ+BpQmrHNzru1RNQkP+9a2ouqjJBuv bpCu+LowfRNVq62T8ipEijhbOs+TgVu23to+pFX+ZxvbTksv+u4DpmXJeC18wHUq0i79 qfoZ2g0Wq34ieRDqxer+bnDTvTYmVm5iRbUccP42o/cikdFWnykwyixTSJIEzHK5QbLL VzqPQDgwNdL+o5cYHVFgkuAqXZ5AIaImFGoMsnTk2OUDMESk5RPG7iNhJIzNoLceyPjl j8/A== X-Gm-Message-State: AGi0PubfSoQdo+Hka+KfD0gE4InIsr//IWUKBcqFW1OS6G4Jis42mCUu OvvXFmhpWAe+2Xne9n1rgIs= X-Google-Smtp-Source: APiQypLMHyPCoD0045oHjHegbrwp6gRQSGxOQGJo2oOA+031VO+4YwsEMbDoeFQY6GWxH5CvKbja8Q== X-Received: by 2002:a17:90a:284e:: with SMTP id p14mr5931954pjf.10.1587731697484; Fri, 24 Apr 2020 05:34:57 -0700 (PDT) Received: from syed ([106.223.101.26]) by smtp.gmail.com with ESMTPSA id f99sm4787703pjg.22.2020.04.24.05.34.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2020 05:34:57 -0700 (PDT) Date: Fri, 24 Apr 2020 18:04:49 +0530 From: Syed Nayyar Waris To: akpm@linux-foundation.org Cc: andriy.shevchenko@linux.intel.com, vilhelm.gray@gmail.com, linus.walleij@linaro.org, bgolaszewski@baylibre.com, michal.simek@xilinx.com, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] gpio: xilinx: Utilize for_each_set_clump macro Message-ID: <20200424123449.GA5741@syed> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This patch reimplements the xgpio_set_multiple function in drivers/gpio/gpio-xilinx.c to use the new for_each_set_clump macro. Instead of looping for each bit in xgpio_set_multiple function, now we can check each channel at a time and save cycles. Cc: Linus Walleij Cc: Bartosz Golaszewski Cc: Michal Simek Signed-off-by: Syed Nayyar Waris Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-xilinx.c | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index 67f9f82..428207f 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -136,39 +136,43 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val) static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, unsigned long *bits) { - unsigned long flags; + unsigned long flags[2]; struct xgpio_instance *chip = gpiochip_get_data(gc); - int index = xgpio_index(chip, 0); - int offset, i; - - spin_lock_irqsave(&chip->gpio_lock[index], flags); - - /* Write to GPIO signals */ - for (i = 0; i < gc->ngpio; i++) { - if (*mask == 0) - break; - /* Once finished with an index write it out to the register */ - if (index != xgpio_index(chip, i)) { - xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + - index * XGPIO_CHANNEL_OFFSET, - chip->gpio_state[index]); - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); - index = xgpio_index(chip, i); - spin_lock_irqsave(&chip->gpio_lock[index], flags); - } - if (__test_and_clear_bit(i, mask)) { - offset = xgpio_offset(chip, i); - if (test_bit(i, bits)) - chip->gpio_state[index] |= BIT(offset); - else - chip->gpio_state[index] &= ~BIT(offset); - } + u32 *const state = chip->gpio_state; + unsigned int *const width = chip->gpio_width; + const unsigned long state_size = BITS_PER_TYPE(*state); + unsigned long offset, clump; + size_t index; + +#define TOTAL_BITS BITS_PER_TYPE(chip->gpio_state) + DECLARE_BITMAP(old, TOTAL_BITS); + DECLARE_BITMAP(new, TOTAL_BITS); + DECLARE_BITMAP(changed, TOTAL_BITS); + + spin_lock_irqsave(&chip->gpio_lock[0], flags[0]); + spin_lock_irqsave(&chip->gpio_lock[1], flags[1]); + + bitmap_set_value(old, state[0], 0, width[0]); + bitmap_set_value(old, state[1], width[0], width[1]); + bitmap_replace(new, old, bits, mask, gc->ngpio); + + bitmap_set_value(old, state[0], 0, state_size); + bitmap_set_value(old, state[1], state_size, state_size); + state[0] = bitmap_get_value(new, 0, width[0]); + state[1] = bitmap_get_value(new, width[0], width[1]); + bitmap_set_value(new, state[0], 0, state_size); + bitmap_set_value(new, state[1], state_size, state_size); + bitmap_xor(changed, old, new, TOTAL_BITS); + + for_each_set_clump(offset, clump, changed, TOTAL_BITS, state_size) { + index = offset / state_size; + xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + + index * XGPIO_CHANNEL_OFFSET, + state[index]); } - xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + - index * XGPIO_CHANNEL_OFFSET, chip->gpio_state[index]); - - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); + spin_unlock_irqrestore(&chip->gpio_lock[1], flags[1]); + spin_unlock_irqrestore(&chip->gpio_lock[0], flags[0]); } /**