From nobody Fri Dec 19 17:45:22 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41CF61A5BAC; Tue, 15 Apr 2025 07:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744701129; cv=none; b=jnzjMCuCU/PMBdmIQqv3a9ovg0V5LX5ZmCzxD39o6vi2BTprbnwvoSMWKnO+FGYao5yepydJEQS6O5oEM9Zx+eATM/KYJAs2mat5F3bs+GyhXje52i9FiddUKBTf1Z7reR71xLlREFQSv0/+W36P+j67btTcDsO4DTiqt3Fck0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744701129; c=relaxed/simple; bh=KjRBHpnhNx2L2f4e+8bxxLFlyH6oMQahHuhznMztzag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d4l61t4Qq6AnUrMT2i0xM3RySpmr3K5VOsEHPWn2MStFWZr43enZJT2TQgwE/SGuv3rsBnyzkeNFSImwCVE2+/H82phU3Yi4nIkWJUbaaqA5ojl3Bs5Pi9mFL9l6r8kJsvM74wBvf/WbCnPOcbkzaIikInGVjD/OWyFBUnFUt10= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [223.64.68.238]) by gateway (Coremail) with SMTP id _____8Bx32vEBv5n9Im9AA--.52625S3; Tue, 15 Apr 2025 15:12:04 +0800 (CST) Received: from localhost.localdomain (unknown [223.64.68.238]) by front1 (Coremail) with SMTP id qMiowMBxGcS1Bv5ni3SCAA--.35528S3; Tue, 15 Apr 2025 15:12:01 +0800 (CST) From: Huacai Chen To: Huacai Chen , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Yanteng Si , Feiyang Chen , loongarch@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Huacai Chen , Biao Dong , Baoqi Zhang Subject: [PATCH net-next 1/3] net: stmmac: dwmac-loongson: Move queue number init to common function Date: Tue, 15 Apr 2025 15:11:26 +0800 Message-ID: <20250415071128.3774235-2-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250415071128.3774235-1-chenhuacai@loongson.cn> References: <20250415071128.3774235-1-chenhuacai@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMBxGcS1Bv5ni3SCAA--.35528S3 X-CM-SenderInfo: hfkh0x5xdftxo6or00hjvr0hdfq/ X-Coremail-Antispam: 1Uk129KBj93XoWxAw4UCw4DtrW8WrWfZw1xCrX_yoW5Wr4xp3 y3Aay7WrWftr9rKan8J3yUZry5ArWFqrZ2gFW2kw1fCFyqkw1qq34rKFWvkFZ7AFWDu3W3 ZF4jkr4UWF1qkwbCm3ZEXasCq-sJn29KB7ZKAUJUUUUf529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2kKe7AKxVWUAVWUtwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYI kI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUtVWr XwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI4 8JMxkF7I0En4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j 6r4UMxCIbckI1I0E14v26r126r1DMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AK xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8_gA5UUUUU== Content-Type: text/plain; charset="utf-8" Currently, the tx and rx queue number initialization is duplicated in loongson_gmac_data() and loongson_gnet_data(), so move it to the common function loongson_default_data(). This is a preparation for later patches. Tested-by: Biao Dong Signed-off-by: Baoqi Zhang Signed-off-by: Huacai Chen --- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index 1a93787056a7..f5fdef56da2c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -83,6 +83,9 @@ struct stmmac_pci_info { static void loongson_default_data(struct pci_dev *pdev, struct plat_stmmacenet_data *plat) { + int i; + struct loongson_data *ld =3D plat->bsp_priv; + /* Get bus_id, this can be overwritten later */ plat->bus_id =3D pci_dev_id(pdev); =20 @@ -116,17 +119,6 @@ static void loongson_default_data(struct pci_dev *pdev, =20 plat->dma_cfg->pbl =3D 32; plat->dma_cfg->pblx8 =3D true; -} - -static int loongson_gmac_data(struct pci_dev *pdev, - struct plat_stmmacenet_data *plat) -{ - struct loongson_data *ld; - int i; - - ld =3D plat->bsp_priv; - - loongson_default_data(pdev, plat); =20 if (ld->loongson_id =3D=3D DWMAC_CORE_LS_MULTICHAN) { plat->rx_queues_to_use =3D CHANNEL_NUM; @@ -141,6 +133,12 @@ static int loongson_gmac_data(struct pci_dev *pdev, plat->tx_queues_to_use =3D 1; plat->rx_queues_to_use =3D 1; } +} + +static int loongson_gmac_data(struct pci_dev *pdev, + struct plat_stmmacenet_data *plat) +{ + loongson_default_data(pdev, plat); =20 plat->phy_interface =3D PHY_INTERFACE_MODE_RGMII_ID; =20 @@ -172,27 +170,8 @@ static void loongson_gnet_fix_speed(void *priv, int sp= eed, unsigned int mode) static int loongson_gnet_data(struct pci_dev *pdev, struct plat_stmmacenet_data *plat) { - struct loongson_data *ld; - int i; - - ld =3D plat->bsp_priv; - loongson_default_data(pdev, plat); =20 - if (ld->loongson_id =3D=3D DWMAC_CORE_LS_MULTICHAN) { - plat->rx_queues_to_use =3D CHANNEL_NUM; - plat->tx_queues_to_use =3D CHANNEL_NUM; - - /* Only channel 0 supports checksum, - * so turn off checksum to enable multiple channels. - */ - for (i =3D 1; i < CHANNEL_NUM; i++) - plat->tx_queues_cfg[i].coe_unsupported =3D 1; - } else { - plat->tx_queues_to_use =3D 1; - plat->rx_queues_to_use =3D 1; - } - plat->phy_interface =3D PHY_INTERFACE_MODE_GMII; plat->mdio_bus_data->phy_mask =3D ~(u32)BIT(2); plat->fix_mac_speed =3D loongson_gnet_fix_speed; --=20 2.47.1