mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
net: ionic: register PHC for rdma timestamping
Currently, the driver only registers the PTP Hardware Clock (PHC) if Ethernet hardware timestamping is supported. Update the registration logic to register the PHC if the device supports either Ethernet hardware timestamping or RDMA completion timestamping. Co-developed-by: Allen Hubbe <allen.hubbe@amd.com> Signed-off-by: Allen Hubbe <allen.hubbe@amd.com> Signed-off-by: Abhijit Gangurde <abhijit.gangurde@amd.com> Link: https://patch.msgid.link/20260610154216.712374-2-abhijit.gangurde@amd.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
This commit is contained in:
parent
0ca7997938
commit
8aae47a046
|
|
@ -1041,10 +1041,14 @@ static int ionic_get_ts_info(struct net_device *netdev,
|
|||
|
||||
info->phc_index = ptp_clock_index(lif->phc->ptp);
|
||||
|
||||
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
|
||||
SOF_TIMESTAMPING_TX_HARDWARE |
|
||||
SOF_TIMESTAMPING_RX_HARDWARE |
|
||||
SOF_TIMESTAMPING_RAW_HARDWARE;
|
||||
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;
|
||||
|
||||
if (!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return 0;
|
||||
|
||||
info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |
|
||||
SOF_TIMESTAMPING_RX_HARDWARE |
|
||||
SOF_TIMESTAMPING_RAW_HARDWARE;
|
||||
|
||||
/* tx modes */
|
||||
|
||||
|
|
|
|||
|
|
@ -1181,6 +1181,7 @@ enum ionic_eth_hw_features {
|
|||
IONIC_ETH_HW_TX_CSUM_GENEVE = BIT(18),
|
||||
IONIC_ETH_HW_TSO_GENEVE = BIT(19),
|
||||
IONIC_ETH_HW_TIMESTAMP = BIT(20),
|
||||
IONIC_ETH_HW_RDMA_TIMESTAMP = BIT(21),
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1500,7 +1500,8 @@ static int ionic_set_nic_features(struct ionic_lif *lif,
|
|||
ctx.cmd.lif_setattr.features = ionic_netdev_features_to_nic(features);
|
||||
|
||||
if (lif->phc)
|
||||
ctx.cmd.lif_setattr.features |= cpu_to_le64(IONIC_ETH_HW_TIMESTAMP);
|
||||
ctx.cmd.lif_setattr.features |= lif->ionic->ident.lif.eth.config.features &
|
||||
cpu_to_le64(IONIC_ETH_HW_TIMESTAMP | IONIC_ETH_HW_RDMA_TIMESTAMP);
|
||||
|
||||
err = ionic_adminq_post_wait(lif, &ctx);
|
||||
if (err)
|
||||
|
|
@ -1551,6 +1552,8 @@ static int ionic_set_nic_features(struct ionic_lif *lif,
|
|||
dev_dbg(dev, "feature ETH_HW_TSO_UDP_CSUM\n");
|
||||
if (lif->hw_features & IONIC_ETH_HW_TIMESTAMP)
|
||||
dev_dbg(dev, "feature ETH_HW_TIMESTAMP\n");
|
||||
if (lif->hw_features & IONIC_ETH_HW_RDMA_TIMESTAMP)
|
||||
dev_dbg(dev, "feature ETH_HW_RDMA_TIMESTAMP\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,7 +77,8 @@ static int ionic_lif_hwstamp_set_ts_config(struct ionic_lif *lif,
|
|||
bool rx_all;
|
||||
__le64 mask;
|
||||
|
||||
if (!lif->phc || !lif->phc->ptp)
|
||||
if (!lif->phc || !lif->phc->ptp ||
|
||||
!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
mutex_lock(&lif->phc->config_lock);
|
||||
|
|
@ -210,7 +211,8 @@ int ionic_hwstamp_set(struct net_device *netdev,
|
|||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
int err;
|
||||
|
||||
if (!lif->phc || !lif->phc->ptp)
|
||||
if (!lif->phc || !lif->phc->ptp ||
|
||||
!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
mutex_lock(&lif->queue_lock);
|
||||
|
|
@ -228,7 +230,8 @@ void ionic_lif_hwstamp_replay(struct ionic_lif *lif)
|
|||
{
|
||||
int err;
|
||||
|
||||
if (!lif->phc || !lif->phc->ptp)
|
||||
if (!lif->phc || !lif->phc->ptp ||
|
||||
!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return;
|
||||
|
||||
mutex_lock(&lif->queue_lock);
|
||||
|
|
@ -242,7 +245,8 @@ void ionic_lif_hwstamp_recreate_queues(struct ionic_lif *lif)
|
|||
{
|
||||
int err;
|
||||
|
||||
if (!lif->phc || !lif->phc->ptp)
|
||||
if (!lif->phc || !lif->phc->ptp ||
|
||||
!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return;
|
||||
|
||||
mutex_lock(&lif->phc->config_lock);
|
||||
|
|
@ -267,7 +271,8 @@ int ionic_hwstamp_get(struct net_device *netdev,
|
|||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
|
||||
if (!lif->phc || !lif->phc->ptp)
|
||||
if (!lif->phc || !lif->phc->ptp ||
|
||||
!(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
mutex_lock(&lif->phc->config_lock);
|
||||
|
|
@ -506,7 +511,8 @@ static const struct ptp_clock_info ionic_ptp_info = {
|
|||
|
||||
void ionic_lif_register_phc(struct ionic_lif *lif)
|
||||
{
|
||||
if (!lif->phc || !(lif->hw_features & IONIC_ETH_HW_TIMESTAMP))
|
||||
if (!lif->phc ||
|
||||
!(lif->hw_features & (IONIC_ETH_HW_TIMESTAMP | IONIC_ETH_HW_RDMA_TIMESTAMP)))
|
||||
return;
|
||||
|
||||
lif->phc->ptp = ptp_clock_register(&lif->phc->ptp_info, lif->ionic->dev);
|
||||
|
|
@ -545,7 +551,7 @@ void ionic_lif_alloc_phc(struct ionic_lif *lif)
|
|||
return;
|
||||
|
||||
features = le64_to_cpu(ionic->ident.lif.eth.config.features);
|
||||
if (!(features & IONIC_ETH_HW_TIMESTAMP))
|
||||
if (!(features & (IONIC_ETH_HW_TIMESTAMP | IONIC_ETH_HW_RDMA_TIMESTAMP)))
|
||||
return;
|
||||
|
||||
phc = devm_kzalloc(ionic->dev, sizeof(*phc), GFP_KERNEL);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user