From patchwork Tue Nov 28 08:04:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp185668vqy; Wed, 29 Nov 2023 22:20:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJTbhOhMaSWfEzKIDJm11+rnDeJd2wObzqDQ88pXr5gmuUKVgLaJrjqV3uDDoLPm4y9oyy X-Received: by 2002:a05:6a00:1993:b0:6cb:cdd0:76f7 with SMTP id d19-20020a056a00199300b006cbcdd076f7mr23477237pfl.21.1701325257351; Wed, 29 Nov 2023 22:20:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701325257; cv=none; d=google.com; s=arc-20160816; b=dsQ1vkrNBxZ6ulm5MUo5Jk1E+QV41MWHzmkGuQCJDQ32mUlUQWRikVpMUe3g3j8TKb Lsf/nZWSlOSiLsvxYaull+mr2LbAwB5SILzEhgFaR59PYnMbdha0CPjsfZFB2yExaAjs J4xeOc7TFoYoUCNkXzYYloY3mPltUQzemN9D1gOHg4uzVSHcgimtv6mSLmabgoiq2gwj fvbLYBBUTe4p1rYrThhO2y634SW39YVceGYKzsRNRN4o5IYNBvg4PcuNwz6dfGCQr1o5 kSJsadTXgzgXd//O+dOxU6AIw4G38urdBhLej/28paKSr5CWsxaYItxa83Cg8w5Mu5Je FvkA== 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=TER/zjgFsQ4zH/M/nBtL41p2wpZGtg22rimu0p57AMs=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=YaNmCK0/09J/CnfO51aeh7decj+TLffFm7t/bgB8bqwhBLwOXi2ELdrt/FpXmkaQyP kib50JA1gQjXXljKuzoquDOQUto5N76Q032RlwHXtHx/jxhmC7TIbh8i9aYu4SqlkS7E in7+v3CoAPzl6Eain66Q25H/NK1W537vqADsny8g1gOasZmbOxIZWht9/KWGzu5SB/+7 sQ6cdHS6p88avFqmizUcNY8otYZ/ZvR4+l6dFJxOWnuuADV7EK1AnsLKACHQ4zAJup5i x3DZ08p6MU6F0OEUsMBEQf6cnd/6MQ+9paA340ZrRJn/H3xcJSV5K0kU3yNKxPxh1k9u sOFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=NSH+yIqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id p5-20020a056a0026c500b0068a5877bfaesi527084pfw.382.2023.11.29.22.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 22:20:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=NSH+yIqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 5EA37805F437; Tue, 28 Nov 2023 00:04:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343989AbjK1IEo (ORCPT + 99 others); Tue, 28 Nov 2023 03:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343955AbjK1IEj (ORCPT ); Tue, 28 Nov 2023 03:04:39 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE1DEDB for ; Tue, 28 Nov 2023 00:04:44 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40b4746ae51so12485395e9.2 for ; Tue, 28 Nov 2023 00:04:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158683; x=1701763483; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TER/zjgFsQ4zH/M/nBtL41p2wpZGtg22rimu0p57AMs=; b=NSH+yIqa5s/ZejJN07Qauf8d3WJ0IEOgE4+CpI5Ssa7gTjJgaJ8SKPO995OfuT9yiT ayBU6HqLc35b+YC1Pe9OicLyCOXwsySYl+EVIcsaYZ6H8AHJROjjcYxgh3eIBuAxQR5i WI+9CDTAi8vOPIX9u3K5rbkKyovh0twyjTiQdGLGRyP+trLsVOMDekoT7VazH0cra6Nk UgFzWAdzI7bN9m7wUyFNUQSbKFLze6KCd8/jzdTqd21+1eAzztQYyWaIQ0q+qqYKgLI6 UtjVproy8mrqO703i2QqpZmnOhBCmXFbFgMdf06JTPZSmO7asZqVGnAiunDC3+D7OvQD KHzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158683; x=1701763483; 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=TER/zjgFsQ4zH/M/nBtL41p2wpZGtg22rimu0p57AMs=; b=p2IQS3ooY/IT9ULJS0gOu3tRVP824iLT9kD+luQRkrRcRR9HzSPAWiMbg1/ljaKUNn pc3miWTxcOZR8QY4i6JHwxSfc6C4kJeEJpn8qfz0Ikfy0so7gH7oRkbFlOGSGtx8m8pt cnvvz6i+ulqQGycWx+SUc6e+wUcJYbOEw9pufIxF6IsIP9AZRcNkq3BhH4uEGBO+4li8 VHBpAK2y6U2sEmCzeQAoRVTPvVtUuOTAAVyJHItidfWPOiGHW4B7Ab/IWlI72Kk4A6KJ YiX4xvLWlfeW7LoGsWZOECZ4++v+pa7EpRzbd4ElvPbF7ARWts4fIoOAHpYc0bmTAXIW MK8w== X-Gm-Message-State: AOJu0YxQP8GOoNqktwXnuaY67fTo9vJtnPUYB4kxlv+4MzKQy9LQZ1yG kEdfGeOXPyjCzqR5Hpas95DaxA== X-Received: by 2002:a05:600c:4f8a:b0:40b:4520:45a6 with SMTP id n10-20020a05600c4f8a00b0040b452045a6mr4460089wmq.8.1701158683147; Tue, 28 Nov 2023 00:04:43 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:42 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] net: ravb: Check return value of reset_control_deassert() Date: Tue, 28 Nov 2023 10:04:34 +0200 Message-Id: <20231128080439.852467-2-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:04:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783968833239900589 X-GMAIL-MSGID: 1783968833239900589 From: Claudiu Beznea reset_control_deassert() could return an error. Some devices cannot work if reset signal de-assert operation fails. To avoid this check the return code of reset_control_deassert() in ravb_probe() and take proper action. Along with it, the free_netdev() call from the error path was moved after reset_control_assert() on its own label (out_free_netdev) to free netdev in case reset_control_deassert() fails. Fixes: 0d13a1a464a0 ("ravb: Add reset support") Reviewed-by: Sergey Shtylyov Reviewed-by: Philipp Zabel Signed-off-by: Claudiu Beznea --- Changes in v2: - documented the addition of out_free_netdev goto label - collected Rb tags Changes since [1]: - added goto label for free_netdev() [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index c70cff80cc99..50c4c79be035 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2645,7 +2645,10 @@ static int ravb_probe(struct platform_device *pdev) ndev->features = info->net_features; ndev->hw_features = info->net_hw_features; - reset_control_deassert(rstc); + error = reset_control_deassert(rstc); + if (error) + goto out_free_netdev; + pm_runtime_enable(&pdev->dev); pm_runtime_get_sync(&pdev->dev); @@ -2872,11 +2875,11 @@ static int ravb_probe(struct platform_device *pdev) out_disable_refclk: clk_disable_unprepare(priv->refclk); out_release: - free_netdev(ndev); - pm_runtime_put(&pdev->dev); pm_runtime_disable(&pdev->dev); reset_control_assert(rstc); +out_free_netdev: + free_netdev(ndev); return error; } From patchwork Tue Nov 28 08:04:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171743 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp185622vqy; Wed, 29 Nov 2023 22:20:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQ1rd0XtkPPWlrSnG0vy2KqITxYRaLkZGv/is4Z0hEDtvIStBqGUbbD/PeSj/R91jXknoQ X-Received: by 2002:a05:6358:6f13:b0:16e:325b:8e67 with SMTP id r19-20020a0563586f1300b0016e325b8e67mr16444919rwn.25.1701325246331; Wed, 29 Nov 2023 22:20:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701325246; cv=none; d=google.com; s=arc-20160816; b=C+jJE3HIuTZhjwt7f3t0bSMCnpwV8TY8d8w8gkVceMEFjFLp9CQI9fYZ37wWJeTWLW OxhcGSsqWoahKe7FDy0iVOxT47pWnXpgQJrBcUysnUFA6O9bPpJSxOS/7xQIcuI1Hqfa a5yyqg/Bfl9UZ270Qw79WkQQcEIGUpKORv7KrrB0oLV5oCWLUHW/djssjHuYYY2zpZAI 6x6l3KJs/io0358YOR2RY3gT8fNdWvLYCGUFNyJnayyCQ/50xfHv5UPDAUJ0x3kEhnYK Is+7+3m2n174N8zAYXe5Ru5dD/ajOR7YHDzlgKM2xd/SVS78V1wx7vtnYkA1MofLmWTz K/CQ== 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=tex/f+v5XiThmeQ/1yf1Rnsid+DeltBdSjavRwGvUE0=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=RIW1erMMLXYav6/LKcZnrdn2pVeZgWmw3gbbYZxK+vKk+47bBlX8fKpSMR5SxYA+Sc WeHKVX1mPH1EvnQaISd+e5tkAL0E6VOrYIIYtsnc/iY34/+G/hZJBjKzziDTNS1i/Ecc JCIMT3jkbpQrexO499Z0frmh77tLAztkue4DZ/Z5On6v+fYh6ve+PLPGEg//zlNtRb1M 85PdSRjxoyA+2VMgDinx7HOu3SDyo1llACx78Wq6QeAv+ZOjA/hwGJf0JOWUvHWu+YXa GcTAOaE5lZDUB3uER8ayRUPvMrQaSzhgIu6YY1jcmFUEbe+AevugchglqOEr9/bpfeBt jCtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=BhSlTlws; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id b23-20020a6567d7000000b005be1ee5c3f2si587740pgs.289.2023.11.29.22.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 22:20:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=BhSlTlws; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 31B6E807EADB; Tue, 28 Nov 2023 00:05:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343960AbjK1IEu (ORCPT + 99 others); Tue, 28 Nov 2023 03:04:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343962AbjK1IEk (ORCPT ); Tue, 28 Nov 2023 03:04:40 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 585FAB6 for ; Tue, 28 Nov 2023 00:04:46 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b479b9c35so11959455e9.1 for ; Tue, 28 Nov 2023 00:04:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158685; x=1701763485; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tex/f+v5XiThmeQ/1yf1Rnsid+DeltBdSjavRwGvUE0=; b=BhSlTlwsDX7EXSCG+VX6B79BvgoXHd3U8a/cpeGFbEjaV2osMCqUhL1pl4XF9LE0bQ iPwiKRrjO2grjbrzsg8VG4nqHOJRJGP8BDCO0SuLC0xuWcG/MGsCJrry6FTYGfFBFkQe rhCsCs8vcXl7YB+XR+OVZp8Nkz4hPDab+7zPn6DtAlpGmXmseDlEjry+8DyTE3Q0SRDF S01ZUwc8WvTwJsfEi6HLvdLa7IxdUoKiMm+gnW1DcEkdwk94w/vERWZyR/S8VCyshEvl UuKsydZip5vsibo/rNvTIu6QW2BxwpZd5MSQ4vy2tMxbcx4TDYCDdrLVv/+t7poAAXr/ bhdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158685; x=1701763485; 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=tex/f+v5XiThmeQ/1yf1Rnsid+DeltBdSjavRwGvUE0=; b=nmy+s/LV6D//B7W+CQ5tQvXOHy3FD0aztCBQvBDmala4WI25bjub0WuNGL0CxbawMk 0j6sdA59ZH5z7Rt4hF4JOCQ7sRSgQX1ANeoQ+lzLJsYs5BYfSxqMiuANWJGBpHjY4JEB Mzzq+rZe1H8q5ltmR/Olmph4eYB2R0nu3t3OC7riXJGBek7tPaTxvTntfmjfBZ2qZSwx L7NUdsYCFFNSWBzAEOMQ7dJz2n0UADl40hLoumzcNxLDApWR78HAMW2hQ9goJSLch5wu 988ChgauJYUa5nbL4JnW05iNOoJVqDujXBZPPOT33mP6Hd4e2XHLwlMFuU1aLd6TD/SI iRAw== X-Gm-Message-State: AOJu0Yzfg+bI2B45y76eWOb9vC3xYTFK0OiTK/02cfOQ1nvPWOyjEDG4 CZWb+8h0jPevsEQbbXWplLVmAw== X-Received: by 2002:a05:600c:1381:b0:405:3455:e1a3 with SMTP id u1-20020a05600c138100b004053455e1a3mr9383229wmf.17.1701158684750; Tue, 28 Nov 2023 00:04:44 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:44 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] net: ravb: Use pm_runtime_resume_and_get() Date: Tue, 28 Nov 2023 10:04:35 +0200 Message-Id: <20231128080439.852467-3-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:05:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783968821550434012 X-GMAIL-MSGID: 1783968821550434012 From: Claudiu Beznea pm_runtime_get_sync() may return an error. In case it returns with an error dev->power.usage_count needs to be decremented. pm_runtime_resume_and_get() takes care of this. Thus use it. Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Reviewed-by: Sergey Shtylyov Signed-off-by: Claudiu Beznea --- Changes in v2: - s/out_runtime_disable/out_rpm_disable - collected Rb tag Changes since [1]: - added goto label for pm_runtime_disable(); with this innecessary changes were removed [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 50c4c79be035..0af2ace286be 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2650,7 +2650,9 @@ static int ravb_probe(struct platform_device *pdev) goto out_free_netdev; pm_runtime_enable(&pdev->dev); - pm_runtime_get_sync(&pdev->dev); + error = pm_runtime_resume_and_get(&pdev->dev); + if (error < 0) + goto out_rpm_disable; if (info->multi_irqs) { if (info->err_mgmt_irqs) @@ -2876,6 +2878,7 @@ static int ravb_probe(struct platform_device *pdev) clk_disable_unprepare(priv->refclk); out_release: pm_runtime_put(&pdev->dev); +out_rpm_disable: pm_runtime_disable(&pdev->dev); reset_control_assert(rstc); out_free_netdev: From patchwork Tue Nov 28 08:04:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp191377vqy; Wed, 29 Nov 2023 22:38:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXjG0UQp2yb5khz4cdZlpe3ZIDSXZ1w20q0pR3Qh/mx/aV1Suxm+a6bhlqYFQRW1CH7nLx X-Received: by 2002:a17:902:d303:b0:1cc:5691:5113 with SMTP id b3-20020a170902d30300b001cc56915113mr22611515plc.26.1701326324478; Wed, 29 Nov 2023 22:38:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701326324; cv=none; d=google.com; s=arc-20160816; b=w7OuAOx6ldmGNPN3p8od+w1xvAgbHJMu1bCM0BWsNt04Yo7lYV2661HHwH8yqQ+dhY T/8i284sSzSYbYxSc0fIslYq14NbyvxezvbY9hLmH1nhzIklFV7uJQ2qvNNolu1SE1BJ q1ouFG6IdW98JZ+E+/QN4F04p71td8BceI+sScUWxuPfzqbrkDPpSdi+mvJoUoZtSpc+ 0AqAtlyZaDQia+n90mvTOAMT35Lq4jqNMKdDJV0ovFovK5mNhJhFEKFlNHLgfioOE9vw rtdymp480Gat4yvcpJ8Rmizey0iXy/m4VYwMYOaR3CFIpiHvarjF2h/b8pOYc99PjM2P pmSg== 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=IoaNebWj6WdqROHUgOaXFN9XZbA5N7Tmp23rLr1Pw/A=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=vgVMoLA7Pd44c9Titk+WczT9iN7SNBGqOZbf8vaqkLoZo0rgIjvUAYtlHpuUBZBXxD ALDGyrqqIG9x/74mbSXQ812VCfA8Je7v4uQTdqisI4IF2x0jvljtS29HGI0nMqgyfRdf y0sFzEVWQdaOXjimSlQzUN8BAiJ06w0lcVL0YzNToinDDw5EX/x2LT+rAY3yo4s62XSd F8DZNaH5aNDfOsxrRNClwxk8+mDNgBSsCyuBDo26gQ3+OjtAIoyNAVDZ7mXGHWKijxwd YuROEDRwIgONl64rruNnxEZ76VP5NoB1vjwDn1ifVGQRKkOd5f4ju4yV0qse23d5wvKn vNig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=QnXBzJ+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id jg4-20020a17090326c400b001cfb84c92fasi541159plb.70.2023.11.29.22.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 22:38:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=QnXBzJ+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 7A440822509A; Tue, 28 Nov 2023 00:05:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344025AbjK1IEy (ORCPT + 99 others); Tue, 28 Nov 2023 03:04:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343982AbjK1IEm (ORCPT ); Tue, 28 Nov 2023 03:04:42 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E42C7DB for ; Tue, 28 Nov 2023 00:04:47 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-507a0907896so6657047e87.2 for ; Tue, 28 Nov 2023 00:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158686; x=1701763486; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IoaNebWj6WdqROHUgOaXFN9XZbA5N7Tmp23rLr1Pw/A=; b=QnXBzJ+g115eGwqrZGkYam4RQe2aCxxcfRRj2P+wZuoHuDS+QUdWc3XIIS6xY6ygkX 9oLkZHXsXjJV+8eUvT/l1bQ3faYTQ0fdIBu7T94qOMwB0Nzp2T5utMqZCR6t5IyI9IHG g967U2liIckFIWnLJa7IFW7Z5vdDRLmSnex2U+y9fWrqKilyFH/2AYuVKZ8y6nXEu2YV iMlL5VRDuIB3pB65bSVEhfat1nNB7J+CNd0ZQuGtjvvjDSIdmJnCkGUQGIrAK7S6cieo XBUaMvD8HmKWHTWT2arr1E3aBf+lrQOqNFuDBwH5jrsemVtb/rn/EVI+I0Nwc5QiYnib R54w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158686; x=1701763486; 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=IoaNebWj6WdqROHUgOaXFN9XZbA5N7Tmp23rLr1Pw/A=; b=cYGpJ8Nbm1tpYA/AXyoVABi1fltVCOsrYPzxvFyBeJNBtmrsgGcDB7Y60R6Q0e1hzv ZV1/okC+2M2iW2hBLyUxThVUGfh+dlYDWDs77fiSIajJAV9Q7OJ29uV1dBNpscbcPfLA unrrjJcM+LS+YRlNzrFakkaVS4248TPcERL/5gvPyKOFiuaMUx8NXW4St1TEPcD0liuj gc2V6r9P+XijejJ7WHqJDq7woOCrrDBEgFeaY4qy2wt6DIOCDtT1pjMTJDLIpJ1oteI5 oxo/u8yHFKgw6T9vgyhOdGnMzfwzF4ClnwtscjdjM1dvuL2aFsCz2M62gzCfmg/oHkSk euOw== X-Gm-Message-State: AOJu0Yz2ZkLprqqAK295Q7TTmQHPOj1ZIl7chGYKpJ8P+S0Ie9SKUxYt 65LjmNduUC5KFTBkeo692R/YcQ== X-Received: by 2002:a19:8c5c:0:b0:50a:b9dd:43f with SMTP id i28-20020a198c5c000000b0050ab9dd043fmr8382999lfj.21.1701158686229; Tue, 28 Nov 2023 00:04:46 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:45 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] net: ravb: Make write access to CXR35 first before accessing other EMAC registers Date: Tue, 28 Nov 2023 10:04:36 +0200 Message-Id: <20231128080439.852467-4-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:05:04 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783969952163096452 X-GMAIL-MSGID: 1783969952163096452 From: Claudiu Beznea Hardware manual of RZ/G3S (and RZ/G2L) specifies the following on the description of CXR35 register (chapter "PHY interface select register (CXR35)"): "After release reset, make write-access to this register before making write-access to other registers (except MDIOMOD). Even if not need to change the value of this register, make write-access to this register at least one time. Because RGMII/MII MODE is recognized by accessing this register". The setup procedure for EMAC module (chapter "Setup procedure" of RZ/G3S, RZ/G2L manuals) specifies the E-MAC.CXR35 register is the first EMAC register that is to be configured. Note [A] from chapter "PHY interface select register (CXR35)" specifies the following: [A] The case which CXR35 SEL_XMII is used for the selection of RGMII/MII in APB Clock 100 MHz. (1) To use RGMII interface, Set ‘H’03E8_0000’ to this register. (2) To use MII interface, Set ‘H’03E8_0002’ to this register. Take into account these indication. Fixes: 1089877ada8d ("ravb: Add RZ/G2L MII interface support") Reviewed-by: Sergey Shtylyov Signed-off-by: Claudiu Beznea --- Changes in v2: - none Changes since [1]: - collected Rb tag [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 0af2ace286be..62a986b5de41 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -515,6 +515,15 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) { struct ravb_private *priv = netdev_priv(ndev); + if (priv->phy_interface == PHY_INTERFACE_MODE_MII) { + ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35); + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0); + } else { + ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_RGMII, CXR35); + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, + CXR31_SEL_LINK0); + } + /* Receive frame limit set register */ ravb_write(ndev, GBETH_RX_BUFF_MAX + ETH_FCS_LEN, RFLR); @@ -537,14 +546,6 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) /* E-MAC interrupt enable register */ ravb_write(ndev, ECSIPR_ICDIP, ECSIPR); - - if (priv->phy_interface == PHY_INTERFACE_MODE_MII) { - ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0); - ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35); - } else { - ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, - CXR31_SEL_LINK0); - } } static void ravb_emac_init_rcar(struct net_device *ndev) From patchwork Tue Nov 28 08:04:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171746 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp188787vqy; Wed, 29 Nov 2023 22:31:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSfTsPg+7pBnABrbqn+17n/Atzbly4y73INcjNK6wfqF4505bhov/RwmGwagAfrWc7Ft3C X-Received: by 2002:a05:6a00:14c6:b0:6c4:dc5b:5b2b with SMTP id w6-20020a056a0014c600b006c4dc5b5b2bmr23141589pfu.20.1701325870079; Wed, 29 Nov 2023 22:31:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701325870; cv=none; d=google.com; s=arc-20160816; b=UMgIs2itxAmleabTotEiwQEUggeLj9m5CwCVnBHFubq/jiIwVk2EsD+eGiF+6+8S1G 0k99f0H+DJI8AdaLnUDRwdQyPS+81FtA+BZ9LLRMVnAgWVg8TSlujxAMHcDv9DRaeE/3 gVXYaVBk23FrhNtAyi96t5wHDM2nOZbMwmFfGEUU4QZhyCVqDEli5JXYqevFZ3HaHveO BV7KiiAm06lJhsy/nPQAbGzAPYADoCqMgjXfRPapCpMt34e7XuhirHGdQgRnMjIyD4C6 FzvhXOUSB84XkJ3csRD/VJ6OqK8+p3bNzccF7TYTIkN71ADSav+M3rLd6w1BrBpQbAPV /eTQ== 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=fTVx8N2lyLVeP/GZzmvvrZO4776iEUf9UriNFWs6nw4=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=pXGuZ05sAw7V2RlzBFn/R7wgInuGgVgxddChCL5IOXqRo6TzUKMvsAtJBTZ+Hra+z4 KIhl7BzIZY1kLoGPxALcKyEkKJEtIjzHZRbaqwdLMireH0Sbu0fp4Aazb+jTroSwssmZ +cnp1XO9BTIQGLTLCuCBE55eZTElFmct8jwSR+EZJ7QjgMqJYGJvj/exLKdLKERotcXS p3Xlz+l5yOSDc0dXcsPdI3t8BcGtNAYQ7Y3PoFe5e3T5oOHUgYUqh+xMGvE39iAcr5++ Q1VdmmdEzBNVPjubCpC/N60lgzweD3hEXAydAw2glXia1EF7LrV0kMiN95vHtBGR4j1+ /9yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=btPiitC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id i19-20020a63d453000000b0059beadab759si627413pgj.652.2023.11.29.22.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 22:31:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=btPiitC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 04C9A807E897; Tue, 28 Nov 2023 00:05:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344039AbjK1IE6 (ORCPT + 99 others); Tue, 28 Nov 2023 03:04:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343986AbjK1IEn (ORCPT ); Tue, 28 Nov 2023 03:04:43 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5033E1A3 for ; Tue, 28 Nov 2023 00:04:49 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40859dee28cso41748885e9.0 for ; Tue, 28 Nov 2023 00:04:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158688; x=1701763488; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fTVx8N2lyLVeP/GZzmvvrZO4776iEUf9UriNFWs6nw4=; b=btPiitC99qPsBgEM94E46UgZB7+GJfKZdtn6J7Gckw3he8kTGnxcUnc6GwqkSf8Dd+ Rw7WQ9nf7agG9IlppmHfSombhRYKlZw4FWXo+xXPvwKriiJ9xY+qLC6iHF+sG0NuQF01 Mhyz/R6OvjIsBK1qO0xe3rdQ5I6XK75Ifrp7G2nFrPZKHKuecDtuiod9KMAX0KrWN29/ 3z9JD3TcdzyEoMcrY79WmYjGjqiaBSoJi80veH8iHGcTQcX+6UCWzvkpwLjBapaj0YRb zOw18C8BKGHWlrDVTyy+h9V/oKQ5yCKINE6o3i0q3q1YBIPO7GW6uuX7oAg9Ck6WoFuO O3kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158688; x=1701763488; 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=fTVx8N2lyLVeP/GZzmvvrZO4776iEUf9UriNFWs6nw4=; b=K6LwQQGy/z0I9oUlavfYJO4fQ98uMNhM2t3DwBRDXNUi5UHUhuXaII9pJ47ExgDY8P fu2jvw5tXVIGuQZ9xL3KLrXJHEk9tIMAF1kbqCUnqJAZ6SWv8RgjYbEc3lI9+MGTA79H tK2oi8i6oK4OE2s6D8HyklnVamzGYtU/rKS7KGO7VBtqybUWvRG3gyLcfuweAL2zsTjX Zy3CPHTomp0RStKJ9/dAIvEERhj6AhKWra4N/+gntX9uvvOZWgd/yL0aFH0sI1FEmOAa 2XkvA3XgwkaZrJqesDFBNIPs1gVHr7AHhsJf7wu5HbE1UGW52IsBwKoUPdAPxRzOHIVq 7E+A== X-Gm-Message-State: AOJu0YxenutgwmeiUqGD9HXvODDKAsMlUEYa3AJAzhQt4EVRufAhWWD3 46OHRM58Mx+VPBbrUQ/2HTIE7A== X-Received: by 2002:a05:600c:4e94:b0:40b:4c36:f80 with SMTP id f20-20020a05600c4e9400b0040b4c360f80mr810627wmq.32.1701158687784; Tue, 28 Nov 2023 00:04:47 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:47 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] net: ravb: Start TX queues after HW initialization succeeded Date: Tue, 28 Nov 2023 10:04:37 +0200 Message-Id: <20231128080439.852467-5-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:05:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783969475331917985 X-GMAIL-MSGID: 1783969475331917985 From: Claudiu Beznea ravb_phy_start() may fail. If that happens, the TX queues will remain started. Thus, move the netif_tx_start_all_queues() after PHY is successfully initialized. Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Reviewed-by: Sergey Shtylyov Signed-off-by: Claudiu Beznea --- Changes in v2: - none Changes since [1]: - collected Rb tag [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 62a986b5de41..2ef46c71f2bb 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1812,13 +1812,13 @@ static int ravb_open(struct net_device *ndev) if (info->gptp) ravb_ptp_init(ndev, priv->pdev); - netif_tx_start_all_queues(ndev); - /* PHY control start */ error = ravb_phy_start(ndev); if (error) goto out_ptp_stop; + netif_tx_start_all_queues(ndev); + return 0; out_ptp_stop: From patchwork Tue Nov 28 08:04:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171097 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp150340vqn; Tue, 28 Nov 2023 22:20:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvfNvdo8ThnpGY7uzu/+ZLkdpv82B88mAhBzGmELFC+/CTOLIzg+qCVmEQLTzm8tlLVTT4 X-Received: by 2002:a05:6a20:d90e:b0:18b:d17c:6af2 with SMTP id jd14-20020a056a20d90e00b0018bd17c6af2mr23140006pzb.57.1701238836035; Tue, 28 Nov 2023 22:20:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701238836; cv=none; d=google.com; s=arc-20160816; b=MRFXdvWXaDxWqsfxi1E7T2d50/DH3VxfauTTeMzz9uL2gJvrXp2gzSkEpm20Eg2L1O /HO1X6phrZwSrk/hpOoI08MkbjS6j9wkS7Ox6OVIChJE6o5E122Aw2nkX8Wnr8Eq0IKX seuRzG5+jEvfSJp8dUs0YAnaIOJO1DoOo6vkHXAY+xBREB39qLuTES3DWpUj+HIz6036 aEM6YGjyLE+K8ZK/9xtwFMQVvZ9Wm6251jc73hIufZ2StIBNCTVEUhx8LC0yv3l9QhEE gPvEwWZAkg5FHcywpjumlP4U0Tj1cWBWh2D4hx5+cHDAhzDMVTypf1xq/vnaEEpaTqj/ 4Wig== 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=7UUIFtQDzSDtAn0+xL/a4rToHREO/z6KIZ1fp0e9QBw=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=EpFxYPHMldrl3h1eTnRMbZPZN3u2nr1wxW0yZ/79GzFec9FmdxtBP5fUDz1nSfwqFw GczHrtuWxVJuTXeyH1tT7kNaIDA4ln/aLTLvX5QUrO6cC6RGFTRTJI83rZFAQnleunEA 2IHSE6ItO4QBiPLo8EJEG2GaERb08WUCZUE/FHsI8UwVlXyiPEYX0hBS90MSZ3C98Woa rEt1jHTckgVqXrKGfl4/HmF4dPbvitWJRlpY7SQ52hyvxdJh7ssxt5Ir+QdPz04MaMUv JkufDFYRu7CLUH9Ptp9ivmwVWhDYxF4yUV+85+Pg282n9WUIe748eYpfrRyo760gCtex stXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=NTru99EY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id ne20-20020a17090b375400b002859a8aee84si627841pjb.172.2023.11.28.22.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:20:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=NTru99EY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D624E807780E; Tue, 28 Nov 2023 00:05:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344048AbjK1IFG (ORCPT + 99 others); Tue, 28 Nov 2023 03:05:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343983AbjK1IEp (ORCPT ); Tue, 28 Nov 2023 03:04:45 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D87BC1 for ; Tue, 28 Nov 2023 00:04:50 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40b399a6529so21770705e9.1 for ; Tue, 28 Nov 2023 00:04:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158689; x=1701763489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7UUIFtQDzSDtAn0+xL/a4rToHREO/z6KIZ1fp0e9QBw=; b=NTru99EYPWeI2IZS/ZDXNx/2q9s804lRjP4j4Kgs3Bj9vAiCsUpHBQhvORI30Xg+F/ nlpuAp8hrQb3tncaeBk8Xf6FIBlipXk0hoFAywPHFlEVZvh600BeBxoO0/Pp2XWIvAHK r2hw0yBpBcf3dubMAOqG1p2h2wcR8RV5fnSvcBP/vGp2Hfuq55Yq8+I1D+a5rusT9qCJ XdF/ti3gINrjlH+OJoEw7sNR7NgFL2d5oPIMm2jxZMaR/zB98G0u2w3Vm2IAtZrzB//S IdvtiSnp1J9qJV2B6NOf0IhajygZT/dq4GdIV4k6+B1gJ/BxNg+k8JWQNPV1QTK2WzeT AHtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158689; x=1701763489; 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=7UUIFtQDzSDtAn0+xL/a4rToHREO/z6KIZ1fp0e9QBw=; b=pSlf9VfZOvG+kEPRBwuhnZGywy0DZrA5VF4SPE0dJ6owyyW4BJrKRGX+6x9UiNd6Tc HXKBACQiTzilYN41h2XX1cfDiV7v3MVrEFBmeJu2kSoUrSrar9kEvVgG23v+G20N39lM FRlXLIOmMqa0N2+iQz28g6Eilitp+usitKAEU7fayoGluTD81IbkjVvvvNuUxR+X2mYv Sz6S6sddsUEG7MUF475X7oxHUhddKmV0lvWj60cPdIAyFLTsgRYHDpJOqH/Fu0DAGnMq 7Db/d2FJr5+fOc2YL3coMFwXJ1BuevT7UgqBQOiYcpHpqhVzjmN25vWT/rwfE6NcXsxX ZRaw== X-Gm-Message-State: AOJu0YzfkeIMB8aeVLrgfx123zfwdyOHZ2prBBeZ78zwd5tGwtRoM00s cV03DxqbzLz2rL7+YC3Xn2LYMJwU134JIXP/TSM= X-Received: by 2002:a05:600c:35c7:b0:40b:3322:2af6 with SMTP id r7-20020a05600c35c700b0040b33222af6mr12528814wmq.5.1701158689281; Tue, 28 Nov 2023 00:04:49 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:48 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] net: ravb: Stop DMA in case of failures on ravb_open() Date: Tue, 28 Nov 2023 10:04:38 +0200 Message-Id: <20231128080439.852467-6-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:05:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783878213822525616 X-GMAIL-MSGID: 1783878213822525616 From: Claudiu Beznea In case ravb_phy_start() returns with error the settings applied in ravb_dmac_init() are not reverted (e.g. config mode). For this call ravb_stop_dma() on failure path of ravb_open(). Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver") Reviewed-by: Sergey Shtylyov Signed-off-by: Claudiu Beznea --- Changes in v2: - none Changes since [1]: - s/ravb_dma_init/ravb_dmac_init in commit description - collected Rb tag [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 2ef46c71f2bb..2396fab3f608 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1825,6 +1825,7 @@ static int ravb_open(struct net_device *ndev) /* Stop PTP Clock driver */ if (info->gptp) ravb_ptp_stop(ndev); + ravb_stop_dma(ndev); out_free_irq_mgmta: if (!info->multi_irqs) goto out_free_irq; From patchwork Tue Nov 28 08:04:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171096 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp150297vqn; Tue, 28 Nov 2023 22:20:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtmn9Pl+DPHfPtgWuIM2K3rlJNn0NIQyj0HJQlyHNghjb6bkzBaoEO5vyRnXpn4+eT3eDu X-Received: by 2002:a05:6a20:a103:b0:189:11e8:6237 with SMTP id q3-20020a056a20a10300b0018911e86237mr20964045pzk.51.1701238829824; Tue, 28 Nov 2023 22:20:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701238829; cv=none; d=google.com; s=arc-20160816; b=JKl8YfGjfA2ea8kJGKomxw22JJGZa7nhho7932hXqJQ15We/aXolKKRBzs4xWmrtjH fNOcQnRYaOKSO8+kkM/UvlHa9//2/x7iXDXhq1xgdCbs9RLOaBYDtVX+V8AaxU4Et4LE gVMdJb/npVMO3stsBjZp4xEKDOmgmqHUK+B7FtEI1AjgF4aiOxiUW+Q2bKsKfF4OCBWf LyIcCtRfup33yxAXX+viwEE/SUgOKcx01fmDC6KEiHbCOBgqKX3lOVLDx8lxcxBHtgi8 oBEEd9ueqZJ7usPKoLvvKJBPaKeDOtqOXcbUi16baQvsnTKPMoGzNm4KChXy34cO7ipd 02oA== 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=llunhkM8sKXrafDQaQtl/MAyFYLs2dUG+zsrZHGyqOA=; fh=0TmBxb3iK+HPjRlYDVXDLy5dPQUGD9gLiQry0et3j2E=; b=cGMw76EfGl0kk7JBmMAbgpZgV3AN8DYZ2LlS+UrbSSpX4RGJo4AaBV98G8QwedLv4i qUebLHBme4pBfzvwWGl8+RI9w5zqKgyhWt7FWl/B1fkQqZwlkWWJBnUmSoCT/sUuPlFU Q35agFihncEfg3YNo0nCmSGB+MmqpQXcbY4ST3fw5KAKYHV0eb1j0tQD2R+8KMmsg5HR /7egBy7RK6vCMy3bDAmYPF+YYXy8zBkK4Sbb7oT7yCzHIZL5IuEn49qFbXkFXMLiMoj6 HoCznTTeqkS0MMy+de/rDgElPFJ3dcYMz78T4NsPgVBs66l2LlXmSv7WpCU74kbABENM 3BQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=PrE3MAkP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id t3-20020a635343000000b005bdb6daee0dsi13797096pgl.303.2023.11.28.22.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:20:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=PrE3MAkP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id AE06A80732B3; Tue, 28 Nov 2023 00:05:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344056AbjK1IFM (ORCPT + 99 others); Tue, 28 Nov 2023 03:05:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343994AbjK1IEs (ORCPT ); Tue, 28 Nov 2023 03:04:48 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1E9D1B6 for ; Tue, 28 Nov 2023 00:04:52 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40b27726369so36030045e9.0 for ; Tue, 28 Nov 2023 00:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701158691; x=1701763491; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=llunhkM8sKXrafDQaQtl/MAyFYLs2dUG+zsrZHGyqOA=; b=PrE3MAkPkGQcth7uVaMUssbZEHhpQknLEbWRZVyPUW/LT+seWNHo8Ox1JohwEXY1qP R4EF+8QaGmNSOEzhfiP7ywLFi8++Mr/S1eL6p2Y4BinebiRPwRdvDKfUg5ABPUdrTJuf 85ZVmWxqVQ4zRVwVPrFJw8wuQ/LJuGDVNsBkryLqb3PkOPgu7e6NjBXhIu0hi/c4ul4m APwfDK/yLoS0wElgR1SgQLjB/Jwct5XYTH5Gb//1nXeKYp3NZJR3ElYaBnQxbVvQY3Bl ABfJSq5FUTxP7SGiQYl58FAu3Y7Hyeyrmt7wgPIBLHwhUibLsXHmAKBABUZY8pn2r5/l 5Mjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701158691; x=1701763491; 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=llunhkM8sKXrafDQaQtl/MAyFYLs2dUG+zsrZHGyqOA=; b=kzwUTxaji9CoOtBH0JviB9+l9656qtlnoxNZCFkUbFIi288O2FlyBZOWDrqsowZeoJ VW8DP34tfqbON7HIb7Eks9Uf1BKXW9eAoCmUMpUf/9RzSP/IVEoZwQ0RZ7Y+v/GiFbJe kDUwpuP9X5h4TKfSmW/TUFM/G3ncCx1r/snOH5rPeNfSKoIqcNyBKyLRWPjuXYFD1W2z 4LvCn8PDwShgCQeOlbK/WoddMDvFui/Oljq12pc6Y/8QncEX78mQAFcjtUgotV4IKHP6 8iE+xj4crD+zIn3TmaIyPQrOgtqmK0e3+ToXEZgS5VS12hw7GxQ0kERcnxLm4oywUlR9 nTJg== X-Gm-Message-State: AOJu0Yxk1u3TXR52gIFBD45orWpFxuQhd+n017+/1fexGC9LnBTeiPAh umWFjdvaf/4caOIbNRdaPPEwwg== X-Received: by 2002:a05:600c:1f82:b0:408:364e:34a2 with SMTP id je2-20020a05600c1f8200b00408364e34a2mr6194992wmb.10.1701158691121; Tue, 28 Nov 2023 00:04:51 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b0040b4ccdcffbsm1127534wmq.2.2023.11.28.00.04.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:04:50 -0800 (PST) From: Claudiu X-Google-Original-From: Claudiu To: s.shtylyov@omp.ru, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, yoshihiro.shimoda.uh@renesas.com, renesas@sang-engineering.com, robh@kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mitsuhiro.kimura.kc@renesas.com, masaru.nagai.vx@renesas.com Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] net: ravb: Keep reverse order of operations in ravb_remove() Date: Tue, 28 Nov 2023 10:04:39 +0200 Message-Id: <20231128080439.852467-7-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> References: <20231128080439.852467-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 28 Nov 2023 00:05:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783878206996423105 X-GMAIL-MSGID: 1783878206996423105 From: Claudiu Beznea On RZ/G3S SMARC Carrier II board having RGMII connections b/w Ethernet MACs and PHYs it has been discovered that doing unbind/bind for ravb driver in a loop leads to wrong speed and duplex for Ethernet links and broken connectivity (the connectivity cannot be restored even with bringing interface down/up). Before doing unbind/bind the Ethernet interfaces were configured though systemd. The sh instructions used to do unbind/bind were: $ cd /sys/bus/platform/drivers/ravb/ $ while :; do echo 11c30000.ethernet > unbind ; \ echo 11c30000.ethernet > bind; done It has been discovered that there is a race b/w IOCTLs initialized by systemd at the response of success binding and the "ravb_write(ndev, CCC_OPC_RESET, CCC)" call in ravb_remove() as follows: 1/ as a result of bind success the user space open/configures the interfaces tough an IOCTL; the following stack trace has been identified on RZ/G3S: Call trace: dump_backtrace+0x9c/0x100 show_stack+0x20/0x38 dump_stack_lvl+0x48/0x60 dump_stack+0x18/0x28 ravb_open+0x70/0xa58 __dev_open+0xf4/0x1e8 __dev_change_flags+0x198/0x218 dev_change_flags+0x2c/0x80 devinet_ioctl+0x640/0x708 inet_ioctl+0x1e4/0x200 sock_do_ioctl+0x50/0x108 sock_ioctl+0x240/0x358 __arm64_sys_ioctl+0xb0/0x100 invoke_syscall+0x50/0x128 el0_svc_common.constprop.0+0xc8/0xf0 do_el0_svc+0x24/0x38 el0_svc+0x34/0xb8 el0t_64_sync_handler+0xc0/0xc8 el0t_64_sync+0x190/0x198 2/ this call may execute concurrently with ravb_remove() as the unbind/bind operation was executed in a loop 3/ if the operation mode is changed to RESET (through ravb_write(ndev, CCC_OPC_RESET, CCC) call in ravb_remove()) while the above ravb_open() is in progress it may lead to MAC (or PHY, or MAC-PHY connection, the right point hasn't been identified at the moment) to be broken, thus the Ethernet connectivity fails to restore. The simple fix for this is to move ravb_write(ndev, CCC_OPC_RESET, CCC)) after unregister_netdev() to avoid resetting the controller while the netdev interface is still registered. To avoid future issues in ravb_remove(), the patch follows the proper order of operations in ravb_remove(): reverse order compared with ravb_probe(). This avoids described races as the IOCTLs as well as unregister_netdev() (called now at the beginning of ravb_remove()) calls rtnl_lock() before continuing and IOCTLs check (though devinet_ioctl()) if device is still registered just after taking the lock: int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr) { // ... rtnl_lock(); ret = -ENODEV; dev = __dev_get_by_name(net, ifr->ifr_name); if (!dev) goto done; // ... done: rtnl_unlock(); out: return ret; } Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Reviewed-by: Sergey Shtylyov Signed-off-by: Claudiu Beznea --- Changes in v2: - fixed typos in commit description - collected Rb tag Changes since [1]: - s/ravb_dma_init/ravb_dmac_init in commit description - collected Rb tag [1] https://lore.kernel.org/all/20231120084606.4083194-1-claudiu.beznea.uj@bp.renesas.com/ drivers/net/ethernet/renesas/ravb_main.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 2396fab3f608..9178f6d60e74 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2894,22 +2894,26 @@ static void ravb_remove(struct platform_device *pdev) struct ravb_private *priv = netdev_priv(ndev); const struct ravb_hw_info *info = priv->info; - /* Stop PTP Clock driver */ - if (info->ccc_gac) - ravb_ptp_stop(ndev); - - clk_disable_unprepare(priv->gptp_clk); - clk_disable_unprepare(priv->refclk); - - /* Set reset mode */ - ravb_write(ndev, CCC_OPC_RESET, CCC); unregister_netdev(ndev); if (info->nc_queues) netif_napi_del(&priv->napi[RAVB_NC]); netif_napi_del(&priv->napi[RAVB_BE]); + ravb_mdio_release(priv); + + /* Stop PTP Clock driver */ + if (info->ccc_gac) + ravb_ptp_stop(ndev); + dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat, priv->desc_bat_dma); + + /* Set reset mode */ + ravb_write(ndev, CCC_OPC_RESET, CCC); + + clk_disable_unprepare(priv->gptp_clk); + clk_disable_unprepare(priv->refclk); + pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); reset_control_assert(priv->rstc);