From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from co1outboundpool.messaging.microsoft.com (co1ehsobe002.messaging.microsoft.com [216.32.180.185]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "MSIT Machine Auth CA 2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 6C0922C014B for ; Sat, 23 Nov 2013 05:39:25 +1100 (EST) Message-ID: <1385145548.1403.524.camel@snotra.buserror.net> Subject: Re: [PATCH v2] powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536 From: Scott Wood To: Liu Gang Date: Fri, 22 Nov 2013 12:39:08 -0600 In-Reply-To: <1385107960-373-1-git-send-email-Gang.Liu@freescale.com> References: <1385107960-373-1-git-send-email-Gang.Liu@freescale.com> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Cc: b07421@freescale.com, linus.walleij@linaro.org, r61911@freescale.com, linux-gpio@vger.kernel.org, agust@denx.de, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, 2013-11-22 at 16:12 +0800, Liu Gang wrote: > For MPC8572/MPC8536, the status of GPIOs defined as output > cannot be determined by reading GPDAT register, so the code > use shadow data register instead. But the code may give the > wrong status of GPIOs defined as input under some scenarios: > > 1. If some pins were configured as inputs and were asserted > high before booting the kernel, the shadow data has been > initialized with those pin values. > 2. Some pins have been configured as output first and have > been set to the high value, then reconfigured as input. > > The above cases will make the shadow data for those input > pins to be set to high. Then reading the pin status will > always return high even if the actual pin status is low. > > The code should eliminate the effects of the shadow data to > the input pins, and the status of those pins should be > read directly from GPDAT. > > Signed-off-by: Liu Gang > --- > changes in v2: > - Added more description of the problem. > - Reduced one in_be32() call. > - Do not modify the shadow data. > > drivers/gpio/gpio-mpc8xxx.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c > index 914e859..d7d6d72 100644 > --- a/drivers/gpio/gpio-mpc8xxx.c > +++ b/drivers/gpio/gpio-mpc8xxx.c > @@ -70,10 +70,14 @@ static int mpc8572_gpio_get(struct gpio_chip *gc, unsigned int gpio) > u32 val; > struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc); > struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm); > + u32 out_mask, out_shadow; > > - val = in_be32(mm->regs + GPIO_DAT) & ~in_be32(mm->regs + GPIO_DIR); > + out_mask = in_be32(mm->regs + GPIO_DIR); > > - return (val | mpc8xxx_gc->data) & mpc8xxx_gpio2mask(gpio); > + val = in_be32(mm->regs + GPIO_DAT) & ~out_mask; > + out_shadow = mpc8xxx_gc->data & out_mask; > + > + return (val | out_shadow) & mpc8xxx_gpio2mask(gpio); > } > > static int mpc8xxx_gpio_get(struct gpio_chip *gc, unsigned int gpio) Acked-by: Scott Wood -Scott