From patchwork Mon Jun 21 17:30:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 12335331 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79165C48BC2 for ; Mon, 21 Jun 2021 17:31:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66B016113E for ; Mon, 21 Jun 2021 17:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbhFURdu (ORCPT ); Mon, 21 Jun 2021 13:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231694AbhFURdi (ORCPT ); Mon, 21 Jun 2021 13:33:38 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39817C0617AE for ; Mon, 21 Jun 2021 10:31:18 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id u11so15401078ljh.2 for ; Mon, 21 Jun 2021 10:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bJlskXXqPukoUIiMaWjgnuEmfc7b1Qye4aSSYHDeJ90=; b=YC+v2VFSlEj714Fipr+X5uKqGdyPOi0fZRjQqg66R6KKAg8Uo5T40tWRGiB2MRbsLJ YhWQdupK4lXKB+ixP2oNXdfPhwOqLLgRyr7EJs9xXpxDYkeUzROoI/VXf/5tbYjuDQM4 0/g++YC3yKdJbNwDJROq5/H8+tf1OyHf0ZER2ZrR9OE9iA06CWnM8c0gKLPQfMHOp8Ys Y2AHTUWnw3dKAfqfFADjQD8oyTg0vl+aKDETGNvjxRlbt1C24aPPE53KUhmYARbZEIo5 me1h5U+cZOc2HFPgwhMQm/7fRjRM4J6BNJF8GdRW35MYUpmEnerbG5w49OKaz5WMy7T1 UcyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bJlskXXqPukoUIiMaWjgnuEmfc7b1Qye4aSSYHDeJ90=; b=Kj8v0RTQYjSSh6NLwzCS8HopcFMWNFLQsHUTVJE4tX5Xn6ab9a7vZJ6ejlCAUz2ciy eZ1UERMJDa0Egho4O8LgUYWy8p8fg8G2OBZPlFE2k46NU0R+STSzeISNe0Fo5h8V7W7u TXLQ5pvxTio/aR8ari+dChETqZFvoFHFvH3nBpS1iIv2ZMaRRXUCpCi/IgjuiNI59Kls SjenvB/vrrqumgZ4MDGjbMiFIuKze3WrCgKcyucZEPG+ed0MvfCl6WZ84r7zGHbagrpR W0Zk+ROz9bYW7XOiDnrKAs4s87DLDmA3fIFoKuSnKT0GrT2VDEWFdZtrSirNeavGBLAC buuA== X-Gm-Message-State: AOAM532nSr5MTjhuIfK6vUpCHf5glkMzcmkHF/b84UxYj6GN8MKgtS1B EobaDKa5dzQu4VEDnUyI1INeew== X-Google-Smtp-Source: ABdhPJwh/jpROltqTQn9Q+zie8Ck/NJNxGVWm47H6XdT5P2r+bkSKZ6WmxdaMC1PibH6CfqUQq5BJA== X-Received: by 2002:a2e:87d6:: with SMTP id v22mr23205134ljj.50.1624296676473; Mon, 21 Jun 2021 10:31:16 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id u11sm1926380lfs.257.2021.06.21.10.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 10:31:15 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, linux@armlinux.org.uk, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, Samer.El-Haj-Mahmoud@arm.com, jon@solid-run.com, tn@semihalf.com, rjw@rjwysocki.net, lenb@kernel.org, Marcin Wojtas Subject: [net-next: PATCH v3 5/6] net: mvpp2: enable using phylink with ACPI Date: Mon, 21 Jun 2021 19:30:27 +0200 Message-Id: <20210621173028.3541424-6-mw@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210621173028.3541424-1-mw@semihalf.com> References: <20210621173028.3541424-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Now that the MDIO and phylink are supported in the ACPI world, enable to use them in the mvpp2 driver. Ensure a backward compatibility with the firmware whose ACPI description does not contain the necessary elements for the proper phy handling and fall back to relying on the link interrupts instead. Signed-off-by: Marcin Wojtas --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 9bca8c8f9f8d..a66ed3194015 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -4793,9 +4793,8 @@ static int mvpp2_open(struct net_device *dev) goto err_cleanup_txqs; } - /* Phylink isn't supported yet in ACPI mode */ - if (port->of_node) { - err = phylink_of_phy_connect(port->phylink, port->of_node, 0); + if (port->phylink) { + err = phylink_fwnode_phy_connect(port->phylink, port->fwnode, 0); if (err) { netdev_err(port->dev, "could not attach PHY (%d)\n", err); @@ -6703,6 +6702,19 @@ static void mvpp2_acpi_start(struct mvpp2_port *port) SPEED_UNKNOWN, DUPLEX_UNKNOWN, false, false); } +/* In order to ensure backward compatibility for ACPI, check if the port + * firmware node comprises the necessary description allowing to use phylink. + */ +static bool mvpp2_use_acpi_compat_mode(struct fwnode_handle *port_fwnode) +{ + if (!is_acpi_node(port_fwnode)) + return false; + + return (!fwnode_property_present(port_fwnode, "phy-handle") && + !fwnode_property_present(port_fwnode, "managed") && + !fwnode_get_named_child_node(port_fwnode, "fixed-link")); +} + /* Ports initialization */ static int mvpp2_port_probe(struct platform_device *pdev, struct fwnode_handle *port_fwnode, @@ -6921,8 +6933,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, dev->max_mtu = MVPP2_BM_JUMBO_PKT_SIZE; dev->dev.of_node = port_node; - /* Phylink isn't used w/ ACPI as of now */ - if (port_node) { + if (!mvpp2_use_acpi_compat_mode(port_fwnode)) { port->phylink_config.dev = &dev->dev; port->phylink_config.type = PHYLINK_NETDEV; @@ -6934,6 +6945,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, } port->phylink = phylink; } else { + dev_warn(&pdev->dev, "Use link irqs for port#%d. FW update required\n", port->id); port->phylink = NULL; }