| Message ID | 20200420140319.76122-1-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,F/master] net: phy: realtek: fix handling of RTL8105e-integrated PHY | expand |
On 20/04/2020 15:03, Paolo Pisati wrote: > From: Heiner Kallweit <hkallweit1@gmail.com> > > BugLink: https://bugs.launchpad.net/bugs/1871182 > > [ No applicable upstream commit ] > > After the referenced fix it turned out that one particular RTL8168 > chip version (RTL8105e) does not work on 5.4 because no dedicated PHY > driver exists. Adding this PHY driver was done for fixing a different > issue for versions from 5.5 already. I re-send the same change for 5.4 > because the commit message differs. > > Fixes: 2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > (cherry picked from commit 3fcd53b1d859799686a08785afb8990566c31cfa > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git) > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> > --- > drivers/net/phy/realtek.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c > index c76df51dd3c5..879ca37c8508 100644 > --- a/drivers/net/phy/realtek.c > +++ b/drivers/net/phy/realtek.c > @@ -456,6 +456,15 @@ static struct phy_driver realtek_drvs[] = { > .resume = genphy_resume, > .read_page = rtl821x_read_page, > .write_page = rtl821x_write_page, > + }, { > + PHY_ID_MATCH_MODEL(0x001cc880), > + .name = "RTL8208 Fast Ethernet", > + .read_mmd = genphy_read_mmd_unsupported, > + .write_mmd = genphy_write_mmd_unsupported, > + .suspend = genphy_suspend, > + .resume = genphy_resume, > + .read_page = rtl821x_read_page, > + .write_page = rtl821x_write_page, > }, { > PHY_ID_MATCH_EXACT(0x001cc910), > .name = "RTL8211 Gigabit Ethernet", > Introduces a model ID, so looks sane to me. Clean upstream cherry pick, so.. Acked-by: Colin Ian King <colin.king@canonical.com>
On Mon, Apr 20, 2020 at 04:03:19PM +0200, Paolo Pisati wrote: > From: Heiner Kallweit <hkallweit1@gmail.com> > > BugLink: https://bugs.launchpad.net/bugs/1871182 > > [ No applicable upstream commit ] > > After the referenced fix it turned out that one particular RTL8168 > chip version (RTL8105e) does not work on 5.4 because no dedicated PHY > driver exists. Adding this PHY driver was done for fixing a different > issue for versions from 5.5 already. I re-send the same change for 5.4 > because the commit message differs. > > Fixes: 2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > (cherry picked from commit 3fcd53b1d859799686a08785afb8990566c31cfa > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git) > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
On Mon, Apr 20, 2020 at 04:03:19PM +0200, Paolo Pisati wrote: > From: Heiner Kallweit <hkallweit1@gmail.com> > > BugLink: https://bugs.launchpad.net/bugs/1871182 > > [ No applicable upstream commit ] > > After the referenced fix it turned out that one particular RTL8168 > chip version (RTL8105e) does not work on 5.4 because no dedicated PHY > driver exists. Adding this PHY driver was done for fixing a different > issue for versions from 5.5 already. I re-send the same change for 5.4 > because the commit message differs. > > Fixes: 2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > (cherry picked from commit 3fcd53b1d859799686a08785afb8990566c31cfa > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git) > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> > --- > drivers/net/phy/realtek.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c > index c76df51dd3c5..879ca37c8508 100644 > --- a/drivers/net/phy/realtek.c > +++ b/drivers/net/phy/realtek.c > @@ -456,6 +456,15 @@ static struct phy_driver realtek_drvs[] = { > .resume = genphy_resume, > .read_page = rtl821x_read_page, > .write_page = rtl821x_write_page, > + }, { > + PHY_ID_MATCH_MODEL(0x001cc880), > + .name = "RTL8208 Fast Ethernet", > + .read_mmd = genphy_read_mmd_unsupported, > + .write_mmd = genphy_write_mmd_unsupported, > + .suspend = genphy_suspend, > + .resume = genphy_resume, > + .read_page = rtl821x_read_page, > + .write_page = rtl821x_write_page, > }, { > PHY_ID_MATCH_EXACT(0x001cc910), > .name = "RTL8211 Gigabit Ethernet", > -- > 2.25.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index c76df51dd3c5..879ca37c8508 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -456,6 +456,15 @@ static struct phy_driver realtek_drvs[] = { .resume = genphy_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, + }, { + PHY_ID_MATCH_MODEL(0x001cc880), + .name = "RTL8208 Fast Ethernet", + .read_mmd = genphy_read_mmd_unsupported, + .write_mmd = genphy_write_mmd_unsupported, + .suspend = genphy_suspend, + .resume = genphy_resume, + .read_page = rtl821x_read_page, + .write_page = rtl821x_write_page, }, { PHY_ID_MATCH_EXACT(0x001cc910), .name = "RTL8211 Gigabit Ethernet",