Re: [PATCH 1/1] phy: fix build breakage: add PHY_MODE_SATA

From: Miquel Raynal
Date: Mon Jan 14 2019 - 03:57:50 EST


Hi Olof,

Olof Johansson <olof@xxxxxxxxx> wrote on Sat, 12 Jan 2019 19:57:12
-0800:

> On Sat, Jan 12, 2019 at 6:05 PM Jens Axboe <axboe@xxxxxxxxx> wrote:
> >
> > On 1/12/19 6:29 PM, john.hubbard@xxxxxxxxx wrote:
> > > From: John Hubbard <jhubbard@xxxxxxxxxx>
> > >
> > > Commit 49e54187ae0b ("ata: libahci_platform: comply to PHY framework") uses
> > > the PHY_MODE_SATA, but that enum had not yet been added. This caused a
> > > build failure for me, with today's linux.git.
> > >
> > > Also, there is a potentially conflicting (mis-named) PHY_MODE_SATA, hiding
> > > in the Marvell Berlin SATA PHY driver.
> > >
> > > Fix the build by:
> > >
> > > 1) Renaming Marvell's defined value to a more scoped name,
> > > in order to avoid any potential conflicts: PHY_BERLIN_MODE_SATA.
> > >
> > > 2) Adding the missing enum, which was going to be added anyway as part
> > > of [1].
> > >
> > > [1] https://lkml.kernel.org/r/20190108163124.6409-3-miquel.raynal@xxxxxxxxxxx
> > >
> > > Fixes: 49e54187ae0b ("ata: libahci_platform: comply to PHY framework")
> >
> > Linus, this is probably a better option in terms of what should go in to
> > fix that commit.
>
> I'm OK with this, but it does beg the question how the patch was
> tested before submitting, if it didn't build.
>
> Is there functional breakage behind it? I currently lack online
> hardware to test myself, unfortunately.

This is my mistake, I forgot to tell Jens about this dependency,
I am very sorry about that. As reported by John, this patch depends on
the addition of PHY_MODE_SATA in the PHY type enumeration. This series
([1]) has been delayed and I should have warned Jens about it. I'm fine
with the above fix though.

Kishon, will you be able to base phy-next on top of this fix? It will
be needed for the addition of the COMPHY driver.


Thanks and again, sorry for the troubles.
MiquÃl