From patchwork Wed Mar 12 22:15:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 14013975 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 161021EFF81; Wed, 12 Mar 2025 22:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817771; cv=none; b=LeybQeKzr5GdXT94t+pDYAEclJ9LV5blPn3D8zlUv13t9fSGRe4uNnWl/qBiWXGi8Ps6Mwyyd7XSmwJL7caDI6D/P84Uo7HOeWdQ2+PJ5odDxzm0aOuh/3BRierxf/fXfDE5e1vtn7o8YuaDT53ScuHaSPomYpTpm2lpSrQZZTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817771; c=relaxed/simple; bh=NdeYUySIiYtPzYwBwD5+tXrplkOPuaQwtpJ5FgKG8a4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BCCr3AFL6IsPGdfpAMxk02Eh1hPvHxfXlM+yTr2bpqtKM/ZW+jfpdIzi9eKQE7soVkYBGLGSeo3JqBT0wAdaXreg9BVRo5CuOKMA3ahypcMkSd/DjA28cdtLT3FttvNmDsmR8jzlmLHkcAWhxOcdeiHDQyCHvGbP7/58nTEnXaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=dlzZqd2p; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dlzZqd2p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741817770; x=1773353770; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=NdeYUySIiYtPzYwBwD5+tXrplkOPuaQwtpJ5FgKG8a4=; b=dlzZqd2pZJ9ozVXXvXys1qkJ8T9a2sAdlpLK6ByrUw04mFl4ZKyypjbe DwDjTzV0UunfKPlcSoyPMLTIBqOh1iH6A9gQSE+OWwD0ze9vDyTLiDIWY 5KWi0T96WHOKpErZ74DZttY2Fpma8SOJAreRVWexUqpwffrthq7y19Y8Y sOokw5l5hliWAOx6NYC3ZirkBo1/v9oIw9/76NIGHLSwsGQ4G2E31MUXj AJ05WuQ/MmiTwwyutMerwhi9EnnN9uScKKqr8SPmGvxMRBYkCJfx6hcbL IgbWiulRBD5DOSBJwAFtYjsmYMfGAFQJIpaV6no5KXcFwy2+eTaQnd/rs A==; X-CSE-ConnectionGUID: wzCDKYLgSHqbhHHWaU8aCA== X-CSE-MsgGUID: cRGgUJ/ATTCIVhRhTaxxgA== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="54288380" X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="54288380" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 X-CSE-ConnectionGUID: 4HPccVGcS1W1/YOMvq4TvA== X-CSE-MsgGUID: zuJTnNl9QyOwsEw3Pr9dyg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="125950239" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:06 -0700 From: Jacob Keller Date: Wed, 12 Mar 2025 15:15:50 -0700 Subject: [PATCH net v2 1/5] igb: reject invalid external timestamp requests for 82580-based HW Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-jk-net-fixes-supported-extts-flags-v2-1-ea930ba82459@intel.com> References: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> In-Reply-To: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Ruud Bos , Paul Barker , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Bryan Whitehead , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko , Michal Swiatkowski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org The igb_ptp_feature_enable_82580 function correctly checks that unknown flags are not passed to the function. However, it does not actually check PTP_RISING_EDGE or PTP_FALLING_EDGE when configuring the external timestamp function. The data sheet for the 82580 product says: Upon a change in the input level of one of the SDP pins that was configured to detect Time stamp events using the TSSDP register, a time stamp of the system time is captured into one of the two auxiliary time stamp registers (AUXSTMPL/H0 or AUXSTMPL/H1). For example to define timestamping of events in the AUXSTMPL0 and AUXSTMPH0 registers, Software should: 1. Set the TSSDP.AUX0_SDP_SEL field to select the SDP pin that detects the level change and set the TSSDP.AUX0_TS_SDP_EN bit to 1. 2. Set the TSAUXC.EN_TS0 bit to 1 to enable timestamping The same paragraph is in the i350 and i354 data sheets. The wording implies that the time stamps are captured at any level change. There does not appear to be any way to only timestamp one edge of the signal. Reject requests which do not set both PTP_RISING_EDGE and PTP_FALLING_EDGE when operating under PTP_STRICT_FLAGS mode via PTP_EXTTS_REQUEST2. Fixes: 38970eac41db ("igb: support EXTTS on 82580/i354/i350") Reviewed-by: Michal Swiatkowski Signed-off-by: Jacob Keller --- Changes in v2: - Fix the 82580 check to allow disabling the pin without flags set. --- drivers/net/ethernet/intel/igb/igb_ptp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index f9457055612004c10f74379122063e8136fe7d76..f323e1c1989f1bfbbf1f04043c2c0f14ae8c716f 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -509,6 +509,12 @@ static int igb_ptp_feature_enable_82580(struct ptp_clock_info *ptp, PTP_STRICT_FLAGS)) return -EOPNOTSUPP; + /* Both the rising and falling edge are timestamped */ + 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); From patchwork Wed Mar 12 22:15:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 14013974 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8211E1EEA40; Wed, 12 Mar 2025 22:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817771; cv=none; b=IF30xjcaoQwKdwGWZdmJiGnOaVCPlm8wgp51ZWYGlSpxjMqiw4/o46dmoBxOlwqP9zFhCTY793VX32tLVuCS9W2tfNvEwts6zlPJKsb/NomVcCiwkE7E2vGs+jxRyDg6G3YPjLhgdOI1XCiBi2zjRHFvvx57pCi1qijByL/e4tI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817771; c=relaxed/simple; bh=uPzVgNJtr9kkTWtPDLiGgIWOsAJbSrZd8+u0qOMgpFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vo/yeqA4mriHwf9LUjR93pkyKnzFsjnGvDlykPh3Fi11exao1++wwItY+DhgcoroC7BWQbSmq1EqDrUZ6LIJ6vOQoM6tsgBSFb364UfKAUYvdpoQ+//oAdK22ipMJkHPLo1aCV+ED1r8qNni7BcXMX6vgpp0B7HDK+iJr5bIfT0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=X4m0JfJO; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="X4m0JfJO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741817770; x=1773353770; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=uPzVgNJtr9kkTWtPDLiGgIWOsAJbSrZd8+u0qOMgpFE=; b=X4m0JfJOqlLXOsMDE8rLogrUaKDM8R71fpHb5A3CPEsj2UrLeb21r/2d X80cijbk7q1Tt21lJqt1F07uQyfpiYepyHFPCIr/6H0pLF1ejyhsfF0jF W8pFJVcEJ22+93Q0YEYg562jWzm5ok1fEPREnrftQoanQbs28r0d3ZecO hQjwYfb4z0GmLN12eX2WA8BVaRehKaohCsGy1gqIupKz8Tf/AoR1jIVzY 5kJn/Vo0Ghkja6JCGuX8aTQo+qZWUy7lIvOkcWplEZS9m0x984Mg27vxC JGTLLlVd5Roce6GuhByiG/9QZ4J71DDKU+B5JZCLpewpww5oL6y6GAgEe g==; X-CSE-ConnectionGUID: 9QQ6n2hWSW281Qv2gjaMTg== X-CSE-MsgGUID: alZCEDeXT5O1UGmYEgUbJw== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="54288399" X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="54288399" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 X-CSE-ConnectionGUID: RPZqz1gqRd2fk2ZEEyOS1w== X-CSE-MsgGUID: hNR8Cw4qTzSxMi0CU6QKgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="125950242" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 From: Jacob Keller Date: Wed, 12 Mar 2025 15:15:51 -0700 Subject: [PATCH net v2 2/5] renesas: reject PTP_STRICT_FLAGS as unsupported Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-jk-net-fixes-supported-extts-flags-v2-2-ea930ba82459@intel.com> References: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> In-Reply-To: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Ruud Bos , Paul Barker , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Bryan Whitehead , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko , Michal Swiatkowski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org The ravb_ptp_extts() function checks the flags coming from the PTP_EXTTS_REQUEST ioctl, to ensure that future flags are not accepted on accident. This was updated to 'honor' the PTP_STRICT_FLAGS in commit 6138e687c7b6 ("ptp: Introduce strict checking of external time stamp options."). However, the driver does not *actually* validate the flags. I originally fixed this driver to reject future flags in commit 592025a03b34 ("renesas: reject unsupported external timestamp flags"). It is still unclear whether this hardware timestamps the rising, falling, or both edges of the input signal. Accepting requests with PTP_STRICT_FLAGS is a bug, as this could lead to users mistakenly assuming a request with PTP_RISING_EDGE actually timestamps the rising edge only. Reject requests with PTP_STRICT_FLAGS (and hence all PTP_EXTTS_REQUEST2 requests) until someone with access to the datasheet or hardware knowledge can confirm the timestamping behavior and update this driver. Fixes: 6138e687c7b6 ("ptp: Introduce strict checking of external time stamp options.") Signed-off-by: Jacob Keller Reviewed-by: Niklas Söderlund --- drivers/net/ethernet/renesas/ravb_ptp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_ptp.c b/drivers/net/ethernet/renesas/ravb_ptp.c index 6e4ef7af27bf31ab2aad8e06a65e0ede6046e3c0..b4365906669f3bd40953813e263aeaafd2e1eb70 100644 --- a/drivers/net/ethernet/renesas/ravb_ptp.c +++ b/drivers/net/ethernet/renesas/ravb_ptp.c @@ -179,8 +179,7 @@ static int ravb_ptp_extts(struct ptp_clock_info *ptp, /* Reject requests with unsupported flags */ if (req->flags & ~(PTP_ENABLE_FEATURE | PTP_RISING_EDGE | - PTP_FALLING_EDGE | - PTP_STRICT_FLAGS)) + PTP_FALLING_EDGE)) return -EOPNOTSUPP; if (req->index) From patchwork Wed Mar 12 22:15:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 14013976 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B0C71EFFBD; Wed, 12 Mar 2025 22:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817772; cv=none; b=omLF8LcbIlr6X0YIWgT9cunlwsZWSKhYQjLyCMkZ0jxp0gPYhl/z2Rpgm1c5nXDEAAT9gyUFeiPVrBs7T7yJCDM3L57p8wQjdfOcLb/4AYEF93GCumgTdPEm0yD723Oa3MuBKrCauV3zlVfQACkPgeLsXQSo9kidtE3TA58r9kk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817772; c=relaxed/simple; bh=VzLmmWyim0nHsZCIPWUYMGPDjbA4w3HmsLWEbB6sip0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GWP7enGFPVv5YKd30DW/8y5xw6PKQ113J4vGXrudAJf9SWdDELaE9BrW0ZMdF20rRNVEWE63tsBfQUHKb0ATAsdR8un0TdmJfFYfjtFu5yD5Mr7l9urEWGLUjqWHqJuU3EJvMsC3Tvfg8h0IHzw8XDeqkLVr1b8V1VPzyh36ed4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=UOjUO3WU; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UOjUO3WU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741817772; x=1773353772; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=VzLmmWyim0nHsZCIPWUYMGPDjbA4w3HmsLWEbB6sip0=; b=UOjUO3WU1NVa7pTAIOssGQ3ZPntpiBeMmjLsjrITlnMIFRbpAV7PKKyE TS6MwrUZ9J1KiE3csEl9gwiAeYRVLF7KIb3fiJGRUe7k97wnx2bfhJTHu /ZQNPdjNPkRpM+Um6honv/zm95Hj98CdiMWoJcYrvGYTMOPS0j46wHJHg xLkyy1WFWV3jB3D9QY6RQ9+SaGBogswTTMNd6ourBBfI6YYIuivGfTBGI PsQC5LVMjXLwv4vAPjI6kPwAg+tRK8VIgsvzNTubo5mmR40/lvupZ8Y/p HuOPLIQtgI7CyK3trUmxpHL8UNQ2uwuHWSNvWjjkoFX22Z/ASmyZ0pRc6 A==; X-CSE-ConnectionGUID: wNrJoq71QEuKUUZsODZuhA== X-CSE-MsgGUID: 8FVCXbpBS2WA/RRQIL6jGw== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="54288417" X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="54288417" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:08 -0700 X-CSE-ConnectionGUID: Ucezg74kRGKlYbjB2GPKQQ== X-CSE-MsgGUID: TuONhjYaQf2evtu/9Ja0FA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="125950245" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 From: Jacob Keller Date: Wed, 12 Mar 2025 15:15:52 -0700 Subject: [PATCH net v2 3/5] net: lan743x: reject unsupported external timestamp requests Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-jk-net-fixes-supported-extts-flags-v2-3-ea930ba82459@intel.com> References: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> In-Reply-To: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Ruud Bos , Paul Barker , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Bryan Whitehead , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko , Michal Swiatkowski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org The lan743x_ptp_io_event_cap_en() function checks that the given request sets only one of PTP_RISING_EDGE or PTP_FALLING_EDGE, but not both. However, this driver does not check whether other flags (such as PTP_EXT_OFF) are set, nor whether any future unrecognized flags are set. Fix this by adding the appropriate check to the lan743x_ptp_io_extts() function. Fixes: 60942c397af6 ("net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)") Signed-off-by: Jacob Keller --- drivers/net/ethernet/microchip/lan743x_ptp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c index 4a777b449ecd03ac0d7576f8570f1a7794fb3d06..0be44dcb339387e9756f36f909f65c20870bc49b 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.c +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c @@ -942,6 +942,12 @@ static int lan743x_ptp_io_extts(struct lan743x_adapter *adapter, int on, extts = &ptp->extts[index]; + if (extts_request->flags & ~(PTP_ENABLE_FEATURE | + PTP_RISING_EDGE | + PTP_FALLING_EDGE | + PTP_STRICT_FLAGS)) + return -EOPNOTSUPP; + if (on) { extts_pin = ptp_find_pin(ptp->ptp_clock, PTP_PF_EXTTS, index); if (extts_pin < 0) From patchwork Wed Mar 12 22:15:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 14013977 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA6651F03C8; Wed, 12 Mar 2025 22:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817773; cv=none; b=Wvs7mveXEjNsnnTFeJ3dTAjGkg8qE9oxgG9lIzj6/9tiqCVR8eEH/o6IhDJb4Td4UR37vyaHmAG1fh1TmKCpRJDpaoyVXVCn6kyMnpVL57+lnHosTQWvKxCZpvAtOpDU9rNjcLpKzV5mBMLj3cmSUAwGUxn32Yk+3fjT4dIFrTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817773; c=relaxed/simple; bh=vgAZuqrWQCBG8jhKLQ4s5o+NgYF0GeB2/KjKVbVyH3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ITrsU3AQc/OeQrlF31+oWdld/3c0EGkQRFcQ007gxEh0PEk0zBM3uHrzX+s4F9xRHRaeb9UvRjx3PbEDUVzqyz4DMEyviuYNvXcE9gP7XNhC5BkCEKQe5Los2AGQKFRnuOG9dsRq9OQXSHGOYz2jw5x+1JXJm8HTnZUaItCh0xk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BcKeE33K; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BcKeE33K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741817772; x=1773353772; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=vgAZuqrWQCBG8jhKLQ4s5o+NgYF0GeB2/KjKVbVyH3U=; b=BcKeE33KE3ct7DS3dfPabopU3HL4aETL3IkqNME4hwMjPWP4q1JPe+Oz CA5v/ZqEnniHnrtzSSdMhSYJFe1lPFfwlLB3I2eWYQI2PGWUST72SHkJg WjmojNsZmwFJwbn8rdPuKX/5FnV0HQSxQar3MG0JRKVF0U89m4P1v4AY+ Q5UbILSch+uR8HF0Q7m90BVj0Hs+tMrShKZGLQAL8ppeWTUivsqmS4rl3 V9u28RMC0MmSeqj08L0HT1ZShos9ieLcz6UNbedemTv7Rco2RtFGqAyjz 2RVLxic2DHd4ZmRXyPXXgnHwFq8QpFdeQureFUazxClY/27jRGwPWABQF A==; X-CSE-ConnectionGUID: J4zSChknSaula6qRFz1Buw== X-CSE-MsgGUID: wD+2HSkpQsylW2e3vRkpDQ== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="54288428" X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="54288428" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:08 -0700 X-CSE-ConnectionGUID: NU+jXKSzRhCVauvSo0DIVg== X-CSE-MsgGUID: UO53gP7LTCGerISZjlE5Gg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="125950248" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 From: Jacob Keller Date: Wed, 12 Mar 2025 15:15:53 -0700 Subject: [PATCH net v2 4/5] broadcom: fix supported flag check in periodic output function Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-jk-net-fixes-supported-extts-flags-v2-4-ea930ba82459@intel.com> References: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> In-Reply-To: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Ruud Bos , Paul Barker , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Bryan Whitehead , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko , Michal Swiatkowski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org 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 --- drivers/net/phy/bcm-phy-ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/bcm-phy-ptp.c b/drivers/net/phy/bcm-phy-ptp.c index 208e8f561e0696e64bd5e842b66d88c65d70bfc0..eba8b5fb1365f4e43331e479e8e2f3c4b590ab96 100644 --- a/drivers/net/phy/bcm-phy-ptp.c +++ b/drivers/net/phy/bcm-phy-ptp.c @@ -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) From patchwork Wed Mar 12 22:15:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 14013978 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE58B1F03D8; Wed, 12 Mar 2025 22:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817773; cv=none; b=NAcuWcEnze2DQuUN5f1ee5RM7bKFCgPS6HeCsjFTRfppEw2h47RE72lD46EH26VAsOUqWRHwMv9YFOoPEAxaVAiglMCT85kfXW8GSbf3l13gnXeh0C7PFSWvyR/WK3ntkEvDeHFvRC5iiOL0FB0Pap9dcyBpqh13ak2la4frFUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741817773; c=relaxed/simple; bh=dZtHQmHw2E/TNV4LhtJkvHxvd1dLBtC07ImShwyJx1c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oIsHwryE6zp/uppaO35pMHuGnyUDvCba2CtqFBlQP8lM8Bo4ol5pHVqYME6MEgPtF8q0sQssfAdpnrEbGJhviBB4jJFdpUnCkNZ5pIKDl7sECX3CU+vxoIlX8FUU9m2FsA8eLRGwiwvkmcpWYW18hEYwuNeiKYljJAtFrgHy0Jg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ZU0vjVmN; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZU0vjVmN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741817772; x=1773353772; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=dZtHQmHw2E/TNV4LhtJkvHxvd1dLBtC07ImShwyJx1c=; b=ZU0vjVmNwb13IxsezdyVAJFPfP44KITuMRdGrjZ2NidMGHzlOh2zg9+H F2Z67pbtWxfRU+wATNmCeV9IR8kqlPQEMyhKUlKkVeX2aUPQjyMCEOvEo 16LplSKIdLxgfTdOhVhtThinXmmJSHzlnKZlU9k+6bzNGfllbtHsgHxi7 T+rJEg1Omi/xQL86AikwsYfzL1j7O8T8/fGFalNLr18e60yazA2A9SN7h VL0GSRJOyUXx+/WZk/hO+RXrlgOlU0i/UaVZ8RsYEZiT/QlE8NVTdumXq t1gZXxbRUTil85vV7ZZdQzUpjfgWqDe4si3/WnwPxaPRs12jv9l24kKmC Q==; X-CSE-ConnectionGUID: B3zqPGFURBW21N+3jJdO9g== X-CSE-MsgGUID: ltJWj/1iQYiULtOGLBPgLw== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="54288432" X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="54288432" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:08 -0700 X-CSE-ConnectionGUID: n41JY1lQQdaoPy2xR1G+TQ== X-CSE-MsgGUID: 7j8DIBiETSWs78ngq/acow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,242,1736841600"; d="scan'208";a="125950251" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2025 15:16:07 -0700 From: Jacob Keller Date: Wed, 12 Mar 2025 15:15:54 -0700 Subject: [PATCH net v2 5/5] ptp: ocp: reject unsupported periodic output flags Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-jk-net-fixes-supported-extts-flags-v2-5-ea930ba82459@intel.com> References: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> In-Reply-To: <20250312-jk-net-fixes-supported-extts-flags-v2-0-ea930ba82459@intel.com> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Ruud Bos , Paul Barker , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Bryan Whitehead , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko , Michal Swiatkowski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org The ptp_ocp_signal_from_perout() function supports PTP_PEROUT_DUTY_CYCLE and PTP_PEROUT_PHASE. It does not support PTP_PEROUT_ONE_SHOT, but does not reject a request with such an unsupported flag. Add the appropriate check to ensure that unsupported requests are rejected both for PTP_PEROUT_ONE_SHOT as well as any future flags. Fixes: 1aa66a3a135a ("ptp: ocp: Program the signal generators via PTP_CLK_REQ_PEROUT") Reviewed-by: Vadim Fedorenko Signed-off-by: Jacob Keller --- drivers/ptp/ptp_ocp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index b651087f426f50a73229ca57634fc5d6912e0a87..4a87af0980d695a9ab1b23e2544f620759ccb892 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -2090,6 +2090,10 @@ ptp_ocp_signal_from_perout(struct ptp_ocp *bp, int gen, { struct ptp_ocp_signal s = { }; + if (req->flags & ~(PTP_PEROUT_DUTY_CYCLE | + PTP_PEROUT_PHASE)) + return -EOPNOTSUPP; + s.polarity = bp->signal[gen].polarity; s.period = ktime_set(req->period.sec, req->period.nsec); if (!s.period)