]> www.infradead.org Git - users/hch/misc.git/commitdiff
broadcom: fix supported flag check in periodic output function
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 12 Mar 2025 22:15:53 +0000 (15:15 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 20 Mar 2025 07:50:03 +0000 (08:50 +0100)
In bcm_ptp_perout_locked, the driver rejects requests which have
PTP_PEROUT_PHASE set. This appears to be an attempt to reject any
unsupported flags. Unfortunately, this only checks one flag, but does not
protect against PTP_PEROUT_ONE_SHOT, or any future flags which may be
added.

Fix the check to ensure that no flag other than the supported
PTP_PEROUT_DUTY_CYCLE is set.

Fixes: 7bfe91efd525 ("net: phy: Add support for 1PPS out and external timestamps")
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250312-jk-net-fixes-supported-extts-flags-v2-4-ea930ba82459@intel.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/phy/bcm-phy-ptp.c

index 208e8f561e0696e64bd5e842b66d88c65d70bfc0..eba8b5fb1365f4e43331e479e8e2f3c4b590ab96 100644 (file)
@@ -597,7 +597,8 @@ static int bcm_ptp_perout_locked(struct bcm_ptp_private *priv,
 
        period = BCM_MAX_PERIOD_8NS;    /* write nonzero value */
 
-       if (req->flags & PTP_PEROUT_PHASE)
+       /* Reject unsupported flags */
+       if (req->flags & ~PTP_PEROUT_DUTY_CYCLE)
                return -EOPNOTSUPP;
 
        if (req->flags & PTP_PEROUT_DUTY_CYCLE)