]> git.karo-electronics.de Git - linux-beck.git/blobdiff - drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
drm/nouveau/clk/gk20a: put mnp values into their own struct
[linux-beck.git] / drivers / gpu / drm / nouveau / nvkm / subdev / clk / gk20a.c
index 5da2aa8cc33307702898b4b4a91833c068d41ab9..b7a1b3c83a2b0664679eb3081686a803cd7ee777 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,8 @@
 #include <core/tegra.h>
 #include <subdev/timer.h>
 
-#define MHZ (1000 * 1000)
+#define KHZ (1000)
+#define MHZ (KHZ * 1000)
 
 #define MASK(w)        ((1 << w) - 1)
 
@@ -97,7 +98,7 @@ static const u8 pl_to_div[] = {
 /* p: */ 1, 2, 3, 4, 5, 6, 8, 10, 12, 16, 12, 16, 20, 24, 32,
 };
 
-/* All frequencies in Mhz */
+/* All frequencies in Khz */
 struct gk20a_clk_pllg_params {
        u32 min_vco, max_vco;
        u32 min_u, max_u;
@@ -107,30 +108,36 @@ struct gk20a_clk_pllg_params {
 };
 
 static const struct gk20a_clk_pllg_params gk20a_pllg_params = {
-       .min_vco = 1000, .max_vco = 2064,
-       .min_u = 12, .max_u = 38,
+       .min_vco = 1000000, .max_vco = 2064000,
+       .min_u = 12000, .max_u = 38000,
        .min_m = 1, .max_m = 255,
        .min_n = 8, .max_n = 255,
        .min_pl = 1, .max_pl = 32,
 };
 
+struct gk20a_pll {
+       u32 m;
+       u32 n;
+       u32 pl;
+};
+
 struct gk20a_clk {
        struct nvkm_clk base;
        const struct gk20a_clk_pllg_params *params;
-       u32 m, n, pl;
+       struct gk20a_pll pll;
        u32 parent_rate;
 };
 
 static void
-gk20a_pllg_read_mnp(struct gk20a_clk *clk)
+gk20a_pllg_read_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll)
 {
        struct nvkm_device *device = clk->base.subdev.device;
        u32 val;
 
        val = nvkm_rd32(device, GPCPLL_COEFF);
-       clk->m = (val >> GPCPLL_COEFF_M_SHIFT) & MASK(GPCPLL_COEFF_M_WIDTH);
-       clk->n = (val >> GPCPLL_COEFF_N_SHIFT) & MASK(GPCPLL_COEFF_N_WIDTH);
-       clk->pl = (val >> GPCPLL_COEFF_P_SHIFT) & MASK(GPCPLL_COEFF_P_WIDTH);
+       pll->m = (val >> GPCPLL_COEFF_M_SHIFT) & MASK(GPCPLL_COEFF_M_WIDTH);
+       pll->n = (val >> GPCPLL_COEFF_N_SHIFT) & MASK(GPCPLL_COEFF_N_WIDTH);
+       pll->pl = (val >> GPCPLL_COEFF_P_SHIFT) & MASK(GPCPLL_COEFF_P_WIDTH);
 }
 
 static u32
@@ -139,8 +146,8 @@ gk20a_pllg_calc_rate(struct gk20a_clk *clk)
        u32 rate;
        u32 divider;
 
-       rate = clk->parent_rate * clk->n;
-       divider = clk->m * pl_to_div[clk->pl];
+       rate = clk->parent_rate * clk->pll.n;
+       divider = clk->pll.m * pl_to_div[clk->pll.pl];
 
        return rate / divider / 2;
 }
@@ -152,15 +159,13 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate)
        u32 target_clk_f, ref_clk_f, target_freq;
        u32 min_vco_f, max_vco_f;
        u32 low_pl, high_pl, best_pl;
-       u32 target_vco_f, vco_f;
+       u32 target_vco_f;
        u32 best_m, best_n;
-       u32 u_f;
-       u32 m, n, n2;
-       u32 delta, lwv, best_delta = ~0;
+       u32 best_delta = ~0;
        u32 pl;
 
-       target_clk_f = rate * 2 / MHZ;
-       ref_clk_f = clk->parent_rate / MHZ;
+       target_clk_f = rate * 2 / KHZ;
+       ref_clk_f = clk->parent_rate / KHZ;
 
        max_vco_f = clk->params->max_vco;
        min_vco_f = clk->params->min_vco;
@@ -201,8 +206,12 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate)
 
        /* Select lowest possible VCO */
        for (pl = low_pl; pl <= high_pl; pl++) {
+               u32 m, n, n2;
+
                target_vco_f = target_clk_f * pl_to_div[pl];
                for (m = clk->params->min_m; m <= clk->params->max_m; m++) {
+                       u32 u_f, vco_f;
+
                        u_f = ref_clk_f / m;
 
                        if (u_f < clk->params->min_u)
@@ -225,6 +234,8 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate)
                                vco_f = ref_clk_f * n / m;
 
                                if (vco_f >= min_vco_f && vco_f <= max_vco_f) {
+                                       u32 delta, lwv;
+
                                        lwv = (vco_f + (pl_to_div[pl] / 2))
                                                / pl_to_div[pl];
                                        delta = abs(lwv - target_clk_f);
@@ -249,17 +260,18 @@ found_match:
        if (best_delta != 0)
                nvkm_debug(subdev,
                           "no best match for target @ %dMHz on gpc_pll",
-                          target_clk_f);
+                          target_clk_f / KHZ);
 
-       clk->m = best_m;
-       clk->n = best_n;
-       clk->pl = best_pl;
+       clk->pll.m = best_m;
+       clk->pll.n = best_n;
+       clk->pll.pl = best_pl;
 
-       target_freq = gk20a_pllg_calc_rate(clk) / MHZ;
+       target_freq = gk20a_pllg_calc_rate(clk);
 
        nvkm_debug(subdev,
                   "actual target freq %d MHz, M %d, N %d, PL %d(div%d)\n",
-                  target_freq, clk->m, clk->n, clk->pl, pl_to_div[clk->pl]);
+                  target_freq / MHZ, clk->pll.m, clk->pll.n, clk->pll.pl,
+                  pl_to_div[clk->pll.pl]);
        return 0;
 }
 
@@ -323,17 +335,19 @@ gk20a_pllg_slide(struct gk20a_clk *clk, u32 n)
 }
 
 static void
-_gk20a_pllg_enable(struct gk20a_clk *clk)
+gk20a_pllg_enable(struct gk20a_clk *clk)
 {
        struct nvkm_device *device = clk->base.subdev.device;
+
        nvkm_mask(device, GPCPLL_CFG, GPCPLL_CFG_ENABLE, GPCPLL_CFG_ENABLE);
        nvkm_rd32(device, GPCPLL_CFG);
 }
 
 static void
-_gk20a_pllg_disable(struct gk20a_clk *clk)
+gk20a_pllg_disable(struct gk20a_clk *clk)
 {
        struct nvkm_device *device = clk->base.subdev.device;
+
        nvkm_mask(device, GPCPLL_CFG, GPCPLL_CFG_ENABLE, 0);
        nvkm_rd32(device, GPCPLL_CFG);
 }
@@ -344,25 +358,26 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, bool allow_slide)
        struct nvkm_subdev *subdev = &clk->base.subdev;
        struct nvkm_device *device = subdev->device;
        u32 val, cfg;
-       u32 m_old, pl_old, n_lo;
+       struct gk20a_pll old_pll;
+       u32 n_lo;
 
        /* get old coefficients */
-       val = nvkm_rd32(device, GPCPLL_COEFF);
-       m_old = (val >> GPCPLL_COEFF_M_SHIFT) & MASK(GPCPLL_COEFF_M_WIDTH);
-       pl_old = (val >> GPCPLL_COEFF_P_SHIFT) & MASK(GPCPLL_COEFF_P_WIDTH);
+       gk20a_pllg_read_mnp(clk, &old_pll);
 
        /* do NDIV slide if there is no change in M and PL */
        cfg = nvkm_rd32(device, GPCPLL_CFG);
-       if (allow_slide && clk->m == m_old && clk->pl == pl_old &&
-           (cfg & GPCPLL_CFG_ENABLE)) {
-               return gk20a_pllg_slide(clk, clk->n);
+       if (allow_slide && clk->pll.m == old_pll.m &&
+           clk->pll.pl == old_pll.pl && (cfg & GPCPLL_CFG_ENABLE)) {
+               return gk20a_pllg_slide(clk, clk->pll.n);
        }
 
        /* slide down to NDIV_LO */
-       n_lo = DIV_ROUND_UP(m_old * clk->params->min_vco,
-                           clk->parent_rate / MHZ);
        if (allow_slide && (cfg & GPCPLL_CFG_ENABLE)) {
-               int ret = gk20a_pllg_slide(clk, n_lo);
+               int ret;
+
+               n_lo = DIV_ROUND_UP(old_pll.m * clk->params->min_vco,
+                                   clk->parent_rate / KHZ);
+               ret = gk20a_pllg_slide(clk, n_lo);
 
                if (ret)
                        return ret;
@@ -387,19 +402,19 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, bool allow_slide)
                udelay(2);
        }
 
-       _gk20a_pllg_disable(clk);
+       gk20a_pllg_disable(clk);
 
        nvkm_debug(subdev, "%s: m=%d n=%d pl=%d\n", __func__,
-                  clk->m, clk->n, clk->pl);
+                  clk->pll.m, clk->pll.n, clk->pll.pl);
 
-       n_lo = DIV_ROUND_UP(clk->m * clk->params->min_vco,
-                           clk->parent_rate / MHZ);
-       val = clk->m << GPCPLL_COEFF_M_SHIFT;
-       val |= (allow_slide ? n_lo : clk->n) << GPCPLL_COEFF_N_SHIFT;
-       val |= clk->pl << GPCPLL_COEFF_P_SHIFT;
+       n_lo = DIV_ROUND_UP(clk->pll.m * clk->params->min_vco,
+                           clk->parent_rate / KHZ);
+       val = clk->pll.m << GPCPLL_COEFF_M_SHIFT;
+       val |= (allow_slide ? n_lo : clk->pll.n) << GPCPLL_COEFF_N_SHIFT;
+       val |= clk->pll.pl << GPCPLL_COEFF_P_SHIFT;
        nvkm_wr32(device, GPCPLL_COEFF, val);
 
-       _gk20a_pllg_enable(clk);
+       gk20a_pllg_enable(clk);
 
        val = nvkm_rd32(device, GPCPLL_CFG);
        if (val & GPCPLL_CFG_LOCK_DET_OFF) {
@@ -414,16 +429,24 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, bool allow_slide)
                return -ETIMEDOUT;
 
        /* switch to VCO mode */
-       nvkm_mask(device, SEL_VCO, 0, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT));
+       nvkm_mask(device, SEL_VCO, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT),
+                 BIT(SEL_VCO_GPC2CLK_OUT_SHIFT));
 
        /* restore out divider 1:1 */
        val = nvkm_rd32(device, GPC2CLK_OUT);
-       val &= ~GPC2CLK_OUT_VCODIV_MASK;
-       udelay(2);
-       nvkm_wr32(device, GPC2CLK_OUT, val);
+       if ((val & GPC2CLK_OUT_VCODIV_MASK) !=
+           (GPC2CLK_OUT_VCODIV1 << GPC2CLK_OUT_VCODIV_SHIFT)) {
+               val &= ~GPC2CLK_OUT_VCODIV_MASK;
+               val |= GPC2CLK_OUT_VCODIV1 << GPC2CLK_OUT_VCODIV_SHIFT;
+               udelay(2);
+               nvkm_wr32(device, GPC2CLK_OUT, val);
+               /* Intentional 2nd write to assure linear divider operation */
+               nvkm_wr32(device, GPC2CLK_OUT, val);
+               nvkm_rd32(device, GPC2CLK_OUT);
+       }
 
        /* slide up to new NDIV */
-       return allow_slide ? gk20a_pllg_slide(clk, clk->n) : 0;
+       return allow_slide ? gk20a_pllg_slide(clk, clk->pll.n) : 0;
 }
 
 static int
@@ -438,30 +461,6 @@ gk20a_pllg_program_mnp(struct gk20a_clk *clk)
        return err;
 }
 
-static void
-gk20a_pllg_disable(struct gk20a_clk *clk)
-{
-       struct nvkm_device *device = clk->base.subdev.device;
-       u32 val;
-
-       /* slide to VCO min */
-       val = nvkm_rd32(device, GPCPLL_CFG);
-       if (val & GPCPLL_CFG_ENABLE) {
-               u32 coeff, m, n_lo;
-
-               coeff = nvkm_rd32(device, GPCPLL_COEFF);
-               m = (coeff >> GPCPLL_COEFF_M_SHIFT) & MASK(GPCPLL_COEFF_M_WIDTH);
-               n_lo = DIV_ROUND_UP(m * clk->params->min_vco,
-                                   clk->parent_rate / MHZ);
-               gk20a_pllg_slide(clk, n_lo);
-       }
-
-       /* put PLL in bypass before disabling it */
-       nvkm_mask(device, SEL_VCO, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT), 0);
-
-       _gk20a_pllg_disable(clk);
-}
-
 #define GK20A_CLK_GPC_MDIV 1000
 
 static struct nvkm_pstate
@@ -569,7 +568,7 @@ gk20a_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
        case nv_clk_src_crystal:
                return device->crystal;
        case nv_clk_src_gpc:
-               gk20a_pllg_read_mnp(clk);
+               gk20a_pllg_read_mnp(clk, &clk->pll);
                return gk20a_pllg_calc_rate(clk) / GK20A_CLK_GPC_MDIV;
        default:
                nvkm_error(subdev, "invalid clock source %d\n", src);
@@ -602,7 +601,25 @@ gk20a_clk_tidy(struct nvkm_clk *base)
 static void
 gk20a_clk_fini(struct nvkm_clk *base)
 {
+       struct nvkm_device *device = base->subdev.device;
        struct gk20a_clk *clk = gk20a_clk(base);
+       u32 val;
+
+       /* slide to VCO min */
+       val = nvkm_rd32(device, GPCPLL_CFG);
+       if (val & GPCPLL_CFG_ENABLE) {
+               struct gk20a_pll pll;
+               u32 n_lo;
+
+               gk20a_pllg_read_mnp(clk, &pll);
+               n_lo = DIV_ROUND_UP(pll.m * clk->params->min_vco,
+                                   clk->parent_rate / KHZ);
+               gk20a_pllg_slide(clk, n_lo);
+       }
+
+       /* put PLL in bypass before disabling it */
+       nvkm_mask(device, SEL_VCO, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT), 0);
+
        gk20a_pllg_disable(clk);
 }
 
@@ -663,7 +680,7 @@ gk20a_clk_new(struct nvkm_device *device, int index, struct nvkm_clk **pclk)
        clk->parent_rate = clk_get_rate(tdev->clk);
 
        ret = nvkm_clk_ctor(&gk20a_clk, device, index, true, &clk->base);
-       nvkm_info(&clk->base.subdev, "parent clock rate: %d Mhz\n",
-                 clk->parent_rate / MHZ);
+       nvkm_debug(&clk->base.subdev, "parent clock rate: %d Khz\n",
+                  clk->parent_rate / KHZ);
        return ret;
 }