On Thu, Dec 26, 2013 at 07:01:57PM +0100, Andrew Lunn wrote: > On Mon, Dec 23, 2013 at 01:07:35PM +0100, Simon Guinot wrote: > > From: Lior Amsalem <[email protected]> > > > > From: Lior Amsalem <[email protected]> > > > > This patch fixes a SATA hotplug issue on the Armada 370 and Armada XP > > SoCs. Without it, if a disk is unplugged from a SATA port, then further > > hotplug notification are now longer received on this port. > > > > This should be applied to every -stable kernel supporting Armada SoCs. > > > > Signed-off-by: Lior Amsalem <[email protected]> > > Signed-off-by: Nadav Haklai <[email protected]> > > Signed-off-by: Simon Guinot <[email protected]> > > Cc: Thomas Petazzoni <[email protected]> > > Cc: Jason Cooper <[email protected]> > > Cc: Andrew Lunn <[email protected]> > > Cc: Gregory Clement <[email protected]> > > Cc: Sebastian Hesselbarth <[email protected]> > > Cc: [email protected] > > I tested this on Kirkwood, which does not have any issues to > (re)hotplug. Still works O.K. with this patch.
Hi Andrew, Thanks for the tests. > > My only reservation is that neither the Kirkwood nor Dove datasheet > list the LP_PHY_CTL register. Are we now poking something which does > not exist on these SoCs? Is that safe? I will check that. Simon > > Tested-by: Andrew Lunn <[email protected]> > > Andrew > > > > --- > > drivers/ata/sata_mv.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c > > index 56be318..89ca472 100644 > > --- a/drivers/ata/sata_mv.c > > +++ b/drivers/ata/sata_mv.c > > @@ -304,6 +304,7 @@ enum { > > MV5_LTMODE = 0x30, > > MV5_PHY_CTL = 0x0C, > > SATA_IFCFG = 0x050, > > + LP_PHY_CTL = 0x058, > > > > MV_M2_PREAMP_MASK = 0x7e0, > > > > @@ -1358,6 +1359,7 @@ static int mv_scr_write(struct ata_link *link, > > unsigned int sc_reg_in, u32 val) > > > > if (ofs != 0xffffffffU) { > > void __iomem *addr = mv_ap_base(link->ap) + ofs; > > + void __iomem *lp_phy_addr = mv_ap_base(link->ap) + LP_PHY_CTL; > > if (sc_reg_in == SCR_CONTROL) { > > /* > > * Workaround for 88SX60x1 FEr SATA#26: > > @@ -1374,6 +1376,14 @@ static int mv_scr_write(struct ata_link *link, > > unsigned int sc_reg_in, u32 val) > > */ > > if ((val & 0xf) == 1 || (readl(addr) & 0xf) == 1) > > val |= 0xf000; > > + > > + /* > > + * Setting PHY speed according to SControl speed > > + */ > > + if ((val & 0xf0) == 0x10) > > + writelfl(0x7, lp_phy_addr); > > + else > > + writelfl(0x227, lp_phy_addr); > > } > > writelfl(val, addr); > > return 0; > > -- > > 1.8.5.1 > >
signature.asc
Description: Digital signature
