Re: [PATCH] mfd: rtsx: fix PM suspend for 5227 & 5249

[micky]

On 09/18/2014 12:53 PM, Lee Jones wrote:
> On Thu, 18 Sep 2014, micky_ching@xxxxxxxxxxxxxx wrote:
>
> > From: Micky Ching <micky_ching@xxxxxxxxxxxxxx>
> >
> > Fix rts5227&5249 failed send buffer cmd after suspend,
> > PM_CTRL3 should reset before send any buffer cmd after suspend.
> > Otherwise, buffer cmd will failed, this will lead resume fail.
> >
> > Signed-off-by: Micky Ching <micky_ching@xxxxxxxxxxxxxx>
> > ---
> >   drivers/mfd/rts5227.c        |   19 +++++++++++++++++++
> >   drivers/mfd/rts5249.c        |    4 ++++
> >   drivers/mfd/rtsx_pcr.h       |    1 +
> >   include/linux/mfd/rtsx_pci.h |   12 ++++++++++++
> >   4 files changed, 36 insertions(+)
> I think you'll find you just broke the build.
>
> What happens when you compile these as modules?
I build as modules with no warning or error, did you find anything wrong?
> > diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c
> > index 9c8eec8..8222a31 100644
> > --- a/drivers/mfd/rts5227.c
> > +++ b/drivers/mfd/rts5227.c
> > @@ -128,8 +128,27 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
> >   	return rtsx_pci_send_cmd(pcr, 100);
> >   }
> >   
> > +int rts5227_pm_reset(struct rtsx_pcr *pcr)
> > +{
> > +	int err;
> > +
> > +	/* init aspm */
> > +	err = rtsx_pci_update_cfg_byte(pcr, LCTLR, 0xFC, 0);
> > +	if (err < 0)
> > +		return err;
> > +
> > +	/* reset PM_CTRL3 before send buffer cmd */
> > +	return rtsx_pci_write_register(pcr, PM_CTRL3, 0x10, 0x00);
> > +}
> > +
> >   static int rts5227_optimize_phy(struct rtsx_pcr *pcr)
> >   {
> > +	int err;
> > +
> > +	err = rts5227_pm_reset(pcr);
> > +	if (err < 0)
> > +		return err;
> > +
> >   	/* Optimize RX sensitivity */
> >   	return rtsx_pci_write_phy_register(pcr, 0x00, 0xBA42);
> >   }
> > diff --git a/drivers/mfd/rts5249.c b/drivers/mfd/rts5249.c
> > index 573de7b..0f1b0e6 100644
> > --- a/drivers/mfd/rts5249.c
> > +++ b/drivers/mfd/rts5249.c
> > @@ -130,6 +130,10 @@ static int rts5249_optimize_phy(struct rtsx_pcr *pcr)
> >   {
> >   	int err;
> >   
> > +	err = rts5227_pm_reset(pcr);
> > +	if (err < 0)
> > +		return err;
> I don't like this.  Place rts52xx_pm_reset() somewhere more central.
> Perhaps an inline function in the header would be better?
Thanks, I will fix later.
> >   	err = rtsx_pci_write_phy_register(pcr, PHY_REG_REV,
> >   			PHY_REG_REV_RESV | PHY_REG_REV_RXIDLE_LATCHED |
> >   			PHY_REG_REV_P1_EN | PHY_REG_REV_RXIDLE_EN |
> > diff --git a/drivers/mfd/rtsx_pcr.h b/drivers/mfd/rtsx_pcr.h
> > index 07e4c2e..acc7a1e 100644
> > --- a/drivers/mfd/rtsx_pcr.h
> > +++ b/drivers/mfd/rtsx_pcr.h
> > @@ -72,4 +72,5 @@ do {									\
> >   	pcr->ms_pull_ctl_disable_tbl = __device##_ms_pull_ctl_disable_tbl; \
> >   } while (0)
> >   
> > +int rts5227_pm_reset(struct rtsx_pcr *pcr);
> >   #endif
> > diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
> > index 74346d5..b34fec8 100644
> > --- a/include/linux/mfd/rtsx_pci.h
> > +++ b/include/linux/mfd/rtsx_pci.h
> > @@ -967,4 +967,16 @@ static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr)
> >   	return (u8 *)(pcr->host_cmds_ptr);
> >   }
> >   
> > +static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,
> > +		u8 mask, u8 append)
> > +{
> > +	int err;
> > +	u8 val;
> > +
> > +	err = pci_read_config_byte(pcr->pci, addr, &val);
> > +	if (err < 0)
> > +		return err;
> > +	return pci_write_config_byte(pcr->pci, addr, (val & mask) | append);
> > +}
> > +
> >   #endif

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/