| From foo@baz Wed Feb 28 16:16:23 CET 2018 |
| From: Yangbo Lu <yangbo.lu@nxp.com> |
| Date: Tue, 9 Jan 2018 11:02:33 +0800 |
| Subject: net: gianfar_ptp: move set_fipers() to spinlock protecting area |
| |
| From: Yangbo Lu <yangbo.lu@nxp.com> |
| |
| |
| [ Upstream commit 11d827a993a969c3c6ec56758ff63a44ba19b466 ] |
| |
| set_fipers() calling should be protected by spinlock in |
| case that any interrupt breaks related registers setting |
| and the function we expect. This patch is to move set_fipers() |
| to spinlock protecting area in ptp_gianfar_adjtime(). |
| |
| Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> |
| Acked-by: Richard Cochran <richardcochran@gmail.com> |
| Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/freescale/gianfar_ptp.c |
| +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c |
| @@ -314,11 +314,10 @@ static int ptp_gianfar_adjtime(struct pt |
| now = tmr_cnt_read(etsects); |
| now += delta; |
| tmr_cnt_write(etsects, now); |
| + set_fipers(etsects); |
| |
| spin_unlock_irqrestore(&etsects->lock, flags); |
| |
| - set_fipers(etsects); |
| - |
| return 0; |
| } |
| |
