From patchwork Thu Apr 13 14:13:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 13210326 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 827A9C77B61 for ; Thu, 13 Apr 2023 14:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229840AbjDMONM (ORCPT ); Thu, 13 Apr 2023 10:13:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbjDMONM (ORCPT ); Thu, 13 Apr 2023 10:13:12 -0400 Received: from h1.cmg1.smtp.forpsi.com (h1.cmg1.smtp.forpsi.com [81.2.195.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA336213F for ; Thu, 13 Apr 2023 07:13:10 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id mxhDpEho1Pm6CmxhEpKchO; Thu, 13 Apr 2023 16:13:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395189; bh=eRHsidDVNRs2M1+VN+3eusBdsnRkuZeVQ3Wznm+7910=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=MC58rDro3QaZCutFrj0WHj6AMq57eBtpWE6O41bh5fJUjjmyLu1RRztfUAVoGGIm5 mJq2LpHH2ouNRlULgMzgaoXfqBri3k6nSzEV1dbpU0OoU9cLMZldC47D8gCWEciCbE mdGnWUtJsxbYBuKKofv21WdON4g8nDb2rD7Q2n44JQsIp82ifTWfV1FW7NTVWDj4Sp 3DQmHjvUAfjQZNyAZQ4tnz5HCiBA6ZwDlg1vKZ1azfRmY8Bxu8caaViCF7YGCLXdPE PnLkYvnIRifxb6cKx/kf1lCGY6S4on7FgqA5ZXYaN/2hL7d07Zgz5KgYUxX0EJ0g41 SUj5DKbXa07Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395188; bh=eRHsidDVNRs2M1+VN+3eusBdsnRkuZeVQ3Wznm+7910=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=UchwybpYIpHyKj+trxCOHoCZUjPb3waAUXRrYEuo3+12oBgK38Vo/mam3K7/D0mJZ 3A4HlrBg0gQYSJBT5tqD9JeDJKkLj7YC8VwTh039DnEYrAMnVtNPAYpw2EUqKdPGKk 0yZVP0fzwcrMfVRULkKgn0Vod7KH2RvvaGAd1Cn0zzYWMR2N63vMA0XuXQNjN3HEfz 20ypBgHxX72bQLK3f2GM3lqg6Zjfsp43KSyz2bz9TvNHp6X1dsNVJOgkjtzgpwH83a uoc1UKgnV+/Ycw6j63TJeVJSpBuGl4fasv4HqdcR6w9GZh1C6H1/mt5u+e728QB8MX g0l0yt2cqAL0A== Date: Thu, 13 Apr 2023 16:13:07 +0200 From: Ladislav Michl To: linux-staging@lists.linux.dev Cc: netdev@vger.kernel.org, linux-mips@vger.kernel.org, Chris Packham Subject: [PATCH 1/3] staging: octeon: don't panic Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfGSUgvGZsGiQ2QUfSG2dtv0L2CVYoffxI9HjN0JXtcLfpSYUcAC7ZB69AlVV76rl0VWakwKvu6G7/t3O2WA6Fp7/duGQjp8acWlXACAAJGsz3GrZ7Mc1 WvdolzbEu7ImGwif9zi5HE/jhkq39JDOgnHRqoKpWQdhPqPJk3xk1w1/8K9K+cGmwhZKVXBrb0hDu5EKCGcrkyB8D0mv/GL7irV+ml8o1ZnIWC6lytlsxd5v f2EgLEljqB/zI9R+5pyY8D5YqaAIwSgUA7oVHL2qsf1zBub9yLnfeqLZ5EPKBVMf Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Ladislav Michl It is unfortunate to halt kernel just because no network interfaces was registered. Signed-off-by: Ladislav Michl --- drivers/staging/octeon/ethernet-rx.c | 33 +++++++++++++++++++++++----- drivers/staging/octeon/ethernet-rx.h | 2 +- drivers/staging/octeon/ethernet-tx.c | 16 ++++++++------ drivers/staging/octeon/ethernet-tx.h | 2 +- drivers/staging/octeon/ethernet.c | 31 ++++++++++++++++++++++---- 5 files changed, 66 insertions(+), 18 deletions(-) diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 965330eec80a..24ae4b3bd58b 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -448,7 +448,7 @@ void cvm_oct_poll_controller(struct net_device *dev) } #endif -void cvm_oct_rx_initialize(void) +int cvm_oct_rx_initialize(void) { int i; struct net_device *dev_for_napi = NULL; @@ -460,8 +460,11 @@ void cvm_oct_rx_initialize(void) } } - if (!dev_for_napi) - panic("No net_devices were allocated."); + if (!dev_for_napi) { + pr_err("No net_devices were allocated."); + return -ENODEV; + } + for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) { int ret; @@ -479,10 +482,28 @@ void cvm_oct_rx_initialize(void) /* Register an IRQ handler to receive POW interrupts */ ret = request_irq(oct_rx_group[i].irq, cvm_oct_do_interrupt, 0, "Ethernet", &oct_rx_group[i].napi); - if (ret) - panic("Could not acquire Ethernet IRQ %d\n", + if (ret) { + int j; + + pr_err("Could not acquire Ethernet IRQ %d\n", oct_rx_group[i].irq); + for (j = 0; j < i; j++) { + if (!(pow_receive_groups & BIT(j))) + continue; + + cvmx_write_csr(OCTEON_IS_MODEL(OCTEON_CN68XX) ? + CVMX_SSO_WQ_INT_THRX(j) : + CVMX_POW_WQ_INT_THRX(j), + 0); + free_irq(oct_rx_group[j].irq, cvm_oct_device); + netif_napi_del(&oct_rx_group[j].napi); + } + + return ret; + } + + disable_irq_nosync(oct_rx_group[i].irq); /* Enable POW interrupt when our port has at least one packet */ @@ -518,6 +539,8 @@ void cvm_oct_rx_initialize(void) napi_schedule(&oct_rx_group[i].napi); } atomic_inc(&oct_rx_ready); + + return 0; } void cvm_oct_rx_shutdown(void) diff --git a/drivers/staging/octeon/ethernet-rx.h b/drivers/staging/octeon/ethernet-rx.h index ff6482fa20d6..9a98f662d813 100644 --- a/drivers/staging/octeon/ethernet-rx.h +++ b/drivers/staging/octeon/ethernet-rx.h @@ -6,7 +6,7 @@ */ void cvm_oct_poll_controller(struct net_device *dev); -void cvm_oct_rx_initialize(void); +int cvm_oct_rx_initialize(void); void cvm_oct_rx_shutdown(void); static inline void cvm_oct_rx_refill_pool(int fill_threshold) diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index a36e36701c74..c02b023ac8c0 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -694,19 +694,21 @@ static irqreturn_t cvm_oct_tx_cleanup_watchdog(int cpl, void *dev_id) return IRQ_HANDLED; } -void cvm_oct_tx_initialize(void) +int cvm_oct_tx_initialize(void) { - int i; + int ret; /* Disable the interrupt. */ cvmx_write_csr(CVMX_CIU_TIMX(1), 0); /* Register an IRQ handler to receive CIU_TIMX(1) interrupts */ - i = request_irq(OCTEON_IRQ_TIMER1, - cvm_oct_tx_cleanup_watchdog, 0, - "Ethernet", cvm_oct_device); + ret = request_irq(OCTEON_IRQ_TIMER1, + cvm_oct_tx_cleanup_watchdog, 0, + "Ethernet", cvm_oct_device); + + if (ret) + pr_err("Could not acquire Ethernet IRQ %d\n", OCTEON_IRQ_TIMER1); - if (i) - panic("Could not acquire Ethernet IRQ %d\n", OCTEON_IRQ_TIMER1); + return ret; } void cvm_oct_tx_shutdown(void) diff --git a/drivers/staging/octeon/ethernet-tx.h b/drivers/staging/octeon/ethernet-tx.h index 6c524668f65a..b4e328a4b499 100644 --- a/drivers/staging/octeon/ethernet-tx.h +++ b/drivers/staging/octeon/ethernet-tx.h @@ -9,6 +9,6 @@ netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev); int cvm_oct_transmit_qos(struct net_device *dev, void *work_queue_entry, int do_free, int qos); -void cvm_oct_tx_initialize(void); +int cvm_oct_tx_initialize(void); void cvm_oct_tx_shutdown(void); void cvm_oct_tx_shutdown_dev(struct net_device *dev); diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index f662739137b5..949ef51bf896 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -672,6 +672,8 @@ static void cvm_set_rgmii_delay(struct octeon_ethernet *priv, int iface, static int cvm_oct_probe(struct platform_device *pdev) { + int ret; + int port; int num_interfaces; int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; @@ -705,7 +707,6 @@ static int cvm_oct_probe(struct platform_device *pdev) num_interfaces = cvmx_helper_get_number_of_interfaces(); for (interface = 0; interface < num_interfaces; interface++) { int num_ports = cvmx_helper_ports_on_interface(interface); - int port; for (port = cvmx_helper_get_ipd_port(interface, 0); port < cvmx_helper_get_ipd_port(interface, num_ports); @@ -801,7 +802,6 @@ static int cvm_oct_probe(struct platform_device *pdev) cvmx_helper_interface_mode_t imode = cvmx_helper_interface_get_mode(interface); int num_ports = cvmx_helper_ports_on_interface(interface); - int port; int port_index; for (port_index = 0, @@ -911,8 +911,15 @@ static int cvm_oct_probe(struct platform_device *pdev) } } - cvm_oct_tx_initialize(); - cvm_oct_rx_initialize(); + ret = cvm_oct_tx_initialize(); + if (ret) + goto err; + + ret = cvm_oct_rx_initialize(); + if (ret) { + cvm_oct_tx_shutdown(); + goto err; + } /* * 150 uS: about 10 1500-byte packets at 1GE. @@ -922,6 +929,22 @@ static int cvm_oct_probe(struct platform_device *pdev) schedule_delayed_work(&cvm_oct_rx_refill_work, HZ); return 0; + +err: + for (port = 0; port < TOTAL_NUMBER_OF_PORTS; port++) { + if (cvm_oct_device[port]) { + struct net_device *dev = cvm_oct_device[port]; + struct octeon_ethernet *priv = netdev_priv(dev); + + cancel_delayed_work_sync(&priv->port_periodic_work); + + unregister_netdev(dev); + free_netdev(dev); + cvm_oct_device[port] = NULL; + } + } + + return ret; } static int cvm_oct_remove(struct platform_device *pdev) From patchwork Thu Apr 13 14:14:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 13210331 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 53953C77B61 for ; Thu, 13 Apr 2023 14:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231474AbjDMOOJ (ORCPT ); Thu, 13 Apr 2023 10:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231299AbjDMOOI (ORCPT ); Thu, 13 Apr 2023 10:14:08 -0400 Received: from h1.cmg1.smtp.forpsi.com (h1.cmg1.smtp.forpsi.com [81.2.195.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0557359D for ; Thu, 13 Apr 2023 07:14:07 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id mxi8pEi7aPm6Cmxi9pKcoR; Thu, 13 Apr 2023 16:14:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395245; bh=d4RY8XHU9yr1d2C7YF4zciMiPeh9xjFTvv8n5kIJFCg=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=jHP1KzIJtaiYWVt32Li+nEIMNegwokCKrWVBGagI3+pzvSdLwhqZG0KdfJFIST938 UfSP95+l/S516/Ntecy7CYWhCM8MAfN/nJZuDyn7sbGIA0vXNLfZeh/NPmpOYU93Rz jMMTwt0VWhbeqSz2B0Lq8pQvh/QN0MSpmKWSvCHB5LB9We+yXoRO+M1c7edzojUIWJ k1dYxg4zzAxw+QypoZ9kX/fSYFknfY536ySHm8zWOihQlaj4muM54RUEz8Dbovc4O4 Pkc4XmS2fA2LxxJo/BJqPkLPq9HyEy2gjFymJ1Z/Jv6p7xAdE+29msMx9pKkf28OvO TeKVPjmqMuZ9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395245; bh=d4RY8XHU9yr1d2C7YF4zciMiPeh9xjFTvv8n5kIJFCg=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=jHP1KzIJtaiYWVt32Li+nEIMNegwokCKrWVBGagI3+pzvSdLwhqZG0KdfJFIST938 UfSP95+l/S516/Ntecy7CYWhCM8MAfN/nJZuDyn7sbGIA0vXNLfZeh/NPmpOYU93Rz jMMTwt0VWhbeqSz2B0Lq8pQvh/QN0MSpmKWSvCHB5LB9We+yXoRO+M1c7edzojUIWJ k1dYxg4zzAxw+QypoZ9kX/fSYFknfY536ySHm8zWOihQlaj4muM54RUEz8Dbovc4O4 Pkc4XmS2fA2LxxJo/BJqPkLPq9HyEy2gjFymJ1Z/Jv6p7xAdE+29msMx9pKkf28OvO TeKVPjmqMuZ9A== Date: Thu, 13 Apr 2023 16:14:04 +0200 From: Ladislav Michl To: linux-staging@lists.linux.dev Cc: netdev@vger.kernel.org, linux-mips@vger.kernel.org, Chris Packham Subject: [PATCH 2/3] staging: octeon: avoid needless device allocation Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfGHwwZS7Gk02EBad2RtgD3BzQprvwVOWYEp597MhjkvcfpbgvgIOuKGnZhOoMV21xs8mMfVr0nzK7NJkl7UwEmuxp4jrRveq7hurxt49iIbXvlC3DsAE EIgbcy43VJg1jeqdVVt3MUHjpk+5pakgDChGNvgnUj7G1rSFJ9l1VNutAC2EoIcr5SCdx4OEvF3rjsUKHsR5Q+v+WXhYSyG0KaoRmlATE0HNCNi7RPSwjgid BPWROsR80bOq2Mb784p7jJXdB8toFukFh7z1EeOg174KBLrPlg46QykBD7U7yLUh Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Ladislav Michl Etherdev is allocated and then tested for valid interface, then it is immediately freed after port is found unsupported. Move that decision out of the port loop. Signed-off-by: Ladislav Michl --- drivers/staging/octeon/ethernet.c | 114 +++++++++++++++--------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 949ef51bf896..466d43a71d34 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -799,18 +799,63 @@ static int cvm_oct_probe(struct platform_device *pdev) num_interfaces = cvmx_helper_get_number_of_interfaces(); for (interface = 0; interface < num_interfaces; interface++) { + int num_ports, port_index; + const struct net_device_ops *ops; + const char *name; + phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA; cvmx_helper_interface_mode_t imode = - cvmx_helper_interface_get_mode(interface); - int num_ports = cvmx_helper_ports_on_interface(interface); - int port_index; + cvmx_helper_interface_get_mode(interface); + + switch (imode) { + case CVMX_HELPER_INTERFACE_MODE_NPI: + ops = &cvm_oct_npi_netdev_ops; + name = "npi%d"; + break; + + case CVMX_HELPER_INTERFACE_MODE_XAUI: + ops = &cvm_oct_xaui_netdev_ops; + name = "xaui%d"; + break; + + case CVMX_HELPER_INTERFACE_MODE_LOOP: + ops = &cvm_oct_npi_netdev_ops; + name = "loop%d"; + break; + + case CVMX_HELPER_INTERFACE_MODE_SGMII: + ops = &cvm_oct_sgmii_netdev_ops; + name = "eth%d"; + phy_mode = PHY_INTERFACE_MODE_SGMII; + break; + + case CVMX_HELPER_INTERFACE_MODE_SPI: + ops = &cvm_oct_spi_netdev_ops; + name = "spi%d"; + break; + + case CVMX_HELPER_INTERFACE_MODE_GMII: + ops = &cvm_oct_rgmii_netdev_ops; + name = "eth%d"; + phy_mode = PHY_INTERFACE_MODE_GMII; + break; + case CVMX_HELPER_INTERFACE_MODE_RGMII: + ops = &cvm_oct_rgmii_netdev_ops; + name = "eth%d"; + break; + + default: + continue; + } + + num_ports = cvmx_helper_ports_on_interface(interface); for (port_index = 0, port = cvmx_helper_get_ipd_port(interface, 0); port < cvmx_helper_get_ipd_port(interface, num_ports); port_index++, port++) { struct octeon_ethernet *priv; struct net_device *dev = - alloc_etherdev(sizeof(struct octeon_ethernet)); + alloc_etherdev(sizeof(struct octeon_ethernet)); if (!dev) { pr_err("Failed to allocate ethernet device for port %d\n", port); @@ -830,7 +875,12 @@ static int cvm_oct_probe(struct platform_device *pdev) priv->port = port; priv->queue = cvmx_pko_get_base_queue(priv->port); priv->fau = fau - cvmx_pko_get_num_queues(port) * 4; - priv->phy_mode = PHY_INTERFACE_MODE_NA; + priv->phy_mode = phy_mode; + if (imode == CVMX_HELPER_INTERFACE_MODE_RGMII) + cvm_set_rgmii_delay(priv, interface, + port_index); + dev->netdev_ops = ops; + strscpy(dev->name, name, sizeof(dev->name)); for (qos = 0; qos < 16; qos++) skb_queue_head_init(&priv->tx_free_list[qos]); for (qos = 0; qos < cvmx_pko_get_num_queues(port); @@ -839,64 +889,16 @@ static int cvm_oct_probe(struct platform_device *pdev) dev->min_mtu = VLAN_ETH_ZLEN - mtu_overhead; dev->max_mtu = OCTEON_MAX_MTU - mtu_overhead; - switch (priv->imode) { - /* These types don't support ports to IPD/PKO */ - case CVMX_HELPER_INTERFACE_MODE_DISABLED: - case CVMX_HELPER_INTERFACE_MODE_PCIE: - case CVMX_HELPER_INTERFACE_MODE_PICMG: - break; - - case CVMX_HELPER_INTERFACE_MODE_NPI: - dev->netdev_ops = &cvm_oct_npi_netdev_ops; - strscpy(dev->name, "npi%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_XAUI: - dev->netdev_ops = &cvm_oct_xaui_netdev_ops; - strscpy(dev->name, "xaui%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_LOOP: - dev->netdev_ops = &cvm_oct_npi_netdev_ops; - strscpy(dev->name, "loop%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_SGMII: - priv->phy_mode = PHY_INTERFACE_MODE_SGMII; - dev->netdev_ops = &cvm_oct_sgmii_netdev_ops; - strscpy(dev->name, "eth%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_SPI: - dev->netdev_ops = &cvm_oct_spi_netdev_ops; - strscpy(dev->name, "spi%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_GMII: - priv->phy_mode = PHY_INTERFACE_MODE_GMII; - dev->netdev_ops = &cvm_oct_rgmii_netdev_ops; - strscpy(dev->name, "eth%d", sizeof(dev->name)); - break; - - case CVMX_HELPER_INTERFACE_MODE_RGMII: - dev->netdev_ops = &cvm_oct_rgmii_netdev_ops; - strscpy(dev->name, "eth%d", sizeof(dev->name)); - cvm_set_rgmii_delay(priv, interface, - port_index); - break; - } - if (priv->of_node && of_phy_is_fixed_link(priv->of_node)) { if (of_phy_register_fixed_link(priv->of_node)) { netdev_err(dev, "Failed to register fixed link for interface %d, port %d\n", interface, priv->port); - dev->netdev_ops = NULL; + free_netdev(dev); + continue; } } - if (!dev->netdev_ops) { - free_netdev(dev); - } else if (register_netdev(dev) < 0) { + if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device for interface %d, port %d\n", interface, priv->port); free_netdev(dev); From patchwork Thu Apr 13 14:15:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 13210332 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 9CE57C77B6E for ; Thu, 13 Apr 2023 14:15:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231584AbjDMOPM (ORCPT ); Thu, 13 Apr 2023 10:15:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbjDMOPJ (ORCPT ); Thu, 13 Apr 2023 10:15:09 -0400 Received: from h2.cmg1.smtp.forpsi.com (h2.cmg1.smtp.forpsi.com [81.2.195.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35B46359D for ; Thu, 13 Apr 2023 07:15:04 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id mxj3pEiQQPm6Cmxj4pKcxR; Thu, 13 Apr 2023 16:15:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395303; bh=LJ3AihKV3TEhQcOjRolOk5kLTV5Q5SrBdSFY8+7EuNI=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=veXovTBV4SKQ0SiZzQS0i0io2QjF+5bO7D24L36G8S7qfapqB0Lmqml+FGNFyuuLB AYtMUZwUflTwz+pPOsfR/rnanw9uQh22QN5Q39zeTxAos5H63FQu3CZnMglVJFTSW6 QZcLDVKQ4DF/fsT4UlJsF48tRahGg2gkBkVT6vL4Llr564Aap0qQVRcfAWyg4B7NdI ig/pWwK30iANESZspUkGKm5GaVnAyvDH3/Vj47mW2wP9KSzk+xmfjH+i1i0cT9W4we SHdtZURsFT16W0ek6N1b3aGVw303MKS+VUc3wJeTtsYHfyFWmo/lpjkc8XeMkZ4rdd YP6VBDI0XXNQA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1681395303; bh=LJ3AihKV3TEhQcOjRolOk5kLTV5Q5SrBdSFY8+7EuNI=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=veXovTBV4SKQ0SiZzQS0i0io2QjF+5bO7D24L36G8S7qfapqB0Lmqml+FGNFyuuLB AYtMUZwUflTwz+pPOsfR/rnanw9uQh22QN5Q39zeTxAos5H63FQu3CZnMglVJFTSW6 QZcLDVKQ4DF/fsT4UlJsF48tRahGg2gkBkVT6vL4Llr564Aap0qQVRcfAWyg4B7NdI ig/pWwK30iANESZspUkGKm5GaVnAyvDH3/Vj47mW2wP9KSzk+xmfjH+i1i0cT9W4we SHdtZURsFT16W0ek6N1b3aGVw303MKS+VUc3wJeTtsYHfyFWmo/lpjkc8XeMkZ4rdd YP6VBDI0XXNQA== Date: Thu, 13 Apr 2023 16:15:01 +0200 From: Ladislav Michl To: linux-staging@lists.linux.dev Cc: netdev@vger.kernel.org, linux-mips@vger.kernel.org, Chris Packham Subject: [RFC 3/3] staging: octeon: convert to use phylink Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfIOWteqv/Zg1Tnwt3LQ5lj7+QB9wcJU3vy4eozqgxvSwk+NoAJxzIWD4D7jGEyUqvLt3kbVnLePAqZjD2oRnBn2+rwRzyiwuRF05tHpqq6TZkh445g+M hXaZwBl5HhcpvnJJwSHp0CtMLJ8E8aPEK+idVI85/N1paDZjaRzBCFJRW4gb9dv7ctK4V7wtnJqPFIImph6M4uYeuR8PurHvf2v+kVRiHSgaH9aZU5Iis471 nv/dOU7uhuyF0o9H4OHaaO+bDze6ucP8h71o2jqCkRrp1CT9+Zu3erjyCMk/FwwH Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Ladislav Michl Signed-off-by: Ladislav Michl --- drivers/staging/octeon/Kconfig | 2 +- drivers/staging/octeon/ethernet-mdio.c | 171 ++++++++++++++--------- drivers/staging/octeon/ethernet-rgmii.c | 13 +- drivers/staging/octeon/ethernet.c | 64 +++------ drivers/staging/octeon/octeon-ethernet.h | 8 +- 5 files changed, 136 insertions(+), 122 deletions(-) diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig index 5319909eb2f6..fda90025710d 100644 --- a/drivers/staging/octeon/Kconfig +++ b/drivers/staging/octeon/Kconfig @@ -3,7 +3,7 @@ config OCTEON_ETHERNET tristate "Cavium Networks Octeon Ethernet support" depends on CAVIUM_OCTEON_SOC || COMPILE_TEST depends on NETDEVICES - select PHYLIB + select PHYLINK select MDIO_OCTEON help This driver supports the builtin ethernet ports on Cavium diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c index b3049108edc4..a14fb4dbb2fd 100644 --- a/drivers/staging/octeon/ethernet-mdio.c +++ b/drivers/staging/octeon/ethernet-mdio.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include @@ -26,23 +26,27 @@ static void cvm_oct_get_drvinfo(struct net_device *dev, strscpy(info->bus_info, "Builtin", sizeof(info->bus_info)); } -static int cvm_oct_nway_reset(struct net_device *dev) +static int cvm_oct_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) { - if (!capable(CAP_NET_ADMIN)) - return -EPERM; + struct octeon_ethernet *priv = netdev_priv(dev); + + return phylink_ethtool_ksettings_get(priv->phylink, cmd); +} - if (dev->phydev) - return phy_start_aneg(dev->phydev); +static int cvm_oct_set_link_ksettings(struct net_device *dev, + const struct ethtool_link_ksettings *cmd) +{ + struct octeon_ethernet *priv = netdev_priv(dev); - return -EINVAL; + return phylink_ethtool_ksettings_set(priv->phylink, cmd); } const struct ethtool_ops cvm_oct_ethtool_ops = { .get_drvinfo = cvm_oct_get_drvinfo, - .nway_reset = cvm_oct_nway_reset, .get_link = ethtool_op_get_link, - .get_link_ksettings = phy_ethtool_get_link_ksettings, - .set_link_ksettings = phy_ethtool_set_link_ksettings, + .get_link_ksettings = cvm_oct_get_link_ksettings, + .set_link_ksettings = cvm_oct_set_link_ksettings, }; /** @@ -55,53 +59,80 @@ const struct ethtool_ops cvm_oct_ethtool_ops = { */ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - if (!netif_running(dev)) - return -EINVAL; + struct octeon_ethernet *priv = netdev_priv(dev); - if (!dev->phydev) - return -EINVAL; + return phylink_mii_ioctl(priv->phylink, rq, cmd); +} - return phy_mii_ioctl(dev->phydev, rq, cmd); +static void cvm_oct_mac_get_state(struct phylink_config *config, + struct phylink_link_state *state) +{ + union cvmx_helper_link_info link_info; + struct net_device *dev = to_net_dev(config->dev); + struct octeon_ethernet *priv = netdev_priv(dev); + + link_info = cvmx_helper_link_get(priv->port); + state->link = link_info.s.link_up; + state->duplex = link_info.s.full_duplex ? DUPLEX_FULL : DUPLEX_HALF; + state->speed = link_info.s.speed; } -void cvm_oct_note_carrier(struct octeon_ethernet *priv, - union cvmx_helper_link_info li) +static void cvm_oct_mac_config(struct phylink_config *config, + unsigned int mode, + const struct phylink_link_state *state) { - if (li.s.link_up) { - pr_notice_ratelimited("%s: %u Mbps %s duplex, port %d, queue %d\n", - netdev_name(priv->netdev), li.s.speed, - (li.s.full_duplex) ? "Full" : "Half", - priv->port, priv->queue); - } else { - pr_notice_ratelimited("%s: Link down\n", - netdev_name(priv->netdev)); - } } -void cvm_oct_adjust_link(struct net_device *dev) +static void cvm_oct_mac_link_down(struct phylink_config *config, + unsigned int mode, phy_interface_t interface) { + union cvmx_helper_link_info link_info; + struct net_device *dev = to_net_dev(config->dev); struct octeon_ethernet *priv = netdev_priv(dev); + + link_info.u64 = 0; + link_info.s.link_up = 0; + link_info.s.full_duplex = 0; + link_info.s.speed = 0; + priv->link_info = link_info.u64; + + cvmx_helper_link_set(priv->port, link_info); + + priv->poll_used = false; +} + +static void cvm_oct_mac_link_up(struct phylink_config *config, + struct phy_device *phy, + unsigned int mode, phy_interface_t interface, + int speed, int duplex, + bool tx_pause, bool rx_pause) +{ union cvmx_helper_link_info link_info; + struct net_device *dev = to_net_dev(config->dev); + struct octeon_ethernet *priv = netdev_priv(dev); link_info.u64 = 0; - link_info.s.link_up = dev->phydev->link ? 1 : 0; - link_info.s.full_duplex = dev->phydev->duplex ? 1 : 0; - link_info.s.speed = dev->phydev->speed; + link_info.s.link_up = 1; + link_info.s.full_duplex = duplex == DUPLEX_FULL ? 1 : 0; + link_info.s.speed = speed; priv->link_info = link_info.u64; - /* - * The polling task need to know about link status changes. - */ - if (priv->poll) - priv->poll(dev); + cvmx_helper_link_set(priv->port, link_info); - if (priv->last_link != dev->phydev->link) { - priv->last_link = dev->phydev->link; - cvmx_helper_link_set(priv->port, link_info); - cvm_oct_note_carrier(priv, link_info); + if (!phy && priv->poll) { + priv->poll_used = true; + priv->poll(dev); } } +static const struct phylink_mac_ops cvm_oct_phylink_ops = { + .validate = phylink_generic_validate, + .mac_pcs_get_state = cvm_oct_mac_get_state, + .mac_config = cvm_oct_mac_config, + .mac_link_down = cvm_oct_mac_link_down, + .mac_link_up = cvm_oct_mac_link_up, +}; + int cvm_oct_common_stop(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); @@ -116,15 +147,14 @@ int cvm_oct_common_stop(struct net_device *dev) priv->poll = NULL; - if (dev->phydev) - phy_disconnect(dev->phydev); + phylink_stop(priv->phylink); + phylink_disconnect_phy(priv->phylink); if (priv->last_link) { link_info.u64 = 0; priv->last_link = 0; cvmx_helper_link_set(priv->port, link_info); - cvm_oct_note_carrier(priv, link_info); } return 0; } @@ -138,34 +168,45 @@ int cvm_oct_common_stop(struct net_device *dev) */ int cvm_oct_phy_setup_device(struct net_device *dev) { + phy_interface_t phy_mode; + struct phylink *phylink; struct octeon_ethernet *priv = netdev_priv(dev); - struct device_node *phy_node; - struct phy_device *phydev = NULL; - if (!priv->of_node) - goto no_phy; - - phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0); - if (!phy_node && of_phy_is_fixed_link(priv->of_node)) - phy_node = of_node_get(priv->of_node); - if (!phy_node) - goto no_phy; + priv->phylink_config.dev = &dev->dev; + priv->phylink_config.type = PHYLINK_NETDEV; + priv->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | + MAC_10 | MAC_100 | MAC_1000; + __set_bit(PHY_INTERFACE_MODE_MII, + priv->phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_RMII, + priv->phylink_config.supported_interfaces); + + switch (priv->imode) { + case CVMX_HELPER_INTERFACE_MODE_RGMII: + phy_interface_set_rgmii(priv->phylink_config.supported_interfaces); + break; + case CVMX_HELPER_INTERFACE_MODE_SGMII: + __set_bit(PHY_INTERFACE_MODE_1000BASEX, + priv->phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_SGMII, + priv->phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_QSGMII, + priv->phylink_config.supported_interfaces); + break; + default: + break; + } - phydev = of_phy_connect(dev, phy_node, cvm_oct_adjust_link, 0, - priv->phy_mode); - of_node_put(phy_node); + if (of_get_phy_mode(priv->of_node, &phy_mode) == 0) + priv->phy_mode = phy_mode; - if (!phydev) - return -EPROBE_DEFER; + phylink = phylink_create(&priv->phylink_config, + of_fwnode_handle(priv->of_node), + priv->phy_mode, &cvm_oct_phylink_ops); + if (IS_ERR(phylink)) + return PTR_ERR(phylink); - priv->last_link = 0; - phy_start(phydev); + priv->phylink = phylink; - return 0; -no_phy: - /* If there is no phy, assume a direct MAC connection and that - * the link is up. - */ - netif_carrier_on(dev); return 0; } diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c index 0c4fac31540a..8c6eb0b87254 100644 --- a/drivers/staging/octeon/ethernet-rgmii.c +++ b/drivers/staging/octeon/ethernet-rgmii.c @@ -115,17 +115,8 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) cvm_oct_check_preamble_errors(dev); - if (likely(!status_change)) - return; - - /* Tell core. */ - if (link_info.s.link_up) { - if (!netif_carrier_ok(dev)) - netif_carrier_on(dev); - } else if (netif_carrier_ok(dev)) { - netif_carrier_off(dev); - } - cvm_oct_note_carrier(priv, link_info); + if (likely(status_change)) + phylink_mac_change(priv->phylink, link_info.s.link_up); } int cvm_oct_rgmii_open(struct net_device *dev) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 466d43a71d34..21892f805245 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -128,7 +128,7 @@ static void cvm_oct_periodic_worker(struct work_struct *work) struct octeon_ethernet, port_periodic_work.work); - if (priv->poll) + if (priv->poll_used && priv->poll) priv->poll(cvm_oct_device[priv->port]); cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats @@ -446,23 +446,20 @@ int cvm_oct_common_init(struct net_device *dev) void cvm_oct_common_uninit(struct net_device *dev) { - if (dev->phydev) - phy_disconnect(dev->phydev); + struct octeon_ethernet *priv = netdev_priv(dev); + + cancel_delayed_work_sync(&priv->port_periodic_work); + phylink_destroy(priv->phylink); } int cvm_oct_common_open(struct net_device *dev, void (*link_poll)(struct net_device *)) { + int err; union cvmx_gmxx_prtx_cfg gmx_cfg; struct octeon_ethernet *priv = netdev_priv(dev); int interface = INTERFACE(priv->port); int index = INDEX(priv->port); - union cvmx_helper_link_info link_info; - int rv; - - rv = cvm_oct_phy_setup_device(dev); - if (rv) - return rv; gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); gmx_cfg.s.en = 1; @@ -473,20 +470,17 @@ int cvm_oct_common_open(struct net_device *dev, if (octeon_is_simulation()) return 0; - if (dev->phydev) { - int r = phy_read_status(dev->phydev); - - if (r == 0 && dev->phydev->link == 0) - netif_carrier_off(dev); - cvm_oct_adjust_link(dev); - } else { - link_info = cvmx_helper_link_get(priv->port); - if (!link_info.s.link_up) - netif_carrier_off(dev); - priv->poll = link_poll; - link_poll(dev); + err = phylink_of_phy_connect(priv->phylink, priv->of_node, 0); + if (err) { + netdev_err(dev, "Could not attach PHY (%d)\n", err); + return err; } + priv->poll_used = false; + priv->poll = link_poll; + + phylink_start(priv->phylink); + return 0; } @@ -504,13 +498,7 @@ void cvm_oct_link_poll(struct net_device *dev) else priv->link_info = link_info.u64; - if (link_info.s.link_up) { - if (!netif_carrier_ok(dev)) - netif_carrier_on(dev); - } else if (netif_carrier_ok(dev)) { - netif_carrier_off(dev); - } - cvm_oct_note_carrier(priv, link_info); + phylink_mac_change(priv->phylink, link_info.s.link_up); } static int cvm_oct_xaui_open(struct net_device *dev) @@ -797,7 +785,6 @@ static int cvm_oct_probe(struct platform_device *pdev) } } - num_interfaces = cvmx_helper_get_number_of_interfaces(); for (interface = 0; interface < num_interfaces; interface++) { int num_ports, port_index; const struct net_device_ops *ops; @@ -889,18 +876,15 @@ static int cvm_oct_probe(struct platform_device *pdev) dev->min_mtu = VLAN_ETH_ZLEN - mtu_overhead; dev->max_mtu = OCTEON_MAX_MTU - mtu_overhead; - if (priv->of_node && of_phy_is_fixed_link(priv->of_node)) { - if (of_phy_register_fixed_link(priv->of_node)) { - netdev_err(dev, "Failed to register fixed link for interface %d, port %d\n", - interface, priv->port); - free_netdev(dev); - continue; - } + if (cvm_oct_phy_setup_device(dev)) { + free_netdev(dev); + continue; } if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device for interface %d, port %d\n", interface, priv->port); + phylink_destroy(priv->phylink); free_netdev(dev); } else { cvm_oct_device[priv->port] = dev; @@ -938,8 +922,7 @@ static int cvm_oct_probe(struct platform_device *pdev) struct net_device *dev = cvm_oct_device[port]; struct octeon_ethernet *priv = netdev_priv(dev); - cancel_delayed_work_sync(&priv->port_periodic_work); - + phylink_destroy(priv->phylink); unregister_netdev(dev); free_netdev(dev); cvm_oct_device[port] = NULL; @@ -969,9 +952,8 @@ static int cvm_oct_remove(struct platform_device *pdev) struct net_device *dev = cvm_oct_device[port]; struct octeon_ethernet *priv = netdev_priv(dev); - cancel_delayed_work_sync(&priv->port_periodic_work); - cvm_oct_tx_shutdown_dev(dev); + phylink_destroy(priv->phylink); unregister_netdev(dev); free_netdev(dev); cvm_oct_device[port] = NULL; diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h index a6140705706f..fc9bc0974a2a 100644 --- a/drivers/staging/octeon/octeon-ethernet.h +++ b/drivers/staging/octeon/octeon-ethernet.h @@ -12,7 +12,7 @@ #define OCTEON_ETHERNET_H #include -#include +#include #ifdef CONFIG_CAVIUM_OCTEON_SOC @@ -62,6 +62,8 @@ struct octeon_ethernet { int imode; /* PHY mode */ phy_interface_t phy_mode; + struct phylink *phylink; + struct phylink_config phylink_config; /* List of outstanding tx buffers per queue */ struct sk_buff_head tx_free_list[16]; unsigned int last_speed; @@ -69,6 +71,7 @@ struct octeon_ethernet { /* Last negotiated link state */ u64 link_info; /* Called periodically to check link status */ + bool poll_used; void (*poll)(struct net_device *dev); struct delayed_work port_periodic_work; struct device_node *of_node; @@ -86,12 +89,9 @@ void cvm_oct_spi_uninit(struct net_device *dev); int cvm_oct_common_init(struct net_device *dev); void cvm_oct_common_uninit(struct net_device *dev); -void cvm_oct_adjust_link(struct net_device *dev); int cvm_oct_common_stop(struct net_device *dev); int cvm_oct_common_open(struct net_device *dev, void (*link_poll)(struct net_device *)); -void cvm_oct_note_carrier(struct octeon_ethernet *priv, - union cvmx_helper_link_info li); void cvm_oct_link_poll(struct net_device *dev); extern int always_use_pow;