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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12CE6C33CA4 for ; Fri, 10 Jan 2020 15:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE60D2077C for ; Fri, 10 Jan 2020 15:13:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=synopsys.com header.i=@synopsys.com header.b="l5WMTDg7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728428AbgAJPNs (ORCPT ); Fri, 10 Jan 2020 10:13:48 -0500 Received: from sv2-smtprelay2.synopsys.com ([149.117.73.133]:55700 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728141AbgAJPNk (ORCPT ); Fri, 10 Jan 2020 10:13:40 -0500 Received: from mailhost.synopsys.com (mdc-mailhost2.synopsys.com [10.225.0.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id 237B44060C; Fri, 10 Jan 2020 15:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1578669220; bh=NQsm6egfjz1AjvbIX8szBOLKNIQdQ/x4a9hjA8nOve4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=l5WMTDg7sZKfVE7G7JOjv+aQ/zsGskTwAhmdpOjl9O55pgyQKD4XmqEPKBLuXrlzG wE8xFdFBTFmbC3S+n1c/yrQVqzr9hWPfcCFccZXcNGDFme6KxdHBz+KfUukJJADxOH Kvd+X106bBks+ZMvTiBbB/XLk0I9znsW8wN/YE4SIlVj2pdQoDmYyZL/+te6o7ZtnM QWmUkVKf1AJ9uTJGtnLFpCOUAsFXhuyP4fDHXeF4EkOTHhuLn+/MO8fV+ZLQG7sRLV LHaOH9U9Xe8ZZ6wOq/pmfqr1ureRTiTH9rVUfJndt3/fUPHe/jHbbnMsN5m92MCYma xbNBnuMiOORcg== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id A9D36A0067; Fri, 10 Jan 2020 15:13:38 +0000 (UTC) From: Jose Abreu To: netdev@vger.kernel.org Cc: Joao Pinto , Jose Abreu , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Maxime Coquelin , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] net: stmmac: gmac5+: Fix missing return Date: Fri, 10 Jan 2020 16:13:35 +0100 Message-Id: <1f4783ff9f89fc3fc207d72a69152a44cfd5ba30.1578669088.git.Jose.Abreu@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If FPE is supposed to be disabled we need to return after disabling it. Fixes: 7c7282746883 ("net: stmmac: gmac5+: Add support for Frame Preemption") Signed-off-by: Jose Abreu --- Cc: Giuseppe Cavallaro Cc: Alexandre Torgue Cc: Jose Abreu Cc: "David S. Miller" Cc: Maxime Coquelin Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 5d4a3c2458ea..494c859b4ade 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq, value &= ~EFPE; writel(value, ioaddr + MAC_FPE_CTRL_STS); + return; } value = readl(ioaddr + GMAC_RXQ_CTRL1); -- 2.7.4 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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 733F7C282DD for ; Fri, 10 Jan 2020 15:13:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 400AA2077C for ; Fri, 10 Jan 2020 15:13:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tRG/TQbS"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=synopsys.com header.i=@synopsys.com header.b="l5WMTDg7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 400AA2077C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=synopsys.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Ow/kQKIlEQvbdHsf2Nyr2qDZg0z1bxoDwNx3M6kYFVU=; b=tRG/TQbSQSo01tGxS3Q+AqO0b+ con95Zpb0mSh2U+uuSBdS1dKf9SiLXcjap0D5c2AAMkAi462UDDXc9XgQuLt3SRCvY7tM3mOiw5H0 t6jgoc2/vQzubcrg+4VKS2lZ9Q5+LT1GdUxQuvHXr/V+j6uxzN/dYytlO3/lt/sIHPrINCsKOhYna Y70nkUZcsieocvbfW1DAj57qJS2ouZVLWalEOgkCk9hPlX6ySqn5rfV4FsHW31c3JwagxIuFrW6K5 o/75Pzk/yQTv42ZY8pA4v1pViaOXScMgLpfFfTQqtPDui+Ji+/w9ExxBIlnjXXPigaDIit0VSwGL5 ZjzBKFNw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipvys-0001Hw-7G; Fri, 10 Jan 2020 15:13:46 +0000 Received: from smtprelay-out1.synopsys.com ([149.117.73.133]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipvyn-0001GG-Vu for linux-arm-kernel@lists.infradead.org; Fri, 10 Jan 2020 15:13:43 +0000 Received: from mailhost.synopsys.com (mdc-mailhost2.synopsys.com [10.225.0.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id 237B44060C; Fri, 10 Jan 2020 15:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1578669220; bh=NQsm6egfjz1AjvbIX8szBOLKNIQdQ/x4a9hjA8nOve4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=l5WMTDg7sZKfVE7G7JOjv+aQ/zsGskTwAhmdpOjl9O55pgyQKD4XmqEPKBLuXrlzG wE8xFdFBTFmbC3S+n1c/yrQVqzr9hWPfcCFccZXcNGDFme6KxdHBz+KfUukJJADxOH Kvd+X106bBks+ZMvTiBbB/XLk0I9znsW8wN/YE4SIlVj2pdQoDmYyZL/+te6o7ZtnM QWmUkVKf1AJ9uTJGtnLFpCOUAsFXhuyP4fDHXeF4EkOTHhuLn+/MO8fV+ZLQG7sRLV LHaOH9U9Xe8ZZ6wOq/pmfqr1ureRTiTH9rVUfJndt3/fUPHe/jHbbnMsN5m92MCYma xbNBnuMiOORcg== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id A9D36A0067; Fri, 10 Jan 2020 15:13:38 +0000 (UTC) From: Jose Abreu To: netdev@vger.kernel.org Subject: [PATCH net-next 2/2] net: stmmac: gmac5+: Fix missing return Date: Fri, 10 Jan 2020 16:13:35 +0100 Message-Id: <1f4783ff9f89fc3fc207d72a69152a44cfd5ba30.1578669088.git.Jose.Abreu@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200110_071342_033262_35705B01 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jose Abreu , Joao Pinto , Alexandre Torgue , linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , Giuseppe Cavallaro , "David S. Miller" , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org If FPE is supposed to be disabled we need to return after disabling it. Fixes: 7c7282746883 ("net: stmmac: gmac5+: Add support for Frame Preemption") Signed-off-by: Jose Abreu --- Cc: Giuseppe Cavallaro Cc: Alexandre Torgue Cc: Jose Abreu Cc: "David S. Miller" Cc: Maxime Coquelin Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 5d4a3c2458ea..494c859b4ade 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq, value &= ~EFPE; writel(value, ioaddr + MAC_FPE_CTRL_STS); + return; } value = readl(ioaddr + GMAC_RXQ_CTRL1); -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel