Re: [PATCH 02/10] ravb: Rename "no_ptp_cfg_active" and "ptp_cfg_active" variables
From: Sergey Shtylyov <hidden>
Date: 2021-10-01 20:43:32
Also in:
linux-renesas-soc
On 10/1/21 6:06 PM, Biju Das wrote:
Rename the variable "no_ptp_cfg_active" with "gptp" and
This shouldn't be a rename but the extension of the meaning instead...
"ptp_cfg_active" with "ccc_gac" to match the HW features. There is no functional change. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Suggested-by: Sergey Shtylyov <redacted> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- RFc->v1: * Renamed the variable "no_ptp_cfg_active" with "gptp" and "ptp_cfg_active" with "ccc_gac --- drivers/net/ethernet/renesas/ravb.h | 4 ++-- drivers/net/ethernet/renesas/ravb_main.c | 26 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-)
[...]
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 8f2358caef34..dc7654abfe55 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c@@ -1274,7 +1274,7 @@ static int ravb_set_ringparam(struct net_device *ndev, if (netif_running(ndev)) { netif_device_detach(ndev); /* Stop PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp)
Where have you lost !info->ccc_gac?
quoted hunk ↗ jump to hunk
ravb_ptp_stop(ndev); /* Wait for DMA stopping */ error = ravb_stop_dma(ndev);@@ -1306,7 +1306,7 @@ static int ravb_set_ringparam(struct net_device *ndev, ravb_emac_init(ndev); /* Initialise PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp) ravb_ptp_init(ndev, priv->pdev);
The same question here...
quoted hunk ↗ jump to hunk
netif_device_attach(ndev);@@ -1446,7 +1446,7 @@ static int ravb_open(struct net_device *ndev) ravb_emac_init(ndev); /* Initialise PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp)
... and here.
quoted hunk ↗ jump to hunk
ravb_ptp_init(ndev, priv->pdev); netif_tx_start_all_queues(ndev);@@ -1460,7 +1460,7 @@ static int ravb_open(struct net_device *ndev) out_ptp_stop: /* Stop PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp) ravb_ptp_stop(ndev);
... and here.
quoted hunk ↗ jump to hunk
out_free_irq_nc_tx: if (!info->multi_irqs)@@ -1508,7 +1508,7 @@ static void ravb_tx_timeout_work(struct work_struct *work) netif_tx_stop_all_queues(ndev); /* Stop PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp)
... and here.
quoted hunk ↗ jump to hunk
ravb_ptp_stop(ndev); /* Wait for DMA stopping */@@ -1543,7 +1543,7 @@ static void ravb_tx_timeout_work(struct work_struct *work) out: /* Initialise PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp) ravb_ptp_init(ndev, priv->pdev);
... and here.
quoted hunk ↗ jump to hunk
netif_tx_start_all_queues(ndev);@@ -1752,7 +1752,7 @@ static int ravb_close(struct net_device *ndev) ravb_write(ndev, 0, TIC); /* Stop PTP Clock driver */ - if (info->no_ptp_cfg_active) + if (info->gptp)
... and here.
quoted hunk ↗ jump to hunk
ravb_ptp_stop(ndev); /* Set the config mode to stop the AVB-DMAC's processes */@@ -2018,7 +2018,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .internal_delay = 1, .tx_counters = 1, .multi_irqs = 1, - .ptp_cfg_active = 1,
Where is 'gptp'?
+ .ccc_gac = 1,
};
static const struct ravb_hw_info ravb_gen2_hw_info = {[...]
quoted hunk ↗ jump to hunk
@@ -2080,7 +2080,7 @@ static void ravb_set_config_mode(struct net_device *ndev) struct ravb_private *priv = netdev_priv(ndev); const struct ravb_hw_info *info = priv->info; - if (info->no_ptp_cfg_active) { + if (info->gptp) {
Where have you lost !info->ccc_gac?
ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG); /* Set CSEL value */ ravb_modify(ndev, CCC, CCC_CSEL, CCC_CSEL_HPB);
[...] MBR, Sergey