Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v2] pinctrl: pinctrl-single: Fix pcs_request_gpio() when
 bits_per_mux != 0
To:     Andy Shevchenko <andy.shevchenko@gmail.com>
Cc:     linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>,
        Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
        "open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Tony Lindgren <tony@atomide.com>,
        Haojian Zhuang <haojian.zhuang@linaro.org>,
        Linus Walleij <linus.walleij@linaro.org>
References: <1519077427-30165-1-git-send-email-david@lechnology.com>
 <CAHp75VeR2LG-qAzQs2048K3pyfRkz7OKioHDNyU8bVAPsgy8ew@mail.gmail.com>
From:   David Lechner <david@lechnology.com>
Message-ID: <6f8d2656-476c-81b6-6109-b26b98f15d31@lechnology.com>
Date:   Mon, 5 Mar 2018 16:39:51 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <CAHp75VeR2LG-qAzQs2048K3pyfRkz7OKioHDNyU8bVAPsgy8ew@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 02/20/2018 06:56 AM, Andy Shevchenko wrote:
> On Mon, Feb 19, 2018 at 11:57 PM, David Lechner <david@lechnology.com> wrote:
>> This fixes pcs_request_gpio() in the pinctrl-single driver when
>> bits_per_mux != 0. It appears this was overlooked when the multiple
>> pins per register feature was added.
>>
>> Fixes: 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")
>> Signed-off-by: David Lechner <david@lechnology.com>
>> ---
>>
>> v2 changes:
>> - don't wrap Fixes: line in commit message since it is a special machine-
>>    readable line.
>>
>> There was some discussion in v1 about using DIV_ROUND_UP(), etc. macros, but
>> the consensus was to leave it as-is since it matches existing code and that
>> macros can be introduced in another patch.
>>
>>   drivers/pinctrl/pinctrl-single.c | 22 +++++++++++++++++++---
>>   1 file changed, 19 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
>> index cec7537..a7c5eb3 100644
>> --- a/drivers/pinctrl/pinctrl-single.c
>> +++ b/drivers/pinctrl/pinctrl-single.c
>> @@ -391,9 +391,25 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev,
>>                          || pin < frange->offset)
>>                          continue;
> 
>>                  mux_bytes = pcs->width / BITS_PER_BYTE;
>> -               data = pcs->read(pcs->base + pin * mux_bytes) & ~pcs->fmask;
>> -               data |= frange->gpiofunc;
>> -               pcs->write(data, pcs->base + pin * mux_bytes);
>> +
>> +               if (pcs->bits_per_mux) {
>> +                       int byte_num, offset, pin_shift;
>> +
>> +                       byte_num = (pcs->bits_per_pin * pin) / BITS_PER_BYTE;
>> +                       offset = (byte_num / mux_bytes) * mux_bytes;
>> +                       pin_shift = pin % (pcs->width / pcs->bits_per_pin) *
>> +                                   pcs->bits_per_pin;
>> +
>> +                       data = pcs->read(pcs->base + offset);
>> +                       data &= ~(pcs->fmask << pin_shift);
>> +                       data |= frange->gpiofunc << pin_shift;
>> +                       pcs->write(data, pcs->base + offset);
>> +               } else {
> 
>> +                       data = pcs->read(pcs->base + pin * mux_bytes);
>> +                       data &= ~pcs->fmask;
>> +                       data |= frange->gpiofunc;
>> +                       pcs->write(data, pcs->base + pin * mux_bytes);
> 
> Just an idea, you may leave this almost untouched and do calculate
> pin_shift and offset in condition, like
> 
> if (...) {
>   pin_shift = ...
>   offset = ...
> } else {
>   pin_shift = 0;
>   offset = pin * mux_bytes;
> }
> 
>                         data = pcs->read(pcs->base + offset);
>                         data &= ~(pcs->fmask << pin_shift);
>                         data |= frange->gpiofunc << pin_shift;
>                         pcs->write(data, pcs->base + offset);
> 
> It's also possible to split to two changes, where first introduces
> that variables and their default values (see 'else' branch) and second
> one introduces an if branch override.
> 
>> +               }
>>                  break;
> 

Yes, there are many ways this could be done. However, I would like
to just leave it as it is since it matches the patterns used
elsewhere in this file.