From patchwork Tue Jul 9 08:21:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13727421 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 1C66DC3DA41 for ; Tue, 9 Jul 2024 08:23:15 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kG7XBsQlE3wteyMVxAgB3FeKItlmk44xoPu+CQNnd0w=; b=fZMbJ3GtcCeRAkRxZg2NCV4P+5 KXYy2y4BBstoSwH5uFYsLUEgSIdymAjjWEb714tvf68DY8EaxzKzFuNDDtabkkRCAoyemirRFTC0G o2foh5rBndTl0Ki96ylbCVr1xjKMMjBsQzowJKaLMD9L3kbTwkQMBq6Xv1qZDmjSIbgZKggLSaX9l mnwjrvSK5YCPx9ivBTXrueCyYGrNm+Ltcml7VzC+DuDHHJyLk1SJRwOIqlaH+xMxotNcXJKyx0Gnz XSXjBLjLWzX5TQv9HGJtKUWnBoviawhhhbQKLpmKyBM3VxudmoaTUwQFvl3RavAqRVee8wRGBu1fX VkCCn6qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sR67q-00000006NpF-1x0h; Tue, 09 Jul 2024 08:23:02 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sR67Y-00000006NhP-1fS8 for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2024 08:22:45 +0000 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2c9df3eb0edso1954281a91.3 for ; Tue, 09 Jul 2024 01:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720513363; x=1721118163; darn=lists.infradead.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=kG7XBsQlE3wteyMVxAgB3FeKItlmk44xoPu+CQNnd0w=; b=eu6Zmgo4cUtxadf6XLbgNgNlqhi292UAEATYGRsa8HIYc4smMmXX2bUmtnfLJMV0rc PUFvK4XPJDN/SInM7zxIu1zS5Z43WqPglfwo1IoFIef3CTdyRtS+LFUL7SIITRLahU+C 44P9q7oQWD4Ptuccg8Suv9nDZ0Eug8tZxO0VGcsyiBwD9ijl6HuhLpXLkui7QVcpNj4k 6EoFRqvoFEMgkxU2zVo4AS2gdr6Jd/jZ+1mdpTxtIJmFrxLfoIDcqlRwd/Fqa0rAu/4l w/+uu91sygDCFEtq8qykx6wKLs9j2sWQ5JHv1jsW60BM4CQBl2BrWfFYjr5gf3d4wRsA dSHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720513363; x=1721118163; 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=kG7XBsQlE3wteyMVxAgB3FeKItlmk44xoPu+CQNnd0w=; b=vuBDyC5FBMKlNe/AS9/hHsdTgaSku+JNjZhAEo+I+NAZDpcZAdChNs4Ys5S6OgH5Qf qqDES3X3pmxuJPJLrdB0TNPaGL/xd9bGiyi9idzcXgJbu7P0UMIJzLU5cXMq+vyBI8IO B/+2xzcRLyDpfDPsWLEZwAH4/L5F/JolXDB9MGY9PP3FIitePqFvEibUllyM/D3y/50Q 5fS9G/trwPIBKLfsALyYiWnuUSUngdBIMxLdHCWi68B7icoohiKCTU5mN8W1zDLNfdnk aJlIIeROONh8ywTn98KxFzXFIbQlZA4Nni407AfzM9KaB+BILMLeUfcCGG8dZaQ9PKE4 JAow== X-Forwarded-Encrypted: i=1; AJvYcCUOumvcAzb1N1yALzh0LW5s0saeXaFDg1DRv17rYEN6cwjKTDJ22BIpEn3mGkDVtytH03mlh+AUMY4eqUbLsSllTn9MR0F5dn8uWLkH3yOkqUyUs1g= X-Gm-Message-State: AOJu0Yzd5PiLSdq0S35WbDfK+B1jVyHpNi3ywxT0aDRtR1eeFbXbYWW6 mpIE9axkRC+q1PBgTQFMVFYTLayClAqUtMs6BBt64Tz8DxANLG0T X-Google-Smtp-Source: AGHT+IFgGL6RTLzIY5jdRBvv34mJdpYMSNbt5TDn2M3+NI7ogAZwEyXUqJrg0iTQS9IS1HL8eNA2Bw== X-Received: by 2002:a17:90a:4966:b0:2bd:d42b:22dc with SMTP id 98e67ed59e1d1-2ca35d533b9mr1624494a91.43.1720513362881; Tue, 09 Jul 2024 01:22:42 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2c99a92a430sm9588929a91.4.2024.07.09.01.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 01:22:42 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: Andrew Lunn , "David S. Miller" , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Joao Pinto Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xfr@outlook.com, rock.xu@nio.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v1 1/7] net: stmmac: xgmac: drop incomplete FPE implementation Date: Tue, 9 Jul 2024 16:21:19 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240709_012244_460915_3F01F472 X-CRM114-Status: GOOD ( 11.86 ) 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 The FPE support for xgmac is incomplete, drop it temporarily. Once FPE implementation is refactored, xgmac support will be added. Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 -- .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 27 ------------------- 2 files changed, 29 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index 6a2c7d22df1e..917796293c26 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -193,8 +193,6 @@ #define XGMAC_MDIO_ADDR 0x00000200 #define XGMAC_MDIO_DATA 0x00000204 #define XGMAC_MDIO_C22P 0x00000220 -#define XGMAC_FPE_CTRL_STS 0x00000280 -#define XGMAC_EFPE BIT(0) #define XGMAC_ADDRx_HIGH(x) (0x00000300 + (x) * 0x8) #define XGMAC_ADDR_MAX 32 #define XGMAC_AE BIT(31) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 6a987cf598e4..e5bc3957041e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -1505,31 +1505,6 @@ static void dwxgmac2_set_arp_offload(struct mac_device_info *hw, bool en, writel(value, ioaddr + XGMAC_RX_CONFIG); } -static void dwxgmac3_fpe_configure(void __iomem *ioaddr, struct stmmac_fpe_cfg *cfg, - u32 num_txq, - u32 num_rxq, bool enable) -{ - u32 value; - - if (!enable) { - value = readl(ioaddr + XGMAC_FPE_CTRL_STS); - - value &= ~XGMAC_EFPE; - - writel(value, ioaddr + XGMAC_FPE_CTRL_STS); - return; - } - - value = readl(ioaddr + XGMAC_RXQ_CTRL1); - value &= ~XGMAC_RQ; - value |= (num_rxq - 1) << XGMAC_RQ_SHIFT; - writel(value, ioaddr + XGMAC_RXQ_CTRL1); - - value = readl(ioaddr + XGMAC_FPE_CTRL_STS); - value |= XGMAC_EFPE; - writel(value, ioaddr + XGMAC_FPE_CTRL_STS); -} - const struct stmmac_ops dwxgmac210_ops = { .core_init = dwxgmac2_core_init, .set_mac = dwxgmac2_set_mac, @@ -1570,7 +1545,6 @@ const struct stmmac_ops dwxgmac210_ops = { .config_l3_filter = dwxgmac2_config_l3_filter, .config_l4_filter = dwxgmac2_config_l4_filter, .set_arp_offload = dwxgmac2_set_arp_offload, - .fpe_configure = dwxgmac3_fpe_configure, }; static void dwxlgmac2_rx_queue_enable(struct mac_device_info *hw, u8 mode, @@ -1627,7 +1601,6 @@ const struct stmmac_ops dwxlgmac2_ops = { .config_l3_filter = dwxgmac2_config_l3_filter, .config_l4_filter = dwxgmac2_config_l4_filter, .set_arp_offload = dwxgmac2_set_arp_offload, - .fpe_configure = dwxgmac3_fpe_configure, }; int dwxgmac2_setup(struct stmmac_priv *priv)