[PATCH 5.10.y-cip 40/61] ravb: Add magic_pkt to struct ravb_hw_info


Lad Prabhakar
 

From: Biju Das <biju.das.jz@...>

commit ebd5df063ce4a98553875e5b75eb8c0ab0584936 upstream.

E-MAC on R-Car supports magic packet detection, whereas RZ/G2L
does not support this feature. Add magic_pkt to struct ravb_hw_info
and enable this feature only for R-Car.

Signed-off-by: Biju Das <biju.das.jz@...>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...>
Signed-off-by: David S. Miller <davem@...>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...>
---
drivers/net/ethernet/renesas/ravb.h | 1 +
drivers/net/ethernet/renesas/ravb_main.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 1772f0fe3cb5..ea8f7b8f37de 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1007,6 +1007,7 @@ struct ravb_hw_info {
unsigned gptp:1; /* AVB-DMAC has gPTP support */
unsigned ccc_gac:1; /* AVB-DMAC has gPTP support active in config mode */
unsigned nc_queue:1; /* AVB-DMAC has NC queue */
+ unsigned magic_pkt:1; /* E-MAC supports magic packet detection */
};

struct ravb_private {
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 7ee3cd39c86e..5d21cfd236f3 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1434,8 +1434,9 @@ static void ravb_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
static int ravb_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
{
struct ravb_private *priv = netdev_priv(ndev);
+ const struct ravb_hw_info *info = priv->info;

- if (wol->wolopts & ~WAKE_MAGIC)
+ if (!info->magic_pkt || (wol->wolopts & ~WAKE_MAGIC))
return -EOPNOTSUPP;

priv->wol_enabled = !!(wol->wolopts & WAKE_MAGIC);
@@ -2134,6 +2135,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
.multi_irqs = 1,
.ccc_gac = 1,
.nc_queue = 1,
+ .magic_pkt = 1,
};

static const struct ravb_hw_info ravb_gen2_hw_info = {
@@ -2155,6 +2157,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
.aligned_tx = 1,
.gptp = 1,
.nc_queue = 1,
+ .magic_pkt = 1,
};

static const struct ravb_hw_info gbeth_hw_info = {
--
2.17.1

Join cip-dev@lists.cip-project.org to automatically receive all group messages.