realtek: phy: drop external RTL8218B firmware blob

No one has looked into the firmware based RTL8218B initializations
for a long time. Instead the basic setup sequences have evolved
so that they can start the RTL8218B PHY from scratch. See

19bc6e8 ("realtek: phy: add basic RTL8218B setup")
4fa90d8 ("realtek: phy: enhance RTL8218B initialization")

Drop the legacy coding.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21679
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
index 4eb4d138a1ce295794ff1b301a564b3b02a7d9a8..5d77bd15d62e4f03c4dec2c0254d7e77edc44a85 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
+++ b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
@@ -37,7 +37,6 @@ extern struct rtl83xx_soc_info soc_info;
  * the cache and paging engine of the MDIO controller.
  */
 #define RTL838X_PAGE_RAW               0x0fff
-#define RTL839X_PAGE_RAW               0x1fff
 
 /* internal RTL821X PHY uses register 0x1d to select media page */
 #define RTL821XINT_MEDIA_PAGE_SELECT   0x1d
@@ -60,7 +59,6 @@ extern struct rtl83xx_soc_info soc_info;
 #define RTL8214FC_MEDIA_COPPER         BIT(11)
 
 static const struct firmware rtl838x_8380_fw;
-static const struct firmware rtl838x_8218b_fw;
 
 struct rtl821x_shared_priv {
        int base_addr;
@@ -235,25 +233,6 @@ out:
        return NULL;
 }
 
-static void rtl821x_phy_setup_package_broadcast(struct phy_device *phydev, bool enable)
-{
-       int mac = phydev->mdio.addr;
-
-       /* select main page 0 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-       /* write to 0x8 to register 0x1d on main page 0 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_INTERNAL);
-       /* select page 0x266 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL821X_PAGE_PORT);
-       /* set phy id and target broadcast bitmap in register 0x16 on page 0x266 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, 0x16, (enable ? 0xff00 : 0x00) | mac);
-       /* return to main page 0 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-       /* write to 0x0 to register 0x1d on main page 0 */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL821XINT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
-       mdelay(1);
-}
-
 static int rtl821x_prepare_patch(struct phy_device *phydev, int ports)
 {
        struct phy_device *patchphy;
@@ -344,94 +323,6 @@ static int rtl8380_configure_int_rtl8218b(struct phy_device *phydev)
        return 0;
 }
 
-static int rtl8380_configure_ext_rtl8218b(struct phy_device *phydev)
-{
-       u32 *rtl8218B_6276B_rtl8380_perport;
-       u32 *rtl8380_rtl8218b_perchip;
-       u32 *rtl8380_rtl8218b_perport;
-       struct phy_device *patchphy;
-       struct fw_header *h;
-       u32 val, ipd;
-       int ret;
-
-       /* Read internal PHY ID */
-       phy_write_paged(phydev, 31, 27, 0x0002);
-       val = phy_read_paged(phydev, 31, 28);
-       if (val != RTL821X_CHIP_ID) {
-               phydev_err(phydev, "Expected external RTL8218B, found PHY-ID %x\n", val);
-               return -1;
-       }
-
-       h = rtl838x_request_fw(phydev, &rtl838x_8218b_fw, FIRMWARE_838X_8218b_1);
-       if (!h)
-               return -1;
-
-       if (h->phy != 0x8218b000) {
-               phydev_err(phydev, "Wrong firmware file: PHY mismatch.\n");
-               return -1;
-       }
-
-       rtl8380_rtl8218b_perchip = (void *)h + sizeof(struct fw_header) + h->parts[0].start;
-       rtl8218B_6276B_rtl8380_perport = (void *)h + sizeof(struct fw_header) + h->parts[1].start;
-       rtl8380_rtl8218b_perport = (void *)h + sizeof(struct fw_header) + h->parts[2].start;
-
-       val = phy_read(phydev, MII_BMCR);
-       if (val & BMCR_PDOWN)
-               rtl8380_int_phy_on_off(phydev, true);
-       else
-               rtl8380_phy_reset(phydev);
-
-       msleep(100);
-
-       /* Get Chip revision */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, 0x1b, 0x4);
-       val = phy_read_paged(phydev, RTL838X_PAGE_RAW, 0x1c);
-
-       phydev_info(phydev, "patch chip revision %d\n", val);
-
-       for (int i = 0; rtl8380_rtl8218b_perchip[i * 3] &&
-                       rtl8380_rtl8218b_perchip[i * 3 + 1]; i++) {
-               patchphy = get_package_phy(phydev, rtl8380_rtl8218b_perchip[i * 3]);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW,
-                               rtl8380_rtl8218b_perchip[i * 3 + 1],
-                               rtl8380_rtl8218b_perchip[i * 3 + 2]);
-       }
-
-       /* Enable PHY */
-       for (int port = 0; port < 8; port++) {
-               patchphy = get_package_phy(phydev, port);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, 0x00, 0x1140);
-       }
-       mdelay(100);
-
-       ret = rtl821x_prepare_patch(phydev, 8);
-       if (ret)
-               return ret;
-
-       /* Use Broadcast ID method for patching */
-       rtl821x_phy_setup_package_broadcast(phydev, true);
-
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, 30, 8);
-       phy_write_paged(phydev, 0x26e, 17, 0xb);
-       phy_write_paged(phydev, 0x26e, 16, 0x2);
-       mdelay(1);
-       ipd = phy_read_paged(phydev, 0x26e, 19);
-       phy_write_paged(phydev, 0, 30, 0);
-       ipd = (ipd >> 4) & 0xf; /* unused ? */
-
-       for (int i = 0; rtl8218B_6276B_rtl8380_perport[i * 2]; i++) {
-               phy_write_paged(phydev, RTL838X_PAGE_RAW, rtl8218B_6276B_rtl8380_perport[i * 2],
-                               rtl8218B_6276B_rtl8380_perport[i * 2 + 1]);
-       }
-
-       /* Disable broadcast ID */
-       rtl821x_phy_setup_package_broadcast(phydev, false);
-
-       return 0;
-}
-
 static bool __rtl8214fc_media_is_fibre(struct phy_device *phydev)
 {
        struct phy_device *basephy = get_base_phy(phydev);
@@ -705,10 +596,7 @@ static int rtl8214c_phy_probe(struct phy_device *phydev)
 
 static int rtl8218b_ext_phy_probe(struct phy_device *phydev)
 {
-       if (rtl821x_package_join(phydev, 8) == RTL821X_JOIN_LAST) {
-               if (soc_info.family == RTL8380_FAMILY_ID)
-                       return rtl8380_configure_ext_rtl8218b(get_base_phy(phydev));
-       }
+       rtl821x_package_join(phydev, 8);
 
        return 0;
 }

diff --git a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
index 7e6f62e94bbc30a941a315201994d8493342ad0c..a446570f11900fd9d1ab04584b4f034ea42fd62f 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
+++ b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
@@ -22,7 +22,6 @@ struct __packed fw_header {
  * this has been changed, this firmware file can be dropped completely.
  */
 #define FIRMWARE_838X_8380_1                   "rtl838x_phy/rtl838x_8380.fw"
-#define FIRMWARE_838X_8218b_1                  "rtl838x_phy/rtl838x_8218b.fw"
 
 #define PHY_ID_RTL8214C                                0x001cc942
 #define PHY_ID_RTL8218B_E                      0x001cc980

diff --git a/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8218b.fw b/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8218b.fw
deleted file mode 100644 (file)
index 66325ef..0000000
Binary files a/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8218b.fw and /dev/null differ

diff --git a/target/linux/realtek/rtl838x/config-6.12 b/target/linux/realtek/rtl838x/config-6.12
index 946bdf4d6adef1914ad2011ef1ab85ab9b7b8f7a..fe55afc06514ce503fe9ee136b93babe6da69c95 100644 (file)
--- a/target/linux/realtek/rtl838x/config-6.12
+++ b/target/linux/realtek/rtl838x/config-6.12
@@ -57,7 +57,7 @@ CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_8250=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXTRA_FIRMWARE="rtl838x_phy/rtl838x_8218b.fw rtl838x_phy/rtl838x_8380.fw"
+CONFIG_EXTRA_FIRMWARE="rtl838x_phy/rtl838x_8380.fw"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FIXED_PHY=y
 CONFIG_FORCE_NR_CPUS=y