From patchwork Mon Mar 10 22:16:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 14010781 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 4C2A41DFE20; Mon, 10 Mar 2025 22:16:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645014; cv=none; b=pksp4iX5ARMqkt3FLb/FkuEJNr0zC1o+I43baCEXBw57ULrivCmVDv2O4FOKbJdzBnMdk8wyC5P9P53IJ58g5PIH+fgGP9oLwI5ST12RzyA4ao9Ym4Q2iX+CQmNqEN48QmgYXbLN52gUX/8WRgkjE+Ot+K/yL4DBAvzsFQKZreQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645014; c=relaxed/simple; bh=myoSGgj74XPWSsdzkbKReU54Ix7Ldof7Y/C1MVgScH0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZYw6MEx4Horkk5cLW+SLM+5OfSfBfPN4XilauSZw9tcDDEjV2qmopvJW5J7RcJXB8Xdq+r0BCLgk3Tm/jltgV+IAWCIYZqxGXCsx27U1J1bjLupeqzVNk5JxdnS4ehwG8myx9kDXhM/VnPXAj4s/Uxd+AMOu/9U37p4soWtV3PU= 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=n2lLNBl4; arc=none smtp.client-ip=198.175.65.14 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="n2lLNBl4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741645012; x=1773181012; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=myoSGgj74XPWSsdzkbKReU54Ix7Ldof7Y/C1MVgScH0=; b=n2lLNBl4SO8voCKJhysCR9eLrxAB+mrVbtJvLIsHfGy+mIKtxY3sXmNP CcOpDPtiPqI/i60JzEnVXLgm5OBwXoIfsddB7yGhRt3TCUet3c/9wOZvI OZUtOVekqhiDp84FeUhjUc8fPcgm2XvjNC4Hvr75XEdwZG4RraancmRZn MCYRgfbSjvB+auYBYyi0fwRRQK5ymJfRQ4lRtWlvB2GQOD99sY8h7eo6K tUN0FuFY+mP/LVGCkl+YJx1WZpeLGSwbeujSID76/I0yZ6sjd9fyEyU0R 9BZqlslISUbIwT8Tl/NAQ+QYLrp1MBh4/rNX+UYlUtSl8lx7QAZwwVq3z w==; X-CSE-ConnectionGUID: KHO+s8xXQPmsYcZsqlmb7w== X-CSE-MsgGUID: P08JWCspTBqmm8wnXx6Pkg== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="46443285" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="46443285" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:50 -0700 X-CSE-ConnectionGUID: 9M7MY91sQ0GFODloV84q9g== X-CSE-MsgGUID: WnZ+pzQ2RKC4p8tI+T5R2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="143315035" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:50 -0700 From: Jacob Keller Date: Mon, 10 Mar 2025 15:16:36 -0700 Subject: [PATCH net 1/5] igb: reject invalid external timestamp requests for 82580-based HW Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250310-jk-net-fixes-supported-extts-flags-v1-1-854ffb5f3a96@intel.com> References: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@intel.com> In-Reply-To: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@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, Raju Lakkaraju , Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko 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 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") Signed-off-by: Jacob Keller Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/intel/igb/igb_ptp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index f9457055612004c10f74379122063e8136fe7d76..b89ef4538a18d7ca11325ddc15944a878f4d807e 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -509,6 +509,11 @@ static int igb_ptp_feature_enable_82580(struct ptp_clock_info *ptp, PTP_STRICT_FLAGS)) return -EOPNOTSUPP; + /* Both the rising and falling edge are timstamped */ + if (rq->extts.flags & PTP_STRICT_FLAGS && + (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 Mon Mar 10 22:16:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 14010782 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 69B241E411C; Mon, 10 Mar 2025 22:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; cv=none; b=QK1zPfe3LLT7068pejr/Cu5pRdlgZdmufy1zdFVtdZprA0KROlXf5E+uvCyUBVMvwauv7Z8447Z2ZvFzaZkcSJXMwUFpkDyPxC6TYgWBEv6W5k8hSoUpW9dl3Sx7oIGcvppAPfegIybTTZ9Dih2+TKiAtIclv0Mr+tSsHd8oQJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; c=relaxed/simple; bh=uPzVgNJtr9kkTWtPDLiGgIWOsAJbSrZd8+u0qOMgpFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h+W03x40HhbbPtXsrtifI/JLAKriBrWnFETbF2lip1Uk+kNr5Leu+hK72rcuXFLRjGOhOyEpSrQRJMv/YkmZt3ER5CEBvlTMkJQ3P0NkTWw/GLa+eBFK4cyvRjgqxVb4ZYgPsOhigeF/fBiKW/CuZXqVPgjgJqedLASZHAU6DAY= 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=iWdJKGL4; arc=none smtp.client-ip=198.175.65.14 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="iWdJKGL4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741645013; x=1773181013; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=uPzVgNJtr9kkTWtPDLiGgIWOsAJbSrZd8+u0qOMgpFE=; b=iWdJKGL4sT798gygWiKmecVle75QtY31ZV53CIw62wZcLUPnbwr5+HhH CmmV+PscjBaEdBPnHPQF/g2n7/NrWS63eJ4txqMG+elkUicJzBTRpvd+O fDg59gKLltWqZHiOh/TVY5kEW/pLWRemiCRXuwdj4eovF4affOFTtwMvU GxsotTsrbCOK2YbsnPnoC6OJWT8AZSqZvNFe1k4534Do3f1R/HxBRikpr z0MBuzWtDpm/X1t7CJBmmoxnGg065gTVfbs9bA+HYXPbZhv8PcAVJeoGF oO92/R86Hbc3pXdZawhHCQdTJXhRyTsW852IDNQPvKhRKavs23GrSxKc9 A==; X-CSE-ConnectionGUID: zsFT/Rc7SxeDeeBz9MDLGQ== X-CSE-MsgGUID: qiF90Tk8Sr+EJ80CXSPLpQ== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="46443300" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="46443300" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:51 -0700 X-CSE-ConnectionGUID: pyIFQ1evQc2fPiccT80O7w== X-CSE-MsgGUID: Rsad+2zVT/S5NLl9/fCAXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="143315040" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:51 -0700 From: Jacob Keller Date: Mon, 10 Mar 2025 15:16:37 -0700 Subject: [PATCH net 2/5] renesas: reject PTP_STRICT_FLAGS as unsupported Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250310-jk-net-fixes-supported-extts-flags-v1-2-854ffb5f3a96@intel.com> References: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@intel.com> In-Reply-To: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@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, Raju Lakkaraju , Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko 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 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 --- 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 Mon Mar 10 22:16:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 14010783 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 D48721E5734; Mon, 10 Mar 2025 22:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; cv=none; b=S9UfWsWnU6LN6vLSa0D4aryhRQfMS5ePthhsk9QwumqGQNbecy2FjzGN6gEE5LrnEUBAP4PBqZ8+TRIPx934OlEMhQsnSTXKinliD7Ahbi4WDr6CkP7dQeuh9s6e5/CUC57LCt7FPIQWFwSLQ9yrsLbF+G0qB4ESOFxJoQeM7Gk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; c=relaxed/simple; bh=VzLmmWyim0nHsZCIPWUYMGPDjbA4w3HmsLWEbB6sip0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e0MtsNI6LvTkFcntyZCSjMfM3R8yI5c89IPSkEcNkPBpNQEZ9voZiR/1dAJfkW80zb9TWU70JT1W029yXXBYTx258h89qcoKkIQ6UrCevSb+Zy2SDysIYpph3Qz4T5jQxdR5m+NWnMxkPakZXLR1GIO7GARYHZAjPeGYXqlLPpQ= 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=c5QbF/ot; arc=none smtp.client-ip=198.175.65.14 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="c5QbF/ot" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741645014; x=1773181014; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=VzLmmWyim0nHsZCIPWUYMGPDjbA4w3HmsLWEbB6sip0=; b=c5QbF/ot0prTagyxJtjaLGQj+7ZdptWjnvYsNlMk5t0ZhF2ifUdpbz+c M3nt4MqOvcSRg8PJqo+0RhW4ez7txlWh1F9eJ6vxFBNCTgLvj/hDqmrlf u69RSrEQ+g2bmtk+9BCSpQp/+oVgQpQ/4AjNZoubfibRJ8pGO552u+LxU AuvyD6DsYUaosYavvVvDkQ4flEDc4RsS7Zl/i++Xa32wwT/tRPUYFhlKP hEknHpyvscXrIbQ5j8SjTbJKGL+6wtW8Jg6qjZdJaDXtfm1cXFRK1JxYX HAP3P8IXxl71X2ToEq/y9T0F25DVrzFM6HAZOahJ6uSTeNRfuereueBgN w==; X-CSE-ConnectionGUID: VV+720O8R6qM47N4qBU5zw== X-CSE-MsgGUID: dt3TUISvQzeRw4LQ7Ef1ZQ== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="46443315" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="46443315" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:51 -0700 X-CSE-ConnectionGUID: aIwT9U65RtWSb4jdW5AY8w== X-CSE-MsgGUID: Hu8Gqi8uTCS1Ssqen7xDmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="143315046" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:51 -0700 From: Jacob Keller Date: Mon, 10 Mar 2025 15:16:38 -0700 Subject: [PATCH net 3/5] net: lan743x: reject unsupported external timestamp requests Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250310-jk-net-fixes-supported-extts-flags-v1-3-854ffb5f3a96@intel.com> References: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@intel.com> In-Reply-To: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@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, Raju Lakkaraju , Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko 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 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 Mon Mar 10 22:16:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 14010784 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 175E81E5B8B; Mon, 10 Mar 2025 22:16:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; cv=none; b=g1L73QWXG7h2OxHtUjZqO224gruzjBX3VZ7R8Fr8hQZDZ2UJk5v5jxFxx4CzdMI4HHQrjFMwq+2GH20uZWcxiXwFoVB8dID1LotSBb+Zcch5kLPTXg0LcAy0J9vlKzwcV4j+smgE9blBAhBDIpVX2/iGFIRNeVA+cw7ixs6UI0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645015; c=relaxed/simple; bh=vgAZuqrWQCBG8jhKLQ4s5o+NgYF0GeB2/KjKVbVyH3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JyLjZ0W9AoDN2czBtg27I7eBEyRQ+i/TINkaQ2NaNMAv+c+m3L9K+aSMpfcgkB18klZlmfrRlmoJdQfa3P3N77fWx8vCtX1JpSrfD1wVOMmDPlyGTCGQbcd27SpPBKUM95kgNQG1+E1u4Z3KBiLf/Fh9QiA0pKbxNsWCgP8RGa4= 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=HuBLsaTe; arc=none smtp.client-ip=198.175.65.14 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="HuBLsaTe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741645014; x=1773181014; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=vgAZuqrWQCBG8jhKLQ4s5o+NgYF0GeB2/KjKVbVyH3U=; b=HuBLsaTewk6HlmyDKEaAR/6SBOe7fM9rtOn4e7JxQn95TVJHM2AQsF7R onDS4migVbzEyP2bYGqye/n0xPfJ7EZRhL3urddgmLKwEZLaP/zkaRVWH hAnyLQCZ0qjts7jCU7wbqErpFQDNBWHJQFptdMqjh2WwiVprAcEYu9nQ7 9xEKcvAMHr1MEe9oQa0Qb5flW41SWHufvkqpg5a1EVQZkK1dhtGZvSoGZ tneOQ/HOWu6a/AmWNhviKHLX1EMScQUuWmNgJdUz2IDLMnSYt1vibwT7W B1CdrkhG9OHHhF7dLh6S4ttF7kGcMEPoNgVLnePicfE3+/cv9+VbO1iKE A==; X-CSE-ConnectionGUID: mbGEcOE9Qpq9JQ+ChJUlKA== X-CSE-MsgGUID: 20ieANMHT3qQJO2334J6DQ== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="46443330" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="46443330" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:52 -0700 X-CSE-ConnectionGUID: IFiZBJ1MRY69tA7JEHGrhQ== X-CSE-MsgGUID: 298+Y2kOS9eoNIBjE0E6Yg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="143315050" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:51 -0700 From: Jacob Keller Date: Mon, 10 Mar 2025 15:16:39 -0700 Subject: [PATCH net 4/5] broadcom: fix supported flag check in periodic output function Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250310-jk-net-fixes-supported-extts-flags-v1-4-854ffb5f3a96@intel.com> References: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@intel.com> In-Reply-To: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@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, Raju Lakkaraju , Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko 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 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 Mon Mar 10 22:16:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 14010785 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 491561E8348; Mon, 10 Mar 2025 22:16:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645019; cv=none; b=gJqzT8+Im81+mWoDx4gzU0k4jCxkL7NYRLdJqtA15DBkDDZKGoiTVOiNI+wEW6pUC92voIwlVelLXipP7WDLNwiRvSlUvSX0CU5WbX5p+1pE+b7MZ9aP6zQ0Ijnrw2ZwjhfNgNjSzAqMPc50sA2MkgyCSi2apgUuqRBECh9fKHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741645019; c=relaxed/simple; bh=Z8+q2GV/aH550yKDFdVnUikndMt1LzCKO/Ii8P5vA5A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=emQ4W8s1nnBU52eGAwhG6KUMqUnRXMxqv42F/KOL92xAeFzYB9am0RKWeZblxYR1ci/5JeiMVBljzJUGpb3TfV+MZmLIUkjdHLQfLkyrncd8IkIO/PpGE32+ux79sOSlqJATljbXTgeRd3tk3kNPH1v5xSAF0z8eUFzCPUFK4ck= 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=TlV7ZyJK; arc=none smtp.client-ip=198.175.65.14 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="TlV7ZyJK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741645015; x=1773181015; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=Z8+q2GV/aH550yKDFdVnUikndMt1LzCKO/Ii8P5vA5A=; b=TlV7ZyJKlD0YQMWxoMbteLxytxPVnr3eg/P7V9KHGPzlpNMNEs4J1TO6 FxRtqSAu4tsTbiVYbpzi5oXYmbPApVH7xEIBY9WYaWkSTqYrLEc3b1mwh H66UQDooAbO3jndB50Pqe3aRfSXUjtFwATpKTM9XZTo9vzF8lQtZ8ym+M Nzr31Wn3B1g/HmehiwPwp0idHzOPCDxUCyiOLIL37ikjEea8Wm8ol6NyS QTyhOiu6d+yTvI73q2Lmdqzy4rMEuXWrn6pfuvtOd5kz1ugeWqnmHY0E/ CUBEOyfHHsrmGj3Y9WJxXpZpFuSZInShXW6Gohlzc7/rK9lp+swTWLp5o g==; X-CSE-ConnectionGUID: 0Iy3PrYDTru4U58ZBOrHvQ== X-CSE-MsgGUID: fn4yyUboQe6W9fQIfylNfA== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="46443345" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="46443345" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:52 -0700 X-CSE-ConnectionGUID: kY5vil/mQL6S7hDXNmQUtg== X-CSE-MsgGUID: NB6gvf4ST3aeLEoatqrb3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="143315055" Received: from jekeller-desk.jf.intel.com ([10.166.241.15]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 15:16:52 -0700 From: Jacob Keller Date: Mon, 10 Mar 2025 15:16:40 -0700 Subject: [PATCH net 5/5] ptp: ocp: reject unsupported periodic output flags Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250310-jk-net-fixes-supported-extts-flags-v1-5-854ffb5f3a96@intel.com> References: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@intel.com> In-Reply-To: <20250310-jk-net-fixes-supported-extts-flags-v1-0-854ffb5f3a96@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, Raju Lakkaraju , Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Jonathan Lemon , Lasse Johnsen , Vadim Fedorenko 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 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") Signed-off-by: Jacob Keller Reviewed-by: Vadim Fedorenko --- 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)