From patchwork Mon Nov 27 09:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171103 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp157010vqn; Tue, 28 Nov 2023 22:41:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmf0XdRGJ4Y6tU0HfdoRTykOPmvXd49/LandA/VlWna3oJKkrDY96HyHKp7eBQj0qcVJau X-Received: by 2002:a05:6358:33aa:b0:16b:fcaa:e748 with SMTP id i42-20020a05635833aa00b0016bfcaae748mr19452118rwd.9.1701240082805; Tue, 28 Nov 2023 22:41:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701240082; cv=none; d=google.com; s=arc-20160816; b=zVPyqHGR9NqIS/q8ecGibR2QGqHy170/Cd7VGgzGRNWoDTdCLY4mQu/x7hjCy6ICW+ G8Qo/r5hcRLX38P4WWyc1442DekPF2D2T/elqU8qpmp1FjaBk0nbDIiFnJRparMcnv0Z 4Iu4NtofK4iIk2r9PqLBpbP3WXXYRJhWIty2kF1h+CztuHn04hj20DyJlZDtIuvcpbGf 3yB22cB+nYlWT9pjFFO+w1zmn27emUhB1VsTIIPL/nCkxzM47Z88vm6rcb5JcGI5NEHy gqA+J9ITnsvpBwufQCtclNvFuv7DXLQfUXmvoO3fhF4j45w+nWdLmf5rMiUSP5t5rGUY SY4Q== 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=f1Odgh8NQ+ymmAyVzkExaOV4kNSDq/6wv5PLiqzNFYg=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=TsElGeW6twkkpvGzFWOaFlQyGP7NJuB1wOzkwKH2LWkh+7PKp5H02KXPOwDc2hDcxf YuJJ14/F3Iy+7DGExH0gXtngSgCPqEntV0hDBWG6HtwqXy1MAfC82Ywj+vWDo3/qIky6 KpqMKyLoXDD5tMGGlhUxLPL1Zu5p5xzWoLzfAJAUauEx2fL4JnuhQnl/vc2WkvVEhDzX 1tSqib7+WV6BycEpCkAd33IwSqCOwpgtzIS6NRDNrE4Wn1hzaEWEzq4Ik0+dxFsgFadc v4mitaoc0wVIiC5lnZ8aHdWjsbF+G5CpsltJo3s9MWvqSaSIr80cmd1IybkSwfFrfMVv 6hhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=MPzl9jCx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 17-20020a630d51000000b005c2188ae892si13791133pgn.583.2023.11.28.22.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:41:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=MPzl9jCx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id C44148098715; Mon, 27 Nov 2023 01:04:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232659AbjK0JEl (ORCPT + 99 others); Mon, 27 Nov 2023 04:04:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232607AbjK0JEh (ORCPT ); Mon, 27 Nov 2023 04:04:37 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC25E184 for ; Mon, 27 Nov 2023 01:04:43 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a0029289b1bso539135466b.1 for ; Mon, 27 Nov 2023 01:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075882; x=1701680682; 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=f1Odgh8NQ+ymmAyVzkExaOV4kNSDq/6wv5PLiqzNFYg=; b=MPzl9jCxhIUN6DjkTUK94dkPbCkWZ1DjnfDjx6uOOvWT6PjCae5EzmolsWinzmZaDz K2Vixs6mgTPcu+u670olQFdDmbWA0nZf3A+wb15aMQc26Ga6DmyI6Yc1617gtHzxCf0o 0Is6WO1rNR1GkZUxprIeqIGRu8ftoxs3D64nP4hGBzj+S/IcDIOlZp+UEJSPHCdoFdpm mttuZ05PnlSdRjjgPNxCtYtOQc/ivHVlSifejBhvbGzOOMMcz880QivPgMcWeACWCYmI IeBip2veRpGlkuGCRxiGYxyAFLZ/CjYkq8CzC13J7MlOe+FyIdyu2owObzrm77AuHCXI cItw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075882; x=1701680682; 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=f1Odgh8NQ+ymmAyVzkExaOV4kNSDq/6wv5PLiqzNFYg=; b=K+F9mq6/5/0zSHcggZ6CnoWiE6atJhA3pZLzZl23jcndn1HqyvrMQYgWSZYfZM1D3O mpteteueb++SHwHhbdWLWswi0EUQZadCOSSYCYSLQwHHOp0w6Qk2rfbGjCcrUgF9UU7W WMxe6QVmIyFHTEj7h6b/a0hAbO4VyEYzp+LXH5N+gDObrcW/sK6bQIO6a5uaZ+PtyQ1f RR/t5KCG20BE31GbSu0u0c1Sx7Qfk4LML++xY5Jz0BVubUgOQnDA6Cj8Q/QGfk6A9SDF EaeRGZ3192gdaJMrZXydmkamIfQLvUEqdJgqbDvfi47BreA+qX5ecsSqrExZ3wirJ/yN zftQ== X-Gm-Message-State: AOJu0YyG+l6VRCd9QyN26GwFceF2a+ZqTzEZUHmP2kBrozDVIQD0ByP2 Q4m6Dti7+2bmTZU8N/tLLQhIAg== X-Received: by 2002:a17:906:10d:b0:a00:2686:6b40 with SMTP id 13-20020a170906010d00b00a0026866b40mr6513858eje.14.1701075882183; Mon, 27 Nov 2023 01:04:42 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01:04:41 -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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 1/6] net: ravb: Check return value of reset_control_deassert() Date: Mon, 27 Nov 2023 11:04:21 +0200 Message-Id: <20231127090426.3761729-2-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 01:04:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783717746645421628 X-GMAIL-MSGID: 1783879521000173442 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. Fixes: 0d13a1a464a0 ("ravb: Add reset support") Signed-off-by: Claudiu Beznea --- 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 Mon Nov 27 09:04:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 170060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2952444vqx; Mon, 27 Nov 2023 01:05:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhVmtSU54nP5iScRHeIihh9EOxgvJAoUSOJz0dSrww0QPJ4mgiX+n1j9NEM0UrYWPc2rws X-Received: by 2002:a17:90b:4c02:b0:285:dbbe:1178 with SMTP id na2-20020a17090b4c0200b00285dbbe1178mr1011823pjb.39.1701075952578; Mon, 27 Nov 2023 01:05:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701075952; cv=none; d=google.com; s=arc-20160816; b=uNSCv7kaJpV62D4d7JkIMUIwsCQjwKIh1kMsyG2wJh8In+bc3ZWL0u4v4NM1wEEali hj0C8+vsjvt6liZfFjCBftbzEKjp5vot3KxcO1a0vaqRIbhY9FHsSZ2Y4kFVdcLSmZ2x 0ykFsTjtnI2SY+wW2n5tFxqnIhba13nBI0qvCxbhckPA5QpMiwzKc4vQoYLcAelaHulw TEs7VrFDCUbI3x+mPsxp24lddjbhm9uWIIGKMYIiu8MYv2FA0Q66xCVxpXMqjFuGQJXB lAPtxYjGzXIwW/KuqGGuToUI/oD5ORM97rgS/26vFnKEs2utYb4hVZ64ermfmrKAH8V7 jspg== 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=SY105oJjqBLJjrNiZ881NJwgu30bKrulY2ZruFXx9EI=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=IQVZ/yJCx7uWjTzb/uTHO2U5+Kr1Cnk/+yww/ZMSyXWMCZHePaeCBocTseikRq1NFO jZkt2u1HylLggP4TjlhKU/VcV3nyPwGdrQ8Jt+Yk7ejcJSzNmq1vQ2MbbovVi2md6Yof +KNHLxktuuInrWkMjoxx1zMUUjbPqxBQjeD7ksidFkTSkuyX6YWsRz50TQWxcE9pDN93 +ygx/lLklIL6h27I07Ox7zyMnkR05ZeChCmPHM35IeA1uQ9eOkLIvV/YoB22DVwLwkU8 QXiOBJBM7ahohG0uVQKARiwVwLvHn+HqPMnw8i82psUvb2ZE61pO0Abz+NeQ0IgVxSsj te2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=Cy84VwcD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id pg3-20020a17090b1e0300b00285b8673bb8si3449061pjb.101.2023.11.27.01.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01:05:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=Cy84VwcD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 1786D8098719; Mon, 27 Nov 2023 01:04:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232686AbjK0JEo (ORCPT + 99 others); Mon, 27 Nov 2023 04:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232642AbjK0JEi (ORCPT ); Mon, 27 Nov 2023 04:04:38 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3033D188 for ; Mon, 27 Nov 2023 01:04:45 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-543456dbd7bso9457756a12.1 for ; Mon, 27 Nov 2023 01:04:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075883; x=1701680683; 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=SY105oJjqBLJjrNiZ881NJwgu30bKrulY2ZruFXx9EI=; b=Cy84VwcD08LovmdeluY81pY4hAxrPC/7PtZXICdWX86mK7rGn5tzGvr/0Dixx9M34c PrRrOJPAVkN53uadZIHupv8vw8QrB2kHVuEzz4+QiAqiBGrTLo1Eb/XsNircAQ5wcuTK VIaJhxKj5MlCGXgy/5d9FF4SIvYNmyd3Qo7ihEGVwgZCNkhMPEAXtSHgJsfEAyiSeGBB 9kAvls/FfeXBq00H6X2HYiBiDZYCvjNk3oyG8ytiw0pudB9Ajc0ifHIUIOBBnz6+ofdh /3KkXn8vCe8fKYN8w1iFlmaWVSYMof2tr+Ht1Jm9Fs0aflYkcDfB2iO1y5ssYiMI0BGV w6pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075883; x=1701680683; 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=SY105oJjqBLJjrNiZ881NJwgu30bKrulY2ZruFXx9EI=; b=DFP8fwlhAcjsOeLoT7pnLb39O/RVoWcBGvsjv+ZgH7h9KfyLKVvzY+6SE0sHam/XZc bIVNZZRawClWwFW2GWNy+/4avpkxmYFlv8ycrRWGjsKTGGGAgs5YDfqB8gZKYAxt64fW YfnRCpYONMk2aN2CT2NP+DqWk0uEUeNt+0KpsjXO5wQoeVt6ve9jEbtiDSMW01ZKzJQp U3dLPbJj9qT8W03SxfOU3z9PPkK7rQsq6Q8j+TKiRKwCstHb7sGEOvU1waLg75q8VoWc 0cEbUX3fvvJ/Bv/xlCJfnAxhSAswZSPAyORUl41opUY3UvSHADcjsqUpNCnNhRfxhgNQ hDCA== X-Gm-Message-State: AOJu0YxYrOUBWOnO0UhaUC1iyBYJhDi8RqOanEt9WWBBHOmyynJ4XteG 7wERxZ2qVoMF71B+G7LousvnCw== X-Received: by 2002:a17:906:c44:b0:9ff:889c:c2ff with SMTP id t4-20020a1709060c4400b009ff889cc2ffmr12596865ejf.22.1701075883737; Mon, 27 Nov 2023 01:04:43 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01:04:43 -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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 2/6] net: ravb: Use pm_runtime_resume_and_get() Date: Mon, 27 Nov 2023 11:04:22 +0200 Message-Id: <20231127090426.3761729-3-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 01:04:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783707417907900927 X-GMAIL-MSGID: 1783707417907900927 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") Signed-off-by: Claudiu Beznea Reviewed-by: Sergey Shtylyov --- 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..cd3474168452 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_runtime_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_runtime_disable: pm_runtime_disable(&pdev->dev); reset_control_assert(rstc); out_free_netdev: From patchwork Mon Nov 27 09:04:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp151989vqn; Tue, 28 Nov 2023 22:25:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2ZVeXt+2C2X8NTrGUYkFb56oO+798x/GiwAogJcw6uqGQDOLOy2THZFcjOu/ZHMofLOCU X-Received: by 2002:a81:7613:0:b0:5d2:966b:f2c1 with SMTP id r19-20020a817613000000b005d2966bf2c1mr202058ywc.49.1701239142621; Tue, 28 Nov 2023 22:25:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701239142; cv=none; d=google.com; s=arc-20160816; b=dvSJ8XDKTvtWdF/Z0tjUrm5zjnYvvotW6RIQA3f3+dOON4/BDH5ZFeZ2068sDiLJzo xiY/kwZeclFsVoNoCyPYXqkiWe+Gbl6+017cQdSoIZt8AZks70negEyeGxx1HWuGDvsw Uj+d5ljDgxNGFvrNjv6VfhlqA0VOCQV5j8uP/0qDV9VlgRuCL+Td/jMGV9tWY21mAIB3 Ub9cTNE+mN4DY5e7QRBPIm8qnW2crsH4PscaO/x2NPab4XKJjsX90xpf0JteUci6nUjh dq4Md1IGpu3WY2BdHFQJYlqDQVFWcoyeXDwTPKQzqdv+u7M3y7Gvm6DEdzaIUV5c5teu dHgA== 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=sQu10j0QwV+Ad1UGRhRRU7KzoLHJiBSEBkkZ5ea4Ue8=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=qyvxPQFW6QbjqnJTzMuNNPSgzAclE7AVzM1DLDlm3nmKBr71z/wmpgcSO8F2ImDgdM YYOMNgfVW2U7VXitk9IafZ7mNFsfR+xmkZk+Ez4a2OT55Ghzxo2UcRW3yH1lmowhPjph jCMldBM7O3MGGA0l7grOKPwYrh3KO1uHQlVhicmPvD7XSg4OhNCCUQK8RKRtajox6fcn jOgJXYMqf8nKEKhKVV/g/tY2x43bowe2o4RAoM9y/0Xe79agl0PecxpFBSLVa1wd2CbG RoI4NglSgvJgEC9fpOglWqZlQB904JN2tVWe3iq18ebUFIU4NV6kXo53WwbW4gxeHRl2 XJjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=mOW8jygG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k13-20020a635a4d000000b005859e22461csi14319411pgm.817.2023.11.28.22.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:25:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=mOW8jygG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id BDF5D807B485; Mon, 27 Nov 2023 01:05:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232745AbjK0JEt (ORCPT + 99 others); Mon, 27 Nov 2023 04:04:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232667AbjK0JEl (ORCPT ); Mon, 27 Nov 2023 04:04:41 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 041BB18E for ; Mon, 27 Nov 2023 01:04:47 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a02d12a2444so571166066b.3 for ; Mon, 27 Nov 2023 01:04:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075885; x=1701680685; 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=sQu10j0QwV+Ad1UGRhRRU7KzoLHJiBSEBkkZ5ea4Ue8=; b=mOW8jygGTTUSGr7OMcMHFQIUAKrZcmdrT0Lm9SCUKlwpmtlg/4E8Beo5KiXx+LW4tE CWiI0Bu77dttGNPMVAQxqOV8LaevIHY6Lpo54B8c+2ystx8GJxlnSct7WrkFeobHxSrV Tncu3FJt7ZOqm11A5bxL9nr3OFeU2IuQR3zlgAnAOJzpuwLnNw+C9db/NwnW/qGyHd68 rTF/zjAJhqIvEhGRfTxPcPLwbzKWPrw/457bv4DZ94JWReWw+GbvkewGnyOtMPwS/CO9 G7iWfj6FATirr5rGhp4ECHCV6Al/cBGsyNHjzW2W3HsgsmdZgf2K5tWnaQ0UyoEjICEv XA5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075885; x=1701680685; 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=sQu10j0QwV+Ad1UGRhRRU7KzoLHJiBSEBkkZ5ea4Ue8=; b=bPzcSZ0pgL72YD90PvpbfhsH05hp1we9iRqo3KPvJxmba+Jgj35EO0KDtJ5GxXv6J5 jFRtn43o8BsrhZeGKbLfmLDVVUe1dxOKggVW64GNlAwhZgq26HJ1cntsKNRcM32dgEBs fstFlV5wXKVYhSPsDA85s0nT/HygfbLrZDei4OxEQ9vvfTsGGnaOYBMiL9pfKl/o6XCL /Y/9vqdICAKVX5k38X0PSLDBvWyRTYcYx++ady2LU1QEu8blvZCHCt/OzNDxDxEQKY62 Qd9BhoDjjtzNoJByxnoX3t8Kj6wTqR1hhZToYHI35fNyVc1XJQ2cmGfyAOav9jxYUKKL RbPA== X-Gm-Message-State: AOJu0YyPtS1UClFS/oUZsLssxe4M+lT9CaEsKuFHStz96fJQZW18dDsm NItOJVKosWV0PYxxJz58dvO5uA4JegSCVl5GGN0= X-Received: by 2002:a17:906:eb0f:b0:a02:95ea:1289 with SMTP id mb15-20020a170906eb0f00b00a0295ea1289mr8362060ejb.20.1701075885302; Mon, 27 Nov 2023 01:04:45 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01: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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 3/6] net: ravb: Make write access to CXR35 first before accessing other EMAC registers Date: Mon, 27 Nov 2023 11:04:23 +0200 Message-Id: <20231127090426.3761729-4-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 01:05:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783878535067744515 X-GMAIL-MSGID: 1783878535067744515 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") Signed-off-by: Claudiu Beznea Reviewed-by: Sergey Shtylyov --- 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 cd3474168452..2d4f4fb3d16e 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 Mon Nov 27 09:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 171100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp153431vqn; Tue, 28 Nov 2023 22:30:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IHoZ9h859XHEkvpCL6iiNjUEVIhVDfWWtonp4/Lx4vVFAVNErbyk2w+tDH70t4H2RURnpC1 X-Received: by 2002:a17:902:c945:b0:1cf:c340:c1e2 with SMTP id i5-20020a170902c94500b001cfc340c1e2mr11836554pla.50.1701239435155; Tue, 28 Nov 2023 22:30:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701239435; cv=none; d=google.com; s=arc-20160816; b=XQcubMua7wfKxbS72hk9NbOW9Rdf2IGl3RfLMSHHL76dgPoP331aHsxDFS5S7QIxyx C5/PUQ8aaEs0uec7LqjvIqs5ah7u5tvzSm+N+jSMm3Xc1wLWQdGBirhAQutrV23d0Joz vV1o5hZdOy19Kf8E/aLko654IdRKw+E+M/2FV8jUq1B3vkqpgWrxN2qSXAZIL2FMbw6D OUC45kTYWbZbTC+KwOJbrqXmpQGdRyHavlltXS3tj+N1vY6+XkE/g+of0ku1sD21Op1a /O2IzPJ8Nqt3WoZRhYmXsv4DteeB3Ut2MlUexPnKrTx0dmUi2OjKSu6PNQwL1ORT+rDX +wXg== 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=ELkubP0P+TLGoCnHyLiXJ02PqgLHPPVcTUt4fu5hI+U=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=BnZtzvz+dG/WzxyJJqcSo9kxfPndIF9JzKcQ82qu/zR1zHv0+HuJQUx07r4iRgqg1q b04Z+Qw5oWFRY5jKukaxwUhqlMwjkNDnjYV/74u0Goxk98O+TiQ/VA7lTwPPNlIgKmZn zvmHxNS5qgPhGq6vkiuEngQfWHssS31dPMKTq0WjI3pSNMIfEyZMwGMYOdJKRxsyAPAa WXf4/w1tUYpt2V24mPIh7Xts94m+cT1CxhIN1lRBuKAQ6LXNfQIwbaLoDyN+RAtGOMGz G/fAxlslaRmAxy3t9XZ5dUk/GXO/fyXEUyLJ1N0mfmoSb3z9gCHeMzou8Ofh43QdmuG0 +gSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=m079bd8O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id t9-20020a170902e84900b001cfb3d25f2asi9350102plg.652.2023.11.28.22.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:30:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=m079bd8O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id BC38F805FB3F; Mon, 27 Nov 2023 01:05:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232748AbjK0JEx (ORCPT + 99 others); Mon, 27 Nov 2023 04:04:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232711AbjK0JEo (ORCPT ); Mon, 27 Nov 2023 04:04:44 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4D261A5 for ; Mon, 27 Nov 2023 01:04:48 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a00c200782dso571759666b.1 for ; Mon, 27 Nov 2023 01:04:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075887; x=1701680687; 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=ELkubP0P+TLGoCnHyLiXJ02PqgLHPPVcTUt4fu5hI+U=; b=m079bd8OcJFjx2msty6Z505gA3PCNLsaHAVt4LHONHEE7B36nWigeeRxBK3dbs0a4k SzOzokAVadlBLFaTRAUNwFBBpX9tvxtJ7PwSwOyOKiRHwMXLRpzZ/poRfBuggQ02BsY8 KDAyh67FRQ/Pm7U19f+eRHBw/buiigB3YUIib6QEYsaTZvD9vWEZ51pq3371W7HR1ib4 rB/Fl1a/lT0kpz+AscGl6u5MDKiFzArgxAAiNS0tvizvKDpx+SGpKc1GgsMzMAId3cnZ fRMiO0hpo0xRQnNdguTt5CrLrs5bKofZuw/i9lW42cOFi3tBYCpC8zOYX/n7lzrM+E0s bPJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075887; x=1701680687; 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=ELkubP0P+TLGoCnHyLiXJ02PqgLHPPVcTUt4fu5hI+U=; b=f+/VD6gmpq67SA/XuZ+9uKfJHkOxo1M/pSsm9wko57VaPDigBPdGqZyZEqvEhzXLTj vCYcPu7ehgKM348D50Vv/rB0fUZE0dVqbQRFt5JYDgUCgoBLDWGb4F+9ZE2jsKa+Tvjs BOCSmpp2F7ow2VMy8QtLUwyZnkYOjSSo/a6xOWLk6RCczIOVV+fnbwWCE1g49LRc7nxC nMRebwr4CzInmBiUV1z16+lgKfQyhZpFJlbEiC/ac4IveeOak/YFE/kzU8sDY4PuTiZd XzZpadr8XAX9o40DSB3OSYICldsAkNU8JqmHgVcbm5Cnbf/5gt9Mq2Kv7oAvUMbl+qGY BpJw== X-Gm-Message-State: AOJu0YziQhLBZEXLQp9Ziwqhx8xlygwkLaEON2mX051LccfGj8T7rCgH //t/vSB8dw21zpYsq6e4W7BjqA== X-Received: by 2002:a17:906:3a87:b0:a03:24d9:12ce with SMTP id y7-20020a1709063a8700b00a0324d912cemr7704534ejd.63.1701075886887; Mon, 27 Nov 2023 01:04:46 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01:04:46 -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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 4/6] net: ravb: Start TX queues after HW initialization succeeded Date: Mon, 27 Nov 2023 11:04:24 +0200 Message-Id: <20231127090426.3761729-5-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 01:05:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783878842060007682 X-GMAIL-MSGID: 1783878842060007682 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") Signed-off-by: Claudiu Beznea Reviewed-by: Sergey Shtylyov --- 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 2d4f4fb3d16e..f7e62e6c9df9 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 Mon Nov 27 09:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 170388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3419884vqx; Mon, 27 Nov 2023 12:00:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IENI5idPRnAdHcoLwnF9PL1xZOEUg5UQNoiBZXchVRUUpIqxLfKLtMrjkRZ39WYVtTA+Xhm X-Received: by 2002:a05:6a00:3015:b0:6ca:2b55:58b7 with SMTP id ay21-20020a056a00301500b006ca2b5558b7mr13682484pfb.20.1701115220805; Mon, 27 Nov 2023 12:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701115220; cv=none; d=google.com; s=arc-20160816; b=Wu/Qe763EINTCrvPC2S7Bi/K3Iz1NVwg89Esr1nZhc4WF0ovks4zl7USh7zEdH/W8Y J7Ui2/WQBc1o2+j6KE5tBCXhtzZb6YP4s9btDbkCiyupxHTvnr1/NLbs2baSQMk4YSJ3 rlC4b7n/Gvt7E6zCHT9C8BFQQFvCS13QmFNLo43i6N5KmviVXFepGjMNau/JadldulDD vcvXJ8q2AJj3wfOho7Y/vYNZbZeje6PiHPBGdy4Vrow6gSBY09DyA88idNAPfXLGz6DW pcN+E1JclhKrj1UHG95MbtqcYUmg9eWt2iqIKeDQnjT1ksdrXRpxfzF+LJdwRmFbKJUJ lUew== 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=mlwN1qAsHWca5scAvNLuwE5lxsRTiu67SGgg4R0r8Q0=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=UERjnH1F9aCZXSF96PYgIQB920fFOTZCHDsmbrNqscsQTN+YBFCkxLhjDp8hHFS1rv hwzAzC0ViW9Q6G6ZBXDfWfx8KE8cvzezyZsj7VivxEQjrmoYTQgAyj9ehIgR8ohp7rLY 5YNti/xvt3/eBJccCgLzmrMcm2jxrXRpRJzusv3EiFaW21YpYV58zbliZehKAqdI50H5 ZFDU+oJ2rxUWaZxIYI+WFN/Q+6mTnB+7nMntJUL5UGMi1A43gN1O4/3eFAtpZrcQ7C7+ ZqLw10sM8BfeeAHO0cXiOs8lInJg0KkI5+c3dst5e9ZBXXYn1ioKGatCaj4cbS05xasR 48tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=mK2+XRTf; 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 v4-20020a056a00148400b006c9bf737482si10371723pfu.295.2023.11.27.12.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 12:00:20 -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=mK2+XRTf; 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 AD69B8063036; Mon, 27 Nov 2023 01:05:17 -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 S232775AbjK0JE7 (ORCPT + 99 others); Mon, 27 Nov 2023 04:04:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbjK0JEr (ORCPT ); Mon, 27 Nov 2023 04:04:47 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0794D1BE for ; Mon, 27 Nov 2023 01:04:50 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5482df11e73so5234813a12.0 for ; Mon, 27 Nov 2023 01:04:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075888; x=1701680688; 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=mlwN1qAsHWca5scAvNLuwE5lxsRTiu67SGgg4R0r8Q0=; b=mK2+XRTfjLkVysJyfdFGzgvus2pb0IBOCv6sWeT19Po0xmWmXeF1fnURbwfgrXTZoh mXUzckH4CPLdA0SPT3d33BmXpCTqPx9tEeE4V3hKbwncMAmSCzd5N7dackSvibWFhtBU 777w/QINmqmeNPb0gMNzogDgRQjo3sxsyO0t8jic6+uJquqkoiy+eYw5MkEC/V3NO0fE S1PFx7PVKkA9FRhyof+DNq38cie0OWM1J7Iej1lxVWIBephtRBsUJebF+99rBkzDtCMh X8O/Nlib/4jFfj18+lHStyX2BDPEF14M6Zqaxh1LvA/8Icm2yUR0d+EFLahRGIidh9EF B/Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075888; x=1701680688; 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=mlwN1qAsHWca5scAvNLuwE5lxsRTiu67SGgg4R0r8Q0=; b=TDBMNYckULDttP8g6Um0e8EnWS41DyF7X0h/TjCWO6n6KdeMu8FpulkKHv1AGQBoyx YVzJEaHjS8PqeCTBeAOZaYIKblM5WQS3qR/1kRy5ixCiJa8ZllpdRGVwSRD2PkwKQTbO bul+slCm1RWZ3ax4bqi9hqSviyY5i4c/gSDTqqPC9c80fg0tKCFSWR6qK+/CXap5DXxO OOvQV3stVh6x2rTnorne4k+Wx6zfy5bvJLb5v717kd0EXG06nzCx5vjDKSqQBzdBroKH dcR/kG2hfM6COheWZLZgmgW+4urX6WO3lvRn7clxbBc5TkqVmEIyWMcSDLrrnt2au26m K8ag== X-Gm-Message-State: AOJu0YyM1fd0/DK96RD+8ONYyGVXILj0tDmlycftPoDdzowPJL2nIPcw Tdp5QiB0FCPgJc6Ow4o1gotuaQ== X-Received: by 2002:a17:906:5817:b0:a00:aa23:34d0 with SMTP id m23-20020a170906581700b00a00aa2334d0mr7398772ejq.68.1701075888425; Mon, 27 Nov 2023 01:04:48 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01: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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 5/6] net: ravb: Stop DMA in case of failures on ravb_open() Date: Mon, 27 Nov 2023 11:04:25 +0200 Message-Id: <20231127090426.3761729-6-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-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]); Mon, 27 Nov 2023 01:05:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783748593489389627 X-GMAIL-MSGID: 1783748593489389627 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") Signed-off-by: Claudiu Beznea Reviewed-by: Sergey Shtylyov --- 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 f7e62e6c9df9..805720166ef3 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 Mon Nov 27 09:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 170561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3726021vqx; Mon, 27 Nov 2023 22:57:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6jLlcEUuL8b8NvQKcgifjTeDvqIe8bCadlX+90tTNT9BAEzK/Z6jRB5/iMu2NLlUIiLZd X-Received: by 2002:a05:6808:1391:b0:3af:8ed3:d7a3 with SMTP id c17-20020a056808139100b003af8ed3d7a3mr18803550oiw.54.1701154666659; Mon, 27 Nov 2023 22:57:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701154666; cv=none; d=google.com; s=arc-20160816; b=MmugRUUKUkTrQPqBmhOjiuJqpyhscG4VDfDIjax0W23CO39qChqQXedONvSC5+gXAJ YBfbWKNqtu0GLmhR2xJ5wCCUY+U+3taoDrVxk7gFUHTNNuLOjgQ6ulSHsqNFBp9s5tlF vYRgVgFs+mLHS7AEgPJKd+eX1Uq4CGY7gBQW1Czz2xIkHL9OKvJ1wQ1qfPT+AKi9DP9O LmCx5IVcr9GKQ22pRpCX+NnexVbPOP3JK5NDyaQQFX/SQbnPbIzx5Ihef38MAl7ZHn9b iucAhPQ8I1Pnoxw4yJMFPYNRCv/CZmb//DGSe7j63xVyfPhK36b9JUAPlDyMWmAdyQMc n+vA== 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=AFPzyYcg2nUUJpJ3l3C/kpW+QQW8M0KLB90b9p9tNMM=; fh=+jwocpIEcpU4tee9Medy6FcgWbHkCjESAH5riVYuYu0=; b=fg+Gs6YF2N7b7CAT15aPMYmX/23sTkvpo4xaR6tcLzRIrZf1uSRKiFPBgb5eO4/4a2 23NNF6vl/TOTfBbYDTDOmMCU+/fEMB0WYzcuYvjaplChbeoLjxpQYXRn+8W0CVr1t89f snnbC4bpZ6jcfQ2N6yfMrlQMu4M7Lep4JCUmzQj/tD0F9nLfv9PmlOEimVk3dSSo0AAV /SWVc/dgV9RU9OsoIP5slymq46+ex0bOSVwXTTBwJIhy1YFwi/HFvszZ83nd+zZdZNX3 nh1Ken4z96osd5aGAZSJrn8xIt/zt8fUU1kj5HHh1wS0jQnve68kbrssISc7wBECii+b 7rBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=aBN5G60R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id f18-20020a056a0022d200b0068fe0f46f27si11912671pfj.171.2023.11.27.22.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 22:57:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=aBN5G60R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 224148034628; Mon, 27 Nov 2023 01:05:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232803AbjK0JFD (ORCPT + 99 others); Mon, 27 Nov 2023 04:05:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232698AbjK0JEt (ORCPT ); Mon, 27 Nov 2023 04:04:49 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C5709E for ; Mon, 27 Nov 2023 01:04:51 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54afdbdb7d2so3422162a12.3 for ; Mon, 27 Nov 2023 01:04:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701075890; x=1701680690; 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=AFPzyYcg2nUUJpJ3l3C/kpW+QQW8M0KLB90b9p9tNMM=; b=aBN5G60RGOPaDQLtt8UsvGBjnXb3POhSF2ghUsdTfzN2oXHfPrmoNJltef434ClBBO slK79P+pSwgj3DbfC8MAnMzoSNSm5kQqhB2Sucdk2xin8VM6DmkyXmpkOcP/JMtljC+S rmj8beatuLWIZU1Rmhk25ht5R1OpW1JR5wI31s2wx3UYguaz2dFzsqnvq9/3Cp9zWYaZ akhcNadPZOx86mqInbdYP9I942UpBG5hXpsYXsh0t+NNaIMa5LRrUtZGV/+ZDUruXlzt m7YVObIX0lhe2FAV0ETx95B1txsNYBPYfdkY0h5qStGrBs+RBHdnP9teTM7rbMer6O// vRfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701075890; x=1701680690; 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=AFPzyYcg2nUUJpJ3l3C/kpW+QQW8M0KLB90b9p9tNMM=; b=OEKOW4MsZbgIL0JC5VZy6Mi1nix5OM+UMdy7+b04PPJOArZM/snwcRjfcOOlySmnDf VqWnLJVffzjH/7/s7sRF97N393DUjDWeTNiAInk5bMvYrEjmhHYpajUjOyMwG/m1WL6q VxAYuUpSdyKo7C6EKBT/4ZMi1hsrx3EjDsGdo9QwTooXjh0xkTfTqvou7WMIe973yGjJ Zuo7SetVlwIBWVFaTR7Qf0h/HKZRPeyNwwscAP56TdR+xiDfVzUWlWEnGwleMYAKXD3b uZkcgv//ZeCjtgaP0L4dyHXGZurwD9E/gEQTryGvjizeZ+ASZy1MZK+60P/Hlk4FVBQ1 OuDA== X-Gm-Message-State: AOJu0YwWwtmAiTAINVJZxdnZzEz5QCScpWm7DZJFSUdM0Q0S7f9QR9ez VAtkypCoewcWdYqo4CSOCtnQkg== X-Received: by 2002:a17:906:8916:b0:9e6:1dc9:9807 with SMTP id fr22-20020a170906891600b009e61dc99807mr5225024ejc.77.1701075889980; Mon, 27 Nov 2023 01:04:49 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id ay14-20020a170906d28e00b009fad1dfe472sm5456539ejb.153.2023.11.27.01.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 01:04:49 -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, geert+renesas@glider.be, wsa+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, Claudiu Beznea Subject: [PATCH 6/6] net: ravb: Keep reverse order of operations in ravb_remove() Date: Mon, 27 Nov 2023 11:04:26 +0200 Message-Id: <20231127090426.3761729-7-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127090426.3761729-1-claudiu.beznea.uj@bp.renesas.com> References: <20231127090426.3761729-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 morse.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 (morse.vger.email [0.0.0.0]); Mon, 27 Nov 2023 01:05:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783738279242216654 X-GMAIL-MSGID: 1783789955777922135 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)" instruction 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 (though ravb_write(ndev, CCC_OPC_RESET, CCC) instruction 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") Signed-off-by: Claudiu Beznea --- Changes since [1]: - none; this patch is new [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 805720166ef3..9cad10db59b7 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);