| Message ID | 20220930092740.130924-1-Raju.Lakkaraju@microchip.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cb4b12071a4b68df323c339f60805834246b3e9e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,V5] eth: lan743x: reject extts for non-pci11x1x devices | expand |
The 09/30/2022 14:57, Raju Lakkaraju wrote: > Remove PTP_PF_EXTTS support for non-PCI11x1x devices since they do not support > the PTP-IO Input event triggered timestamping mechanisms added > > Fixes: 60942c397af6 ("net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)") > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> > --- > Changes: > ======== > V4 -> V5: > - Remove the Reviewed-by tag added by me > - Correct the Fixes tag subject line > > V3 -> V4: > - Fix the Fixes tag line split > > V2 -> V3: > - Correct the Fixes tag > > V1 -> V2: > - Repost against net with a Fixes tag > > drivers/net/ethernet/microchip/lan743x_ptp.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c > index 6a11e2ceb013..da3ea905adbb 100644 > --- a/drivers/net/ethernet/microchip/lan743x_ptp.c > +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c > @@ -1049,6 +1049,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp, > enum ptp_pin_function func, > unsigned int chan) > { > + struct lan743x_ptp *lan_ptp = > + container_of(ptp, struct lan743x_ptp, ptp_clock_info); > + struct lan743x_adapter *adapter = > + container_of(lan_ptp, struct lan743x_adapter, ptp); > int result = 0; > > /* Confirm the requested function is supported. Parameter > @@ -1057,7 +1061,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp, > switch (func) { > case PTP_PF_NONE: > case PTP_PF_PEROUT: > + break; > case PTP_PF_EXTTS: > + if (!adapter->is_pci11x1x) > + result = -1; > break; > case PTP_PF_PHYSYNC: > default: > -- > 2.25.1 >
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 30 Sep 2022 14:57:40 +0530 you wrote: > Remove PTP_PF_EXTTS support for non-PCI11x1x devices since they do not support > the PTP-IO Input event triggered timestamping mechanisms added > > Fixes: 60942c397af6 ("net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)") > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> > --- > Changes: > ======== > V4 -> V5: > - Remove the Reviewed-by tag added by me > - Correct the Fixes tag subject line > > [...] Here is the summary with links: - [net,V5] eth: lan743x: reject extts for non-pci11x1x devices https://git.kernel.org/netdev/net/c/cb4b12071a4b You are awesome, thank you!
diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c index 6a11e2ceb013..da3ea905adbb 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.c +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c @@ -1049,6 +1049,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp, enum ptp_pin_function func, unsigned int chan) { + struct lan743x_ptp *lan_ptp = + container_of(ptp, struct lan743x_ptp, ptp_clock_info); + struct lan743x_adapter *adapter = + container_of(lan_ptp, struct lan743x_adapter, ptp); int result = 0; /* Confirm the requested function is supported. Parameter @@ -1057,7 +1061,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp, switch (func) { case PTP_PF_NONE: case PTP_PF_PEROUT: + break; case PTP_PF_EXTTS: + if (!adapter->is_pci11x1x) + result = -1; break; case PTP_PF_PHYSYNC: default:
Remove PTP_PF_EXTTS support for non-PCI11x1x devices since they do not support the PTP-IO Input event triggered timestamping mechanisms added Fixes: 60942c397af6 ("net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)") Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> --- Changes: ======== V4 -> V5: - Remove the Reviewed-by tag added by me - Correct the Fixes tag subject line V3 -> V4: - Fix the Fixes tag line split V2 -> V3: - Correct the Fixes tag V1 -> V2: - Repost against net with a Fixes tag drivers/net/ethernet/microchip/lan743x_ptp.c | 7 +++++++ 1 file changed, 7 insertions(+)