From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 31AAB12C544; Mon, 23 Dec 2024 16:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734970543; cv=none; b=P/aj+HJhS2eZg52NQZRL9NX5VtlhMqRVyexuKkFKtT/KQI8ri5+EG1sLFE+d5/s69uNWwjjSTYiJxrXQ15TVygQD2Mhqw24nYd++qsbFBz4vk8leKw8SHVeLZTUVzedda7yLQ6R9lcB+ihPfmdlscbw7ISmKR/ZZVmsU2zO7hI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734970543; c=relaxed/simple; bh=ejIutn26X5AQxV9BF/9oQzDFIc0/r6X+0NUFuQyi6iI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OMzwz8NIXjEc+AWK3Ae//64KOQQFn7Xk+KVPtlk6/w1+FqM9tL1Bv3E9lt+fMO4R/gPIn7CxtjXhXda4AsOj9WCM5Ehug2wgOUJOM2GtysVNcyGPsle2hJoOqDmybau2rtikK2g5zgxtQFrRaX8nIeP4iIFdwXjGfmBlcyHkwH8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vsyWwdfM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vsyWwdfM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EED0AC4CED3; Mon, 23 Dec 2024 16:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734970542; bh=ejIutn26X5AQxV9BF/9oQzDFIc0/r6X+0NUFuQyi6iI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vsyWwdfMJ9SXnAcJOr6lKFtnMAU4hy8fGLNsB0DqiglSb7/AQMbHI0RDwN63Flj3N 1T8wYa4JuRIdVjpB7C1YXX1QaaiG5y07Anjk8FJS5ZA9MHwdE8E2vYzQ61Yvx6LuhW HhoOdIDM1VQZHVWs7OuV9bMp9WxfdoAqsSH2VELs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Francesco Dolcini , Frank Li , =?UTF-8?q?Cs=C3=B3k=C3=A1s, =20Bence?= , Paolo Abeni Subject: [PATCH 6.6 114/116] net: fec: refactor PPS channel configuration Date: Mon, 23 Dec 2024 16:59:44 +0100 Message-ID: <20241223155403.982401783@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241223155359.534468176@linuxfoundation.org> References: <20241223155359.534468176@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Francesco Dolcini commit bf8ca67e21671e7a56e31da45360480b28f185f1 upstream. Preparation patch to allow for PPS channel configuration, no functional change intended. Signed-off-by: Francesco Dolcini Reviewed-by: Frank Li Reviewed-by: Csókás, Bence Signed-off-by: Paolo Abeni Signed-off-by: Csókás, Bence Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/fec_ptp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -84,8 +84,7 @@ #define FEC_CC_MULT (1 << 31) #define FEC_COUNTER_PERIOD (1 << 31) #define PPS_OUPUT_RELOAD_PERIOD NSEC_PER_SEC -#define FEC_CHANNLE_0 0 -#define DEFAULT_PPS_CHANNEL FEC_CHANNLE_0 +#define DEFAULT_PPS_CHANNEL 0 #define FEC_PTP_MAX_NSEC_PERIOD 4000000000ULL #define FEC_PTP_MAX_NSEC_COUNTER 0x80000000ULL @@ -524,8 +523,9 @@ static int fec_ptp_enable(struct ptp_clo unsigned long flags; int ret = 0; + fep->pps_channel = DEFAULT_PPS_CHANNEL; + if (rq->type == PTP_CLK_REQ_PPS) { - fep->pps_channel = DEFAULT_PPS_CHANNEL; fep->reload_period = PPS_OUPUT_RELOAD_PERIOD; ret = fec_ptp_enable_pps(fep, on); @@ -536,10 +536,9 @@ static int fec_ptp_enable(struct ptp_clo if (rq->perout.flags) return -EOPNOTSUPP; - if (rq->perout.index != DEFAULT_PPS_CHANNEL) + if (rq->perout.index != fep->pps_channel) return -EOPNOTSUPP; - fep->pps_channel = DEFAULT_PPS_CHANNEL; period.tv_sec = rq->perout.period.sec; period.tv_nsec = rq->perout.period.nsec; period_ns = timespec64_to_ns(&period);