From patchwork Mon Jul 10 20:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 118068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp56986vqm; Mon, 10 Jul 2023 13:32:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlF1tNO+CJLulKbwYbL1ziKFzmLwle5Cab6stFOVdFRvVzW65k0imtz6+zfB0lX6JO4b/Cgc X-Received: by 2002:a05:6a00:cce:b0:682:537f:2cb8 with SMTP id b14-20020a056a000cce00b00682537f2cb8mr17919982pfv.26.1689021174366; Mon, 10 Jul 2023 13:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689021174; cv=none; d=google.com; s=arc-20160816; b=C116zjKYfOe3mhGGCWMUjEaLIXnY+VPN5waE3Ac+CdUZsV1dKfdOCNzc8YmcqltlCO 1mdN7Llzks8gAxT+FWDG4/2sV7FE+h6mNxzmDEWfGKbtuOoxw615Up73Yx/3mDtxY73g TYAy8y5B50sG+it+M4g4/zUnhAxjhyrcza+Tc9ddWO30mctiK6bxnmeC7bop433qUYzD 9A8/y7CD2MqJLm4HrODSAzoWrKZxr2B2wHjMdlC92nn9xHnHntFJjuxyLtGMM4ranYm+ XVZvmCYRMpSNCfgCPCbwSnf7yij8GPTL0yaybpkZ8WjqXYob7xHSKhYQM6O7BKhLBhen J5bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YmlAnwDpnt7QnZH9R1+eVRqHntPGLtyJNksmlK12GAU=; fh=TEhPL03u9aBEz0qKKE1Mf90ymqVPmmrEZD98ZBvqOO0=; b=OmcoBrmYhl6p2FT44qFcFaOZHk26AvSYymXgkH9FV1/OY82vyz0L/aKVUUyDBaUpNu lID6lUY+x8jjJX6LBnRo5ATMROFOSruEXoMBMrQjb0fWvTal0uvjajmQOF4gk00ryofD 3lMUG2hXG8caheU02wTW851/h0VvhNttYOpVFPlDz3UPtjHrzLtv0Sn7O6a51iN8XPs3 rq4bbAWcSbKAU+vW0Rl7yoIhiCsHpsK5ZKn0bPC7D7vyi3Tu8ANZIsMz7L0GAMgbhDgr 9EXzfmwpuplaiNN8mGjwzSY+MWhSYpkr2nut3q5X+5aZxK9ZNjAAtFEPi7FZNUYYNcoE 5Qnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EOkQN6tw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y11-20020a056a00190b00b006824cda542fsi215672pfi.395.2023.07.10.13.32.41; Mon, 10 Jul 2023 13:32:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EOkQN6tw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232107AbjGJUSa (ORCPT + 99 others); Mon, 10 Jul 2023 16:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231224AbjGJUSY (ORCPT ); Mon, 10 Jul 2023 16:18:24 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 804EB198 for ; Mon, 10 Jul 2023 13:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689020256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YmlAnwDpnt7QnZH9R1+eVRqHntPGLtyJNksmlK12GAU=; b=EOkQN6twhZrgUcYmbPrfnWduq5z+Beqp4QwpmPbVKca1sFR4o28fzHL8eHxF3lo2/wWoK+ Yr5bkI4ILbZg0t8YecAngOG5aphu/vvbZfDk0AVYcn3ozYeSLIDNEHb4sZUzYBhVcI6Cud O7A+BHxx7H4rlgWAxaE0CA7Wvq2xU4o= Received: from mail-oa1-f70.google.com (mail-oa1-f70.google.com [209.85.160.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-xPsx2sS_PEKw8R3Mym_dpw-1; Mon, 10 Jul 2023 16:17:35 -0400 X-MC-Unique: xPsx2sS_PEKw8R3Mym_dpw-1 Received: by mail-oa1-f70.google.com with SMTP id 586e51a60fabf-1b74e921a7aso351954fac.2 for ; Mon, 10 Jul 2023 13:17:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689020254; x=1691612254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YmlAnwDpnt7QnZH9R1+eVRqHntPGLtyJNksmlK12GAU=; b=PeDLRCP5hWqZitSPE1QqLwCFw2/WAQnZPIkMHxj+76N8Bs2h5iUmhv5RTRrvfOSWp2 hznE+2K+C7GMqSOIKxcj991tK6mCK1QjEnPKlmAwgwAYT07BQka7cXiYsaxJcjpQHXSL 7dFe/3rzoBAMTqFNFTCW6jYMPBbLWd84+d25fVE45maCDbR8fZjCRNic0xrXBNvS4+zG W7ktNtVMW96xyQUhTw5ab1qit59Gw89nswj8581BZMFuefXnBghSwHYMGPnGS0bXtOKp 4F2CGo+h0XcKntjhWUnNbbk0JPIiuZrsh+3PJh2sySebGiuN4P+ZzzFI54ZxP+jFqs4l vGtw== X-Gm-Message-State: ABy/qLb2yPzOv5cl2FJxKDVr/OL0ASIFHLuVjrQp3ecp6kzwK/FY7355 pmsEuVbVzapi1EQlcuN3uxm7C8TtLEOJlE7eJ+Xm15h2+K62gzjzZX/Oh0SUUZV2fN9sgfXiRTt cdlLXtYS3OrOV8fx51nkvX+TktdIpoH2KdZxK6aTN3CU1TXcrAWNBB7V67Lm5w5jH2iGRica1Yy zVYHdCWEgw X-Received: by 2002:a05:6870:5254:b0:1b0:4fc5:2e4b with SMTP id o20-20020a056870525400b001b04fc52e4bmr13438916oai.9.1689020254731; Mon, 10 Jul 2023 13:17:34 -0700 (PDT) X-Received: by 2002:a05:6870:5254:b0:1b0:4fc5:2e4b with SMTP id o20-20020a056870525400b001b04fc52e4bmr13438882oai.9.1689020254461; Mon, 10 Jul 2023 13:17:34 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::22]) by smtp.gmail.com with ESMTPSA id j12-20020a81920c000000b0056d2a19ad91sm155097ywg.103.2023.07.10.13.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 13:17:34 -0700 (PDT) From: Andrew Halaney To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, mcoquelin.stm32@gmail.com, pabeni@redhat.com, kuba@kernel.org, edumazet@google.com, davem@davemloft.net, joabreu@synopsys.com, alexandre.torgue@foss.st.com, peppe.cavallaro@st.com, bhupesh.sharma@linaro.org, vkoul@kernel.org, linux-arm-msm@vger.kernel.org, andrew@lunn.ch, simon.horman@corigine.com, Andrew Halaney Subject: [PATCH net-next v2 1/3] net: stmmac: dwmac-qcom-ethqos: Use of_get_phy_mode() over device_get_phy_mode() Date: Mon, 10 Jul 2023 15:06:37 -0500 Message-ID: <20230710201636.200412-2-ahalaney@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230710201636.200412-1-ahalaney@redhat.com> References: <20230710201636.200412-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771067067244655233 X-GMAIL-MSGID: 1771067067244655233 Since this driver only uses devicetree, let's move over to of_get_phy_mode(). That API has an explicit error return and produces a phy_interface_t directly instead of an int when representing the phy mode. Signed-off-by: Andrew Halaney Reviewed-by: Andrew Lunn --- Changes since v1: * Convert to using of_get_phy_mode() instead of continuing to use device_get_phy_mode() (Andrew Lunn) .../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index e62940414e54..ebafdadb28d5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -4,10 +4,10 @@ #include #include #include +#include #include #include #include -#include #include "stmmac.h" #include "stmmac_platform.h" @@ -104,7 +104,7 @@ struct qcom_ethqos { struct clk *link_clk; struct phy *serdes_phy; unsigned int speed; - int phy_mode; + phy_interface_t phy_mode; const struct ethqos_emac_por *por; unsigned int num_por; @@ -720,7 +720,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev) if (!ethqos) return -ENOMEM; - ethqos->phy_mode = device_get_phy_mode(dev); + ret = of_get_phy_mode(np, ðqos->phy_mode); + if (ret) + return dev_err_probe(dev, ret, "Failed to get phy mode\n"); switch (ethqos->phy_mode) { case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: @@ -731,8 +733,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev) case PHY_INTERFACE_MODE_SGMII: ethqos->configure_func = ethqos_configure_sgmii; break; - case -ENODEV: - return -ENODEV; default: return -EINVAL; } From patchwork Mon Jul 10 20:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 118067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp55830vqm; Mon, 10 Jul 2023 13:30:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6KooUjUEVt0ma3U/WzuN7FlIS0HSEFgrP5KPIJhnJQbYeS1WvdGHsqTj+RZAwHR0snoPV X-Received: by 2002:a05:6870:438f:b0:1b0:25b4:4b77 with SMTP id r15-20020a056870438f00b001b025b44b77mr14741223oah.14.1689021036400; Mon, 10 Jul 2023 13:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689021036; cv=none; d=google.com; s=arc-20160816; b=XjvNl+SqDN4ybbp9nKo8Novf4+Q09RWrG8ODVlIx53GFRSry7uFr38LHRrfRw41O8J 00GOFq/2tp/WUwzNaXFDlDx3A/tHoru4Yrf7sgsUQ9JqkUdaSX7LwD81O/r8iA1GmcTi OK6KHmX8KjhL06lF1WLhiSoPa1HLw3In0Kg+Y+h5eM7tw2ISfyYWcYhc+IiNrPvwZ8OO 4ijapHHgWhkE2+suwa/a+HAu7pq+h2Kr5U7STZ1nq/sQEZXUv6xdUwcScSVo3EgCfsIM o5gsBSbJiAKq1We81gcG1L2tg+VmzbvnmFrhpiVMYaYa2Vj8GzRH5cy2kJQ1SaSaAri9 Wxrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZfBCs08BCyvb4rUBf/lFUidTAq5uH0UA99R+iDtQ+Ug=; fh=TEhPL03u9aBEz0qKKE1Mf90ymqVPmmrEZD98ZBvqOO0=; b=b6ObhGdLGksARYk22Xtq8yfH3e96UZDGyb4m2TnZm8PyoKK5PzSWw00Mk3kq2USBP2 G9OUovMcK5YsxjlXB2bLKTO8qWuQj9RXDX1GuiDilmLCl9T+ODYiZTrpxml5nYUGK/eW tkkYFUcjjpgcA1LlEm4Ou5GiPk9jGJZsHiv8fMAuh7N/7+bEZ7gRWRhASHh/c3Oh9Jce BGCCAbJ6Skf51jodOGJMghdiy0P816YLZARH/Y6OrJhP6GAvgTAbPot+z5/HMNacR/9l Tb8F45P3ft+S+BKWRJhlPK+tAwXR0dIBVz7fZB/V96gnWbmWbqIH4VncE5ETxW2gpDsJ VsEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vte6DMJe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iq3-20020a17090afb4300b0025ea1c0edb1si7711710pjb.146.2023.07.10.13.30.22; Mon, 10 Jul 2023 13:30:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vte6DMJe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232006AbjGJUS1 (ORCPT + 99 others); Mon, 10 Jul 2023 16:18:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230527AbjGJUSY (ORCPT ); Mon, 10 Jul 2023 16:18:24 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02FA3197 for ; Mon, 10 Jul 2023 13:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689020260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZfBCs08BCyvb4rUBf/lFUidTAq5uH0UA99R+iDtQ+Ug=; b=Vte6DMJequp4VaHVSbynVId14j94TYH8zqSPUMuTVZ5MHtzjTgtVm1AJ4PkD1AhhAzfKKH STqMUNgKDuygO59j23fYJdvf0Uuf7iKOWEfh/8hZw3bJvc7nvAflwYAHg3T6+QYKsJgU7b YTHCqeqUzAwuWm2JAppvrpWv9RLQW4s= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-PQxISe_LNZujYq9y264CVg-1; Mon, 10 Jul 2023 16:17:39 -0400 X-MC-Unique: PQxISe_LNZujYq9y264CVg-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-1b02ecda1a3so3953557fac.1 for ; Mon, 10 Jul 2023 13:17:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689020258; x=1691612258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZfBCs08BCyvb4rUBf/lFUidTAq5uH0UA99R+iDtQ+Ug=; b=h135sXGnGHmJz2H6dRIBr+EdnHpivQTjfgY1A4S9Q1MapAobRsFG/TvPeY6urOOeHX hYQTMLIr5QGhwyqk3CmpGC1rcuC6Jb0ARq94ZRQNPxMJk1j8wXjFIn83w64xJJ2hPhKp Ybe6/1tjOKoMDhDRsKf4u1BvDZ6MNchoyBaltMoHCYY0rg4pV4e/4Jg4xcv4OEf8WqRX A4DsPF+KbTmxF4eGhMxKfeNJaC47t5ow1AIOUplk/Nu/RvFCypQwN7cZ1Yc6QvSq2P7O 7Ox9Ds7GnXle96N+Ys3BvK5PL3xQeBODazl38OAKIlhFZpczYGdU7+1cIkD4LFeRD8SK mUOg== X-Gm-Message-State: ABy/qLZBTSRLekihcO6VN+hzmeA3REeBR3/fP5saiy8eihPACx5XetdH +OoPtVxQbUUWrYCTmYwR7h4Wq9CyFgr2wc/K3Mj785NA/R1jnS6W/zIX/RmgG71agJ/snle0Zyu x3EPOORYB8rmildq9SA9jlHBp/wbtopZvl/MrwXbuuoV333kwtpSyeEKKaNIUkPsDOltJ4jZp6j oHxtaNHFfy X-Received: by 2002:a05:6870:440b:b0:19f:9353:d9b0 with SMTP id u11-20020a056870440b00b0019f9353d9b0mr13312431oah.24.1689020258072; Mon, 10 Jul 2023 13:17:38 -0700 (PDT) X-Received: by 2002:a05:6870:440b:b0:19f:9353:d9b0 with SMTP id u11-20020a056870440b00b0019f9353d9b0mr13312403oah.24.1689020257748; Mon, 10 Jul 2023 13:17:37 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::22]) by smtp.gmail.com with ESMTPSA id j12-20020a81920c000000b0056d2a19ad91sm155097ywg.103.2023.07.10.13.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 13:17:37 -0700 (PDT) From: Andrew Halaney To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, mcoquelin.stm32@gmail.com, pabeni@redhat.com, kuba@kernel.org, edumazet@google.com, davem@davemloft.net, joabreu@synopsys.com, alexandre.torgue@foss.st.com, peppe.cavallaro@st.com, bhupesh.sharma@linaro.org, vkoul@kernel.org, linux-arm-msm@vger.kernel.org, andrew@lunn.ch, simon.horman@corigine.com, Andrew Halaney Subject: [PATCH net-next v2 2/3] net: stmmac: dwmac-qcom-ethqos: Use dev_err_probe() Date: Mon, 10 Jul 2023 15:06:38 -0500 Message-ID: <20230710201636.200412-3-ahalaney@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230710201636.200412-1-ahalaney@redhat.com> References: <20230710201636.200412-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771066922140151031 X-GMAIL-MSGID: 1771066922140151031 Using dev_err_probe() logs to devices_deferred which is helpful when debugging. Reviewed-by: Andrew Lunn Signed-off-by: Andrew Halaney --- Changes since v1: * Collect tags (Andrew Lunn) drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index ebafdadb28d5..1e103fd356b7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -710,8 +710,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac); if (IS_ERR(plat_dat)) { - dev_err(dev, "dt configuration failed\n"); - return PTR_ERR(plat_dat); + return dev_err_probe(dev, PTR_ERR(plat_dat), + "dt configuration failed\n"); } plat_dat->clks_config = ethqos_clks_config; From patchwork Mon Jul 10 20:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 118066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp55606vqm; Mon, 10 Jul 2023 13:30:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlFPVt2dLtJYgwKQkr9QSjyhu3OrZJTU/AD0O8tJ6E4lmk1N3T42CFX2NcuqWAvV/Qe9J2dH X-Received: by 2002:a05:6a00:1782:b0:666:8403:9f4 with SMTP id s2-20020a056a00178200b00666840309f4mr16207618pfg.16.1689021011581; Mon, 10 Jul 2023 13:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689021011; cv=none; d=google.com; s=arc-20160816; b=uUoPLvDJ+uWxPad0VBo0r5X3tSIvhiYPaESKqX1HvODQCwm8Bt/gAii8XG86X+mmNa 7IfuaTHrVei+D4XscUr9NYfSgrk9TduCMMwrvbQLqLKgvMDPRiypaXYvWRBohEvE7Qdr AZFICfvAxukxUmQL3ltoxMpNsuq7b6fEw6bGMIlUt3bxlwcPu4dSK4oV/YwSLujwxame 1p4fbzuMGHalU0CkKE2zw+rOGBOtLDRrnUuVfH3HCeD9N8q0QabKAKmNlMt9pXWziobg uBL15uU2HQ9Skq8yrXU2OHrWyJyKbCyFAfIpywRsSE3oo58Qf3e+fmClvTMsT83v+vpg WfFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6Lt3BtWczAjK1pGWk1bVfpBjHD7dTaFpkCieY8rxpSU=; fh=TEhPL03u9aBEz0qKKE1Mf90ymqVPmmrEZD98ZBvqOO0=; b=JXaiqrD1S2cjJEQUVOk0iDJyqVeUR/kk9VyxjjI/g72Dyx61InUYpJhnXZI9bxdn+G uqt8fOXKqlT1RUgonvWE3cY7FdaIGTIHBAMB2X48tefXdFI9nYVA3rptJ0bo87VH+Kq3 XjXElfcdnByuTUEWKrzoJSx0yr7sqv4YEWbDXZ6/qgXelFf+ZGBP6T+XNzL7z48zOTT5 q9lqKC2llU0aQyicdBowoLXgBQzeluzZggxyQlq651bA3wVDCJ74wvnNoUS9LWGvG9w/ 0sI768VR0FE0EG13CZJ+vTllOU7lKB6NBW+hneiVtaYxauAbPafDa1RS0rSFdpIyRKFO MJ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KVvfF173; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ea22-20020a056a004c1600b0067af445c0f0si229531pfb.291.2023.07.10.13.29.58; Mon, 10 Jul 2023 13:30:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KVvfF173; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232201AbjGJUSh (ORCPT + 99 others); Mon, 10 Jul 2023 16:18:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232158AbjGJUSc (ORCPT ); Mon, 10 Jul 2023 16:18:32 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2F5D19C for ; Mon, 10 Jul 2023 13:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689020265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Lt3BtWczAjK1pGWk1bVfpBjHD7dTaFpkCieY8rxpSU=; b=KVvfF1732MAQfYbXUb+5wNwvups4BhfmxK+/aU8KKofnpjGni20D18P0jXTpnpgs9YerTN XZkO2ELv6oas3tDx+oRs465vWlsEisgxbtQCD8dKVmVSE4x6FRTFzgCU49mhMJfBF60yEh ttYVYQO6CXv9HQDgWwiIc+m8q039sMY= Received: from mail-oa1-f72.google.com (mail-oa1-f72.google.com [209.85.160.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-n9Oh-F_YMHmfsWG1OMxQfg-1; Mon, 10 Jul 2023 16:17:43 -0400 X-MC-Unique: n9Oh-F_YMHmfsWG1OMxQfg-1 Received: by mail-oa1-f72.google.com with SMTP id 586e51a60fabf-1b44332e279so4126789fac.0 for ; Mon, 10 Jul 2023 13:17:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689020262; x=1691612262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Lt3BtWczAjK1pGWk1bVfpBjHD7dTaFpkCieY8rxpSU=; b=MsovDdTEpXgjNQOOfF+qzhzRvmTXdtG0IhGyurAcpi/tZ8zZKSDEQFNKx185c+kQ66 bPXJ6IlcS1y26jBM8oiXbxg8atLFJ5KiGGwSrpTAOc4NHZ00jYeaPChtNSFKDytJWMcU dd3Rm5J1BmzNAyU00sT727UaSi5wyKIVGwEH0oY7wlWOmECmsXhMNCredRjEjiS/HiV/ REhgD7mQWXXLgKECABeowdoB2Hvi93r//JwTciiRf7GjunSjWoqdKqB75lHI72j6WUnf CUKIQyidW8r5Ru0RYU35/WgP6y78pkvf9mUtyDcRld7jPrOQ4hP+P31KHcPWXRrIRO2R Ok7A== X-Gm-Message-State: ABy/qLZTRyfBmKmhb9PgGHFJPny8L4ZpGgZO7ZL673YJbqFEtfi13iqn Oe+CoGKW0ktj+0AZcPiw4tr71dhHpKRQZo0iUszxNwW/0DKs/qPS8Xwtb/UxfJFznkRXKeRqAdZ EzN+npeS2srjPrD1ssLNtSdfQUS+dEP5gPMwf7SClGAKcQydGNVmebhCmpTJqAiA5EvBxBgHZsB b1zlrc4ftM X-Received: by 2002:a05:6870:6112:b0:1b0:4899:10d with SMTP id s18-20020a056870611200b001b04899010dmr13142265oae.35.1689020262540; Mon, 10 Jul 2023 13:17:42 -0700 (PDT) X-Received: by 2002:a05:6870:6112:b0:1b0:4899:10d with SMTP id s18-20020a056870611200b001b04899010dmr13142235oae.35.1689020262255; Mon, 10 Jul 2023 13:17:42 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::22]) by smtp.gmail.com with ESMTPSA id j12-20020a81920c000000b0056d2a19ad91sm155097ywg.103.2023.07.10.13.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 13:17:41 -0700 (PDT) From: Andrew Halaney To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, mcoquelin.stm32@gmail.com, pabeni@redhat.com, kuba@kernel.org, edumazet@google.com, davem@davemloft.net, joabreu@synopsys.com, alexandre.torgue@foss.st.com, peppe.cavallaro@st.com, bhupesh.sharma@linaro.org, vkoul@kernel.org, linux-arm-msm@vger.kernel.org, andrew@lunn.ch, simon.horman@corigine.com, Andrew Halaney Subject: [PATCH net-next v2 3/3] net: stmmac: dwmac-qcom-ethqos: Log more errors in probe Date: Mon, 10 Jul 2023 15:06:39 -0500 Message-ID: <20230710201636.200412-4-ahalaney@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230710201636.200412-1-ahalaney@redhat.com> References: <20230710201636.200412-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771066896166923185 X-GMAIL-MSGID: 1771066896166923185 These are useful to see when debugging a probe failure. Signed-off-by: Andrew Halaney Reviewed-by: Andrew Lunn --- Changes since v1: * No changes .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 1e103fd356b7..757504ebb676 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -706,7 +706,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) - return ret; + return dev_err_probe(dev, ret, + "Failed to get platform resources\n"); plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac); if (IS_ERR(plat_dat)) { @@ -734,13 +735,16 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->configure_func = ethqos_configure_sgmii; break; default: + dev_err(dev, "Unsupported phy mode %s\n", + phy_modes(ethqos->phy_mode)); return -EINVAL; } ethqos->pdev = pdev; ethqos->rgmii_base = devm_platform_ioremap_resource_byname(pdev, "rgmii"); if (IS_ERR(ethqos->rgmii_base)) - return PTR_ERR(ethqos->rgmii_base); + return dev_err_probe(dev, PTR_ERR(ethqos->rgmii_base), + "Failed to map rgmii resource\n"); ethqos->mac_base = stmmac_res.addr; @@ -752,7 +756,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->link_clk = devm_clk_get(dev, data->link_clk_name ?: "rgmii"); if (IS_ERR(ethqos->link_clk)) - return PTR_ERR(ethqos->link_clk); + return dev_err_probe(dev, PTR_ERR(ethqos->link_clk), + "Failed to get link_clk\n"); ret = ethqos_clks_config(ethqos, true); if (ret) @@ -764,7 +769,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->serdes_phy = devm_phy_optional_get(dev, "serdes"); if (IS_ERR(ethqos->serdes_phy)) - return PTR_ERR(ethqos->serdes_phy); + return dev_err_probe(dev, PTR_ERR(ethqos->serdes_phy), + "Failed to get serdes phy\n"); ethqos->speed = SPEED_1000; ethqos_update_link_clk(ethqos, SPEED_1000);