On 27/02/2024 01:40, Niklas Söderlund wrote:
> The struct member rx_max_buf_size was added before split descriptor
> support where added. It is unclear if the value describes the full skb
> frame buffer or the data descriptor buffer which can be combined into a
> single skb.
>
> Rename it to make it clear it referees to the maximum frame size and can
> cover multiple descriptors.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> drivers/net/ethernet/renesas/ravb.h | 2 +-
> drivers/net/ethernet/renesas/ravb_main.c | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index aecc98282c7e..7f9e8b2c012a 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
> @@ -1059,7 +1059,7 @@ struct ravb_hw_info {
> int stats_len;
> size_t max_rx_len;
> u32 tccr_mask;
> - u32 rx_max_buf_size;
> + u32 rx_max_frame_size;
> unsigned aligned_tx: 1;
>
> /* hardware features */
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index c25a80f4d3b9..3c59e2c317c7 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -2684,7 +2684,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
> .stats_len = ARRAY_SIZE(ravb_gstrings_stats),
> .max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
> .tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,
> - .rx_max_buf_size = SZ_2K,
> + .rx_max_frame_size = SZ_2K,
> .internal_delay = 1,
> .tx_counters = 1,
> .multi_irqs = 1,
> @@ -2710,7 +2710,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
> .stats_len = ARRAY_SIZE(ravb_gstrings_stats),
> .max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
> .tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,
> - .rx_max_buf_size = SZ_2K,
> + .rx_max_frame_size = SZ_2K,
> .aligned_tx = 1,
> .gptp = 1,
> .nc_queues = 1,
> @@ -2733,7 +2733,7 @@ static const struct ravb_hw_info ravb_rzv2m_hw_info = {
> .stats_len = ARRAY_SIZE(ravb_gstrings_stats),
> .max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
> .tccr_mask = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,
> - .rx_max_buf_size = SZ_2K,
> + .rx_max_frame_size = SZ_2K,
> .multi_irqs = 1,
> .err_mgmt_irqs = 1,
> .gptp = 1,
> @@ -2758,7 +2758,7 @@ static const struct ravb_hw_info gbeth_hw_info = {
> .stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth),
> .max_rx_len = ALIGN(GBETH_RX_BUFF_MAX, RAVB_ALIGN),
> .tccr_mask = TCCR_TSRQ0,
> - .rx_max_buf_size = SZ_8K,
> + .rx_max_frame_size = SZ_8K,
> .aligned_tx = 1,
> .tx_counters = 1,
> .carrier_counters = 1,
> @@ -2967,7 +2967,7 @@ static int ravb_probe(struct platform_device *pdev)
> priv->avb_link_active_low =
> of_property_read_bool(np, "renesas,ether-link-active-low");
>
> - ndev->max_mtu = info->rx_max_buf_size - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
> + ndev->max_mtu = info->rx_max_frame_size - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
> ndev->min_mtu = ETH_MIN_MTU;
>
> /* FIXME: R-Car Gen2 has 4byte alignment restriction for tx buffer
Reviewed-by: Paul Barker <paul.barker.ct@xxxxxxxxxxxxxx>
--
Paul BarkerAttachment:
OpenPGP_0x27F4B3459F002257.asc
Description: OpenPGP public key
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature
