iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "net: mvpp2: Improve data types and use min()"

Browse Source 
This reverts commit f7023b3d697c6a7dfe2d9c70e0d8c2c580ccbd76.

Russell indicates that assuming 32bits are sufficient isn't
necessarily safe.

Link: https://lore.kernel.org/20240711154741.174745-1-thorsten.blum@toblux.com/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2024-07-15 09:05:52 -07:00
parent 0970bf676f
commit ba7a0f4436
1 changed files with 6 additions and 6 deletions

12
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

@ -2766,29 +2766,29 @@ static void mvpp2_tx_pkts_coal_set(struct mvpp2_port *port,
}
}
static u32 mvpp2_usec_to_cycles(u32 usec, u32 clk_hz)
static u32 mvpp2_usec_to_cycles(u32 usec, unsigned long clk_hz)
{
u64 tmp = (u64)clk_hz * usec;
do_div(tmp, USEC_PER_SEC);
return min(tmp, U32_MAX);
return tmp > U32_MAX ? U32_MAX : tmp;
}
static u32 mvpp2_cycles_to_usec(u32 cycles, u32 clk_hz)
static u32 mvpp2_cycles_to_usec(u32 cycles, unsigned long clk_hz)
{
u64 tmp = (u64)cycles * USEC_PER_SEC;
do_div(tmp, clk_hz);
return min(tmp, U32_MAX);
return tmp > U32_MAX ? U32_MAX : tmp;
}
/* Set the time delay in usec before Rx interrupt */
static void mvpp2_rx_time_coal_set(struct mvpp2_port *port,
struct mvpp2_rx_queue *rxq)
{
u32 freq = port->priv->tclk;
unsigned long freq = port->priv->tclk;
u32 val = mvpp2_usec_to_cycles(rxq->time_coal, freq);
if (val > MVPP2_MAX_ISR_RX_THRESHOLD) {
@ -2804,7 +2804,7 @@ static void mvpp2_rx_time_coal_set(struct mvpp2_port *port,
static void mvpp2_tx_time_coal_set(struct mvpp2_port *port)
{
u32 freq = port->priv->tclk;
unsigned long freq = port->priv->tclk;
u32 val = mvpp2_usec_to_cycles(port->tx_time_coal, freq);
if (val > MVPP2_MAX_ISR_TX_THRESHOLD) {