From patchwork Fri Aug 9 09:18:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Dolcini X-Patchwork-Id: 13758588 Received: from mail11.truemail.it (mail11.truemail.it [217.194.8.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C0E8190667 for ; Fri, 9 Aug 2024 09:18:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.194.8.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723195136; cv=none; b=K5/GUHBh0OWcPftcMof5wxHPfy2NEK1AgNLPoxhvZJKNUvAABeuZ1jTUjUCI/vcWVF9fvCsI4RFXVfHjyx5NOv5FmvPeMBsVBH8SWmjIc9ApSRvbLL9HOw6lq6Mhl9QXEiSOPsubNm6AAOYii5q/iU2nEZCRkKAIzJjvBjYWqBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723195136; c=relaxed/simple; bh=3bEW4BNL0Bvl0ZyI1YXSrraFhvqdFCLvdIc9738R+FI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DH788PRnf4gvWyhfP+7m/r+IaxvBZ4jvkp5k23w3KQxEqi7GU9VKpRE3UGs4mxldV57HER1batZEo1O/lrcrUnUlLzL6OOHYyYQzA5hSVgjfStz6D4tOWJ6+LsrffvwLUijL9cHiHKAkJojiG6mIKppxTC89ydY91h6TKRtrdz8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=dolcini.it; spf=pass smtp.mailfrom=dolcini.it; dkim=pass (2048-bit key) header.d=dolcini.it header.i=@dolcini.it header.b=mlF3Gsf8; arc=none smtp.client-ip=217.194.8.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=dolcini.it Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=dolcini.it Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dolcini.it header.i=@dolcini.it header.b="mlF3Gsf8" Received: from francesco-nb.pivistrello.it (93-49-2-63.ip317.fastwebnet.it [93.49.2.63]) by mail11.truemail.it (Postfix) with ESMTPA id D02952225B; Fri, 9 Aug 2024 11:18:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dolcini.it; s=default; t=1723195131; bh=bxJPyjYC85DqIcev1XSx6qROZDSV6+5DPIhde6Jh3SU=; h=From:To:Subject; b=mlF3Gsf8f2Omraxk1cn1YDGvwpLT4IcOVqR6cFTSJtzuRHNr3+shzqfMJz+EIg1ju gBsDvtnoqekQto54VYN/kyDkSQthoS8jYumIbY9x8u19XO4abzMlGgzlqiIDEqzk1Y p0aYb+J1+uFwJ40hTKRODy+MT5ywHN5GCSabGQUPszFyh9On/6vOwyFh4SGZ67/+g0 JOAeWDcfjAsv9ObSuotuo0V6qfDPFJtl/heuY1KvWDrzPeHAsSpayoge90Smv1jpkg N8XYRKXhsLy+LJmdm+Jhmeijrth8fdQNXugodFEOaMB5m2tJSWILxcaIfy49lju4K1 ZbHwY1hAA7XpA== From: Francesco Dolcini To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran Cc: Francesco Dolcini , imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Li Subject: [PATCH v2 2/3] net: fec: refactor PPS channel configuration Date: Fri, 9 Aug 2024 11:18:43 +0200 Message-Id: <20240809091844.387824-3-francesco@dolcini.it> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240809091844.387824-1-francesco@dolcini.it> References: <20240809091844.387824-1-francesco@dolcini.it> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Francesco Dolcini Preparation patch to allow for PPS channel configuration, no functional change intended. Signed-off-by: Francesco Dolcini Reviewed-by: Frank Li --- v2: add Reviewed-by --- drivers/net/ethernet/freescale/fec_ptp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 2e4f3e1782a2..25f988b9c7cf 100644 --- 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 @@ -530,8 +529,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, 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); @@ -542,10 +542,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, 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);