From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30AC8263F4A; Thu, 4 Jun 2026 10:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568887; cv=none; b=F8iLuskv+dkanW235LX1fGS990sf/DuHndz9MWoMVpcYUUOnOJWN26MYXw7qGN3+sXpCTemLgBO7vH5DJ7i5UaMx39LVdHQcjCmyLDNkC1jfSZauAaQyd3e6QVs4NaT1nHaXufAH7vr4rgAPP3UEnQE/V1huX/S60585pVkkkWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568887; c=relaxed/simple; bh=sMdJkhwy86WCcpyI3DDlddNDqA52bw9P/vX7N5Pu0to=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jctmftuxy5KpjIFlXpLud8Bs6DyRX219kPLHLeimvSU6juUfzchoLjg+jfkaqj1Og9tkMMrAc5kqSnzj7gjp4hp3Iqb7QpVHi7+d4VwreXE1fQV1IrfwR0RqJyafT6xcXNeHgVvr9nfQxmvp8kX2YUWQ1Eusul/19bIz7soCUmE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=fR6PdrWO; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="fR6PdrWO" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARZHx8272239, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568855; bh=SXHMIX64dykkMCQtPyzTzr32j6WqWG99gZ3E6j3Yt8Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=fR6PdrWOQzo70+q37iLUiPlmyjD3pTfWH4SODugeoYzzldWq77EXgAskqtoy+ZZEM vGNJggw/ylwgBuXVMq3d/GmYIfKG5RJpbaD5HYYbY9XlDAmjs/PEHIVgAOUKHT6Hib NM6zNByRZVOhvohvQiBGZP5x12vC2pHmBuFQzCGj0/H6g/60zLRn05O+sTzKI5VhvZ 5ZtVCgSj5o4enhN5NiOQ0YSIf+XbfQHrhR98YeADQk93sGPsGzyuPrE+Xj6JsLFaQi r4psVUEf6qpRKhDCq5eBnKPxM8FyA/g/5okoamzUQpguLljYJptQtjZC0JX1wK33ep R2Ylk2oI//Ycg== Received: from RS-EX-MBS2.realsil.com.cn ([172.29.17.102]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARZHx8272239 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:35 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS2.realsil.com.cn (172.29.17.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:35 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:35 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 1/7] r8169: add support for multi irqs Date: Thu, 4 Jun 2026 18:27:27 +0800 Message-ID: <20260604102733.1582-2-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu RSS uses multi rx queues to receive packets, and each rx queue needs one irq and napi. So this patch adds support for multi irqs and napi here. Signed-off-by: Javen Xu --- Changes in v2: - remove some unused definitions, such as index, name in rtl8169_irq - remove array imr and isr - remove min_irq_nvecs and max_irq_nvecs, replaced with help function get_min_irq_nvecs and get_max_irq_nvecs - alloc irq by flags, instead of PCI_IRQ_ALL_TYPES Changes in v3: - add enum rtl_isr_version to replace macro definition - remove struct rtl8169_napi, use napi_struct array instead and alloc memory for this array dynamically - remove struct rtl8169_irq Changes in v4: - change retval to ret in rtl8169_set_real_num_queue() - reverse xmas tree in rtl8169_poll() and rtl8169_interrupt() - remove tp->hw_supp_isr_ver Changes in v5: - rtl8169_request_irq(), when failed, only free irqs which are allocated - remove rss_support, simplied napi init, call r8169_init_napi() directly - remove rtl_isr_version, INTR_VEC_MAP_MASK, INTR_VEC_MAP_STATUS, R8169_MAX_MSIX_VEC, rss_enable, recheck_desc_ownbit - rtl_software_parameter_initialize() this function will be expanded in next patch, so i want to remain it here. Changes in v6: - Fix netpoll crash - Fix use-after-free during driver unload by registering a devm action for netif_napi_del() - remove tp->irq Changes in v7: - pass NAPI as arg to rtl_rx() - use netif_set_real_num_queues to replace rtl8169_set_real_num_queues - replace rtl_software_parameter_initialize with rtl_setup_rx_params --- drivers/net/ethernet/realtek/r8169_main.c | 150 +++++++++++++++++----- 1 file changed, 121 insertions(+), 29 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index ec4fc21fa21f..8f3a5c50299f 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -733,7 +733,6 @@ struct rtl8169_private { struct pci_dev *pci_dev; struct net_device *dev; struct phy_device *phydev; - struct napi_struct napi; enum mac_version mac_version; enum rtl_dash_type dash_type; u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */ @@ -745,10 +744,12 @@ struct rtl8169_private { dma_addr_t RxPhyAddr; struct page *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */ struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */ + struct napi_struct *rtl8169_napi; + unsigned int num_rx_rings; u16 cp_cmd; u16 tx_lpi_timer; u32 irq_mask; - int irq; + unsigned int irq_nvecs; struct clk *clk; =20 struct { @@ -2680,6 +2681,11 @@ static void rtl_hw_reset(struct rtl8169_private *tp) rtl_loop_wait_low(tp, &rtl_chipcmd_cond, 100, 100); } =20 +static void rtl_setup_rx_params(struct rtl8169_private *tp) +{ + tp->num_rx_rings =3D 1; +} + static void rtl_request_firmware(struct rtl8169_private *tp) { struct rtl_fw *rtl_fw; @@ -4266,9 +4272,21 @@ static void rtl8169_tx_clear(struct rtl8169_private = *tp) netdev_reset_queue(tp->dev); } =20 +static void rtl8169_napi_disable(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->irq_nvecs; i++) + napi_disable(&tp->rtl8169_napi[i]); +} + +static void rtl8169_napi_enable(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->irq_nvecs; i++) + napi_enable(&tp->rtl8169_napi[i]); +} + static void rtl8169_cleanup(struct rtl8169_private *tp) { - napi_disable(&tp->napi); + rtl8169_napi_disable(tp); =20 /* Give a racing hard_start_xmit a few cycles to complete. */ synchronize_net(); @@ -4314,7 +4332,7 @@ static void rtl_reset_work(struct rtl8169_private *tp) for (i =3D 0; i < NUM_RX_DESC; i++) rtl8169_mark_to_asic(tp->RxDescArray + i); =20 - napi_enable(&tp->napi); + rtl8169_napi_enable(tp); rtl_hw_start(tp); } =20 @@ -4768,7 +4786,8 @@ static inline void rtl8169_rx_csum(struct sk_buff *sk= b, u32 opts1) skb_checksum_none_assert(skb); } =20 -static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, int = budget) +static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, + int budget, struct napi_struct *napi) { struct device *d =3D tp_to_dev(tp); int count; @@ -4820,7 +4839,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, int budget goto release_descriptor; } =20 - skb =3D napi_alloc_skb(&tp->napi, pkt_size); + skb =3D napi_alloc_skb(napi, pkt_size); if (unlikely(!skb)) { dev->stats.rx_dropped++; goto release_descriptor; @@ -4844,7 +4863,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, int budget if (skb->pkt_type =3D=3D PACKET_MULTICAST) dev->stats.multicast++; =20 - napi_gro_receive(&tp->napi, skb); + napi_gro_receive(napi, skb); =20 dev_sw_netstats_rx_add(dev, pkt_size); release_descriptor: @@ -4856,8 +4875,12 @@ static int rtl_rx(struct net_device *dev, struct rtl= 8169_private *tp, int budget =20 static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) { - struct rtl8169_private *tp =3D dev_instance; - u32 status =3D rtl_get_events(tp); + struct napi_struct *napi =3D dev_instance; + struct rtl8169_private *tp; + u32 status; + + tp =3D netdev_priv(napi->dev); + status =3D rtl_get_events(tp); =20 if ((status & 0xffff) =3D=3D 0xffff || !(status & tp->irq_mask)) return IRQ_NONE; @@ -4873,13 +4896,43 @@ static irqreturn_t rtl8169_interrupt(int irq, void = *dev_instance) phy_mac_interrupt(tp->phydev); =20 rtl_irq_disable(tp); - napi_schedule(&tp->napi); + napi_schedule(napi); out: rtl_ack_events(tp, status); =20 return IRQ_HANDLED; } =20 +static void rtl8169_free_irq(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->irq_nvecs; i++) { + struct napi_struct *napi =3D &tp->rtl8169_napi[i]; + + pci_free_irq(tp->pci_dev, i, napi); + } +} + +static int rtl8169_request_irq(struct rtl8169_private *tp) +{ + struct net_device *dev =3D tp->dev; + struct napi_struct *napi; + int i, rc; + + for (i =3D 0; i < tp->irq_nvecs; i++) { + napi =3D &tp->rtl8169_napi[i]; + rc =3D pci_request_irq(tp->pci_dev, i, rtl8169_interrupt, + NULL, napi, "%s-%d", dev->name, i); + if (rc) + goto free_irq; + } + return 0; + +free_irq: + while (--i >=3D 0) + pci_free_irq(tp->pci_dev, i, &tp->rtl8169_napi[i]); + return rc; +} + static void rtl_task(struct work_struct *work) { struct rtl8169_private *tp =3D @@ -4914,13 +4967,13 @@ static void rtl_task(struct work_struct *work) =20 static int rtl8169_poll(struct napi_struct *napi, int budget) { - struct rtl8169_private *tp =3D container_of(napi, struct rtl8169_private,= napi); - struct net_device *dev =3D tp->dev; - int work_done; + struct rtl8169_private *tp =3D netdev_priv(napi->dev); + struct net_device *dev =3D napi->dev; + int work_done =3D 0; =20 rtl_tx(dev, tp, budget); =20 - work_done =3D rtl_rx(dev, tp, budget); + work_done =3D rtl_rx(dev, tp, budget, napi); =20 if (work_done < budget && napi_complete_done(napi, work_done)) rtl_irq_enable(tp); @@ -5035,7 +5088,7 @@ static void rtl8169_up(struct rtl8169_private *tp) phy_init_hw(tp->phydev); phy_resume(tp->phydev); rtl8169_init_phy(tp); - napi_enable(&tp->napi); + rtl8169_napi_enable(tp); enable_work(&tp->wk.work); rtl_reset_work(tp); =20 @@ -5053,7 +5106,7 @@ static int rtl8169_close(struct net_device *dev) rtl8169_down(tp); rtl8169_rx_clear(tp); =20 - free_irq(tp->irq, tp); + rtl8169_free_irq(tp); =20 phy_disconnect(tp->phydev); =20 @@ -5074,7 +5127,10 @@ static void rtl8169_netpoll(struct net_device *dev) { struct rtl8169_private *tp =3D netdev_priv(dev); =20 - rtl8169_interrupt(tp->irq, tp); + for (int i =3D 0; i < tp->irq_nvecs; i++) { + rtl8169_interrupt(pci_irq_vector(tp->pci_dev, i), + &tp->rtl8169_napi[i]); + } } #endif =20 @@ -5082,7 +5138,6 @@ static int rtl_open(struct net_device *dev) { struct rtl8169_private *tp =3D netdev_priv(dev); struct pci_dev *pdev =3D tp->pci_dev; - unsigned long irqflags; int retval =3D -ENOMEM; =20 pm_runtime_get_sync(&pdev->dev); @@ -5107,8 +5162,7 @@ static int rtl_open(struct net_device *dev) =20 rtl_request_firmware(tp); =20 - irqflags =3D pci_dev_msi_enabled(pdev) ? IRQF_NO_THREAD : IRQF_SHARED; - retval =3D request_irq(tp->irq, rtl8169_interrupt, irqflags, dev->name, t= p); + retval =3D rtl8169_request_irq(tp); if (retval < 0) goto err_release_fw_2; =20 @@ -5125,7 +5179,7 @@ static int rtl_open(struct net_device *dev) return retval; =20 err_free_irq: - free_irq(tp->irq, tp); + rtl8169_free_irq(tp); err_release_fw_2: rtl_release_firmware(tp); rtl8169_rx_clear(tp); @@ -5275,6 +5329,14 @@ static void rtl_shutdown(struct pci_dev *pdev) pci_prepare_to_sleep(pdev); } =20 +static void r8169_free_napi(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->irq_nvecs; i++) + netif_napi_del(&tp->rtl8169_napi[i]); + + kfree(tp->rtl8169_napi); +} + static void rtl_remove_one(struct pci_dev *pdev) { struct rtl8169_private *tp =3D pci_get_drvdata(pdev); @@ -5289,6 +5351,8 @@ static void rtl_remove_one(struct pci_dev *pdev) =20 unregister_netdev(tp->dev); =20 + r8169_free_napi(tp); + if (tp->dash_type !=3D RTL_DASH_NONE) rtl8168_driver_stop(tp); =20 @@ -5328,7 +5392,9 @@ static void rtl_set_irq_mask(struct rtl8169_private *= tp) =20 static int rtl_alloc_irq(struct rtl8169_private *tp) { + struct pci_dev *pdev =3D tp->pci_dev; unsigned int flags; + int nvecs; =20 switch (tp->mac_version) { case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06: @@ -5344,7 +5410,14 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) break; } =20 - return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags); + nvecs =3D pci_alloc_irq_vectors(pdev, 1, 1, flags); + + if (nvecs < 0) + return nvecs; + + tp->irq_nvecs =3D nvecs; + + return 0; } =20 static void rtl_read_mac_address(struct rtl8169_private *tp, @@ -5599,6 +5672,12 @@ static bool rtl_aspm_is_safe(struct rtl8169_private = *tp) return false; } =20 +static void r8169_init_napi(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->irq_nvecs; i++) + netif_napi_add(tp->dev, &tp->rtl8169_napi[i], rtl8169_poll); +} + static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *= ent) { const struct rtl_chip_info *chip; @@ -5703,12 +5782,12 @@ static int rtl_init_one(struct pci_dev *pdev, const= struct pci_device_id *ent) =20 rtl_hw_reset(tp); =20 + rtl_setup_rx_params(tp); + rc =3D rtl_alloc_irq(tp); if (rc < 0) return dev_err_probe(&pdev->dev, rc, "Can't allocate interrupt\n"); =20 - tp->irq =3D pci_irq_vector(pdev, 0); - INIT_WORK(&tp->wk.work, rtl_task); disable_work(&tp->wk.work); =20 @@ -5716,8 +5795,6 @@ static int rtl_init_one(struct pci_dev *pdev, const s= truct pci_device_id *ent) =20 dev->ethtool_ops =3D &rtl8169_ethtool_ops; =20 - netif_napi_add(dev, &tp->napi, rtl8169_poll); - dev->hw_features =3D NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; dev->vlan_features =3D NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; @@ -5778,6 +5855,10 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) if (jumbo_max) dev->max_mtu =3D jumbo_max; =20 + rc =3D netif_set_real_num_queues(tp->dev, 1, tp->num_rx_rings); + if (rc < 0) + return dev_err_probe(&pdev->dev, rc, "set tx/rx num failure\n"); + rtl_set_irq_mask(tp); =20 tp->counters =3D dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters), @@ -5792,9 +5873,15 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) if (rc) return rc; =20 + tp->rtl8169_napi =3D kcalloc(tp->irq_nvecs, sizeof(struct napi_struct), G= FP_KERNEL); + if (!tp->rtl8169_napi) + return -ENOMEM; + + r8169_init_napi(tp); + rc =3D register_netdev(dev); if (rc) - return rc; + goto err_free_napi; =20 if (IS_ENABLED(CONFIG_R8169_LEDS)) { if (rtl_is_8125(tp)) @@ -5803,8 +5890,9 @@ static int rtl_init_one(struct pci_dev *pdev, const s= truct pci_device_id *ent) tp->leds =3D rtl8168_init_leds(dev); } =20 - netdev_info(dev, "%s, %pM, %sXID %x, IRQ %d\n", - chip->name, dev->dev_addr, ext_xid_str, xid, tp->irq); + netdev_info(dev, "%s, %pM, %sXID %x, IRQ %d (%d total)\n", + chip->name, dev->dev_addr, ext_xid_str, xid, + pci_irq_vector(pdev, 0), tp->irq_nvecs); =20 if (jumbo_max) netdev_info(dev, "jumbo features [frames: %d bytes, tx checksumming: %s]= \n", @@ -5821,6 +5909,10 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) pm_runtime_put_sync(&pdev->dev); =20 return 0; + +err_free_napi: + r8169_free_napi(tp); + return rc; } =20 static struct pci_driver rtl8169_pci_driver =3D { --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAD6D3C09EB; Thu, 4 Jun 2026 10:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; cv=none; b=O8eDq81tDFkK0Xx3IihVo+NNnTSRJdyS2aiTwG+okqLWeZ9n6A1FeC7mt4HiQHlkrnwlcC1/432Ux7bdIIEnnylA8Od4RlQ4riI2RwoRav9pKtUpLZLSk85j8w5gjjq/AnOn8L+7a9O/GElZwYNWuvdVZbsOmml0myF89c56zpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; c=relaxed/simple; bh=ZnHsQdM7NpNqIzIwu91prPGcreIVpGv1lwIFLl/Qtao=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gcHeTzWfZKEbJ07IBx6Xmi04zN/TqnKp+vOsMtwvgywe29mdxyGya8VCuWhh/MRCJ7oNrT6b24O3yNOFuaqCuMqamvDfjamlC1cBjggT4gGTTxD6MmHDKxYgvcQSK3GfxJybS5v0j1Kr7jY1mcuGSNJV1MSke1Z/zrwIAwtrfnA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=P96YefgQ; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="P96YefgQ" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARZ620272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568855; bh=owM3m747zVWgUYXsftI/AvOUnk3AxMOM3pZPgmWcyrI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=P96YefgQpT0TpFFQd+4a60pN8/In74Yfkund5HwPmcvbzy/sDIH9gu1U9CV8ozAv2 eChbRuyshAGiMcAij1h0C18dOZtUQnzu6gbkuu38JUm8cz0dnHnoZMQPxV87ucPa2H vou50uFasecxvJxAodtyvynuxNrs+y6VA64xwL2htqa7T7d7sGQDkNdF1ayTAF/yOM x8M4mgZbMZAcS3qaXnkraPTXdqvMf2G6ilxuO+wnnlY5GTA7l8zs6BuW1xUe+oz8dl nRHy/DmoIxTwwNXKQs4EurdHHxr35CS7X0XrF2KigBOpuTK14aRZupZvSKV5I/65N8 /LR76aqC4Bgew== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARZ620272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:35 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:35 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:35 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 2/7] r8169: add support for multi rx queues Date: Thu, 4 Jun 2026 18:27:28 +0800 Message-ID: <20260604102733.1582-3-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu This patch adds support for multi rx queues. RSS requires multi rx queues to receive packets. So we need struct rtl8169_rx_ring for each queue. Signed-off-by: Javen Xu --- Changes in v2: - sort some registers by its number - remove some unused definitions, like RX_DESC_RING_TYPE_MAX - change recheck_desc_ownbit type - remove rdsar_reg in rx_ring struct - opts1 are different in rx_desc and rx_desc_rss, move the judgement to Patch 5/7 Changes in v3: - remove ring->rx_desc_alloc_size, use constant instead Changes in v4: - change rdsar_reg type to unsigned int - follow reverse xmas tree, in rtl_set_rx_tx_desc_registers(), rtl8169_alloc_rx_data(), rtl8169_alloc_rx_desc(), rtl8169_free_rx_desc() - add comments on LED_CTRL, remove helper function Changes in v5: - modify rtl8169_init_ring(), do rx clear when failed - add definition R8169_MAX_TX_QUEUES 1 Changes in v6: - Restore the secondary Rx error filter when NETIF_F_RXFALL is enabled in rtl_rx() Changes in v7: - remove code associated with recheck_desc_ownbit --- drivers/net/ethernet/realtek/r8169_main.c | 242 +++++++++++++++++----- 1 file changed, 186 insertions(+), 56 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index 8f3a5c50299f..6dae0d1bfe25 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -74,9 +74,20 @@ #define NUM_TX_DESC 256 /* Number of Tx descriptor registers */ #define NUM_RX_DESC 256 /* Number of Rx descriptor registers */ #define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc)) -#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc)) + +/* + * Workaround for the hardware DMA prefetcher. The H/W might aggressively + * fetch one more descriptor even after hitting the RingEnd mark. We + * allocate this extra dummy space as padding to prevent out-of-bounds + * access and potential IOMMU faults. + */ +#define R8169_RX_RING_BYTES ((NUM_RX_DESC + 1) * sizeof(struct RxDesc)) #define R8169_TX_STOP_THRS (MAX_SKB_FRAGS + 1) #define R8169_TX_START_THRS (2 * R8169_TX_STOP_THRS) +#define R8169_MAX_RX_QUEUES 8 +#define R8127_MAX_RX_QUEUES 8 +#define R8169_DEFAULT_RX_QUEUES 1 +#define R8169_MAX_TX_QUEUES 1 =20 #define OCP_STD_PHY_BASE 0xa400 =20 @@ -441,6 +452,7 @@ enum rtl8125_registers { TxPoll_8125 =3D 0x90, LEDSEL3 =3D 0x96, MAC0_BKP =3D 0x19e0, + RDSAR_Q1_LOW =3D 0x4000, RSS_CTRL_8125 =3D 0x4500, Q_NUM_CTRL_8125 =3D 0x4800, EEE_TXIDLE_TIMER_8125 =3D 0x6048, @@ -728,6 +740,21 @@ enum rtl_dash_type { RTL_DASH_25_BP, }; =20 +enum rx_desc_ring_type { + RX_DESC_RING_TYPE_DEFAULT, + RX_DESC_RING_TYPE_RSS, +}; + +struct rtl8169_rx_ring { + u32 index; /* Rx queue index */ + u32 cur_rx; /* Index of next Rx pkt. */ + u32 dirty_rx; /* Index for recycling. */ + struct RxDesc *rx_desc_array; /* array of Rx Desc*/ + dma_addr_t rx_desc_phy_addr[NUM_RX_DESC]; /* Rx data buffer physical dma = address */ + dma_addr_t rx_phy_addr; /* Rx desc physical address */ + struct page *rx_databuff[NUM_RX_DESC]; /* Rx data buffers */ +}; + struct rtl8169_private { void __iomem *mmio_addr; /* memory map physical address */ struct pci_dev *pci_dev; @@ -735,20 +762,18 @@ struct rtl8169_private { struct phy_device *phydev; enum mac_version mac_version; enum rtl_dash_type dash_type; - u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */ u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */ u32 dirty_tx; struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */ - struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */ dma_addr_t TxPhyAddr; - dma_addr_t RxPhyAddr; - struct page *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */ struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */ struct napi_struct *rtl8169_napi; + struct rtl8169_rx_ring rx_ring[R8169_MAX_RX_QUEUES]; unsigned int num_rx_rings; u16 cp_cmd; u16 tx_lpi_timer; u32 irq_mask; + unsigned int hw_supp_num_rx_queues; unsigned int irq_nvecs; struct clk *clk; =20 @@ -2620,9 +2645,27 @@ static void rtl_init_rxcfg(struct rtl8169_private *t= p) } } =20 +static void rtl8169_rx_desc_init(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->num_rx_rings; i++) { + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; + + memset(ring->rx_desc_array, 0x0, R8169_RX_RING_BYTES); + } +} + static void rtl8169_init_ring_indexes(struct rtl8169_private *tp) { - tp->dirty_tx =3D tp->cur_tx =3D tp->cur_rx =3D 0; + tp->dirty_tx =3D 0; + tp->cur_tx =3D 0; + + for (int i =3D 0; i < tp->hw_supp_num_rx_queues; i++) { + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; + + ring->dirty_rx =3D 0; + ring->cur_rx =3D 0; + ring->index =3D i; + } } =20 static void rtl_jumbo_config(struct rtl8169_private *tp) @@ -2684,6 +2727,14 @@ static void rtl_hw_reset(struct rtl8169_private *tp) static void rtl_setup_rx_params(struct rtl8169_private *tp) { tp->num_rx_rings =3D 1; + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_80: + tp->hw_supp_num_rx_queues =3D R8127_MAX_RX_QUEUES; + break; + default: + tp->hw_supp_num_rx_queues =3D R8169_DEFAULT_RX_QUEUES; + break; + } } =20 static void rtl_request_firmware(struct rtl8169_private *tp) @@ -2810,6 +2861,8 @@ static void rtl_set_rx_max_size(struct rtl8169_privat= e *tp) =20 static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp) { + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[0]; + /* * Magic spell: some iop3xx ARM board needs the TxDescAddrHigh * register to be written before TxDescAddrLow to work. @@ -2817,8 +2870,16 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8= 169_private *tp) */ RTL_W32(tp, TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32); RTL_W32(tp, TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_BIT_MASK(32)); - RTL_W32(tp, RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32); - RTL_W32(tp, RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32)); + RTL_W32(tp, RxDescAddrHigh, ((u64) ring->rx_phy_addr) >> 32); + RTL_W32(tp, RxDescAddrLow, ((u64) ring->rx_phy_addr) & DMA_BIT_MASK(32)); + + for (int i =3D 1; i < tp->num_rx_rings; i++) { + unsigned int rdsar_reg =3D RDSAR_Q1_LOW + (i - 1) * 8; + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; + + RTL_W32(tp, rdsar_reg + 4, ((u64)ring->rx_phy_addr >> 32)); + RTL_W32(tp, rdsar_reg, ((u64)ring->rx_phy_addr) & DMA_BIT_MASK(32)); + } } =20 static void rtl8169_set_magic_reg(struct rtl8169_private *tp) @@ -4165,8 +4226,9 @@ static void rtl8169_mark_to_asic(struct RxDesc *desc) } =20 static struct page *rtl8169_alloc_rx_data(struct rtl8169_private *tp, - struct RxDesc *desc) + struct rtl8169_rx_ring *ring, unsigned int index) { + struct RxDesc *desc =3D ring->rx_desc_array + index; struct device *d =3D tp_to_dev(tp); int node =3D dev_to_node(d); dma_addr_t mapping; @@ -4184,55 +4246,106 @@ static struct page *rtl8169_alloc_rx_data(struct r= tl8169_private *tp, } =20 desc->addr =3D cpu_to_le64(mapping); + ring->rx_desc_phy_addr[index] =3D mapping; rtl8169_mark_to_asic(desc); =20 return data; } =20 -static void rtl8169_rx_clear(struct rtl8169_private *tp) +static void rtl8169_rx_clear(struct rtl8169_private *tp, struct rtl8169_rx= _ring *ring) { int i; =20 - for (i =3D 0; i < NUM_RX_DESC && tp->Rx_databuff[i]; i++) { + for (i =3D 0; i < NUM_RX_DESC && ring->rx_databuff[i]; i++) { dma_unmap_page(tp_to_dev(tp), - le64_to_cpu(tp->RxDescArray[i].addr), + ring->rx_desc_phy_addr[i], R8169_RX_BUF_SIZE, DMA_FROM_DEVICE); - __free_pages(tp->Rx_databuff[i], get_order(R8169_RX_BUF_SIZE)); - tp->Rx_databuff[i] =3D NULL; - tp->RxDescArray[i].addr =3D 0; - tp->RxDescArray[i].opts1 =3D 0; + __free_pages(ring->rx_databuff[i], get_order(R8169_RX_BUF_SIZE)); + ring->rx_databuff[i] =3D NULL; + ring->rx_desc_phy_addr[i] =3D 0; + ring->rx_desc_array[i].addr =3D 0; + ring->rx_desc_array[i].opts1 =3D 0; } } =20 -static int rtl8169_rx_fill(struct rtl8169_private *tp) +static int rtl8169_rx_fill(struct rtl8169_private *tp, struct rtl8169_rx_r= ing *ring) { int i; =20 for (i =3D 0; i < NUM_RX_DESC; i++) { struct page *data; =20 - data =3D rtl8169_alloc_rx_data(tp, tp->RxDescArray + i); + data =3D rtl8169_alloc_rx_data(tp, ring, i); if (!data) { - rtl8169_rx_clear(tp); + rtl8169_rx_clear(tp, ring); return -ENOMEM; } - tp->Rx_databuff[i] =3D data; + ring->rx_databuff[i] =3D data; } =20 /* mark as last descriptor in the ring */ - tp->RxDescArray[NUM_RX_DESC - 1].opts1 |=3D cpu_to_le32(RingEnd); + ring->rx_desc_array[NUM_RX_DESC - 1].opts1 |=3D cpu_to_le32(RingEnd); =20 return 0; } =20 +static int rtl8169_alloc_rx_desc(struct rtl8169_private *tp) +{ + struct pci_dev *pdev =3D tp->pci_dev; + struct rtl8169_rx_ring *ring; + + for (int i =3D 0; i < tp->num_rx_rings; i++) { + ring =3D &tp->rx_ring[i]; + ring->rx_desc_array =3D dma_alloc_coherent(&pdev->dev, + R8169_RX_RING_BYTES, + &ring->rx_phy_addr, + GFP_KERNEL); + if (!ring->rx_desc_array) + return -ENOMEM; + } + return 0; +} + +static void rtl8169_free_rx_desc(struct rtl8169_private *tp) +{ + struct pci_dev *pdev =3D tp->pci_dev; + struct rtl8169_rx_ring *ring; + + for (int i =3D 0; i < tp->num_rx_rings; i++) { + ring =3D &tp->rx_ring[i]; + if (ring->rx_desc_array) { + dma_free_coherent(&pdev->dev, + R8169_RX_RING_BYTES, + ring->rx_desc_array, + ring->rx_phy_addr); + ring->rx_desc_array =3D NULL; + } + } +} + static int rtl8169_init_ring(struct rtl8169_private *tp) { + int i, ret; + rtl8169_init_ring_indexes(tp); + rtl8169_rx_desc_init(tp); =20 memset(tp->tx_skb, 0, sizeof(tp->tx_skb)); - memset(tp->Rx_databuff, 0, sizeof(tp->Rx_databuff)); =20 - return rtl8169_rx_fill(tp); + for (i =3D 0; i < tp->num_rx_rings; i++) { + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; + + memset(ring->rx_databuff, 0, sizeof(ring->rx_databuff)); + ret =3D rtl8169_rx_fill(tp, ring); + if (ret < 0) + goto err_clear; + } + return 0; + +err_clear: + while (--i >=3D 0) + rtl8169_rx_clear(tp, &tp->rx_ring[i]); + return ret; } =20 static void rtl8169_unmap_tx_skb(struct rtl8169_private *tp, unsigned int = entry) @@ -4321,16 +4434,23 @@ static void rtl8169_cleanup(struct rtl8169_private = *tp) rtl8169_init_ring_indexes(tp); } =20 -static void rtl_reset_work(struct rtl8169_private *tp) +static void rtl8169_rx_desc_reset(struct rtl8169_private *tp) { - int i; + for (int i =3D 0; i < tp->num_rx_rings; i++) { + struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; + + for (int j =3D 0; j < NUM_RX_DESC; j++) + rtl8169_mark_to_asic(ring->rx_desc_array + j); + } +} =20 +static void rtl_reset_work(struct rtl8169_private *tp) +{ netif_stop_queue(tp->dev); =20 rtl8169_cleanup(tp); =20 - for (i =3D 0; i < NUM_RX_DESC; i++) - rtl8169_mark_to_asic(tp->RxDescArray + i); + rtl8169_rx_desc_reset(tp); =20 rtl8169_napi_enable(tp); rtl_hw_start(tp); @@ -4776,9 +4896,10 @@ static inline int rtl8169_fragmented_frame(u32 statu= s) return (status & (FirstFrag | LastFrag)) !=3D (FirstFrag | LastFrag); } =20 -static inline void rtl8169_rx_csum(struct sk_buff *skb, u32 opts1) +static inline void rtl8169_rx_csum(struct sk_buff *skb, + struct RxDesc *desc) { - u32 status =3D opts1 & (RxProtoMask | RxCSFailMask); + u32 status =3D le32_to_cpu(desc->opts1) & (RxProtoMask | RxCSFailMask); =20 if (status =3D=3D RxProtoTCP || status =3D=3D RxProtoUDP) skb->ip_summed =3D CHECKSUM_UNNECESSARY; @@ -4786,15 +4907,29 @@ static inline void rtl8169_rx_csum(struct sk_buff *= skb, u32 opts1) skb_checksum_none_assert(skb); } =20 +static bool rtl8169_check_rx_desc_error(struct net_device *dev, + struct rtl8169_private *tp, + u32 status) +{ + if (unlikely(status & RxRES)) { + if (status & (RxRWT | RxRUNT)) + dev->stats.rx_length_errors++; + if (status & RxCRC) + dev->stats.rx_crc_errors++; + return true; + } + return false; +} + static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, - int budget, struct napi_struct *napi) + struct rtl8169_rx_ring *ring, int budget, struct napi_struct *napi) { struct device *d =3D tp_to_dev(tp); int count; =20 - for (count =3D 0; count < budget; count++, tp->cur_rx++) { - unsigned int pkt_size, entry =3D tp->cur_rx % NUM_RX_DESC; - struct RxDesc *desc =3D tp->RxDescArray + entry; + for (count =3D 0; count < budget; count++, ring->cur_rx++) { + unsigned int pkt_size, entry =3D ring->cur_rx % NUM_RX_DESC; + struct RxDesc *desc =3D ring->rx_desc_array + entry; struct sk_buff *skb; const void *rx_buf; dma_addr_t addr; @@ -4810,15 +4945,11 @@ static int rtl_rx(struct net_device *dev, struct rt= l8169_private *tp, */ dma_rmb(); =20 - if (unlikely(status & RxRES)) { + if (rtl8169_check_rx_desc_error(dev, tp, status)) { if (net_ratelimit()) netdev_warn(dev, "Rx ERROR. status =3D %08x\n", status); dev->stats.rx_errors++; - if (status & (RxRWT | RxRUNT)) - dev->stats.rx_length_errors++; - if (status & RxCRC) - dev->stats.rx_crc_errors++; =20 if (!(dev->features & NETIF_F_RXALL)) goto release_descriptor; @@ -4845,8 +4976,8 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, goto release_descriptor; } =20 - addr =3D le64_to_cpu(desc->addr); - rx_buf =3D page_address(tp->Rx_databuff[entry]); + addr =3D le64_to_cpu(ring->rx_desc_phy_addr[entry]); + rx_buf =3D page_address(ring->rx_databuff[entry]); =20 dma_sync_single_for_cpu(d, addr, pkt_size, DMA_FROM_DEVICE); prefetch(rx_buf); @@ -4855,7 +4986,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, skb->len =3D pkt_size; dma_sync_single_for_device(d, addr, pkt_size, DMA_FROM_DEVICE); =20 - rtl8169_rx_csum(skb, status); + rtl8169_rx_csum(skb, desc); skb->protocol =3D eth_type_trans(skb, dev); =20 rtl8169_rx_vlan_tag(desc, skb); @@ -4973,7 +5104,8 @@ static int rtl8169_poll(struct napi_struct *napi, int= budget) =20 rtl_tx(dev, tp, budget); =20 - work_done =3D rtl_rx(dev, tp, budget, napi); + /* rtl8169_poll() is used only when there is a single RX ring. */ + work_done =3D rtl_rx(dev, tp, &tp->rx_ring[0], budget, napi); =20 if (work_done < budget && napi_complete_done(napi, work_done)) rtl_irq_enable(tp); @@ -5104,18 +5236,17 @@ static int rtl8169_close(struct net_device *dev) =20 netif_stop_queue(dev); rtl8169_down(tp); - rtl8169_rx_clear(tp); + for (int i =3D 0; i < tp->num_rx_rings; i++) + rtl8169_rx_clear(tp, &tp->rx_ring[i]); =20 rtl8169_free_irq(tp); =20 phy_disconnect(tp->phydev); =20 - dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, - tp->RxPhyAddr); dma_free_coherent(&pdev->dev, R8169_TX_RING_BYTES, tp->TxDescArray, tp->TxPhyAddr); tp->TxDescArray =3D NULL; - tp->RxDescArray =3D NULL; + rtl8169_free_rx_desc(tp); =20 pm_runtime_put_sync(&pdev->dev); =20 @@ -5151,10 +5282,8 @@ static int rtl_open(struct net_device *dev) if (!tp->TxDescArray) goto out; =20 - tp->RxDescArray =3D dma_alloc_coherent(&pdev->dev, R8169_RX_RING_BYTES, - &tp->RxPhyAddr, GFP_KERNEL); - if (!tp->RxDescArray) - goto err_free_tx_0; + if (rtl8169_alloc_rx_desc(tp) < 0) + goto err_free_rx_1; =20 retval =3D rtl8169_init_ring(tp); if (retval < 0) @@ -5182,12 +5311,10 @@ static int rtl_open(struct net_device *dev) rtl8169_free_irq(tp); err_release_fw_2: rtl_release_firmware(tp); - rtl8169_rx_clear(tp); + for (int i =3D 0; i < tp->num_rx_rings; i++) + rtl8169_rx_clear(tp, &tp->rx_ring[i]); err_free_rx_1: - dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, - tp->RxPhyAddr); - tp->RxDescArray =3D NULL; -err_free_tx_0: + rtl8169_free_rx_desc(tp); dma_free_coherent(&pdev->dev, R8169_TX_RING_BYTES, tp->TxDescArray, tp->TxPhyAddr); tp->TxDescArray =3D NULL; @@ -5688,7 +5815,10 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) u32 txconfig; u32 xid; =20 - dev =3D devm_alloc_etherdev(&pdev->dev, sizeof (*tp)); + dev =3D devm_alloc_etherdev_mqs(&pdev->dev, sizeof(*tp), + R8169_MAX_TX_QUEUES, + R8169_MAX_RX_QUEUES); + if (!dev) return -ENOMEM; =20 --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3577B39DBF4; Thu, 4 Jun 2026 10:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568884; cv=none; b=I123iN5iHl7MkzNptTUSMy2OLEUB988Use/TrZcqkKHBbbdQBXjyY90XcYv51n3d18TLHKumEH+Risbl0WizmsYvr6C0bICYJixudOep4PP8xaNGgpuYdHJaAFji1iGZEyOhsdHlERMC8dCq90RZ+9wFI7SL7Hb3VG0tBfi+/XE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568884; c=relaxed/simple; bh=hWZODWsGtE9uIRkUGN4Kd8ZMNw8mIfDLGoiBwwK1sIU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l7zGnOePib8aJyddlb92qsZdKPqw81dkPRWI05LY5X2kZFURcB12ndSP+PfivGWctHnEzhmmAvLKE9AmaRaonWZyPdBlq+YCbV9oGPiV1mos1iRbqprteGZSaapbKpfaEXD2zQKfhplKb6jGJ47eqDxdO1w3H/9cch1JBZSF1Sw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=wNYgxnpx; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="wNYgxnpx" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARZ640272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568856; bh=lb/BojQYev+9ivHTYICaiCLDHbafQM1IXShmmZEMiDo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=wNYgxnpxKbn9JDrxaherzJxV+IyuhqCfyfP5er58zfe5Ci26TruxBRDWzDm1ArxkW PDaHqPzQ8Pa6RLgpOsCHTGFeF14jZ1bzsWobSqsPXbXrriouWwhWYmC6VqxEhkG/GY jDasTDO+5UKzDDZkYYgSKiPNvAZhpqtLcGh7fV7NHAPQeqvH6hQeqdMZP6eSH+MLl6 NMjixxkUWjPbsEpIadnJu9eJsLxTs74k60qK0Mpp4Nqf2DxUV95lp5/Zbv+cycLGMy 4Y99gwbBoBc35jEJTsqNlGFevqqk8J8eQDpB7gT7598LZS9HbdYLJGhU3TLTCY5qzF iID6TpzspXoow== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARZ640272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:35 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:36 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:35 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 3/7] r8169: add support for new interrupt mapping Date: Thu, 4 Jun 2026 18:27:29 +0800 Message-ID: <20260604102733.1582-4-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu To support RSS, the number of hardware interrupt bits should match the interrupt of software. So we add support for new interrupt mapping here. ISR_VEC_MAP_REG is the hardware register to indicate interrupt status. IMR_SET_VEC_MAP_REG is interrupt mask which is set to enable irq. Signed-off-by: Javen Xu --- Changes in v2: - no changes Changes in v3: - init index in napi_struct and get message_id from index - move rtl8169_disable_hw_interrupt_msix directly before the call to napi_schedule() - change the condition in rtl8169_request_irq when RTL_VEC_MAP_ENABLE enabled, use rtl8169_interrupt_msix Changes in v4: - remove flag tp->feature, replace tp->features & RTL_VEC_MAP_ENABLE with tp->irq_nvecs > 1, they are equivalent. - follow reverse xmas tree, in rtl8169_interrupt_msix(), rtl8169_poll_msix_rx(), rtl8169_poll_msix_tx(), rtl8169_poll_msix_other() - use napi->index in rtl8169_poll_msix_other() - add a comment to describe RTL8127 MSI-X vector layout - simplify r8169_init_napi() Changes in v5: - replace magic number in rtl8169_poll_msix_tx() Changes in v6: - when irq_nvecs <=3D 1, use register IntrMask_8125, else using vec map - fix irq sequence in rtl8169_interrupt_msix(), disable interrupts before clean it - remove dead code in rtl8169_poll_msix_tx() Changes in v7: - remove recheck_desc_ownbit - change return value of rtl_tx - remove message_id which only used once --- drivers/net/ethernet/realtek/r8169_main.c | 173 +++++++++++++++++++--- 1 file changed, 154 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index 6dae0d1bfe25..a416d482aa86 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -86,6 +86,7 @@ #define R8169_TX_START_THRS (2 * R8169_TX_STOP_THRS) #define R8169_MAX_RX_QUEUES 8 #define R8127_MAX_RX_QUEUES 8 +#define R8127_MAX_TX_QUEUES 8 #define R8169_DEFAULT_RX_QUEUES 1 #define R8169_MAX_TX_QUEUES 1 =20 @@ -456,8 +457,12 @@ enum rtl8125_registers { RSS_CTRL_8125 =3D 0x4500, Q_NUM_CTRL_8125 =3D 0x4800, EEE_TXIDLE_TIMER_8125 =3D 0x6048, + IMR_CLEAR_VEC_MAP_REG =3D 0x0d00, + ISR_VEC_MAP_REG =3D 0x0d04, + IMR_SET_VEC_MAP_REG =3D 0x0d0c, }; =20 +#define MSIX_ID_VEC_MAP_LINKCHG 29 #define LEDSEL_MASK_8125 0x23f =20 #define RX_VLAN_INNER_8125 BIT(22) @@ -588,6 +593,9 @@ enum rtl_register_content { =20 /* magic enable v2 */ MagicPacket_v2 =3D (1 << 16), /* Wake up when receives a Magic Packet */ +#define ISRIMR_LINKCHG BIT(29) +#define ISRIMR_TOK_Q0 BIT(8) +#define ISRIMR_ROK_Q0 BIT(0) }; =20 enum rtl_desc_bit { @@ -1670,26 +1678,38 @@ static u32 rtl_get_events(struct rtl8169_private *t= p) =20 static void rtl_ack_events(struct rtl8169_private *tp, u32 bits) { - if (rtl_is_8125(tp)) - RTL_W32(tp, IntrStatus_8125, bits); - else + if (rtl_is_8125(tp)) { + if (tp->irq_nvecs > 1) + RTL_W32(tp, ISR_VEC_MAP_REG, bits); + else + RTL_W32(tp, IntrStatus_8125, bits); + } else { RTL_W16(tp, IntrStatus, bits); + } } =20 static void rtl_irq_disable(struct rtl8169_private *tp) { - if (rtl_is_8125(tp)) - RTL_W32(tp, IntrMask_8125, 0); - else + if (rtl_is_8125(tp)) { + if (tp->irq_nvecs > 1) + RTL_W32(tp, IMR_CLEAR_VEC_MAP_REG, 0xffffffff); + else + RTL_W32(tp, IntrMask_8125, 0); + } else { RTL_W16(tp, IntrMask, 0); + } } =20 static void rtl_irq_enable(struct rtl8169_private *tp) { - if (rtl_is_8125(tp)) - RTL_W32(tp, IntrMask_8125, tp->irq_mask); - else + if (rtl_is_8125(tp)) { + if (tp->irq_nvecs > 1) + RTL_W32(tp, IMR_SET_VEC_MAP_REG, tp->irq_mask); + else + RTL_W32(tp, IntrMask_8125, tp->irq_mask); + } else { RTL_W16(tp, IntrMask, tp->irq_mask); + } } =20 static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp) @@ -4844,8 +4864,8 @@ static void rtl8169_pcierr_interrupt(struct net_devic= e *dev) rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } =20 -static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, - int budget) +static int rtl_tx(struct net_device *dev, struct rtl8169_private *tp, + int budget) { unsigned int dirty_tx, bytes_compl =3D 0, pkts_compl =3D 0; struct sk_buff *skb; @@ -4889,6 +4909,8 @@ static void rtl_tx(struct net_device *dev, struct rtl= 8169_private *tp, if (READ_ONCE(tp->cur_tx) !=3D dirty_tx && skb) rtl8169_doorbell(tp); } + + return pkts_compl; } =20 static inline int rtl8169_fragmented_frame(u32 status) @@ -5043,6 +5065,44 @@ static void rtl8169_free_irq(struct rtl8169_private = *tp) } } =20 +static void rtl8169_disable_hw_interrupt_msix(struct rtl8169_private *tp, = int message_id) +{ + RTL_W32(tp, IMR_CLEAR_VEC_MAP_REG, BIT(message_id)); +} + +static void rtl8169_clear_hw_isr(struct rtl8169_private *tp, int message_i= d) +{ + RTL_W32(tp, ISR_VEC_MAP_REG, BIT(message_id)); +} + +static void rtl8169_enable_hw_interrupt_msix(struct rtl8169_private *tp, i= nt message_id) +{ + RTL_W32(tp, IMR_SET_VEC_MAP_REG, BIT(message_id)); +} + +static irqreturn_t rtl8169_interrupt_msix(int irq, void *dev_instance) +{ + struct napi_struct *napi =3D dev_instance; + struct net_device *dev =3D napi->dev; + int message_id =3D napi->index; + struct rtl8169_private *tp; + + tp =3D netdev_priv(dev); + + if (message_id =3D=3D MSIX_ID_VEC_MAP_LINKCHG) { + rtl8169_clear_hw_isr(tp, message_id); + phy_mac_interrupt(tp->phydev); + return IRQ_HANDLED; + } + + rtl8169_disable_hw_interrupt_msix(tp, message_id); + rtl8169_clear_hw_isr(tp, message_id); + + napi_schedule(napi); + + return IRQ_HANDLED; +} + static int rtl8169_request_irq(struct rtl8169_private *tp) { struct net_device *dev =3D tp->dev; @@ -5051,8 +5111,12 @@ static int rtl8169_request_irq(struct rtl8169_privat= e *tp) =20 for (i =3D 0; i < tp->irq_nvecs; i++) { napi =3D &tp->rtl8169_napi[i]; - rc =3D pci_request_irq(tp->pci_dev, i, rtl8169_interrupt, - NULL, napi, "%s-%d", dev->name, i); + if (tp->irq_nvecs > 1) + rc =3D pci_request_irq(tp->pci_dev, i, rtl8169_interrupt_msix, + NULL, napi, "%s-%d", dev->name, i); + else + rc =3D pci_request_irq(tp->pci_dev, i, rtl8169_interrupt, + NULL, napi, "%s-%d", dev->name, i); if (rc) goto free_irq; } @@ -5101,8 +5165,9 @@ static int rtl8169_poll(struct napi_struct *napi, int= budget) struct rtl8169_private *tp =3D netdev_priv(napi->dev); struct net_device *dev =3D napi->dev; int work_done =3D 0; + int tx_done; =20 - rtl_tx(dev, tp, budget); + tx_done =3D rtl_tx(dev, tp, budget); =20 /* rtl8169_poll() is used only when there is a single RX ring. */ work_done =3D rtl_rx(dev, tp, &tp->rx_ring[0], budget, napi); @@ -5511,10 +5576,16 @@ static const struct net_device_ops rtl_netdev_ops = =3D { =20 static void rtl_set_irq_mask(struct rtl8169_private *tp) { - tp->irq_mask =3D RxOK | RxErr | TxOK | TxErr | LinkChg; + if (tp->irq_nvecs > 1) { + tp->irq_mask =3D ISRIMR_LINKCHG | ISRIMR_TOK_Q0; + for (int i =3D 0; i < tp->num_rx_rings; i++) + tp->irq_mask |=3D ISRIMR_ROK_Q0 << i; + } else { + tp->irq_mask =3D RxOK | RxErr | TxOK | TxErr | LinkChg; =20 - if (tp->mac_version <=3D RTL_GIGA_MAC_VER_06) - tp->irq_mask |=3D SYSErr | RxFIFOOver; + if (tp->mac_version <=3D RTL_GIGA_MAC_VER_06) + tp->irq_mask |=3D SYSErr | RxFIFOOver; + } } =20 static int rtl_alloc_irq(struct rtl8169_private *tp) @@ -5799,10 +5870,74 @@ static bool rtl_aspm_is_safe(struct rtl8169_private= *tp) return false; } =20 +static int rtl8169_poll_msix_rx(struct napi_struct *napi, int budget) +{ + struct net_device *dev =3D napi->dev; + const int message_id =3D napi->index; + struct rtl8169_private *tp; + int work_done =3D 0; + + tp =3D netdev_priv(dev); + + if (message_id < tp->num_rx_rings) + work_done +=3D rtl_rx(dev, tp, &tp->rx_ring[message_id], budget, napi); + + if (work_done < budget && napi_complete_done(napi, work_done)) + rtl8169_enable_hw_interrupt_msix(tp, message_id); + + return work_done; +} + +static int rtl8169_poll_msix_tx(struct napi_struct *napi, int budget) +{ + struct net_device *dev =3D napi->dev; + struct rtl8169_private *tp; + unsigned int work_done; + + tp =3D netdev_priv(dev); + + work_done =3D rtl_tx(dev, tp, budget); + + if (napi_complete_done(napi, work_done)) + rtl8169_enable_hw_interrupt_msix(tp, napi->index); + + return 0; +} + +static int rtl8169_poll_msix_other(struct napi_struct *napi, int budget) +{ + struct net_device *dev =3D napi->dev; + struct rtl8169_private *tp; + + tp =3D netdev_priv(dev); + + if (napi_complete_done(napi, 0)) + rtl8169_enable_hw_interrupt_msix(tp, napi->index); + + return 0; +} + +/* RTL8127 MSI-X vector layout: + * Vectors 0 .. (RxQs - 1) : Rx Queues + * Vectors RxQs .. (RxQs + TxQs - 1) : Tx Queues + * Vector (RxQs + TxQs) and up : Other events (Link status(29), etc.) + */ static void r8169_init_napi(struct rtl8169_private *tp) { - for (int i =3D 0; i < tp->irq_nvecs; i++) - netif_napi_add(tp->dev, &tp->rtl8169_napi[i], rtl8169_poll); + for (int i =3D 0; i < tp->irq_nvecs; i++) { + int (*poll_fn)(struct napi_struct *, int) =3D rtl8169_poll; + + if (tp->irq_nvecs > 1) { + if (i < R8127_MAX_RX_QUEUES) + poll_fn =3D rtl8169_poll_msix_rx; + else if (i < R8127_MAX_RX_QUEUES + R8127_MAX_TX_QUEUES) + poll_fn =3D rtl8169_poll_msix_tx; + else + poll_fn =3D rtl8169_poll_msix_other; + } + netif_napi_add(tp->dev, &tp->rtl8169_napi[i], poll_fn); + tp->rtl8169_napi[i].index =3D i; + } } =20 static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *= ent) --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 295EC3D6CDB; Thu, 4 Jun 2026 10:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568883; cv=none; b=cdvGczgE7Zp+aUbqTpQSvB0FBy+f6QSowkSNXGsxLCJ/wsdMSPngjU0p/8goML6+j2EHcfHS9aVgN8TQqaKdklOVSDnRtMISqv1w/poWzvfTEV17dDoBbQYA4ndUmoi35uoZUT6kMgTJF/ECpV8hmWK0HEJxdfWWc6SFwTwbpnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568883; c=relaxed/simple; bh=rYAw6159oheg+nH4cGJcK95R4/mkk/NYBHiCSKTnBCU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MMIZLxV4J7Xjuw6wTx/GyP2c0Wt3OfsmhKE2KjMYBx11OLuQvq07UH+EPqKQF0Pbvn+Z0KLGejbPiofmnjizH6d3I8Nib4IBjwLfSmziPp5rasZ1SmjsHFVUmBmxgP5IQceWgkfBxBbfrVViBu9quymhxhoXTFLbd6IFqP1P9nM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=EsBIjOmb; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="EsBIjOmb" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARa622272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568856; bh=x1nFGHu126pSqs43OEXyxZh3Xes1NWcDX9fIgTGuIow=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=EsBIjOmb94kwtPc6kkjlI6DxOQ1g4IZfH/+Dk5ZUH/2Nduy+WaH1hZ6aYEDq70ye3 PEzy0J7dHVGZ/SZze8k5UoGB34ykuV3HfEocFVuQQois7dCpj4mU0U6IVt5Doy7aaQ SXiTrYFUYMKdo+5REKyES7OdfCUwAnjpg8ztGdWS+4fDS8iRk9JGLNwAubGJnLU3m9 DW9g91Ku65Nh6WsQcSnxBAJpkUA+mBUO3CEGIcpncGD/gk5VGI9kvwfdUkEBNTAcVv FqkD7MdL3crBXz307nt5JfDKuMDjfKqCKZogJBWqiHKWhM3sfCdigPZHEhEvEis7m+ dmV7FQK/wzTuA== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARa622272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:36 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:36 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:36 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 4/7] r8169: enable new interrupt mapping Date: Thu, 4 Jun 2026 18:27:30 +0800 Message-ID: <20260604102733.1582-5-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu This patch enables new interrupt mapping for RTL8127. Signed-off-by: Javen Xu --- Changes in v2: - no changes Changes in v3: - no changes Changes in v4: - no changes Changes in v5: - no changes Changes in v6: - no changes Changes in v7: - no changes --- drivers/net/ethernet/realtek/r8169_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index a416d482aa86..44dfdd3d4d75 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3945,6 +3945,15 @@ DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond) return r8168_mac_ocp_read(tp, 0xe00e) & BIT(13); } =20 +static void rtl8169_hw_enable_vec_mapping(struct rtl8169_private *tp) +{ + u8 tmp; + + tmp =3D RTL_R8(tp, INT_CFG0_8125); + tmp |=3D INT_CFG0_ENABLE_8125; + RTL_W8(tp, INT_CFG0_8125, tmp); +} + static void rtl_hw_start_8125_common(struct rtl8169_private *tp) { rtl_pcie_state_l2l3_disable(tp); @@ -3953,6 +3962,9 @@ static void rtl_hw_start_8125_common(struct rtl8169_p= rivate *tp) RTL_W32(tp, RSS_CTRL_8125, 0); RTL_W16(tp, Q_NUM_CTRL_8125, 0); =20 + if (tp->irq_nvecs > 1) + rtl8169_hw_enable_vec_mapping(tp); + /* disable UPS */ r8168_mac_ocp_modify(tp, 0xd40a, 0x0010, 0x0000); =20 --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68972393DF9; Thu, 4 Jun 2026 10:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568886; cv=none; b=TD8SMJ6exsappBVGfu/87YCKJvSNLPmZ4OaA8knxODedBD5z+a9Na3JmilqD+C3mRC0jGc7xL1EG5xWiqrWeOZipz20GloHBOdr67nslhiWi2kYCyvOahOTjn64bFeg4K2nsXk7x23+wSZW6RGYc2PKQFpfn2NU5EYjFjYC2NuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568886; c=relaxed/simple; bh=bSmtbg4LGtTIIkFj94DfjM6q+RDRtweCz5FjddWabSQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EOQobinrvWLgVIr15nsJXw7Tc4uWaMG3nnXysdZEm+Kj9AdyYGcNu0vraolZZENs31BQSY4YPz5L3Eu48ZQRB1m1izHhfwWX02SNmUj37FOZQ+r1qOC7UUcFy0YXbDLCBBe0bsR4RwdKHjC+QvkmrLPDYEPGEs80zv9BhLqt7ZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=p6DT1ujv; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="p6DT1ujv" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARa632272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568856; bh=fhywwdM1gxxRwTVTRyRCixkHlCeKM7tDqo/wJtezIPo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=p6DT1ujvoW6D9oSKGRB97Z+arW6L1yEMq4lCWMo5HJNsD4aFi95w+iIyM+I84rIwQ EBzsSIPCTcmIphfBRTR++E3VaoNIYoLmaUroMbHrjGHC5ahvVaHkRjBhu2Gqc0rrQs IYvakD92k7KpflDGGWxZmXrU94O5th336LSKPJiOaLAHVN1GN/tF+vKpP+Xq4nDqMc b7pxHqOBOef9KkpQDMfpFkKr3FXUHrYFORmKJ8PTh6eaXWRohWp1xab9mxwn2HST3S NuiUpjfl+krd4bFWvlg/dPlFn55h2f8De4lLiW2TBXbxEMdaUyrQ/UdoQnooGIbmO7 6iw4AVkvIm9og== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARa632272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:36 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:36 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:36 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 5/7] r8169: add support and enable rss Date: Thu, 4 Jun 2026 18:27:31 +0800 Message-ID: <20260604102733.1582-6-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu This patch adds support and enable rss for RTL8127. Signed-off-by: Javen Xu --- Changes in v2: - some changes moved from Patch 2/7 Changes in v3: - add struct rtl8169_rss_data. Allocate it dynamically when needed. - define rss_key as an u32 array - replace some magic bit numbers in rtl8169_set_rss_hash_opt() and rtl8125_set_rx_q_num() - use union to combine different rx descriptor, refactor struct RxDesc - remove dead code from rtl8169_double_check_rss_support() Changes in v4: - rename macro definition, e.g R8127_MAX_IRQ to R8127_MAX_NUM_IRQVEC - change hw_supp_indir_tbl_entries type to unsigned int - change init_rx_desc_type type to enum - remove rtl_check_rss_support(), add helper function rtl_hw_support_rss() - remove hw_curr_isr_ver, use irq_nvecs to judge whether we should enable vector interrupt mapping, use tp->num_rx_ring to judge whether we should enable rss - remove function rtl8169_double_check_rss_support(), use rtl8169_set_rx_ring_num() to set num_rx_ring according to tp->irq_nvecs Changes in v5: - no changes Changes in v6: - change rss_queue_num type from u8 to unsigned int - fix rx desc clear in rtl8169_rx_clear() for different desc type - clamping num_rx_ring with rounddown_pow_of_two() Changes in v7: - remove unused macro - change unfixed type in rtl8169_store_reta --- drivers/net/ethernet/realtek/r8169_main.c | 389 ++++++++++++++++++++-- 1 file changed, 353 insertions(+), 36 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index 44dfdd3d4d75..d94da4919672 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -89,6 +89,19 @@ #define R8127_MAX_TX_QUEUES 8 #define R8169_DEFAULT_RX_QUEUES 1 #define R8169_MAX_TX_QUEUES 1 +#define R8127_MAX_NUM_IRQVEC 32 +#define R8127_MIN_NUM_IRQVEC 30 +#define R8169_IRQ_DEFAULT 1 +#define RTL_RSS_KEY_SIZE 40 +#define RSS_CPU_NUM_MASK GENMASK(18, 16) +#define RSS_HASH_MASK GENMASK(10, 8) +#define RTL_MAX_INDIRECTION_TABLE_ENTRIES 128 +#define RXS_RSS_UDP BIT(27) +#define RXS_RSS_IPV4 BIT(28) +#define RXS_RSS_IPV6 BIT(29) +#define RXS_RSS_TCP BIT(30) +#define RXS_RSS_L3_TYPE_MASK (RXS_RSS_IPV4 | RXS_RSS_IPV6) +#define RXS_RSS_L4_TYPE_MASK (RXS_RSS_TCP | RXS_RSS_UDP) =20 #define OCP_STD_PHY_BASE 0xa400 =20 @@ -596,6 +609,20 @@ enum rtl_register_content { #define ISRIMR_LINKCHG BIT(29) #define ISRIMR_TOK_Q0 BIT(8) #define ISRIMR_ROK_Q0 BIT(0) +#define RTL_DESC_TYPE_CTRL 0xd8 +#define RSS_KEY_REG 0x4600 +#define RSS_INDIRECTION_TBL_REG 0x4700 +#define RSS_CTRL_TCP_IPV4_SUPP BIT(0) +#define RTL_DESC_TYPE_RSS BIT(1) +#define RSS_CTRL_IPV4_SUPP BIT(1) +#define RSS_CTRL_TCP_IPV6_SUPP BIT(2) +#define RSS_CTRL_IPV6_SUPP BIT(3) +#define RSS_CTRL_IPV6_EXT_SUPP BIT(4) +#define RSS_CTRL_TCP_IPV6_EXT_SUPP BIT(5) +#define RX_RES_RSS BIT(22) +#define RX_RUNT_RSS BIT(21) +#define RX_CRC_RSS BIT(20) +#define RTL_RX_Q_NUM_MASK GENMASK(4, 2) }; =20 enum rtl_desc_bit { @@ -653,6 +680,11 @@ enum rtl_rx_desc_bit { #define RxProtoIP (PID1 | PID0) #define RxProtoMask RxProtoIP =20 +#define RX_UDPT_DESC_RSS BIT(19) +#define RX_TCPT_DESC_RSS BIT(18) +#define RX_UDPF_DESC_RSS BIT(16) /* UDP/IP checksum failed */ +#define RX_TCPF_DESC_RSS BIT(15) /* TCP/IP checksum failed */ + IPFail =3D (1 << 16), /* IP checksum failed */ UDPFail =3D (1 << 15), /* UDP/IP checksum failed */ TCPFail =3D (1 << 14), /* TCP/IP checksum failed */ @@ -674,9 +706,27 @@ struct TxDesc { }; =20 struct RxDesc { - __le32 opts1; - __le32 opts2; - __le64 addr; + union { + /* RX_DESC_TYPE_DEFAULT */ + struct { + __le32 opts1; + __le32 opts2; + __le64 addr; + }; + + /* RX_DESC_TYPE_RSS */ + struct { + union { + __le64 rss_addr; + struct { + __le32 rss_info; + __le32 rss_result; + } rss_dword; + }; + __le32 rss_opts2; + __le32 rss_opts1; + }; + }; }; =20 struct ring_info { @@ -748,9 +798,9 @@ enum rtl_dash_type { RTL_DASH_25_BP, }; =20 -enum rx_desc_ring_type { - RX_DESC_RING_TYPE_DEFAULT, - RX_DESC_RING_TYPE_RSS, +enum rx_desc_type { + RX_DESC_TYPE_DEFAULT, + RX_DESC_TYPE_RSS, }; =20 struct rtl8169_rx_ring { @@ -763,6 +813,12 @@ struct rtl8169_rx_ring { struct page *rx_databuff[NUM_RX_DESC]; /* Rx data buffers */ }; =20 +struct rtl8169_rss_data { + u32 rss_key[RTL_RSS_KEY_SIZE / sizeof(u32)]; + u8 rss_indir_tbl[RTL_MAX_INDIRECTION_TABLE_ENTRIES]; + unsigned int hw_supp_indir_tbl_entries; +}; + struct rtl8169_private { void __iomem *mmio_addr; /* memory map physical address */ struct pci_dev *pci_dev; @@ -782,7 +838,9 @@ struct rtl8169_private { u16 tx_lpi_timer; u32 irq_mask; unsigned int hw_supp_num_rx_queues; + struct rtl8169_rss_data *rss_data; unsigned int irq_nvecs; + enum rx_desc_type init_rx_desc_type; struct clk *clk; =20 struct { @@ -1612,6 +1670,11 @@ static bool rtl_dash_is_enabled(struct rtl8169_priva= te *tp) } } =20 +static bool rtl_hw_support_rss(struct rtl8169_private *tp) +{ + return tp->mac_version =3D=3D RTL_GIGA_MAC_VER_80; +} + static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp) { switch (tp->mac_version) { @@ -1913,9 +1976,20 @@ static inline u32 rtl8169_tx_vlan_tag(struct sk_buff= *skb) TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00; } =20 -static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb) +static void rtl8169_rx_vlan_tag(struct rtl8169_private *tp, + struct RxDesc *desc, + struct sk_buff *skb) { - u32 opts2 =3D le32_to_cpu(desc->opts2); + u32 opts2; + + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + opts2 =3D le32_to_cpu(desc->rss_opts2); + break; + default: + opts2 =3D le32_to_cpu(desc->opts2); + break; + } =20 if (opts2 & RxVlanTag) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff)); @@ -2744,17 +2818,27 @@ static void rtl_hw_reset(struct rtl8169_private *tp) rtl_loop_wait_low(tp, &rtl_chipcmd_cond, 100, 100); } =20 +static void rtl8169_init_rss(struct rtl8169_private *tp) +{ + for (int i =3D 0; i < tp->rss_data->hw_supp_indir_tbl_entries; i++) + tp->rss_data->rss_indir_tbl[i] =3D ethtool_rxfh_indir_default(i, tp->num= _rx_rings); + + netdev_rss_key_fill(tp->rss_data->rss_key, RTL_RSS_KEY_SIZE); +} + static void rtl_setup_rx_params(struct rtl8169_private *tp) { tp->num_rx_rings =3D 1; switch (tp->mac_version) { case RTL_GIGA_MAC_VER_80: tp->hw_supp_num_rx_queues =3D R8127_MAX_RX_QUEUES; + tp->rss_data->hw_supp_indir_tbl_entries =3D RTL_MAX_INDIRECTION_TABLE_EN= TRIES; break; default: tp->hw_supp_num_rx_queues =3D R8169_DEFAULT_RX_QUEUES; break; } + tp->init_rx_desc_type =3D RX_DESC_TYPE_DEFAULT; } =20 static void rtl_request_firmware(struct rtl8169_private *tp) @@ -2879,6 +2963,59 @@ static void rtl_set_rx_max_size(struct rtl8169_priva= te *tp) RTL_W16(tp, RxMaxSize, R8169_RX_BUF_SIZE + 1); } =20 +static void rtl8169_store_rss_key(struct rtl8169_private *tp) +{ + u32 num_entries =3D RTL_RSS_KEY_SIZE / sizeof(u32); + u32 *rss_key =3D tp->rss_data->rss_key; + const u16 rss_key_reg =3D RSS_KEY_REG; + + /* Write redirection table to HW */ + for (int i =3D 0; i < num_entries; i++) + RTL_W32(tp, rss_key_reg + (i * 4), rss_key[i]); +} + +static void rtl8169_store_reta(struct rtl8169_private *tp) +{ + u8 *indir_tbl =3D tp->rss_data->rss_indir_tbl; + unsigned int i; + + /* Write redirection table to HW */ + for (i =3D 0; i < tp->rss_data->hw_supp_indir_tbl_entries; i +=3D 4) { + u32 reta =3D (u32)indir_tbl[i] | + (u32)indir_tbl[i + 1] << 8 | + (u32)indir_tbl[i + 2] << 16 | + (u32)indir_tbl[i + 3] << 24; + RTL_W32(tp, RSS_INDIRECTION_TBL_REG + i, reta); + } +} + +static void rtl8169_set_rss_hash_opt(struct rtl8169_private *tp) +{ + u32 rss_ctrl; + + rss_ctrl =3D FIELD_PREP(RSS_CPU_NUM_MASK, ilog2(tp->num_rx_rings)); + + /* Perform hash on these packet types */ + rss_ctrl |=3D RSS_CTRL_TCP_IPV4_SUPP + | RSS_CTRL_IPV4_SUPP + | RSS_CTRL_IPV6_SUPP + | RSS_CTRL_IPV6_EXT_SUPP + | RSS_CTRL_TCP_IPV6_SUPP + | RSS_CTRL_TCP_IPV6_EXT_SUPP; + + rss_ctrl |=3D FIELD_PREP(RSS_HASH_MASK, + ilog2(tp->rss_data->hw_supp_indir_tbl_entries)); + + RTL_W32(tp, RSS_CTRL_8125, rss_ctrl); +} + +static void rtl_set_rss_config(struct rtl8169_private *tp) +{ + rtl8169_set_rss_hash_opt(tp); + rtl8169_store_reta(tp); + rtl8169_store_rss_key(tp); +} + static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp) { struct rtl8169_rx_ring *ring =3D &tp->rx_ring[0]; @@ -3945,6 +4082,18 @@ DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond) return r8168_mac_ocp_read(tp, 0xe00e) & BIT(13); } =20 +static void rtl8125_set_rx_q_num(struct rtl8169_private *tp) +{ + u16 rx_q_num; + u16 q_ctrl; + + rx_q_num =3D ilog2(tp->num_rx_rings); + q_ctrl =3D RTL_R16(tp, Q_NUM_CTRL_8125); + q_ctrl &=3D ~RTL_RX_Q_NUM_MASK; + q_ctrl |=3D FIELD_PREP(RTL_RX_Q_NUM_MASK, rx_q_num); + RTL_W16(tp, Q_NUM_CTRL_8125, q_ctrl); +} + static void rtl8169_hw_enable_vec_mapping(struct rtl8169_private *tp) { u8 tmp; @@ -3984,6 +4133,13 @@ static void rtl_hw_start_8125_common(struct rtl8169_= private *tp) tp->mac_version =3D=3D RTL_GIGA_MAC_VER_80) RTL_W8(tp, 0xD8, RTL_R8(tp, 0xD8) & ~0x02); =20 + /* enable rx descriptor type v4 and set queue num for rss*/ + if (tp->num_rx_rings > 1) { + rtl8125_set_rx_q_num(tp); + RTL_W8(tp, RTL_DESC_TYPE_CTRL, + RTL_R8(tp, RTL_DESC_TYPE_CTRL) | RTL_DESC_TYPE_RSS); + } + if (tp->mac_version =3D=3D RTL_GIGA_MAC_VER_80) r8168_mac_ocp_modify(tp, 0xe614, 0x0f00, 0x0f00); else if (tp->mac_version =3D=3D RTL_GIGA_MAC_VER_70) @@ -4220,6 +4376,12 @@ static void rtl_hw_start(struct rtl8169_private *tp) rtl_hw_aspm_clkreq_enable(tp, true); rtl_set_rx_max_size(tp); rtl_set_rx_tx_desc_registers(tp); + if (rtl_is_8125(tp)) { + if (tp->num_rx_rings > 1) + rtl_set_rss_config(tp); + else + RTL_W32(tp, RSS_CTRL_8125, 0x00); + } rtl_lock_config_regs(tp); =20 rtl_jumbo_config(tp); @@ -4247,14 +4409,26 @@ static int rtl8169_change_mtu(struct net_device *de= v, int new_mtu) return 0; } =20 -static void rtl8169_mark_to_asic(struct RxDesc *desc) +static void rtl8169_mark_to_asic(struct rtl8169_private *tp, struct RxDesc= *desc) { - u32 eor =3D le32_to_cpu(desc->opts1) & RingEnd; + u32 eor; =20 - desc->opts2 =3D 0; - /* Force memory writes to complete before releasing descriptor */ - dma_wmb(); - WRITE_ONCE(desc->opts1, cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE)); + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + eor =3D le32_to_cpu(desc->rss_opts1) & RingEnd; + desc->rss_opts2 =3D cpu_to_le32(0); + /* Force memory writes to complete before releasing descriptor */ + dma_wmb(); + WRITE_ONCE(desc->rss_opts1, cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZ= E)); + break; + default: + eor =3D le32_to_cpu(desc->opts1) & RingEnd; + desc->opts2 =3D cpu_to_le32(0); + /* Force memory writes to complete before releasing descriptor */ + dma_wmb(); + WRITE_ONCE(desc->opts1, cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE)); + break; + } } =20 static struct page *rtl8169_alloc_rx_data(struct rtl8169_private *tp, @@ -4277,9 +4451,12 @@ static struct page *rtl8169_alloc_rx_data(struct rtl= 8169_private *tp, return NULL; } =20 - desc->addr =3D cpu_to_le64(mapping); ring->rx_desc_phy_addr[index] =3D mapping; - rtl8169_mark_to_asic(desc); + if (tp->init_rx_desc_type =3D=3D RX_DESC_TYPE_RSS) + desc->rss_addr =3D cpu_to_le64(mapping); + else + desc->addr =3D cpu_to_le64(mapping); + rtl8169_mark_to_asic(tp, desc); =20 return data; } @@ -4295,8 +4472,25 @@ static void rtl8169_rx_clear(struct rtl8169_private = *tp, struct rtl8169_rx_ring __free_pages(ring->rx_databuff[i], get_order(R8169_RX_BUF_SIZE)); ring->rx_databuff[i] =3D NULL; ring->rx_desc_phy_addr[i] =3D 0; - ring->rx_desc_array[i].addr =3D 0; - ring->rx_desc_array[i].opts1 =3D 0; + if (tp->init_rx_desc_type =3D=3D RX_DESC_TYPE_RSS) { + ring->rx_desc_array[i].rss_addr =3D 0; + ring->rx_desc_array[i].rss_opts1 =3D 0; + } else { + ring->rx_desc_array[i].addr =3D 0; + ring->rx_desc_array[i].opts1 =3D 0; + } + } +} + +static void rtl8169_mark_as_last_descriptor(struct rtl8169_private *tp, st= ruct RxDesc *desc) +{ + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + desc->rss_opts1 |=3D cpu_to_le32(RingEnd); + break; + default: + desc->opts1 |=3D cpu_to_le32(RingEnd); + break; } } =20 @@ -4316,7 +4510,7 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp= , struct rtl8169_rx_ring *r } =20 /* mark as last descriptor in the ring */ - ring->rx_desc_array[NUM_RX_DESC - 1].opts1 |=3D cpu_to_le32(RingEnd); + rtl8169_mark_as_last_descriptor(tp, &ring->rx_desc_array[NUM_RX_DESC - 1]= ); =20 return 0; } @@ -4472,7 +4666,7 @@ static void rtl8169_rx_desc_reset(struct rtl8169_priv= ate *tp) struct rtl8169_rx_ring *ring =3D &tp->rx_ring[i]; =20 for (int j =3D 0; j < NUM_RX_DESC; j++) - rtl8169_mark_to_asic(ring->rx_desc_array + j); + rtl8169_mark_to_asic(tp, ring->rx_desc_array + j); } } =20 @@ -4930,31 +5124,106 @@ static inline int rtl8169_fragmented_frame(u32 sta= tus) return (status & (FirstFrag | LastFrag)) !=3D (FirstFrag | LastFrag); } =20 -static inline void rtl8169_rx_csum(struct sk_buff *skb, +static inline void rtl8169_rx_hash(struct rtl8169_private *tp, + struct RxDesc *desc, + struct sk_buff *skb) +{ + u32 rss_header_info; + u32 hash_val; + + if (!(tp->dev->features & NETIF_F_RXHASH)) + return; + + rss_header_info =3D le32_to_cpu(desc->rss_dword.rss_info); + + if (!(rss_header_info & RXS_RSS_L3_TYPE_MASK)) + return; + + hash_val =3D le32_to_cpu(desc->rss_dword.rss_result); + + skb_set_hash(skb, hash_val, + (RXS_RSS_L4_TYPE_MASK & rss_header_info) ? + PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3); +} + +static inline void rtl8169_rx_csum(struct rtl8169_private *tp, + struct sk_buff *skb, struct RxDesc *desc) { - u32 status =3D le32_to_cpu(desc->opts1) & (RxProtoMask | RxCSFailMask); + bool csum_ok =3D false; + u32 opts1; =20 - if (status =3D=3D RxProtoTCP || status =3D=3D RxProtoUDP) + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + opts1 =3D le32_to_cpu(desc->rss_opts1); + if (((opts1 & RX_TCPT_DESC_RSS) && !(opts1 & RX_TCPF_DESC_RSS)) || + ((opts1 & RX_UDPT_DESC_RSS) && !(opts1 & RX_UDPF_DESC_RSS))) + csum_ok =3D true; + break; + default: + opts1 =3D le32_to_cpu(desc->opts1) & (RxProtoMask | RxCSFailMask); + if (opts1 =3D=3D RxProtoTCP || opts1 =3D=3D RxProtoUDP) + csum_ok =3D true; + break; + } + + if (csum_ok) skb->ip_summed =3D CHECKSUM_UNNECESSARY; else skb_checksum_none_assert(skb); } =20 +static __le32 rtl8169_rx_desc_opts1(struct rtl8169_private *tp, struct RxD= esc *desc) +{ + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + return READ_ONCE(desc->rss_opts1); + default: + return READ_ONCE(desc->opts1); + } +} + static bool rtl8169_check_rx_desc_error(struct net_device *dev, struct rtl8169_private *tp, u32 status) { - if (unlikely(status & RxRES)) { - if (status & (RxRWT | RxRUNT)) - dev->stats.rx_length_errors++; - if (status & RxCRC) - dev->stats.rx_crc_errors++; - return true; + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + if (unlikely(status & RX_RES_RSS)) { + if (status & RX_RUNT_RSS) + dev->stats.rx_length_errors++; + if (status & RX_CRC_RSS) + dev->stats.rx_crc_errors++; + return true; + } + break; + default: + if (unlikely(status & RxRES)) { + if (status & (RxRWT | RxRUNT)) + dev->stats.rx_length_errors++; + if (status & RxCRC) + dev->stats.rx_crc_errors++; + return true; + } + break; } return false; } =20 +static void rtl8169_set_desc_dma_addr(struct rtl8169_private *tp, + struct RxDesc *desc, + dma_addr_t mapping) +{ + switch (tp->init_rx_desc_type) { + case RX_DESC_TYPE_RSS: + desc->rss_addr =3D cpu_to_le64(mapping); + break; + default: + desc->addr =3D cpu_to_le64(mapping); + break; + } +} + static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, struct rtl8169_rx_ring *ring, int budget, struct napi_struct *napi) { @@ -4969,7 +5238,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, dma_addr_t addr; u32 status; =20 - status =3D le32_to_cpu(READ_ONCE(desc->opts1)); + status =3D le32_to_cpu(rtl8169_rx_desc_opts1(tp, desc)); if (status & DescOwn) break; =20 @@ -4987,7 +5256,8 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, =20 if (!(dev->features & NETIF_F_RXALL)) goto release_descriptor; - else if (status & RxRWT || !(status & (RxRUNT | RxCRC))) + if ((status & RxRWT || !(status & (RxRUNT | RxCRC))) && + tp->init_rx_desc_type =3D=3D RX_DESC_TYPE_DEFAULT) goto release_descriptor; } =20 @@ -5019,11 +5289,12 @@ static int rtl_rx(struct net_device *dev, struct rt= l8169_private *tp, skb->tail +=3D pkt_size; skb->len =3D pkt_size; dma_sync_single_for_device(d, addr, pkt_size, DMA_FROM_DEVICE); - - rtl8169_rx_csum(skb, desc); + if (tp->num_rx_rings > 1) + rtl8169_rx_hash(tp, desc, skb); + rtl8169_rx_csum(tp, skb, desc); skb->protocol =3D eth_type_trans(skb, dev); =20 - rtl8169_rx_vlan_tag(desc, skb); + rtl8169_rx_vlan_tag(tp, desc, skb); =20 if (skb->pkt_type =3D=3D PACKET_MULTICAST) dev->stats.multicast++; @@ -5032,7 +5303,8 @@ static int rtl_rx(struct net_device *dev, struct rtl8= 169_private *tp, =20 dev_sw_netstats_rx_add(dev, pkt_size); release_descriptor: - rtl8169_mark_to_asic(desc); + rtl8169_set_desc_dma_addr(tp, desc, ring->rx_desc_phy_addr[entry]); + rtl8169_mark_to_asic(tp, desc); } =20 return count; @@ -5600,6 +5872,32 @@ static void rtl_set_irq_mask(struct rtl8169_private = *tp) } } =20 +static int get_max_irq_nvecs(struct rtl8169_private *tp) +{ + if (tp->mac_version =3D=3D RTL_GIGA_MAC_VER_80) + return R8127_MAX_NUM_IRQVEC; + return R8169_IRQ_DEFAULT; +} + +static int get_min_irq_nvecs(struct rtl8169_private *tp) +{ + if (tp->mac_version =3D=3D RTL_GIGA_MAC_VER_80) + return R8127_MIN_NUM_IRQVEC; + return R8169_IRQ_DEFAULT; +} + +static void rtl8169_set_rx_ring_num(struct rtl8169_private *tp) +{ + if (tp->irq_nvecs >=3D get_min_irq_nvecs(tp)) { + unsigned int rss_queue_num =3D netif_get_num_default_rss_queues(); + + tp->num_rx_rings =3D rounddown_pow_of_two(min(rss_queue_num, + tp->hw_supp_num_rx_queues)); + if (tp->num_rx_rings >=3D 2) + tp->init_rx_desc_type =3D RX_DESC_TYPE_RSS; + } +} + static int rtl_alloc_irq(struct rtl8169_private *tp) { struct pci_dev *pdev =3D tp->pci_dev; @@ -5620,7 +5918,10 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) break; } =20 - nvecs =3D pci_alloc_irq_vectors(pdev, 1, 1, flags); + nvecs =3D pci_alloc_irq_vectors(pdev, get_min_irq_nvecs(tp), get_max_irq_= nvecs(tp), flags); + + if (nvecs < 0) + nvecs =3D pci_alloc_irq_vectors(pdev, 1, 1, flags); =20 if (nvecs < 0) return nvecs; @@ -6045,6 +6346,12 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) tp->dash_type =3D rtl_get_dash_type(tp); tp->dash_enabled =3D rtl_dash_is_enabled(tp); =20 + if (rtl_hw_support_rss(tp)) { + tp->rss_data =3D devm_kzalloc(&pdev->dev, sizeof(*tp->rss_data), GFP_KER= NEL); + if (!tp->rss_data) + return -ENOMEM; + } + tp->cp_cmd =3D RTL_R16(tp, CPlusCmd) & CPCMD_MASK; =20 if (sizeof(dma_addr_t) > 4 && tp->mac_version >=3D RTL_GIGA_MAC_VER_18 && @@ -6065,6 +6372,11 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) if (rc < 0) return dev_err_probe(&pdev->dev, rc, "Can't allocate interrupt\n"); =20 + rtl8169_set_rx_ring_num(tp); + + if (rtl_hw_support_rss(tp)) + rtl8169_init_rss(tp); + INIT_WORK(&tp->wk.work, rtl_task); disable_work(&tp->wk.work); =20 @@ -6077,6 +6389,11 @@ static int rtl_init_one(struct pci_dev *pdev, const = struct pci_device_id *ent) dev->vlan_features =3D NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; dev->priv_flags |=3D IFF_LIVE_ADDR_CHANGE; =20 + if (rtl_hw_support_rss(tp) && tp->num_rx_rings > 1) { + dev->hw_features |=3D NETIF_F_RXHASH; + dev->features |=3D NETIF_F_RXHASH; + } + /* * Pretend we are using VLANs; This bypasses a nasty bug where * Interrupts stop flowing on high load on 8110SCd controllers. --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18C2C3D6CC4; Thu, 4 Jun 2026 10:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; cv=none; b=VOncEBToatSnwkMb/cf9ZAUrySpCWCtAeUEy9C8akgs+z9xdS3NDlDhc3TltfRB27Uivu/+L4NIMJj+MYrnu8FCL+V0fr0T4stmPvcWGFfsAXfoOo0KFqehVp+mbV7HskKEfN0kY7SrzeiTuEjSWsETpt+ntCwGb7sczzq2fDl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; c=relaxed/simple; bh=x5relM9bghS7MEHtzgw9+N1Qt80baA2DImaxwi+ayPI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YQ7vBY+bVfjTc/M06PZZ+cNX9cNy3ZPlwSImLJKGZicBO5/7/NA5cZe/ZndQYjkQb1JhWIMfMSStX2K3ToBDAIBR7jA7iC6CueNtg7CSQAsNHWvVVEZzV0XheIIJgbOr2vnrjz+WQNJOSCjZQueTDq2H9AxZNhV+TgGp4lVlIYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=enu+IJgP; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="enu+IJgP" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARa642272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568856; bh=bhP6PDzu4/zDu3xF3xPwT3hE4LnMqe3/Drt4X9oS8KY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=enu+IJgPSsGkc//+S1mo+MojgY16Sf5EtMOC6+Qr1N66RFguMTI+EUYooEiB54SI7 c5D4od8MIc29KQTlNRga6iDWMws3d/+a3uAE5t9vdiVP/8MC30V/+gt6zmA0wY7/cE fFOfRKmdVFkZ2ubM92i/osNE9ApTC2B2EZsrekBvRD/CSmGLLslN9GV0/ntXpcV/M6 rKT+vnTfp4gwDN+rZVMM2ljQidaqhb2BC2AAKIhOaQrS/C8o1y+2D6OrrG3t8t2tAy iUA5yZYS/GXJ9/ULNWEdSsFaUoCI97krIREXERyQqy+9jhvPvCXY2ZU8VvTXf9MtLm ftAoFx1AN4UIg== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARa642272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:36 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:36 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:36 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 6/7] r8169: move struct ethtool_ops Date: Thu, 4 Jun 2026 18:27:32 +0800 Message-ID: <20260604102733.1582-7-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu The patch moves the rtl8169_ethtool_ops definition further down in r8169_main.c so that subsequent additions of rtl8169_get_channels and rtl8169_set_channels can be referenced from the ops struct without needing forward declarations. Signed-off-by: Javen Xu --- Changes in v2: - no changes Changes in v3: - no changes Changes in v4: - no changes Changes in v5: - no changes Changes in v6: - modify commit message Changes in v7: - no changes --- drivers/net/ethernet/realtek/r8169_main.c | 56 +++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index d94da4919672..ceecf1a88739 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2536,34 +2536,6 @@ static int rtl8169_set_link_ksettings(struct net_dev= ice *ndev, return 0; } =20 -static const struct ethtool_ops rtl8169_ethtool_ops =3D { - .supported_coalesce_params =3D ETHTOOL_COALESCE_USECS | - ETHTOOL_COALESCE_MAX_FRAMES, - .get_drvinfo =3D rtl8169_get_drvinfo, - .get_regs_len =3D rtl8169_get_regs_len, - .get_link =3D ethtool_op_get_link, - .get_coalesce =3D rtl_get_coalesce, - .set_coalesce =3D rtl_set_coalesce, - .get_regs =3D rtl8169_get_regs, - .get_wol =3D rtl8169_get_wol, - .set_wol =3D rtl8169_set_wol, - .get_strings =3D rtl8169_get_strings, - .get_sset_count =3D rtl8169_get_sset_count, - .get_ethtool_stats =3D rtl8169_get_ethtool_stats, - .get_ts_info =3D ethtool_op_get_ts_info, - .nway_reset =3D phy_ethtool_nway_reset, - .get_eee =3D rtl8169_get_eee, - .set_eee =3D rtl8169_set_eee, - .get_link_ksettings =3D phy_ethtool_get_link_ksettings, - .set_link_ksettings =3D rtl8169_set_link_ksettings, - .get_ringparam =3D rtl8169_get_ringparam, - .get_pause_stats =3D rtl8169_get_pause_stats, - .get_pauseparam =3D rtl8169_get_pauseparam, - .set_pauseparam =3D rtl8169_set_pauseparam, - .get_eth_mac_stats =3D rtl8169_get_eth_mac_stats, - .get_eth_ctrl_stats =3D rtl8169_get_eth_ctrl_stats, -}; - static const struct rtl_chip_info *rtl8169_get_chip_version(u32 xid, bool = gmii) { /* Chips combining a 1Gbps MAC with a 100Mbps PHY */ @@ -6253,6 +6225,34 @@ static void r8169_init_napi(struct rtl8169_private *= tp) } } =20 +static const struct ethtool_ops rtl8169_ethtool_ops =3D { + .supported_coalesce_params =3D ETHTOOL_COALESCE_USECS | + ETHTOOL_COALESCE_MAX_FRAMES, + .get_drvinfo =3D rtl8169_get_drvinfo, + .get_regs_len =3D rtl8169_get_regs_len, + .get_link =3D ethtool_op_get_link, + .get_coalesce =3D rtl_get_coalesce, + .set_coalesce =3D rtl_set_coalesce, + .get_regs =3D rtl8169_get_regs, + .get_wol =3D rtl8169_get_wol, + .set_wol =3D rtl8169_set_wol, + .get_strings =3D rtl8169_get_strings, + .get_sset_count =3D rtl8169_get_sset_count, + .get_ethtool_stats =3D rtl8169_get_ethtool_stats, + .get_ts_info =3D ethtool_op_get_ts_info, + .nway_reset =3D phy_ethtool_nway_reset, + .get_eee =3D rtl8169_get_eee, + .set_eee =3D rtl8169_set_eee, + .get_link_ksettings =3D phy_ethtool_get_link_ksettings, + .set_link_ksettings =3D rtl8169_set_link_ksettings, + .get_ringparam =3D rtl8169_get_ringparam, + .get_pause_stats =3D rtl8169_get_pause_stats, + .get_pauseparam =3D rtl8169_get_pauseparam, + .set_pauseparam =3D rtl8169_set_pauseparam, + .get_eth_mac_stats =3D rtl8169_get_eth_mac_stats, + .get_eth_ctrl_stats =3D rtl8169_get_eth_ctrl_stats, +}; + static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *= ent) { const struct rtl_chip_info *chip; --=20 2.43.0 From nobody Mon Jun 8 09:51:25 2026 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 987723C343F; Thu, 4 Jun 2026 10:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; cv=none; b=ftd/hHJjQbVraaVpaU80y5fzXA9Q95MdYIP+X7sc9H3yb9lV2w+RKhfEtQHHfaIRFFZCjt+5ZLhWwMcSX7SQZ6r3qUUItZk+mP03iuPZkIhFC7c0w3sXm6+SPsczbyY3Ra18vZNyd+ZlCH3A7/q93lFEuR4N0BlPBCvdKcNKer8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568885; c=relaxed/simple; bh=0scIp1g6jFaZ5acwxQ9HF90x7/u6sNALHQ1o2PoyU6E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NerB1DRUsVNjVkBWszS5ksne5qMZbqbrvHRNAPc2D/Mu6Xipv2yhCUwggF+vzZLaWClWP5DQp8TwR+k9jv9g1rNvw39k4GGb4M3GPC8rebzceE4Aeo/7Hmqcw3hMOXEdT9FZyw3wk7oU5fVRBAlgGg8F450QA9sL8QAtmfWmd/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn; spf=pass smtp.mailfrom=realsil.com.cn; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b=JLzgZga7; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realsil.com.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realsil.com.cn header.i=@realsil.com.cn header.b="JLzgZga7" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 654ARa652272242, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1780568857; bh=oufD+Qi8eVvo8qzHrks1StU5mOYjeV4zUSl0nl4KwG8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=JLzgZga7Wpv4PtLdnbLb6YfGzUIOv5B5JvRvMmT9rtuwSUnEztdWL8jnJsC2m+7oC qAWILC0EiERFEP+aMVaKqQGGazdgIqNMIDpF/o3phFUYwk4F7wzbQ95h+EmBXtWWW3 s0Iw3BuE9JX1xT6iYNw/jXbiTZR2olQp+Z2lO+SDDIYW9IpQ5HV3wX/ze8DNW7EDn9 KehDhbwoZF4z1GAmKwz0O1vcETP81ACs8me59SEjSzAs6hjvZQyZVRqvbbf5xi/kC6 z2YILlahTD97IerYPt4rru8G8NQfzpVzjLj74hhIJPsCoESrN/MLDi5BWxc0jm+2zl xh2UTyUq3dDQQ== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.28/5.94) with ESMTPS id 654ARa652272242 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jun 2026 18:27:36 +0800 Received: from RS-EX-MBS1.realsil.com.cn (172.29.17.101) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 4 Jun 2026 18:27:36 +0800 Received: from 172.29.37.154 (172.29.37.152) by RS-EX-MBS1.realsil.com.cn (172.29.17.101) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 4 Jun 2026 18:27:36 +0800 From: javen To: , , , , , , , CC: , , Javen Xu Subject: [PATCH net-next v7 7/7] r8169: support setting rx queue numbers via ethtool Date: Thu, 4 Jun 2026 18:27:33 +0800 Message-ID: <20260604102733.1582-8-javen_xu@realsil.com.cn> X-Mailer: git-send-email 2.50.1.windows.1 In-Reply-To: <20260604102733.1582-1-javen_xu@realsil.com.cn> References: <20260604102733.1582-1-javen_xu@realsil.com.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 Content-Type: text/plain; charset="utf-8" From: Javen Xu This patch add support for changing rx queues by ethtool. We can set rx 1, 2, 4, 8 by ethtool -L eth1 rx num. Signed-off-by: Javen Xu --- Changes in v2: - no changes Changes in v3: - no changes Changes in v4: - remove rss_support and rss_enable - remove some zero-initialized - use kzalloc_objs instead of kcalloc Changes in v5: - no changes Changes in v6: - change subject of this patch - defer the assignment of tp->init_rx_desc_type until after rtl8169_down() - call netif_set_real_num_rx_queues() to synchronize the new rx queue number with networking core Changes in v7: - no changes --- drivers/net/ethernet/realtek/r8169_main.c | 125 ++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethern= et/realtek/r8169_main.c index ceecf1a88739..1cd362b0afbe 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -6225,6 +6225,129 @@ static void r8169_init_napi(struct rtl8169_private = *tp) } } =20 +static void rtl8169_get_channels(struct net_device *dev, + struct ethtool_channels *ch) +{ + struct rtl8169_private *tp =3D netdev_priv(dev); + + ch->max_rx =3D tp->hw_supp_num_rx_queues; + ch->max_tx =3D 1; + + ch->rx_count =3D tp->num_rx_rings; + ch->tx_count =3D 1; +} + +static int rtl8169_realloc_rx(struct rtl8169_private *tp, + struct rtl8169_rx_ring *new_rx, + int new_count) +{ + int i, ret; + + for (i =3D 0; i < new_count; i++) { + struct rtl8169_rx_ring *ring =3D &new_rx[i]; + + ring->rx_desc_array =3D dma_alloc_coherent(&tp->pci_dev->dev, + R8169_RX_RING_BYTES, + &ring->rx_phy_addr, + GFP_KERNEL); + if (!ring->rx_desc_array) { + ret =3D -ENOMEM; + goto err_free; + } + + memset(ring->rx_databuff, 0, sizeof(ring->rx_databuff)); + ret =3D rtl8169_rx_fill(tp, ring); + if (ret) { + dma_free_coherent(&tp->pci_dev->dev, R8169_RX_RING_BYTES, + ring->rx_desc_array, ring->rx_phy_addr); + goto err_free; + } + } + return 0; + +err_free: + while (--i >=3D 0) { + rtl8169_rx_clear(tp, &new_rx[i]); + dma_free_coherent(&tp->pci_dev->dev, R8169_RX_RING_BYTES, + new_rx[i].rx_desc_array, new_rx[i].rx_phy_addr); + } + return ret; +} + +static int rtl8169_set_channels(struct net_device *dev, + struct ethtool_channels *ch) +{ + struct rtl8169_private *tp =3D netdev_priv(dev); + bool if_running =3D netif_running(dev); + enum rx_desc_type old_rx_desc_type; + enum rx_desc_type new_desc_type; + struct rtl8169_rx_ring *new_rx; + int i, ret; + + old_rx_desc_type =3D tp->init_rx_desc_type; + + if (!rtl_hw_support_rss(tp)) { + netdev_warn(dev, "This chip does not support multiple channels/RSS.\n"); + return -EOPNOTSUPP; + } + + if (ch->rx_count > R8169_MAX_RX_QUEUES) + return -EINVAL; + + new_desc_type =3D ch->rx_count > 1 ? RX_DESC_TYPE_RSS : RX_DESC_TYPE_DEFA= ULT; + + if (!if_running) { + tp->num_rx_rings =3D ch->rx_count; + tp->init_rx_desc_type =3D new_desc_type; + return 0; + } + + netif_stop_queue(dev); + rtl8169_down(tp); + + new_rx =3D kzalloc_objs(*new_rx, R8169_MAX_RX_QUEUES); + if (!new_rx) + return -ENOMEM; + + tp->init_rx_desc_type =3D new_desc_type; + ret =3D rtl8169_realloc_rx(tp, new_rx, ch->rx_count); + if (ret) { + tp->init_rx_desc_type =3D old_rx_desc_type; + kfree(new_rx); + return ret; + } + + for (i =3D 0; i < tp->num_rx_rings; i++) + rtl8169_rx_clear(tp, &tp->rx_ring[i]); + rtl8169_free_rx_desc(tp); + + tp->num_rx_rings =3D ch->rx_count; + + memset(tp->rx_ring, 0, sizeof(tp->rx_ring)); + memcpy(tp->rx_ring, new_rx, sizeof(*new_rx) * ch->rx_count); + + for (i =3D 0; i < tp->rss_data->hw_supp_indir_tbl_entries; i++) { + if (ch->rx_count > 1) + tp->rss_data->rss_indir_tbl[i] =3D + ethtool_rxfh_indir_default(i, tp->num_rx_rings); + else + tp->rss_data->rss_indir_tbl[i] =3D 0; + } + + rtl_set_irq_mask(tp); + + rtl8169_up(tp); + netif_start_queue(dev); + + ret =3D netif_set_real_num_rx_queues(dev, ch->rx_count); + if (ret) + netdev_warn(dev, "Failed to set real num rx queues\n"); + + kfree(new_rx); + + return 0; +} + static const struct ethtool_ops rtl8169_ethtool_ops =3D { .supported_coalesce_params =3D ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_MAX_FRAMES, @@ -6243,6 +6366,8 @@ static const struct ethtool_ops rtl8169_ethtool_ops = =3D { .nway_reset =3D phy_ethtool_nway_reset, .get_eee =3D rtl8169_get_eee, .set_eee =3D rtl8169_set_eee, + .get_channels =3D rtl8169_get_channels, + .set_channels =3D rtl8169_set_channels, .get_link_ksettings =3D phy_ethtool_get_link_ksettings, .set_link_ksettings =3D rtl8169_set_link_ksettings, .get_ringparam =3D rtl8169_get_ringparam, --=20 2.43.0