nvgpu: gpu: arbiter for vf switch management

JIRA DNVGPU-143

The arbiter is charged with selecting the proper
frequencies when multiple applications submit
simultaneously clock change requests

On the current implementation, the arbiter guarantees
that the selected frequency will be always higher
or equal to the request, as long as the request is
in range.

The current code is not yet realtime friendly, as
requests are not pre-allocated.

Summary of changes:
(1) pstate/vf switch no longer selects boot frequency
(2) changed mclk code change to accept input freq
(3) added arbiter
(4) now a single session can submit concurrent requests
the last request is the one that applies for that
session
(5) modified locking mechanism to reduce lock contention
(6) Added callback to notify the arbiter that the VF
table has changed and is no longer valid (PMU/Thermals
must call this when VF table is invalid)
(7) changed internal API to work with MHz
(8) added debugfs for stats

Change-Id: I6a7b05c9447761e8536f84ef86b5ab0793164d63
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1239461
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1267120
Reviewed-by: Automatic_Commit_Validation_User

1 files changed, 1 insertions, 60 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c
index ef0834f4..bec5fad1 100644
--- a/drivers/gpu/nvgpu/clk/clk.c
+++ b/drivers/gpu/nvgpu/clk/clk.c
@@ -255,7 +255,7 @@ static int get_regime_id(struct gk20a *g, u32 domain, u32 *regimeid)
         return -EINVAL;
 }
 
-int clk_program_fllclks(struct gk20a *g, struct change_fll_clk *fllclk)
+int clk_program_fll_clks(struct gk20a *g, struct change_fll_clk *fllclk)
 {
         int status = -EINVAL;
         struct clk_domain *pdomain;
@@ -277,8 +277,6 @@ int clk_program_fllclks(struct gk20a *g, struct change_fll_clk *fllclk)
         if (fllclk->clkmhz == 0)
                 return -EINVAL;
 
-        mutex_lock(&pclk->changeclkmutex);
-
         setfllclk.voltuv = fllclk->voltuv;
         setfllclk.gpc2clkmhz = fllclk->clkmhz;
 
@@ -376,63 +374,6 @@ int clk_program_fllclks(struct gk20a *g, struct change_fll_clk *fllclk)
         if (status)
                 goto done;
 done:
-        mutex_unlock(&pclk->changeclkmutex);
-        return status;
-}
-
-int clk_set_boot_fll_clk(struct gk20a *g)
-{
-        int status;
-        struct change_fll_clk bootfllclk;
-        u16 gpc2clk_clkmhz = BOOT_GPC2CLK_MHZ;
-        u32 gpc2clk_voltuv = 0;
-        u32 gpc2clk_voltuv_sram = 0;
-        u16 mclk_clkmhz = BOOT_MCLK_MHZ;
-        u32 mclk_voltuv = 0;
-        u32 mclk_voltuv_sram = 0;
-        u32 voltuv = 0;
-        u32 voltuv_sram = 0;
-
-        mutex_init(&g->clk_pmu.changeclkmutex);
-        status = clk_domain_get_f_or_v(g, CTRL_CLK_DOMAIN_GPC2CLK,
-                &gpc2clk_clkmhz, &gpc2clk_voltuv, CTRL_VOLT_DOMAIN_LOGIC);
-        if (status)
-                return status;
-        status = clk_domain_get_f_or_v(g, CTRL_CLK_DOMAIN_GPC2CLK,
-                &gpc2clk_clkmhz, &gpc2clk_voltuv_sram, CTRL_VOLT_DOMAIN_SRAM);
-        if (status)
-                return status;
-        status = clk_domain_get_f_or_v(g, CTRL_CLK_DOMAIN_MCLK,
-                &mclk_clkmhz, &mclk_voltuv, CTRL_VOLT_DOMAIN_LOGIC);
-        if (status)
-                return status;
-        status = clk_domain_get_f_or_v(g, CTRL_CLK_DOMAIN_MCLK,
-                &mclk_clkmhz, &mclk_voltuv_sram, CTRL_VOLT_DOMAIN_SRAM);
-        if (status)
-                return status;
-
-        voltuv = ((gpc2clk_voltuv) > (mclk_voltuv)) ? (gpc2clk_voltuv)
-                        : (mclk_voltuv);
-
-        voltuv_sram = ((gpc2clk_voltuv_sram) > (mclk_voltuv_sram)) ?
-                (gpc2clk_voltuv_sram) : (mclk_voltuv_sram);
-
-        status = volt_set_voltage(g, voltuv, voltuv_sram);
-        if (status)
-                gk20a_err(dev_from_gk20a(g),
-                        "attempt to set boot voltage failed %d %d",
-                        voltuv, voltuv_sram);
-
-        bootfllclk.api_clk_domain = CTRL_CLK_DOMAIN_GPC2CLK;
-        bootfllclk.clkmhz = gpc2clk_clkmhz;
-        bootfllclk.voltuv = voltuv;
-        status = clk_program_fllclks(g, &bootfllclk);
-        if (status)
-                gk20a_err(dev_from_gk20a(g), "attempt to set boot gpc2clk failed");
-        status = g->clk_pmu.clk_mclk.change(g, DEFAULT_BOOT_MCLK_SPEED);
-        if (status)
-                gk20a_err(dev_from_gk20a(g), "attempt to set boot mclk failed");
-
         return status;
 }