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

Commit e2a689ab authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ptp-Validate-the-ancillary-ioctl-flags-more-carefully' 



Richard Cochran says:

====================
ptp: Validate the ancillary ioctl flags more carefully.

The flags passed to the ioctls for periodic output signals and
time stamping of external signals were never checked, and thus formed
a useless ABI inadvertently.  More recently, a version 2 of the ioctls
was introduced in order make the flags meaningful.  This series
tightens up the checks on the new ioctl flags.

- Patch 1 ensures at least one edge flag is set for the new ioctl.
- Patches 2-7 are Jacob's recent checks, picking up the tags.
- Patch 8 introduces a "strict" flag for passing to the drivers when the
  new ioctl is used.
- Patches 9-12 implement the "strict" checking in the drivers.
- Patch 13 extends the test program to exercise combinations of flags.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3df70afe 6eb54cbb

drivers/net/dsa/mv88e6xxx/ptp.c

+13 −0
Original line number Diff line number Diff line
@@ -273,6 +273,19 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip, 
	int pin;

	int err;



	/* Reject requests with unsupported flags */

	if (rq->extts.flags & ~(PTP_ENABLE_FEATURE |

				PTP_RISING_EDGE |

				PTP_FALLING_EDGE |

				PTP_STRICT_FLAGS))

		return -EOPNOTSUPP;



	/* Reject requests to enable time stamping on both edges. */

	if ((rq->extts.flags & PTP_STRICT_FLAGS) &&

	    (rq->extts.flags & PTP_ENABLE_FEATURE) &&

	    (rq->extts.flags & PTP_EXTTS_EDGES) == PTP_EXTTS_EDGES)

		return -EOPNOTSUPP;



	pin = ptp_find_pin(chip->ptp_clock, PTP_PF_EXTTS, rq->extts.index);



	if (pin < 0)

drivers/net/ethernet/broadcom/tg3.c

+4 −0
Original line number Diff line number Diff line
@@ -6280,6 +6280,10 @@ static int tg3_ptp_enable(struct ptp_clock_info *ptp, 


	switch (rq->type) {

	case PTP_CLK_REQ_PEROUT:

		/* Reject requests with unsupported flags */

		if (rq->perout.flags)

			return -EOPNOTSUPP;



		if (rq->perout.index != 0)

			return -EINVAL;

drivers/net/ethernet/intel/igb/igb_ptp.c

+17 −0
Original line number Diff line number Diff line
@@ -521,6 +521,19 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 


	switch (rq->type) {

	case PTP_CLK_REQ_EXTTS:

		/* Reject requests with unsupported flags */

		if (rq->extts.flags & ~(PTP_ENABLE_FEATURE |

					PTP_RISING_EDGE |

					PTP_FALLING_EDGE |

					PTP_STRICT_FLAGS))

			return -EOPNOTSUPP;



		/* Reject requests failing to enable both edges. */

		if ((rq->extts.flags & PTP_STRICT_FLAGS) &&

		    (rq->extts.flags & PTP_ENABLE_FEATURE) &&

		    (rq->extts.flags & PTP_EXTTS_EDGES) != PTP_EXTTS_EDGES)

			return -EOPNOTSUPP;



		if (on) {

			pin = ptp_find_pin(igb->ptp_clock, PTP_PF_EXTTS,

					   rq->extts.index);
@@ -551,6 +564,10 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 
		return 0;



	case PTP_CLK_REQ_PEROUT:

		/* Reject requests with unsupported flags */

		if (rq->perout.flags)

			return -EOPNOTSUPP;



		if (on) {

			pin = ptp_find_pin(igb->ptp_clock, PTP_PF_PEROUT,

					   rq->perout.index);

drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c

+17 −0
Original line number Diff line number Diff line
@@ -236,6 +236,19 @@ static int mlx5_extts_configure(struct ptp_clock_info *ptp, 
	if (!MLX5_PPS_CAP(mdev))

		return -EOPNOTSUPP;



	/* Reject requests with unsupported flags */

	if (rq->extts.flags & ~(PTP_ENABLE_FEATURE |

				PTP_RISING_EDGE |

				PTP_FALLING_EDGE |

				PTP_STRICT_FLAGS))

		return -EOPNOTSUPP;



	/* Reject requests to enable time stamping on both edges. */

	if ((rq->extts.flags & PTP_STRICT_FLAGS) &&

	    (rq->extts.flags & PTP_ENABLE_FEATURE) &&

	    (rq->extts.flags & PTP_EXTTS_EDGES) == PTP_EXTTS_EDGES)

		return -EOPNOTSUPP;



	if (rq->extts.index >= clock->ptp_info.n_pins)

		return -EINVAL;
@@ -290,6 +303,10 @@ static int mlx5_perout_configure(struct ptp_clock_info *ptp, 
	if (!MLX5_PPS_CAP(mdev))

		return -EOPNOTSUPP;



	/* Reject requests with unsupported flags */

	if (rq->perout.flags)

		return -EOPNOTSUPP;



	if (rq->perout.index >= clock->ptp_info.n_pins)

		return -EINVAL;

drivers/net/ethernet/microchip/lan743x_ptp.c

+4 −0
Original line number Diff line number Diff line
@@ -429,6 +429,10 @@ static int lan743x_ptp_perout(struct lan743x_adapter *adapter, int on, 
	int pulse_width = 0;

	int perout_bit = 0;



	/* Reject requests with unsupported flags */

	if (perout->flags)

		return -EOPNOTSUPP;



	if (!on) {

		lan743x_ptp_perout_off(adapter);

		return 0;