Commit 97a88d9e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ptp-ocp-a-fix-and-refactoring' 

Andy Shevchenko says:

====================
ptp: ocp: A fix and refactoring

Here is the fix for incorrect use of %ptT with the associated
refactoring and additional cleanups.

Note, %ptS, which is introduced in another series that is already
applied to PRINTK tree, doesn't fit here, that's why this fix
is separated from that series.
====================

Link: https://patch.msgid.link/20251124084816.205035-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b796632f 648282e2

drivers/ptp/ptp_ocp.c

+18 −28
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
#include <linux/crc16.h>

#include <linux/dpll.h>



#define PCI_VENDOR_ID_FACEBOOK			0x1d9b

#define PCI_DEVICE_ID_FACEBOOK_TIMECARD		0x0400

#define PCI_DEVICE_ID_META_TIMECARD		0x0400



#define PCI_VENDOR_ID_CELESTICA			0x18d4

#define PCI_DEVICE_ID_CELESTICA_TIMECARD	0x1008
@@ -1030,7 +1029,7 @@ static struct ocp_resource ocp_adva_resource[] = { 
};



static const struct pci_device_id ptp_ocp_pcidev_id[] = {

	{ PCI_DEVICE_DATA(FACEBOOK, TIMECARD, &ocp_fb_resource) },

	{ PCI_DEVICE_DATA(META, TIMECARD, &ocp_fb_resource) },

	{ PCI_DEVICE_DATA(CELESTICA, TIMECARD, &ocp_fb_resource) },

	{ PCI_DEVICE_DATA(OROLIA, ARTCARD, &ocp_art_resource) },

	{ PCI_DEVICE_DATA(ADVA, TIMECARD, &ocp_adva_resource) },
@@ -2225,6 +2224,9 @@ ptp_ocp_ts_enable(void *priv, u32 req, bool enable) 
static void

ptp_ocp_unregister_ext(struct ptp_ocp_ext_src *ext)

{

	if (!ext)

		return;



	ext->info->enable(ext, ~0, false);

	pci_free_irq(ext->bp->pdev, ext->irq_vec, ext);

	kfree(ext);
@@ -3250,20 +3252,16 @@ signal_show(struct device *dev, struct device_attribute *attr, char *buf) 
	struct dev_ext_attribute *ea = to_ext_attr(attr);

	struct ptp_ocp *bp = dev_get_drvdata(dev);

	struct ptp_ocp_signal *signal;

	int gen = (uintptr_t)ea->var;

	struct timespec64 ts;

	ssize_t count;

	int i;



	i = (uintptr_t)ea->var;

	signal = &bp->signal[i];



	count = sysfs_emit(buf, "%llu %d %llu %d", signal->period,

			   signal->duty, signal->phase, signal->polarity);

	signal = &bp->signal[gen];



	ts = ktime_to_timespec64(signal->start);

	count += sysfs_emit_at(buf, count, " %ptT TAI\n", &ts);



	return count;

	return sysfs_emit(buf, "%llu %d %llu %d %ptT TAI\n",

			  signal->period, signal->duty, signal->phase, signal->polarity,

			  &ts.tv_sec);

}

static EXT_ATTR_RW(signal, signal, 0);

static EXT_ATTR_RW(signal, signal, 1);
@@ -4562,20 +4560,13 @@ ptp_ocp_detach(struct ptp_ocp *bp) 
	ptp_ocp_detach_sysfs(bp);

	ptp_ocp_attr_group_del(bp);

	timer_delete_sync(&bp->watchdog);

	if (bp->ts0)

	ptp_ocp_unregister_ext(bp->ts0);

	if (bp->ts1)

	ptp_ocp_unregister_ext(bp->ts1);

	if (bp->ts2)

	ptp_ocp_unregister_ext(bp->ts2);

	if (bp->ts3)

	ptp_ocp_unregister_ext(bp->ts3);

	if (bp->ts4)

	ptp_ocp_unregister_ext(bp->ts4);

	if (bp->pps)

	ptp_ocp_unregister_ext(bp->pps);

	for (i = 0; i < 4; i++)

		if (bp->signal_out[i])

		ptp_ocp_unregister_ext(bp->signal_out[i]);

	for (i = 0; i < __PORT_COUNT; i++)

		if (bp->port[i].line != -1)
@@ -4829,8 +4820,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	return 0;

out_dpll:

	while (i) {

		--i;

	while (i--) {

		dpll_pin_unregister(bp->dpll, bp->sma[i].dpll_pin, &dpll_pins_ops, &bp->sma[i]);

		dpll_pin_put(bp->sma[i].dpll_pin);

	}