github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: xilinx: axienet: Get coalesce parameters from driver state

Browse Source 
The cr variables now contain the same values as the control registers
themselves. Extract/calculate the values from the variables instead of
saving the user-specified values. This allows us to remove some
bookeeping, and also lets the user know what the actual coalesce
settings are.

Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed by: Shannon Nelson <shannon.nelson@amd.com>
Link: https://patch.msgid.link/20250206201036.1516800-4-sean.anderson@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Sean Anderson 2025-02-06 15:10:35 -05:00 committed by Jakub Kicinski
parent d048c717df
commit eb80520e8a
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/xilinx/xilinx_axienet.h
View File

@ -533,10 +533,6 @@ struct skbuf_dma_descriptor {
* supported, the maximum frame size would be 9k. Else it is
* 1522 bytes (assuming support for basic VLAN)
* @rxmem: Stores rx memory size for jumbo frame handling.
* @coalesce_count_rx: Store the irq coalesce on RX side.
* @coalesce_usec_rx: IRQ coalesce delay for RX
* @coalesce_count_tx: Store the irq coalesce on TX side.
* @coalesce_usec_tx: IRQ coalesce delay for TX
* @use_dmaengine: flag to check dmaengine framework usage.
* @tx_chan: TX DMA channel.
* @rx_chan: RX DMA channel.
@ -615,10 +611,6 @@ struct axienet_local {
u32 max_frm_size;
u32 rxmem;
u32 coalesce_count_rx;
u32 coalesce_usec_rx;
u32 coalesce_count_tx;
u32 coalesce_usec_tx;
u8 use_dmaengine;
struct dma_chan *tx_chan;
struct dma_chan *rx_chan;

70
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -223,6 +223,13 @@ static void axienet_dma_bd_release(struct net_device *ndev)
lp->rx_bd_p);
}
static u64 axienet_dma_rate(struct axienet_local *lp)
{
if (lp->axi_clk)
return clk_get_rate(lp->axi_clk);
return 125000000; /* arbitrary guess if no clock rate set */
}
/**
* axienet_calc_cr() - Calculate control register value
* @lp: Device private data
@ -242,12 +249,9 @@ static u32 axienet_calc_cr(struct axienet_local *lp, u32 count, u32 usec)
* the first packet. Otherwise leave at 0 to disable delay interrupt.
*/
if (count > 1) {
u64 clk_rate = 125000000; /* arbitrary guess if no clock rate set */
u64 clk_rate = axienet_dma_rate(lp);
u32 timer;
if (lp->axi_clk)
clk_rate = clk_get_rate(lp->axi_clk);
/* 1 Timeout Interval = 125 * (clock period of SG clock) */
timer = DIV64_U64_ROUND_CLOSEST((u64)usec * clk_rate,
XAXIDMA_DELAY_SCALE);
@ -260,6 +264,23 @@ static u32 axienet_calc_cr(struct axienet_local *lp, u32 count, u32 usec)
return cr;
}
/**
* axienet_coalesce_params() - Extract coalesce parameters from the CR
* @lp: Device private data
* @cr: The control register to parse
* @count: Number of packets before an interrupt
* @usec: Idle time (in usec) before an interrupt
*/
static void axienet_coalesce_params(struct axienet_local *lp, u32 cr,
u32 *count, u32 *usec)
{
u64 clk_rate = axienet_dma_rate(lp);
u64 timer = FIELD_GET(XAXIDMA_DELAY_MASK, cr);
*count = FIELD_GET(XAXIDMA_COALESCE_MASK, cr);
*usec = DIV64_U64_ROUND_CLOSEST(timer * XAXIDMA_DELAY_SCALE, clk_rate);
}
/**
* axienet_dma_start - Set up DMA registers and start DMA operation
* @lp: Pointer to the axienet_local structure
@ -2104,11 +2125,21 @@ axienet_ethtools_get_coalesce(struct net_device *ndev,
struct netlink_ext_ack *extack)
{
struct axienet_local *lp = netdev_priv(ndev);
u32 cr;
ecoalesce->rx_max_coalesced_frames = lp->coalesce_count_rx;
ecoalesce->rx_coalesce_usecs = lp->coalesce_usec_rx;
ecoalesce->tx_max_coalesced_frames = lp->coalesce_count_tx;
ecoalesce->tx_coalesce_usecs = lp->coalesce_usec_tx;
spin_lock_irq(&lp->rx_cr_lock);
cr = lp->rx_dma_cr;
spin_unlock_irq(&lp->rx_cr_lock);
axienet_coalesce_params(lp, cr,
&ecoalesce->rx_max_coalesced_frames,
&ecoalesce->rx_coalesce_usecs);
spin_lock_irq(&lp->tx_cr_lock);
cr = lp->tx_dma_cr;
spin_unlock_irq(&lp->tx_cr_lock);
axienet_coalesce_params(lp, cr,
&ecoalesce->tx_max_coalesced_frames,
&ecoalesce->tx_coalesce_usecs);
return 0;
}
@ -2155,15 +2186,12 @@ axienet_ethtools_set_coalesce(struct net_device *ndev,
return -EINVAL;
}
lp->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
lp->coalesce_usec_rx = ecoalesce->rx_coalesce_usecs;
lp->coalesce_count_tx = ecoalesce->tx_max_coalesced_frames;
lp->coalesce_usec_tx = ecoalesce->tx_coalesce_usecs;
cr = axienet_calc_cr(lp, lp->coalesce_count_rx, lp->coalesce_usec_rx);
cr = axienet_calc_cr(lp, ecoalesce->rx_max_coalesced_frames,
ecoalesce->rx_coalesce_usecs);
axienet_update_coalesce_rx(lp, cr, ~XAXIDMA_CR_RUNSTOP_MASK);
cr = axienet_calc_cr(lp, lp->coalesce_count_tx, lp->coalesce_usec_tx);
cr = axienet_calc_cr(lp, ecoalesce->tx_max_coalesced_frames,
ecoalesce->tx_coalesce_usecs);
axienet_update_coalesce_tx(lp, cr, ~XAXIDMA_CR_RUNSTOP_MASK);
return 0;
}
@ -2946,14 +2974,10 @@ static int axienet_probe(struct platform_device *pdev)
spin_lock_init(&lp->rx_cr_lock);
spin_lock_init(&lp->tx_cr_lock);
lp->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD;
lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
lp->coalesce_usec_rx = XAXIDMA_DFT_RX_USEC;
lp->coalesce_usec_tx = XAXIDMA_DFT_TX_USEC;
lp->rx_dma_cr = axienet_calc_cr(lp, lp->coalesce_count_rx,
lp->coalesce_usec_rx);
lp->tx_dma_cr = axienet_calc_cr(lp, lp->coalesce_count_tx,
lp->coalesce_usec_tx);
lp->rx_dma_cr = axienet_calc_cr(lp, XAXIDMA_DFT_RX_THRESHOLD,
XAXIDMA_DFT_RX_USEC);
lp->tx_dma_cr = axienet_calc_cr(lp, XAXIDMA_DFT_TX_THRESHOLD,
XAXIDMA_DFT_TX_USEC);
ret = axienet_mdio_setup(lp);
if (ret)