mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered
[ Upstream commit4614792eeb
] The CPTS driver registers PTP PHC clock when first netif is going up and unregister it when all netif are down. Now ethtool will show: - PTP PHC clock index 0 after boot until first netif is up; - the last assigned PTP PHC clock index even if PTP PHC clock is not registered any more after all netifs are down. This patch ensures that -1 is returned by ethtool when PTP PHC clock is not registered any more. Fixes:8a2c9a5ab4
("net: ethernet: ti: cpts: rework initialization/deinitialization") Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Acked-by: Richard Cochran <richardcochran@gmail.com> Link: https://lore.kernel.org/r/20201224162405.28032-1-grygorii.strashko@ti.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
db6d55553a
commit
01e61a0b4b
1 changed files with 2 additions and 0 deletions
|
@ -471,6 +471,7 @@ void cpts_unregister(struct cpts *cpts)
|
|||
|
||||
ptp_clock_unregister(cpts->clock);
|
||||
cpts->clock = NULL;
|
||||
cpts->phc_index = -1;
|
||||
|
||||
cpts_write32(cpts, 0, int_enable);
|
||||
cpts_write32(cpts, 0, control);
|
||||
|
@ -572,6 +573,7 @@ struct cpts *cpts_create(struct device *dev, void __iomem *regs,
|
|||
cpts->cc.read = cpts_systim_read;
|
||||
cpts->cc.mask = CLOCKSOURCE_MASK(32);
|
||||
cpts->info = cpts_info;
|
||||
cpts->phc_index = -1;
|
||||
|
||||
cpts_calc_mult_shift(cpts);
|
||||
/* save cc.mult original value as it can be modified
|
||||
|
|
Loading…
Reference in a new issue