From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50719CA0ED3 for ; Wed, 4 Sep 2024 14:06:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pcSQHDuFZNW8f8jn2HlyrNAfmNzNkeFSHZv2Ikhhg8I=; b=4okYJEZ070MF42F+mZpfv3Q9/J DI+YDSLVtoZ61yZ6JF2sKMWMe2L4jihRUCWGzjrHUsSz7YHUSpub1HyoTQDtI3B+G5/9xrh0AVZlc e51vG2JZ5SQFQ/uWnLAcgcXha6oFIVpoolYKQakaCFQPZOIC4edcNy0988Dtl/G/+FGPnCQ0dO8wI 0mN7D+/li5vLAnkp+RUNvmUogxEfbyOxmzPmtW/mJFwV8CoZXP1wqx/OcCy7ycOrVa9dROXFqv7C3 uYZtNQ8epbjWhpB2aTJkyTJh+cCWla9dUN21QosE0ls1mIiR2uxX3xB16iaJdVDIORtvl8vbhQ7rA D4EdcyPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1slqe6-00000004h3r-0tDq; Wed, 04 Sep 2024 14:06:06 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1slqcw-00000004gj1-31BN for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2024 14:04:56 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-42bafd879aeso9162815e9.2 for ; Wed, 04 Sep 2024 07:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725458693; x=1726063493; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=pcSQHDuFZNW8f8jn2HlyrNAfmNzNkeFSHZv2Ikhhg8I=; b=O9PF0vkJFN9wu/g8DQY49a5zcjERKzRXN+86XuFeqMCgbXTQKPKkIvdu4hwn+i9OFt T3xizzAx4h70XjB8X0p+Xs2CBRKlcw8U76cZ6TbUEfHIdzIWHevbPNr6gvKZ6KclOTsO vBvIHDdiZI4Yau58oMeOEM2DoOsLuk5od22SbI+mdnZLxp/X15+fyp29lpaeC+T0mFez IUcu1pqcSqZvKnREU/X12tW1wAsxxS82bRHWTEQPExx13ao6CBeI5nTdEzkVoMo9OLM+ /GL8FoiLBs4bZj64EW/lr6Xyj/o6T0agNHp17iab4HJI9BDzrx/f5RmdAIOd6JICk20c ZsmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725458693; x=1726063493; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pcSQHDuFZNW8f8jn2HlyrNAfmNzNkeFSHZv2Ikhhg8I=; b=U0SaP3emy+GhsuEG8dJGjo1k7U1kvbzhKQF5yHHrfXn1sz4D5pZkXc2DwsDCFGrXVs lOpG9PhXa2p4VXj5ozdGuCRliRNjBSyqi5wveY1c0AUB1JtOQkzZnGhKXXnPVb/PJ67S wEW3DzXy0GpKQc4l0UXByfaEHVqpLxD0WuJdRKKn6dBgjtK3USGlb3L2q09awJ08lnbc aObX+658+soFcf4fm2+7UBBKgQ/cT/YcgvuRBhTu2WGMnTRXKtQuykpipEp6myZtFEaz vRi8scbwm2Nv4xVojLRxKIUebcnVrC8P8VMG+mfn6TrX9TG3pX0AyEuyC0kx5whEf8eq iT4A== X-Forwarded-Encrypted: i=1; AJvYcCWt4rvQfAbORSHQb2sR/LQQJSJ0Sfa7vPxxpp0GDGdvIVxFBxHz4fr9sCZSHYgdw72Buz9/T+r3sH9X9G7EiQ5V@lists.infradead.org X-Gm-Message-State: AOJu0YwhFOVIFIbTLZPdhCAeP+MlCyT/knqAm7ZHSKTvFVOeKQj+5xor RJsCiyHY22tl8mdfHi2wB4kig676SVrno2Q9y21YB0oyAOlDYIGB X-Google-Smtp-Source: AGHT+IFwd43mImwMibDfu+DajpXj0lE+8R58B0kaRqv52bm6izGdfKSggdaX92YjEflO0z3LrM32tw== X-Received: by 2002:a05:600c:1554:b0:425:6962:4253 with SMTP id 5b1f17b1804b1-42bbb43d5e4mr71495425e9.4.1725458691917; Wed, 04 Sep 2024 07:04:51 -0700 (PDT) Received: from skbuf ([188.25.134.29]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374cf7e2dbfsm7060858f8f.37.2024.09.04.07.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 07:04:51 -0700 (PDT) Date: Wed, 4 Sep 2024 17:04:48 +0300 From: Vladimir Oltean To: Furong Xu <0x1207@gmail.com> Cc: Alexander Lobakin , Serge Semin , "David S. Miller" , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Joao Pinto , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, rmk+kernel@armlinux.org.uk, linux@armlinux.org.uk, xfr@outlook.com, Vladimir Oltean Subject: Re: [PATCH net-next v7 3/7] net: stmmac: refactor FPE verification process Message-ID: <20240904140448.6hvjzj3ei2k7jdbe@skbuf> References: <1e452525e496b28c0b1ea43afbdc3533c92930c6.1725441317.git.0x1207@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1e452525e496b28c0b1ea43afbdc3533c92930c6.1725441317.git.0x1207@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240904_070454_786451_64F3093D X-CRM114-Status: GOOD ( 18.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 04, 2024 at 05:21:18PM +0800, Furong Xu wrote: > +/** > + * stmmac_fpe_verify_timer - Timer for MAC Merge verification > + * @t: timer_list struct containing private info > + * > + * Verify the MAC Merge capability in the local TX direction, by > + * transmitting Verify mPackets up to 3 times. Wait until link > + * partner responds with a Response mPacket, otherwise fail. > + */ > +static void stmmac_fpe_verify_timer(struct timer_list *t) > { > - struct stmmac_priv *priv = container_of(work, struct stmmac_priv, > - fpe_task); > - struct stmmac_fpe_cfg *fpe_cfg = &priv->fpe_cfg; > - enum stmmac_fpe_state *lo_state = &fpe_cfg->lo_fpe_state; > - enum stmmac_fpe_state *lp_state = &fpe_cfg->lp_fpe_state; > - bool *hs_enable = &fpe_cfg->hs_enable; > - bool *enable = &fpe_cfg->enable; > - int retries = 20; > - > - while (retries-- > 0) { > - /* Bail out immediately if FPE handshake is OFF */ > - if (*lo_state == FPE_STATE_OFF || !*hs_enable) > - break; > - > - if (*lo_state == FPE_STATE_ENTERING_ON && > - *lp_state == FPE_STATE_ENTERING_ON) { > - stmmac_fpe_configure(priv, priv->ioaddr, > - fpe_cfg, > - priv->plat->tx_queues_to_use, > - priv->plat->rx_queues_to_use, > - *enable); > - > - netdev_info(priv->dev, "configured FPE\n"); > + struct stmmac_fpe_cfg *fpe_cfg = from_timer(fpe_cfg, t, verify_timer); > + struct stmmac_priv *priv = container_of(fpe_cfg, struct stmmac_priv, > + fpe_cfg); > + struct ethtool_mm_state *state = &fpe_cfg->state; > + unsigned long flags; > + bool rearm = false; > > - *lo_state = FPE_STATE_ON; > - *lp_state = FPE_STATE_ON; > - netdev_info(priv->dev, "!!! BOTH FPE stations ON\n"); > - break; > - } > + spin_lock_irqsave(&fpe_cfg->lock, flags); > > - if ((*lo_state == FPE_STATE_CAPABLE || > - *lo_state == FPE_STATE_ENTERING_ON) && > - *lp_state != FPE_STATE_ON) { > - netdev_info(priv->dev, SEND_VERIFY_MPAKCET_FMT, > - *lo_state, *lp_state); > + switch (state->verify_status) { > + case ETHTOOL_MM_VERIFY_STATUS_INITIAL: > + case ETHTOOL_MM_VERIFY_STATUS_VERIFYING: > + if (fpe_cfg->verify_retries != 0) { > stmmac_fpe_send_mpacket(priv, priv->ioaddr, > - fpe_cfg, > - MPACKET_VERIFY); > + fpe_cfg, MPACKET_VERIFY); > + rearm = true; > + } else { > + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_FAILED; > } > - /* Sleep then retry */ > - msleep(500); > + > + fpe_cfg->verify_retries--; > + break; Odd indentation... "break;" should be on the same level with the code, not with the "case" statements. Not sure which editor you use, but even if you hit "==" in vim on this line, it will shift it by one tab to the right. > + > + case ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED: > + stmmac_fpe_configure(priv, priv->ioaddr, fpe_cfg, > + priv->plat->tx_queues_to_use, > + priv->plat->rx_queues_to_use, > + true, true); > + break; Same comment here and below. > + > + default: > + break; > + } > + > + if (rearm) { > + mod_timer(&fpe_cfg->verify_timer, > + jiffies + msecs_to_jiffies(state->verify_time)); > } > > - clear_bit(__FPE_TASK_SCHED, &priv->fpe_task_state); > + spin_unlock_irqrestore(&fpe_cfg->lock, flags); > +}