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)