mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
iavf: add missing PTP adjustment callbacks
The PTP hardware clock documentation requires drivers to implement all
callbacks and return -EOPNOTSUPP for unsupported features.
The iavf driver registers a PHC without adjtime or adjfine callbacks.
A userspace clock_adjtime(2) request reaches ptp_clock_adjtime(), where
ADJ_SETOFFSET calls adjtime and ADJ_FREQUENCY calls adjfine. The missing
callbacks can therefore cause a NULL dereference.
Provide both callbacks and return -EOPNOTSUPP for the unsupported
operations.
Fixes: d734223b2f ("iavf: add initial framework for registering PTP clock")
Link: https://docs.kernel.org/driver-api/ptp.html#writing-clock-drivers
Link: https://lore.kernel.org/all/[email protected]/
Cc: [email protected]
Signed-off-by: Xuanqiang Luo <[email protected]>
Reviewed-by: Vadim Fedorenko <[email protected]>
Acked-by: Jacob Keller <[email protected]>
Tested-by: Rafal Romanowski <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
This commit is contained in:
committed by
Jakub Kicinski
parent
2a1f106379
commit
adbc4d0fff
@@ -252,6 +252,16 @@ static int iavf_ptp_gettimex64(struct ptp_clock_info *info,
|
||||
return iavf_read_phc_indirect(adapter, ts, sts);
|
||||
}
|
||||
|
||||
static int iavf_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int iavf_ptp_adjtime(struct ptp_clock_info *info, s64 delta)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int iavf_ptp_settime64(struct ptp_clock_info *info,
|
||||
const struct timespec64 *ts)
|
||||
{
|
||||
@@ -326,6 +336,8 @@ static int iavf_ptp_register_clock(struct iavf_adapter *adapter)
|
||||
KBUILD_MODNAME, dev_name(dev));
|
||||
ptp_info->owner = THIS_MODULE;
|
||||
ptp_info->gettimex64 = iavf_ptp_gettimex64;
|
||||
ptp_info->adjfine = iavf_ptp_adjfine;
|
||||
ptp_info->adjtime = iavf_ptp_adjtime;
|
||||
ptp_info->settime64 = iavf_ptp_settime64;
|
||||
ptp_info->do_aux_work = iavf_ptp_do_aux_work;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user