soc: fsl: dpio: extract the QBMAN clock frequency from the attributes

Through the dpio_get_attributes() firmware call the dpio driver has
access to the QBMAN clock frequency. Extend the structure which holds
the firmware's response so that we can have access to this information.

This will be needed in the next patches which also add support for
interrupt coalescing which needs to be configured based on the
frequency.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/soc/fsl/dpio/dpio-cmd.h b/drivers/soc/fsl/dpio/dpio-cmd.h
index e13fd3ac193940bd00ab85ee62247942388fd2b0..2fbcb78cdaaf13d5aeae12532c42400876eb4f7e 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio-cmd.h
+++ b/drivers/soc/fsl/dpio/dpio-cmd.h
@@ -46,6 +46,9 @@ struct dpio_rsp_get_attr {
        __le64 qbman_portal_ci_addr;
        /* cmd word 3 */
        __le32 qbman_version;
+       __le32 pad1;
+       /* cmd word 4 */
+       __le32 clk;
 };
 
 struct dpio_stashing_dest {

diff --git a/drivers/soc/fsl/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c
index 7f397b4ad878daf381775d093457af6d12402e2d..dd948889eeab8b93ceca8aeacebfd72f5123456e 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio-driver.c
+++ b/drivers/soc/fsl/dpio/dpio-driver.c
@@ -162,6 +162,7 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev)
                goto err_get_attr;
        }
        desc.qman_version = dpio_attrs.qbman_version;
+       desc.qman_clk = dpio_attrs.clk;
 
        err = dpio_enable(dpio_dev->mc_io, 0, dpio_dev->mc_handle);
        if (err) {

diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index 7351f303055063c7a93cd1e1f1e3fb85297c5818..2acbb96c5e45ffa08682bd2761e3e0d1bf93db67 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -127,6 +127,7 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
        obj->dpio_desc = *desc;
        obj->swp_desc.cena_bar = obj->dpio_desc.regs_cena;
        obj->swp_desc.cinh_bar = obj->dpio_desc.regs_cinh;
+       obj->swp_desc.qman_clk = obj->dpio_desc.qman_clk;
        obj->swp_desc.qman_version = obj->dpio_desc.qman_version;
        obj->swp = qbman_swp_init(&obj->swp_desc);
 

diff --git a/drivers/soc/fsl/dpio/dpio.c b/drivers/soc/fsl/dpio/dpio.c
index af74c597a675620c56e4031f4b61466dc884c608..8ed606ffaac5e2473216bbfbea1024308342e492 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio.c
+++ b/drivers/soc/fsl/dpio/dpio.c
@@ -162,6 +162,7 @@ int dpio_get_attributes(struct fsl_mc_io *mc_io,
        attr->qbman_portal_ci_offset =
                le64_to_cpu(dpio_rsp->qbman_portal_ci_addr);
        attr->qbman_version = le32_to_cpu(dpio_rsp->qbman_version);
+       attr->clk = le32_to_cpu(dpio_rsp->clk);
 
        return 0;
 }

diff --git a/drivers/soc/fsl/dpio/dpio.h b/drivers/soc/fsl/dpio/dpio.h
index da06f72580980544309c2090993d938900fecb94..7fda44f0d7f4da74fd0543f8ba1d80a8002b2083 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio.h
+++ b/drivers/soc/fsl/dpio/dpio.h
@@ -59,6 +59,7 @@ int dpio_disable(struct fsl_mc_io     *mc_io,
  * @num_priorities: Number of priorities for the notification channel (1-8);
  *                     relevant only if 'channel_mode = DPIO_LOCAL_CHANNEL'
  * @qbman_version: QBMAN version
+ * @clk: QBMAN clock frequency value in Hz
  */
 struct dpio_attr {
        int                     id;
@@ -68,6 +69,7 @@ struct dpio_attr {
        enum dpio_channel_mode  channel_mode;
        u8                      num_priorities;
        u32             qbman_version;
+       u32             clk;
 };
 
 int dpio_get_attributes(struct fsl_mc_io       *mc_io,

diff --git a/drivers/soc/fsl/dpio/qbman-portal.h b/drivers/soc/fsl/dpio/qbman-portal.h
index c7c2225b7d914de953a2c9956ce7e68988a534a0..f058289416af4c118e7e46ee970c9b237b58b95f 100644 (file)
--- a/drivers/soc/fsl/dpio/qbman-portal.h
+++ b/drivers/soc/fsl/dpio/qbman-portal.h
@@ -24,6 +24,7 @@ struct qbman_swp_desc {
        void *cena_bar; /* Cache-enabled portal base address */
        void __iomem *cinh_bar; /* Cache-inhibited portal base address */
        u32 qman_version;
+       u32 qman_clk;
 };
 
 #define QBMAN_SWP_INTERRUPT_EQRI 0x01

diff --git a/include/soc/fsl/dpaa2-io.h b/include/soc/fsl/dpaa2-io.h
index c9d849924f890a664a376543871de66381f495ed..041ebf7d804c511fb3aba3e3e744be7f312724fc 100644 (file)
--- a/include/soc/fsl/dpaa2-io.h
+++ b/include/soc/fsl/dpaa2-io.h
@@ -44,6 +44,7 @@ struct device;
  * @regs_cinh:      The cache inhibited regs
  * @dpio_id:        The dpio index
  * @qman_version:   The qman version
+ * @qman_clk:       The qman clock frequency in Hz
  *
  * Describes the attributes and features of the DPIO object.
  */
@@ -55,6 +56,7 @@ struct dpaa2_io_desc {
        void __iomem *regs_cinh;
        int dpio_id;
        u32 qman_version;
+       u32 qman_clk;
 };
 
 struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,