Commit d09adf61 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jakub Kicinski
Browse files

ptp_pch: Use ioread64_hi_lo() / iowrite64_hi_lo() 



There is already helper functions to do 64-bit I/O on 32-bit machines or
buses, thus we don't need to reinvent the wheel.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220207210730.75252-3-andriy.shevchenko@linux.intel.com


Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8664d49a

drivers/ptp/ptp_pch.c

+4 −9
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/io-64-nonatomic-hi-lo.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -298,19 +299,16 @@ static irqreturn_t isr(int irq, void *priv) 
	struct pch_dev *pch_dev = priv;

	struct pch_ts_regs __iomem *regs = pch_dev->regs;

	struct ptp_clock_event event;

	u32 ack = 0, lo, hi, val;

	u32 ack = 0, val;



	val = ioread32(&regs->event);



	if (val & PCH_TSE_SNS) {

		ack |= PCH_TSE_SNS;

		if (pch_dev->exts0_enabled) {

			hi = ioread32(&regs->asms_hi);

			lo = ioread32(&regs->asms_lo);

			event.type = PTP_CLOCK_EXTTS;

			event.index = 0;

			event.timestamp = ((u64) hi) << 32;

			event.timestamp |= lo;

			event.timestamp = ioread64_hi_lo(&regs->asms_hi);

			event.timestamp <<= TICKS_NS_SHIFT;

			ptp_clock_event(pch_dev->ptp_clock, &event);

		}
@@ -319,12 +317,9 @@ static irqreturn_t isr(int irq, void *priv) 
	if (val & PCH_TSE_SNM) {

		ack |= PCH_TSE_SNM;

		if (pch_dev->exts1_enabled) {

			hi = ioread32(&regs->amms_hi);

			lo = ioread32(&regs->amms_lo);

			event.type = PTP_CLOCK_EXTTS;

			event.index = 1;

			event.timestamp = ((u64) hi) << 32;

			event.timestamp |= lo;

			event.timestamp = ioread64_hi_lo(&regs->asms_hi);

			event.timestamp <<= TICKS_NS_SHIFT;

			ptp_clock_event(pch_dev->ptp_clock, &event);

		}