[Linuxarm] Re: [RFCv7 PATCH net-next 08/36] ravb: replace const features initialization with NETDEV_FEATURE_SET

Reviewed-by: Guangbin Huang huangguangbin2@huawei.com

On 2022/7/30 18:17, Jian Shen wrote:

The ravb driver use netdev_features in global structure initialization. Changed the its netdev_features_t memeber to netdev_features_t *, and make it refer to a netdev_features_t global variables.

Signed-off-by: Jian Shen shenjian15@huawei.com

drivers/net/ethernet/renesas/ravb.h | 4 ++-- drivers/net/ethernet/renesas/ravb_main.c | 27 +++++++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index b980bce763d3..efd3c32b9e46 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -1014,8 +1014,8 @@ struct ravb_hw_info { void (*emac_init)(struct net_device *ndev); const char (*gstrings_stats)[ETH_GSTRING_LEN]; size_t gstrings_size;

• netdev_features_t net_hw_features;
• netdev_features_t net_features;

• const netdev_features_t *net_hw_features;
• const netdev_features_t *net_features; int stats_len; size_t max_rx_len; u32 tccr_mask;

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index b357ac4c56c5..b38f689c3683 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -50,6 +50,9 @@ static const char *ravb_tx_irqs[NUM_TX_QUEUE] = { "ch19", /* RAVB_NC */ };

+static netdev_features_t ravb_default_features; +static netdev_features_t ravb_empty_features;

• void ravb_modify(struct net_device *ndev, enum ravb_reg reg, u32 clear, u32 set) {

@@ -2422,8 +2425,8 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .emac_init = ravb_emac_init_rcar, .gstrings_stats = ravb_gstrings_stats, .gstrings_size = sizeof(ravb_gstrings_stats),

• .net_hw_features = NETIF_F_RXCSUM,
• .net_features = NETIF_F_RXCSUM,

• .net_hw_features = &ravb_default_features,
• .net_features = &ravb_default_features, .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,

@@ -2448,8 +2451,8 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { .emac_init = ravb_emac_init_rcar, .gstrings_stats = ravb_gstrings_stats, .gstrings_size = sizeof(ravb_gstrings_stats),

• .net_hw_features = NETIF_F_RXCSUM,
• .net_features = NETIF_F_RXCSUM,

• .net_hw_features = &ravb_default_features,
• .net_features = &ravb_default_features, .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,

@@ -2471,8 +2474,8 @@ static const struct ravb_hw_info ravb_rzv2m_hw_info = { .emac_init = ravb_emac_init_rcar, .gstrings_stats = ravb_gstrings_stats, .gstrings_size = sizeof(ravb_gstrings_stats),

• .net_hw_features = NETIF_F_RXCSUM,
• .net_features = NETIF_F_RXCSUM,

• .net_hw_features = &ravb_default_features,
• .net_features = &ravb_default_features, .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,

@@ -2496,6 +2499,8 @@ static const struct ravb_hw_info gbeth_hw_info = { .emac_init = ravb_emac_init_gbeth, .gstrings_stats = ravb_gstrings_stats_gbeth, .gstrings_size = sizeof(ravb_gstrings_stats_gbeth),

• .net_hw_features = &ravb_empty_features,
• .net_features = &ravb_empty_features, .stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth), .max_rx_len = ALIGN(GBETH_RX_BUFF_MAX, RAVB_ALIGN), .tccr_mask = TCCR_TSRQ0,

@@ -2610,6 +2615,11 @@ static void ravb_set_delay_mode(struct net_device *ndev) ravb_modify(ndev, APSR, APSR_RDM | APSR_TDM, set); }

+static void ravb_features_init(void) +{

• ravb_default_features |= NETIF_F_RXCSUM;

+}

• static int ravb_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node;

@@ -2639,8 +2649,9 @@ static int ravb_probe(struct platform_device *pdev)

info = of_device_get_match_data(&pdev->dev);

• ndev->features = info->net_features;
• ndev->hw_features = info->net_hw_features;

• ravb_features_init();

• ndev->features = *info->net_features;

• ndev->hw_features = *info->net_hw_features;

  reset_control_deassert(rstc); pm_runtime_enable(&pdev->dev);