staging: most: dim2-hdm: add configuration for fcnt

This patch adds possibility to configure the DIM2-IP parameter
representing the number of frames per sub-buffer for synchronous
channels.

Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/hdm-dim2/dim2_hal.c
index 3c524506ee2233f559182301f39528bbd7ac5988..8783dbbdafdc275f3151081ae14177bf60f2b4b2 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_hal.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
@@ -19,18 +19,6 @@
 #include "dim2_reg.h"
 #include <linux/stddef.h>
 
-/*
- * The number of frames per sub-buffer for synchronous channels.
- * Allowed values: 1, 2, 4, 8, 16, 32, 64.
- */
-#define FRAMES_PER_SUBBUFF 16
-
-/*
- * Size factor for synchronous DBR buffer.
- * Minimal value is 4*FRAMES_PER_SUBBUFF.
- */
-#define SYNC_DBR_FACTOR (4u * (u16)FRAMES_PER_SUBBUFF)
-
 /*
  * Size factor for isochronous DBR buffer.
  * Minimal value is 3.
@@ -64,9 +52,6 @@
 /* -------------------------------------------------------------------------- */
 /* generic helper functions and macros */
 
-#define MLBC0_FCNT_VAL_MACRO(n) MLBC0_FCNT_VAL_ ## n ## FPSB
-#define MLBC0_FCNT_VAL(fpsb) MLBC0_FCNT_VAL_MACRO(fpsb)
-
 static inline u32 bit_mask(u8 position)
 {
        return (u32)1 << position;
@@ -85,6 +70,7 @@ struct lld_global_vars_t {
        bool dim_is_initialized;
        bool mcm_is_initialized;
        struct dim2_regs __iomem *dim2; /* DIM2 core base address */
+       u32 fcnt;
        u32 dbr_map[DBR_MAP_SIZE];
 };
 
@@ -398,7 +384,8 @@ static inline bool check_packet_length(u32 packet_length)
 
 static inline bool check_bytes_per_frame(u32 bytes_per_frame)
 {
-       u16 const max_size = ((u16)CDT3_BD_MASK + 1u) / SYNC_DBR_FACTOR;
+       u16 const bd_factor = g.fcnt + 2;
+       u16 const max_size = ((u16)CDT3_BD_MASK + 1u) >> bd_factor;
 
        if (bytes_per_frame <= 0)
                return false; /* too small */
@@ -439,7 +426,7 @@ static inline u16 norm_sync_buffer_size(u16 buf_size, u16 bytes_per_frame)
 {
        u16 n;
        u16 const max_size = (u16)ADT1_ISOC_SYNC_BD_MASK + 1u;
-       u32 const unit = bytes_per_frame * (u16)FRAMES_PER_SUBBUFF;
+       u32 const unit = bytes_per_frame << g.fcnt;
 
        if (buf_size > max_size)
                buf_size = max_size;
@@ -479,7 +466,7 @@ static void dim2_initialize(bool enable_6pin, u8 mlb_clock)
        dimcb_io_write(&g.dim2->MLBC0,
                       enable_6pin << MLBC0_MLBPEN_BIT |
                       mlb_clock << MLBC0_MLBCLK_SHIFT |
-                      MLBC0_FCNT_VAL(FRAMES_PER_SUBBUFF) << MLBC0_FCNT_SHIFT |
+                      g.fcnt << MLBC0_FCNT_SHIFT |
                       true << MLBC0_MLBEN_BIT);
 
        /* activate all HBI channels */
@@ -650,7 +637,8 @@ static bool channel_detach_buffers(struct dim_channel *ch, u16 buffers_number)
 /* -------------------------------------------------------------------------- */
 /* API */
 
-u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock)
+u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock,
+              u32 fcnt)
 {
        g.dim_is_initialized = false;
 
@@ -662,7 +650,11 @@ u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock)
        if (mlb_clock >= 8)
                return DIM_INIT_ERR_MLB_CLOCK;
 
+       if (fcnt > MLBC0_FCNT_MAX_VAL)
+               return DIM_INIT_ERR_MLB_CLOCK;
+
        g.dim2 = dim_base_address;
+       g.fcnt = fcnt;
        g.dbr_map[0] = 0;
        g.dbr_map[1] = 0;
 
@@ -781,6 +773,8 @@ u8 dim_init_isoc(struct dim_channel *ch, u8 is_tx, u16 ch_address,
 u8 dim_init_sync(struct dim_channel *ch, u8 is_tx, u16 ch_address,
                 u16 bytes_per_frame)
 {
+       u16 bd_factor = g.fcnt + 2;
+
        if (!g.dim_is_initialized || !ch)
                return DIM_ERR_DRIVER_NOT_INITIALIZED;
 
@@ -790,7 +784,7 @@ u8 dim_init_sync(struct dim_channel *ch, u8 is_tx, u16 ch_address,
        if (!check_bytes_per_frame(bytes_per_frame))
                return DIM_ERR_BAD_CONFIG;
 
-       ch->dbr_size = bytes_per_frame * SYNC_DBR_FACTOR;
+       ch->dbr_size = bytes_per_frame << bd_factor;
        ch->dbr_addr = alloc_dbr(ch->dbr_size);
        if (ch->dbr_addr >= DBR_SIZE)
                return DIM_INIT_ERR_OUT_OF_MEMORY;

diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h b/drivers/staging/most/hdm-dim2/dim2_hal.h
index 1c924e869de7bfe99935b04d61c0e5191093bc5a..62eb5e7f81dfdac2955e39c42da2dc70d8546d18 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_hal.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.h
@@ -60,7 +60,8 @@ struct dim_channel {
        u16 done_sw_buffers_number; /*< Done software buffers number. */
 };
 
-u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock);
+u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock,
+              u32 fcnt);
 
 void dim_shutdown(void);
 

diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 89a66bb914e4da0784f95d1c565fd162c2763fe5..87039d9aa87fb489eb9577125bbb6cff9ea88dd2 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -44,6 +44,17 @@ static char *clock_speed;
 module_param(clock_speed, charp, 0);
 MODULE_PARM_DESC(clock_speed, "MediaLB Clock Speed");
 
+/*
+ * The parameter representing the number of frames per sub-buffer for
+ * synchronous channels.  Valid values: [0 .. 6].
+ *
+ * The values 0, 1, 2, 3, 4, 5, 6 represent corresponding number of frames per
+ * sub-buffer 1, 2, 4, 8, 16, 32, 64.
+ */
+static u8 fcnt = 4;  /* (1 << fcnt) frames per subbuffer */
+module_param(fcnt, byte, 0);
+MODULE_PARM_DESC(fcnt, "Num of frames per sub-buffer for sync channels as a power of 2");
+
 /*
  * #############################################################################
  *
@@ -212,7 +223,8 @@ static int startup_dim(struct platform_device *pdev)
                        return ret;
        }
 
-       hal_ret = dim_startup(dev->io_base, dev->clk_speed);
+       pr_info("sync: num of frames per sub-buffer: %u\n", fcnt);
+       hal_ret = dim_startup(dev->io_base, dev->clk_speed, fcnt);
        if (hal_ret != DIM_NO_ERROR) {
                pr_err("dim_startup failed: %d\n", hal_ret);
                if (pdata && pdata->destroy)

diff --git a/drivers/staging/most/hdm-dim2/dim2_reg.h b/drivers/staging/most/hdm-dim2/dim2_reg.h
index e0837b6b9ae10ed2f67919923918e840e56f1a77..3b1c2004e5201b7774f29ba52736862646cb802d 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_reg.h
+++ b/drivers/staging/most/hdm-dim2/dim2_reg.h
@@ -77,13 +77,7 @@ enum {
 
        MLBC0_FCNT_SHIFT = 15,
        MLBC0_FCNT_MASK = 7,
-       MLBC0_FCNT_VAL_1FPSB = 0,
-       MLBC0_FCNT_VAL_2FPSB = 1,
-       MLBC0_FCNT_VAL_4FPSB = 2,
-       MLBC0_FCNT_VAL_8FPSB = 3,
-       MLBC0_FCNT_VAL_16FPSB = 4,
-       MLBC0_FCNT_VAL_32FPSB = 5,
-       MLBC0_FCNT_VAL_64FPSB = 6,
+       MLBC0_FCNT_MAX_VAL = 6,
 
        MLBC0_MLBEN_BIT = 0,