Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48cb5e03 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Abstract supported PTP filters 



The 6165 only supports layer L2 PTP, where as the more modern devices
also support UDP and UDPv6, i.e. L4. Abstract the supported receive
filters.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffc705de

drivers/net/dsa/mv88e6xxx/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ struct mv88e6xxx_ptp_ops { 
	int arr0_sts_reg;

	int arr1_sts_reg;

	int dep_sts_reg;

	u32 rx_filters;

};



#define STATS_TYPE_PORT		BIT(0)

drivers/net/dsa/mv88e6xxx/hwtstamp.c

+14 −12
Original line number Diff line number Diff line
@@ -61,7 +61,11 @@ static int mv88e6xxx_ptp_write(struct mv88e6xxx_chip *chip, int addr, 
int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,

			  struct ethtool_ts_info *info)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	const struct mv88e6xxx_ptp_ops *ptp_ops;

	struct mv88e6xxx_chip *chip;



	chip = ds->priv;

	ptp_ops = chip->info->ops->ptp_ops;



	if (!chip->info->ptp_support)

		return -EOPNOTSUPP;
@@ -74,17 +78,7 @@ int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port, 
	info->tx_types =

		(1 << HWTSTAMP_TX_OFF) |

		(1 << HWTSTAMP_TX_ON);

	info->rx_filters =

		(1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);

	info->rx_filters = ptp_ops->rx_filters;



	return 0;

}
@@ -119,6 +113,14 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port, 
	/* The switch supports timestamping both L2 and L4; one cannot be

	 * disabled independently of the other.

	 */



	if (!(BIT(config->rx_filter) & ptp_ops->rx_filters)) {

		config->rx_filter = HWTSTAMP_FILTER_NONE;

		dev_dbg(chip->dev, "Unsupported rx_filter %d\n",

			config->rx_filter);

		return -ERANGE;

	}



	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		tstamp_enable = false;

drivers/net/dsa/mv88e6xxx/ptp.c

+10 −0
Original line number Diff line number Diff line
@@ -325,6 +325,16 @@ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = { 
	.arr0_sts_reg = MV88E6XXX_PORT_PTP_ARR0_STS,

	.arr1_sts_reg = MV88E6XXX_PORT_PTP_ARR1_STS,

	.dep_sts_reg = MV88E6XXX_PORT_PTP_DEP_STS,

	.rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {