e5f3155267
The 'imply' keyword does not do what most people think it does, it only
politely asks Kconfig to turn on another symbol, but does not prevent
it from being disabled manually or built as a loadable module when the
user is built-in. In the ICE driver, the latter now causes a link failure:
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_eth_ioctl':
ice_main.c:(.text+0x13b0): undefined reference to `ice_ptp_get_ts_config'
ice_main.c:(.text+0x13b0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_get_ts_config'
aarch64-linux-ld: ice_main.c:(.text+0x13bc): undefined reference to `ice_ptp_set_ts_config'
ice_main.c:(.text+0x13bc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_set_ts_config'
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_prepare_for_reset':
ice_main.c:(.text+0x31fc): undefined reference to `ice_ptp_release'
ice_main.c:(.text+0x31fc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_release'
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_rebuild':
This is a recurring problem in many drivers, and we have discussed
it several times befores, without reaching a consensus. I'm providing
a link to the previous email thread for reference, which discusses
some related problems.
To solve the dependency issue better than the 'imply' keyword, introduce a
separate Kconfig symbol "CONFIG_PTP_1588_CLOCK_OPTIONAL" that any driver
can depend on if it is able to use PTP support when available, but works
fine without it. Whenever CONFIG_PTP_1588_CLOCK=m, those drivers are
then prevented from being built-in, the same way as with a 'depends on
PTP_1588_CLOCK || !PTP_1588_CLOCK' dependency that does the same trick,
but that can be rather confusing when you first see it.
Since this should cover the dependencies correctly, the IS_REACHABLE()
hack in the header is no longer needed now, and can be turned back
into a normal IS_ENABLED() check. Any driver that gets the dependency
wrong will now cause a link time failure rather than being unable to use
PTP support when that is in a loadable module.
However, the two recently added ptp_get_vclocks_index() and
ptp_convert_timestamp() interfaces are only called from builtin code with
ethtool and socket timestamps, so keep the current behavior by stubbing
those out completely when PTP is in a loadable module. This should be
addressed properly in a follow-up.
As Richard suggested, we may want to actually turn PTP support into a
'bool' option later on, preventing it from being a loadable module
altogether, which would be one way to solve the problem with the ethtool
interface.
Fixes: 06c16d89d2
("ice: register 1588 PTP clock device object for E810 devices")
Link: https://lore.kernel.org/netdev/20210804121318.337276-1-arnd@kernel.org/
Link: https://lore.kernel.org/netdev/CAK8P3a06enZOf=XyZ+zcAwBczv41UuCTz+=0FMf2gBz1_cOnZQ@mail.gmail.com/
Link: https://lore.kernel.org/netdev/CAK8P3a3=eOxE-K25754+fB_-i_0BZzf9a9RfPTX3ppSwu9WZXw@mail.gmail.com/
Link: https://lore.kernel.org/netdev/20210726084540.3282344-1-arnd@kernel.org/
Acked-by: Shannon Nelson <snelson@pensando.io>
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210812183509.1362782-1-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
222 lines
5.1 KiB
C
222 lines
5.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* PTP virtual clock driver
|
|
*
|
|
* Copyright 2021 NXP
|
|
*/
|
|
#include <linux/slab.h>
|
|
#include "ptp_private.h"
|
|
|
|
#define PTP_VCLOCK_CC_SHIFT 31
|
|
#define PTP_VCLOCK_CC_MULT (1 << PTP_VCLOCK_CC_SHIFT)
|
|
#define PTP_VCLOCK_FADJ_SHIFT 9
|
|
#define PTP_VCLOCK_FADJ_DENOMINATOR 15625ULL
|
|
#define PTP_VCLOCK_REFRESH_INTERVAL (HZ * 2)
|
|
|
|
static int ptp_vclock_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
|
|
{
|
|
struct ptp_vclock *vclock = info_to_vclock(ptp);
|
|
unsigned long flags;
|
|
s64 adj;
|
|
|
|
adj = (s64)scaled_ppm << PTP_VCLOCK_FADJ_SHIFT;
|
|
adj = div_s64(adj, PTP_VCLOCK_FADJ_DENOMINATOR);
|
|
|
|
spin_lock_irqsave(&vclock->lock, flags);
|
|
timecounter_read(&vclock->tc);
|
|
vclock->cc.mult = PTP_VCLOCK_CC_MULT + adj;
|
|
spin_unlock_irqrestore(&vclock->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptp_vclock_adjtime(struct ptp_clock_info *ptp, s64 delta)
|
|
{
|
|
struct ptp_vclock *vclock = info_to_vclock(ptp);
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vclock->lock, flags);
|
|
timecounter_adjtime(&vclock->tc, delta);
|
|
spin_unlock_irqrestore(&vclock->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptp_vclock_gettime(struct ptp_clock_info *ptp,
|
|
struct timespec64 *ts)
|
|
{
|
|
struct ptp_vclock *vclock = info_to_vclock(ptp);
|
|
unsigned long flags;
|
|
u64 ns;
|
|
|
|
spin_lock_irqsave(&vclock->lock, flags);
|
|
ns = timecounter_read(&vclock->tc);
|
|
spin_unlock_irqrestore(&vclock->lock, flags);
|
|
*ts = ns_to_timespec64(ns);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptp_vclock_settime(struct ptp_clock_info *ptp,
|
|
const struct timespec64 *ts)
|
|
{
|
|
struct ptp_vclock *vclock = info_to_vclock(ptp);
|
|
u64 ns = timespec64_to_ns(ts);
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vclock->lock, flags);
|
|
timecounter_init(&vclock->tc, &vclock->cc, ns);
|
|
spin_unlock_irqrestore(&vclock->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static long ptp_vclock_refresh(struct ptp_clock_info *ptp)
|
|
{
|
|
struct ptp_vclock *vclock = info_to_vclock(ptp);
|
|
struct timespec64 ts;
|
|
|
|
ptp_vclock_gettime(&vclock->info, &ts);
|
|
|
|
return PTP_VCLOCK_REFRESH_INTERVAL;
|
|
}
|
|
|
|
static const struct ptp_clock_info ptp_vclock_info = {
|
|
.owner = THIS_MODULE,
|
|
.name = "ptp virtual clock",
|
|
/* The maximum ppb value that long scaled_ppm can support */
|
|
.max_adj = 32767999,
|
|
.adjfine = ptp_vclock_adjfine,
|
|
.adjtime = ptp_vclock_adjtime,
|
|
.gettime64 = ptp_vclock_gettime,
|
|
.settime64 = ptp_vclock_settime,
|
|
.do_aux_work = ptp_vclock_refresh,
|
|
};
|
|
|
|
static u64 ptp_vclock_read(const struct cyclecounter *cc)
|
|
{
|
|
struct ptp_vclock *vclock = cc_to_vclock(cc);
|
|
struct ptp_clock *ptp = vclock->pclock;
|
|
struct timespec64 ts = {};
|
|
|
|
if (ptp->info->gettimex64)
|
|
ptp->info->gettimex64(ptp->info, &ts, NULL);
|
|
else
|
|
ptp->info->gettime64(ptp->info, &ts);
|
|
|
|
return timespec64_to_ns(&ts);
|
|
}
|
|
|
|
static const struct cyclecounter ptp_vclock_cc = {
|
|
.read = ptp_vclock_read,
|
|
.mask = CYCLECOUNTER_MASK(32),
|
|
.mult = PTP_VCLOCK_CC_MULT,
|
|
.shift = PTP_VCLOCK_CC_SHIFT,
|
|
};
|
|
|
|
struct ptp_vclock *ptp_vclock_register(struct ptp_clock *pclock)
|
|
{
|
|
struct ptp_vclock *vclock;
|
|
|
|
vclock = kzalloc(sizeof(*vclock), GFP_KERNEL);
|
|
if (!vclock)
|
|
return NULL;
|
|
|
|
vclock->pclock = pclock;
|
|
vclock->info = ptp_vclock_info;
|
|
vclock->cc = ptp_vclock_cc;
|
|
|
|
snprintf(vclock->info.name, PTP_CLOCK_NAME_LEN, "ptp%d_virt",
|
|
pclock->index);
|
|
|
|
spin_lock_init(&vclock->lock);
|
|
|
|
vclock->clock = ptp_clock_register(&vclock->info, &pclock->dev);
|
|
if (IS_ERR_OR_NULL(vclock->clock)) {
|
|
kfree(vclock);
|
|
return NULL;
|
|
}
|
|
|
|
timecounter_init(&vclock->tc, &vclock->cc, 0);
|
|
ptp_schedule_worker(vclock->clock, PTP_VCLOCK_REFRESH_INTERVAL);
|
|
|
|
return vclock;
|
|
}
|
|
|
|
void ptp_vclock_unregister(struct ptp_vclock *vclock)
|
|
{
|
|
ptp_clock_unregister(vclock->clock);
|
|
kfree(vclock);
|
|
}
|
|
|
|
#if IS_BUILTIN(CONFIG_PTP_1588_CLOCK)
|
|
int ptp_get_vclocks_index(int pclock_index, int **vclock_index)
|
|
{
|
|
char name[PTP_CLOCK_NAME_LEN] = "";
|
|
struct ptp_clock *ptp;
|
|
struct device *dev;
|
|
int num = 0;
|
|
|
|
if (pclock_index < 0)
|
|
return num;
|
|
|
|
snprintf(name, PTP_CLOCK_NAME_LEN, "ptp%d", pclock_index);
|
|
dev = class_find_device_by_name(ptp_class, name);
|
|
if (!dev)
|
|
return num;
|
|
|
|
ptp = dev_get_drvdata(dev);
|
|
|
|
if (mutex_lock_interruptible(&ptp->n_vclocks_mux)) {
|
|
put_device(dev);
|
|
return num;
|
|
}
|
|
|
|
*vclock_index = kzalloc(sizeof(int) * ptp->n_vclocks, GFP_KERNEL);
|
|
if (!(*vclock_index))
|
|
goto out;
|
|
|
|
memcpy(*vclock_index, ptp->vclock_index, sizeof(int) * ptp->n_vclocks);
|
|
num = ptp->n_vclocks;
|
|
out:
|
|
mutex_unlock(&ptp->n_vclocks_mux);
|
|
put_device(dev);
|
|
return num;
|
|
}
|
|
EXPORT_SYMBOL(ptp_get_vclocks_index);
|
|
|
|
void ptp_convert_timestamp(struct skb_shared_hwtstamps *hwtstamps,
|
|
int vclock_index)
|
|
{
|
|
char name[PTP_CLOCK_NAME_LEN] = "";
|
|
struct ptp_vclock *vclock;
|
|
struct ptp_clock *ptp;
|
|
unsigned long flags;
|
|
struct device *dev;
|
|
u64 ns;
|
|
|
|
snprintf(name, PTP_CLOCK_NAME_LEN, "ptp%d", vclock_index);
|
|
dev = class_find_device_by_name(ptp_class, name);
|
|
if (!dev)
|
|
return;
|
|
|
|
ptp = dev_get_drvdata(dev);
|
|
if (!ptp->is_virtual_clock) {
|
|
put_device(dev);
|
|
return;
|
|
}
|
|
|
|
vclock = info_to_vclock(ptp->info);
|
|
|
|
ns = ktime_to_ns(hwtstamps->hwtstamp);
|
|
|
|
spin_lock_irqsave(&vclock->lock, flags);
|
|
ns = timecounter_cyc2time(&vclock->tc, ns);
|
|
spin_unlock_irqrestore(&vclock->lock, flags);
|
|
|
|
put_device(dev);
|
|
hwtstamps->hwtstamp = ns_to_ktime(ns);
|
|
}
|
|
EXPORT_SYMBOL(ptp_convert_timestamp);
|
|
#endif
|