Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3639580ybz; Mon, 20 Apr 2020 06:48:19 -0700 (PDT) X-Google-Smtp-Source: APiQypJftKWlCTI2GErK3fmbn+6C7goGPnIwgD15PGUdV0t/tz5bmua8QmFw6VhxhxI0iex7ROpB X-Received: by 2002:a50:9d47:: with SMTP id j7mr12095565edk.296.1587390499711; Mon, 20 Apr 2020 06:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587390499; cv=none; d=google.com; s=arc-20160816; b=WqDjT4tCWHQI9wdN3jn8/Y9TOHW4lpLT1of8QTAhwI5HrDI8YjLsVmCNvl7oT6+c2X c/vnfakIQmvIt7pLO8Gps3KOxLSK4Edq1WHIxxQmX1JXs+Ea9KRtbqNGk/TYJcM0p2nQ aNbWXQkO91fx22vwV5N7v3tO7pYxlykGQQb/y8RpWb+kefRoIKP++TejMwXkkcs+/d/I mCh/eV0AxqRGeCU3JPQv/AIzZww0XsiIqRfxJzjV5FS+Ox+zn25TC2kC8M6hzc/ZD6Z0 xnOY8Y+101ZrljVQdFrNm7eFjXR+4xAO2bfdIvJBFYrcPg2rOOLG+lV7TjIxwqx8LT1I 4kIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DybGnSD+gDm5KiHIgVTRPieT87sb0GIveLoszAIa6ZI=; b=EEOWQuCJGJ+Yvi9o6fo2i7KS1slBCL7vq5ROpF488DoEFSifJlC6z5hS31vDZZQzhq yCJvJ3NQm3B9/fndCb4hqaiEvciiUjo+tT2Xt+BV1aovcM/3/dOAW/jPEu2F3w5+A/+J gYOVsFxf/Ces/cuhQBp2sRFMaD3IvbtOCr9SHePjyOwd/ffjI+pdvGX8sH/IXR+7gbdc LUoW42vngmxdlkMoGD+4cUOLPp+T70CdkroXqZPPgSnJDimHkItCitrAyB5Eh+jHdhAu 8CRw4sEvZGB11hSEfTvsJoXUvxUJ0GZghphQzZejYfy+vVyxzgLXvWQrkgc7nG+3pey1 ut1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZCdEP4Pn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce26si616018edb.172.2020.04.20.06.47.56; Mon, 20 Apr 2020 06:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZCdEP4Pn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727880AbgDTMkz (ORCPT + 99 others); Mon, 20 Apr 2020 08:40:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:33368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727864AbgDTMkw (ORCPT ); Mon, 20 Apr 2020 08:40:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AC1882072B; Mon, 20 Apr 2020 12:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386452; bh=QR1PakUlj/lMWqZD6e71EiolwzkgVTbC7dDXGfQ2WCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCdEP4Pna2WZHjJAqoohloi4YGkqGyFk+YoVGqqAplXBTieBVmTt2b86WVmCNq72n /gK12eZHJ7gPklnvtg1e2BQj0utPWjqgPnuMKdbWC1W33Aeq8y4Y720dS4/UMgW9kr V0/S+b5hfxq/tvDYinaIrORWOyDINOwSeYOMghkg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" Subject: [PATCH 5.5 28/65] net: stmmac: xgmac: Fix VLAN register handling Date: Mon, 20 Apr 2020 14:38:32 +0200 Message-Id: <20200420121512.334989542@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jose Abreu commit 21f64e72e7073199a6f8d7d8efe52cd814d7d665 upstream. Commit 907a076881f1, forgot that we need to clear old values of XGMAC_VLAN_TAG register when we switch from VLAN perfect matching to HASH matching. Fix it. Fixes: 907a076881f1 ("net: stmmac: xgmac: fix incorrect XGMAC_VLAN_TAG register writting") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -576,8 +576,13 @@ static void dwxgmac2_update_vlan_hash(st value |= XGMAC_VLAN_EDVLP; value |= XGMAC_VLAN_ESVL; value |= XGMAC_VLAN_DOVLTC; + } else { + value &= ~XGMAC_VLAN_EDVLP; + value &= ~XGMAC_VLAN_ESVL; + value &= ~XGMAC_VLAN_DOVLTC; } + value &= ~XGMAC_VLAN_VID; writel(value, ioaddr + XGMAC_VLAN_TAG); } else if (perfect_match) { u32 value = readl(ioaddr + XGMAC_PACKET_FILTER); @@ -588,13 +593,19 @@ static void dwxgmac2_update_vlan_hash(st value = readl(ioaddr + XGMAC_VLAN_TAG); + value &= ~XGMAC_VLAN_VTHM; value |= XGMAC_VLAN_ETV; if (is_double) { value |= XGMAC_VLAN_EDVLP; value |= XGMAC_VLAN_ESVL; value |= XGMAC_VLAN_DOVLTC; + } else { + value &= ~XGMAC_VLAN_EDVLP; + value &= ~XGMAC_VLAN_ESVL; + value &= ~XGMAC_VLAN_DOVLTC; } + value &= ~XGMAC_VLAN_VID; writel(value | perfect_match, ioaddr + XGMAC_VLAN_TAG); } else { u32 value = readl(ioaddr + XGMAC_PACKET_FILTER);