Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: rtl83xx-phy: fix RTL8214FC media change

Browse source 
Toggle power on the individual PHY instead of the package. Otherwise
a media change always toggles power on the first port, and not the one
that is being configured.

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
This commit is contained in:
Jan Hoffmann 2022-07-23 22:53:13 +02:00 committed by Daniel Golle
parent b2681e584c
commit bac50e39a7
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
target/linux/realtek/files-5.10/drivers/net/phy/rtl83xx-phy.c
View file

@ -949,19 +949,20 @@ static void rtl8380_rtl8214fc_media_set(struct phy_device *phydev, bool set_fibr
pr_info("Current media %x\n", media); pr_info("Current media %x\n", media);
if (media & 0x2) { if (media & 0x2) {
pr_info("Powering off COPPER\n"); pr_info("Powering off COPPER\n");
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER); phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER);
/* Ensure power is off */ /* Ensure power is off */
power = phy_package_read_paged(phydev, RTL821X_PAGE_POWER, 0x10); power = phy_read_paged(phydev, RTL821X_PAGE_POWER, 0x10);
if (!(power & (1 << 11))) if (!(power & (1 << 11)))
phy_package_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power | (1 << 11)); phy_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power | (1 << 11));
} else { } else {
pr_info("Powering off FIBRE"); pr_info("Powering off FIBRE\n");
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_FIBRE); phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_FIBRE);
/* Ensure power is off */ /* Ensure power is off */
power = phy_package_read_paged(phydev, RTL821X_PAGE_POWER, 0x10); power = phy_read_paged(phydev, RTL821X_PAGE_POWER, 0x10);
if (!(power & (1 << 11))) if (!(power & (1 << 11)))
phy_package_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power | (1 << 11)); phy_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power | (1 << 11));
} }
phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
if (set_fibre) { if (set_fibre) {
val |= 1 << 10; val |= 1 << 10;
@ -975,22 +976,21 @@ static void rtl8380_rtl8214fc_media_set(struct phy_device *phydev, bool set_fibr
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO); phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
if (set_fibre) { if (set_fibre) {
pr_info("Powering on FIBRE"); pr_info("Powering on FIBRE\n");
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_FIBRE); phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_FIBRE);
/* Ensure power is off */ /* Ensure power is off */
power = phy_package_read_paged(phydev, RTL821X_PAGE_POWER, 0x10); power = phy_read_paged(phydev, RTL821X_PAGE_POWER, 0x10);
if (power & (1 << 11)) if (power & (1 << 11))
phy_package_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power & ~(1 << 11)); phy_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power & ~(1 << 11));
} else { } else {
pr_info("Powering on COPPER\n"); pr_info("Powering on COPPER\n");
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER); phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER);
/* Ensure power is off */ /* Ensure power is off */
power = phy_package_read_paged(phydev, RTL821X_PAGE_POWER, 0x10); power = phy_read_paged(phydev, RTL821X_PAGE_POWER, 0x10);
if (power & (1 << 11)) if (power & (1 << 11))
phy_package_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power & ~(1 << 11)); phy_write_paged(phydev, RTL821X_PAGE_POWER, 0x10, power & ~(1 << 11));
} }
phy_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
phy_package_write_paged(phydev, RTL83XX_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
} }
static bool rtl8380_rtl8214fc_media_is_fibre(struct phy_device *phydev) static bool rtl8380_rtl8214fc_media_is_fibre(struct phy_device *phydev)