ravb: Add net_features and net_hw_features to struct ravb_hw_info

On R-Car the checksum calculation on RX frames is done by the E-MAC
module, whereas on RZ/G2L it is done by the TOE.

TOE calculates the checksum of received frames from E-MAC and outputs it to
DMAC. TOE also calculates the checksum of transmission frames from DMAC and
outputs it E-MAC.

Add net_features and net_hw_features to struct ravb_hw_info, to support
subsequent SoCs without any code changes in the ravb_probe function.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 69256d7c5ee7729a950f261fc15320c03234cd9d..85eb3c69ac32311a72ac7262df3ea1d1f56d3c76 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -991,6 +991,8 @@ enum ravb_chip_id {
 struct ravb_hw_info {
        const char (*gstrings_stats)[ETH_GSTRING_LEN];
        size_t gstrings_size;
+       netdev_features_t net_hw_features;
+       netdev_features_t net_features;
        enum ravb_chip_id chip_id;
        int stats_len;
        size_t max_rx_len;

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 48d24cd4e71d299eaeed59343e681bf106d4486f..6b209ad19de7b71151a8bdae87cdd898ab152bff 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1931,6 +1931,8 @@ static int ravb_mdio_release(struct ravb_private *priv)
 static const struct ravb_hw_info ravb_gen3_hw_info = {
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
+       .net_hw_features = NETIF_F_RXCSUM,
+       .net_features = NETIF_F_RXCSUM,
        .chip_id = RCAR_GEN3,
        .stats_len = ARRAY_SIZE(ravb_gstrings_stats),
        .max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
@@ -1939,6 +1941,8 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
 static const struct ravb_hw_info ravb_gen2_hw_info = {
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
+       .net_hw_features = NETIF_F_RXCSUM,
+       .net_features = NETIF_F_RXCSUM,
        .chip_id = RCAR_GEN2,
        .stats_len = ARRAY_SIZE(ravb_gstrings_stats),
        .max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
@@ -2062,14 +2066,14 @@ static int ravb_probe(struct platform_device *pdev)
        if (!ndev)
                return -ENOMEM;
 
-       ndev->features = NETIF_F_RXCSUM;
-       ndev->hw_features = NETIF_F_RXCSUM;
+       info = of_device_get_match_data(&pdev->dev);
+
+       ndev->features = info->net_features;
+       ndev->hw_features = info->net_hw_features;
 
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
 
-       info = of_device_get_match_data(&pdev->dev);
-
        if (info->chip_id == RCAR_GEN3)
                irq = platform_get_irq_byname(pdev, "ch22");
        else