From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1573ECAAA1 for ; Thu, 15 Sep 2022 14:48:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229886AbiIOOsV (ORCPT ); Thu, 15 Sep 2022 10:48:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbiIOOsU (ORCPT ); Thu, 15 Sep 2022 10:48:20 -0400 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CB3166AA28 for ; Thu, 15 Sep 2022 07:48:16 -0700 (PDT) Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.77 with qID 28FElpEtB013932, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/2.81/5.90) with ESMTPS id 28FElpEtB013932 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Thu, 15 Sep 2022 22:47:51 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36505.realtek.com.tw (172.21.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 15 Sep 2022 22:48:13 +0800 Received: from localhost.localdomain (172.21.182.184) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Thu, 15 Sep 2022 22:48:12 +0800 From: Chunhao Lin To: CC: , , Chunhao Lin Subject: [PATCH net-next v4] r8169: add support for rtl8168h(revid 0x2a) + rtl8211fs fiber application Date: Thu, 15 Sep 2022 22:48:07 +0800 Message-ID: <20220915144807.3602-1-hau@realtek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.21.182.184] X-ClientProxiedBy: RTEXH36504.realtek.com.tw (172.21.6.27) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-KSE-ServerInfo: RTEXMBS04.realtek.com.tw, 9 X-KSE-AntiSpam-Interceptor-Info: trusted connection X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Deterministic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 09/15/2022 13:21:00 X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: =?big5?B?Q2xlYW4sIGJhc2VzOiAyMDIyLzkvMTUgpFekyCAxMDo0NTowMA==?= X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled X-KSE-ServerInfo: RTEXH36505.realtek.com.tw, 9 X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8168h(revid 0x2a) + rtl8211fs is for fiber related application. rtl8168h is connected to rtl8211fs mdio bus via its eeprom or gpio pins. In this patch, use bitbanged MDIO framework to access rtl8211fs via rtl8168h's eeprom or gpio pins. And set mdiobb_ops owner to NULL to avoid increase module's refcount to prevent rmmod cannot be done. https://patchwork.kernel.org/project/linux-renesas-soc/patch/20200730100151.7490-1-ashiduka@fujitsu.com/ Signed-off-by: Chunhao Lin --- drivers/net/ethernet/realtek/Kconfig | 1 + drivers/net/ethernet/realtek/r8169_main.c | 286 +++++++++++++++++++++- 2 files changed, 286 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig index 93d9df55b361..20367114ac72 100644 --- a/drivers/net/ethernet/realtek/Kconfig +++ b/drivers/net/ethernet/realtek/Kconfig @@ -100,6 +100,7 @@ config R8169 depends on PCI select FW_LOADER select CRC32 + select MDIO_BITBANG select PHYLIB select REALTEK_PHY help diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index f6f63ba6593a..395eae62050a 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -333,6 +334,15 @@ enum rtl8125_registers { EEE_TXIDLE_TIMER_8125 = 0x6048, }; +enum rtl8168_sfp_registers { + MDIO_IN = 0xdc04, + PINOE = 0xdc06, + PIN_I_SEL_1 = 0xdc08, + PIN_I_SEL_2 = 0xdc0A, + PINPU = 0xdc18, + GPOUTPIN_SEL = 0xdc20, +}; + #define RX_VLAN_INNER_8125 BIT(22) #define RX_VLAN_OUTER_8125 BIT(23) #define RX_VLAN_8125 (RX_VLAN_INNER_8125 | RX_VLAN_OUTER_8125) @@ -573,6 +583,24 @@ struct rtl8169_tc_offsets { __le16 rx_missed; }; +struct rtl_sfp_if_info { + u16 mdio_oe_i; + u16 mdio_oe_o; + u16 mdio_pu; + u16 mdio_pd; + u16 mdc_pu; + u16 mdc_pd; +}; + +struct rtl_sfp_if_mask { + const u16 pin; + const u16 mdio_oe; + const u16 mdio; + const u16 mdc; + const u16 phy_addr; + const u16 rb_pos; +}; + enum rtl_flag { RTL_FLAG_TASK_ENABLED = 0, RTL_FLAG_TASK_RESET_PENDING, @@ -585,6 +613,12 @@ enum rtl_dash_type { RTL_DASH_EP, }; +enum rtl_sfp_if_type { + RTL_SFP_IF_NONE, + RTL_SFP_IF_EEPROM, + RTL_SFP_IF_GPIO, +}; + struct rtl8169_private { void __iomem *mmio_addr; /* memory map physical address */ struct pci_dev *pci_dev; @@ -624,6 +658,10 @@ struct rtl8169_private { struct rtl_fw *rtl_fw; u32 ocp_base; + + enum rtl_sfp_if_type sfp_if_type; + + struct mii_bus *mii_bus; /* MDIO bus control */ }; typedef void (*rtl_generic_fct)(struct rtl8169_private *tp); @@ -1199,6 +1237,242 @@ static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp) } } +struct bb_info { + struct rtl8169_private *tp; + struct mdiobb_ctrl ctrl; + struct rtl_sfp_if_mask mask; + u16 pinoe; + u16 pin_i_sel_1; + u16 pin_i_sel_2; +}; + +/* Data I/O pin control */ +static void rtl_bb_mdio_dir(struct mdiobb_ctrl *ctrl, int output) +{ + struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl); + struct rtl8169_private *tp = bitbang->tp; + const u16 mask = bitbang->mask.mdio_oe; + const u16 reg = PINOE; + u16 value; + + value = bitbang->pinoe; + if (output) + value |= mask; + else + value &= ~mask; + r8168_mac_ocp_write(tp, reg, value); +} + +/* Set bit data*/ +static void rtl_bb_set_mdio(struct mdiobb_ctrl *ctrl, int set) +{ + struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl); + struct rtl8169_private *tp = bitbang->tp; + const u16 mask = bitbang->mask.mdio; + const u16 reg = PIN_I_SEL_2; + u16 value; + + value = bitbang->pin_i_sel_2; + if (set) + value |= mask; + else + value &= ~mask; + r8168_mac_ocp_write(tp, reg, value); +} + +/* Get bit data*/ +static int rtl_bb_get_mdio(struct mdiobb_ctrl *ctrl) +{ + struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl); + struct rtl8169_private *tp = bitbang->tp; + const u16 reg = MDIO_IN; + + return (r8168_mac_ocp_read(tp, reg) & BIT(bitbang->mask.rb_pos)) != 0; +} + +/* MDC pin control */ +static void rtl_bb_mdc_ctrl(struct mdiobb_ctrl *ctrl, int set) +{ + struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl); + struct rtl8169_private *tp = bitbang->tp; + const u16 mask = bitbang->mask.mdc; + const u16 mdc_reg = PIN_I_SEL_1; + u16 value; + + value = bitbang->pin_i_sel_1; + if (set) + value |= mask; + else + value &= ~mask; + r8168_mac_ocp_write(tp, mdc_reg, value); +} + +/* mdio bus control struct */ +static const struct mdiobb_ops bb_ops = { + .owner = NULL, /* set to NULL for not increase refcount */ + .set_mdc = rtl_bb_mdc_ctrl, + .set_mdio_dir = rtl_bb_mdio_dir, + .set_mdio_data = rtl_bb_set_mdio, + .get_mdio_data = rtl_bb_get_mdio, +}; + +#define MDIO_READ 2 +#define MDIO_WRITE 1 +/* MDIO bus init function */ +static int rtl_mdio_bitbang_init(struct rtl8169_private *tp) +{ + struct device *d = tp_to_dev(tp); + struct bb_info *bitbang; + struct mii_bus *new_bus; + + /* create bit control struct for PHY */ + bitbang = devm_kzalloc(d, sizeof(struct bb_info), GFP_KERNEL); + if (!bitbang) + return -ENOMEM; + + /* bitbang init */ + bitbang->tp = tp; + bitbang->ctrl.ops = &bb_ops; + bitbang->ctrl.op_c22_read = MDIO_READ; + bitbang->ctrl.op_c22_write = MDIO_WRITE; + + /* MII controller setting */ + new_bus = alloc_mdio_bitbang(&bitbang->ctrl); + if (!new_bus) + return -ENOMEM; + + tp->mii_bus = new_bus; + + return 0; +} + +static void rtl_sfp_bitbang_init(struct rtl8169_private *tp, + struct rtl_sfp_if_mask *mask) +{ + struct bb_info *bitbang = + container_of(tp->mii_bus->priv, struct bb_info, ctrl); + + r8168_mac_ocp_modify(tp, PINPU, mask->pin, 0); + r8168_mac_ocp_modify(tp, PINOE, 0, mask->pin); + bitbang->pinoe = r8168_mac_ocp_read(tp, PINOE); + bitbang->pin_i_sel_1 = r8168_mac_ocp_read(tp, PIN_I_SEL_1); + bitbang->pin_i_sel_2 = r8168_mac_ocp_read(tp, PIN_I_SEL_2); + memcpy(&bitbang->mask, mask, sizeof(struct rtl_sfp_if_mask)); +} + +static void rtl_sfp_mdio_write(struct rtl8169_private *tp, + u8 reg, + u16 val) +{ + struct mii_bus *bus = tp->mii_bus; + struct bb_info *bitbang; + + if (!bus) + return; + + bitbang = container_of(bus->priv, struct bb_info, ctrl); + bus->write(bus, bitbang->mask.phy_addr, reg, val); +} + +static u16 rtl_sfp_mdio_read(struct rtl8169_private *tp, + u8 reg) +{ + struct mii_bus *bus = tp->mii_bus; + struct bb_info *bitbang; + + if (!bus) + return ~0; + + bitbang = container_of(bus->priv, struct bb_info, ctrl); + + return bus->read(bus, bitbang->mask.phy_addr, reg); +} + +static void rtl_sfp_mdio_modify(struct rtl8169_private *tp, u32 reg, u16 mask, + u16 set) +{ + u16 data = rtl_sfp_mdio_read(tp, reg); + + rtl_sfp_mdio_write(tp, reg, (data & ~mask) | set); +} + +#define RTL8211FS_PHY_ID_1 0x001c +#define RTL8211FS_PHY_ID_2 0xc916 + +static enum rtl_sfp_if_type rtl8168h_check_sfp(struct rtl8169_private *tp) +{ + static struct rtl_sfp_if_mask rtl_sfp_if_eeprom_mask = { + 0x0050, 0x0040, 0x000f, 0x0f00, 0, 6}; + static struct rtl_sfp_if_mask rtl_sfp_if_gpo_mask = { + 0x0210, 0x0200, 0xf000, 0x0f00, 1, 9}; + int const checkcnt = 4; + int i; + + if (rtl_mdio_bitbang_init(tp)) + return RTL_SFP_IF_NONE; + + rtl_sfp_bitbang_init(tp, &rtl_sfp_if_eeprom_mask); + rtl_sfp_mdio_write(tp, 0x1f, 0x0000); + for (i = 0; i < checkcnt; i++) { + if (rtl_sfp_mdio_read(tp, MII_PHYSID1) != RTL8211FS_PHY_ID_1 || + rtl_sfp_mdio_read(tp, MII_PHYSID2) != RTL8211FS_PHY_ID_2) + break; + } + + if (i == checkcnt) + return RTL_SFP_IF_EEPROM; + + rtl_sfp_bitbang_init(tp, &rtl_sfp_if_gpo_mask); + rtl_sfp_mdio_write(tp, 0x1f, 0x0000); + for (i = 0; i < checkcnt; i++) { + if (rtl_sfp_mdio_read(tp, MII_PHYSID1) != RTL8211FS_PHY_ID_1 || + rtl_sfp_mdio_read(tp, MII_PHYSID2) != RTL8211FS_PHY_ID_2) + break; + } + + if (i == checkcnt) + return RTL_SFP_IF_GPIO; + + return RTL_SFP_IF_NONE; +} + +static enum rtl_sfp_if_type rtl_check_sfp(struct rtl8169_private *tp) +{ + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_46: + if (tp->pci_dev->revision == 0x2a) + return rtl8168h_check_sfp(tp); + else + return RTL_SFP_IF_NONE; + default: + return RTL_SFP_IF_NONE; + } +} + +static void rtl_hw_sfp_phy_config(struct rtl8169_private *tp) +{ + /* disable ctap */ + rtl_sfp_mdio_write(tp, 0x1f, 0x0a43); + rtl_sfp_mdio_modify(tp, 0x19, BIT(6), 0); + + /* change Rx threshold */ + rtl_sfp_mdio_write(tp, 0x1f, 0x0dcc); + rtl_sfp_mdio_modify(tp, 0x14, 0, BIT(2) | BIT(3) | BIT(4)); + + /* switch pin34 to PMEB pin */ + rtl_sfp_mdio_write(tp, 0x1f, 0x0d40); + rtl_sfp_mdio_modify(tp, 0x16, 0, BIT(5)); + + /* enable pass_linkctl_en */ + rtl_sfp_mdio_write(tp, 0x1f, 0x0a4b); + rtl_sfp_mdio_modify(tp, 0x11, 0, BIT(4)); + + rtl_sfp_mdio_write(tp, 0x1f, 0x0000); + + /* disable ctap */ + phy_modify_paged(tp->phydev, 0x0a43, 0x11, BIT(6), 0); +} + static void rtl_set_d3_pll_down(struct rtl8169_private *tp, bool enable) { switch (tp->mac_version) { @@ -2168,6 +2442,9 @@ static void rtl8169_init_phy(struct rtl8169_private *tp) tp->pci_dev->subsystem_device == 0xe000) phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf01b); + if (tp->sfp_if_type != RTL_SFP_IF_NONE) + rtl_hw_sfp_phy_config(tp); + /* We may have called phy_speed_down before */ phy_speed_up(tp->phydev); @@ -2224,7 +2501,8 @@ static void rtl_prepare_power_down(struct rtl8169_private *tp) rtl_ephy_write(tp, 0x19, 0xff64); if (device_may_wakeup(tp_to_dev(tp))) { - phy_speed_down(tp->phydev, false); + if (tp->sfp_if_type == RTL_SFP_IF_NONE) + phy_speed_down(tp->phydev, false); rtl_wol_enable_rx(tp); } } @@ -4866,6 +5144,10 @@ static void rtl_remove_one(struct pci_dev *pdev) if (tp->dash_type != RTL_DASH_NONE) rtl8168_driver_stop(tp); + /* free bitbang info */ + if (tp->mii_bus) + free_mdio_bitbang(tp->mii_bus); + rtl_release_firmware(tp); /* restore original MAC address */ @@ -5210,6 +5492,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->dash_type = rtl_check_dash(tp); + tp->sfp_if_type = rtl_check_sfp(tp); + tp->cp_cmd = RTL_R16(tp, CPlusCmd) & CPCMD_MASK; if (sizeof(dma_addr_t) > 4 && tp->mac_version >= RTL_GIGA_MAC_VER_18 && -- 2.25.1