dpaa2-eth: Update dpni_get_single_step_cfg command

dpni_get_single_step_cfg is an MC firmware command used for
retrieving the contents of SINGLE_STEP 1588 register available
in a DPMAC.

This patch adds a new version of this command that returns as an extra
argument the physical base address of the aforementioned register.
The address will be used to directly modify the contents of the
SINGLE_STEP register instead of invoking the MC command
dpni_set_single_step_cgf. The former approach introduced huge delays on
the TX datapath when one step PTP events were transmitted. This led to low
throughput and high latencies observed in the PTP correction field.

Signed-off-by: Radu Bulie <radu-andrei.bulie@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h
index 9f80bdfeedece34fccd85300aa4dc42a33eaec4e..828f538097af8b0096771e36e2d53e52ffc11cd5 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h
@@ -98,7 +98,7 @@
 #define DPNI_CMDID_GET_LINK_CFG                                DPNI_CMD(0x278)
 
 #define DPNI_CMDID_SET_SINGLE_STEP_CFG                 DPNI_CMD(0x279)
-#define DPNI_CMDID_GET_SINGLE_STEP_CFG                 DPNI_CMD(0x27a)
+#define DPNI_CMDID_GET_SINGLE_STEP_CFG                 DPNI_CMD_V2(0x27a)
 
 /* Macros for accessing command fields smaller than 1byte */
 #define DPNI_MASK(field)       \
@@ -658,12 +658,16 @@ struct dpni_cmd_single_step_cfg {
        __le16 flags;
        __le16 offset;
        __le32 peer_delay;
+       __le32 ptp_onestep_reg_base;
+       __le32 pad0;
 };
 
 struct dpni_rsp_single_step_cfg {
        __le16 flags;
        __le16 offset;
        __le32 peer_delay;
+       __le32 ptp_onestep_reg_base;
+       __le32 pad0;
 };
 
 struct dpni_cmd_enable_vlan_filter {

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.c b/drivers/net/ethernet/freescale/dpaa2/dpni.c
index d6afada99fb66b54927bca44cf2e16206d45f3d0..6c3b36f20fb80638dd1ac96c47918fc833573976 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpni.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpni.c
@@ -2136,6 +2136,8 @@ int dpni_get_single_step_cfg(struct fsl_mc_io *mc_io,
        ptp_cfg->ch_update = dpni_get_field(le16_to_cpu(rsp_params->flags),
                                            PTP_CH_UPDATE) ? 1 : 0;
        ptp_cfg->peer_delay = le32_to_cpu(rsp_params->peer_delay);
+       ptp_cfg->ptp_onestep_reg_base =
+                                 le32_to_cpu(rsp_params->ptp_onestep_reg_base);
 
        return err;
 }

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h b/drivers/net/ethernet/freescale/dpaa2/dpni.h
index 7de0562bbf59c467988e44aa809556150a27e15e..6fffd519aa00e2af883c480fcd93770de09bfe8d 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpni.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpni.h
@@ -1074,12 +1074,18 @@ int dpni_set_tx_shaping(struct fsl_mc_io *mc_io,
  * @peer_delay:        For peer-to-peer transparent clocks add this value to the
  *             correction field in addition to the transient time update.
  *             The value expresses nanoseconds.
+ * @ptp_onestep_reg_base: 1588 SINGLE_STEP register base address. This address
+ *                       is used to update directly the register contents.
+ *                       User has to create an address mapping for it.
+ *
+ *
  */
 struct dpni_single_step_cfg {
        u8      en;
        u8      ch_update;
        u16     offset;
        u32     peer_delay;
+       u32     ptp_onestep_reg_base;
 };
 
 int dpni_set_single_step_cfg(struct fsl_mc_io *mc_io,