ARM: tegra: clock: Support variable iso share calculator

Added and option to calculate iso share for each use case based on
iso bw (instead of fixed share across entire bw range).

Bug 1259082

Change-Id: Ic995e445bd2daa6e02b0b247ca01ddb3d72196b1
Signed-off-by: Alex Frid <afrid@nvidia.com>
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
(cherry picked from commit 627bc12f845b52e49b26e0cda0ba32d44e974399)
Reviewed-on: http://git-master/r/252580
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

diff --git a/arch/arm/mach-tegra/tegra_emc.c b/arch/arm/mach-tegra/tegra_emc.c
index ec2d2ce1596c2695b67c50b899a87e21fc99f28d..276422d5427299fe6988050152e872ef249eea01 100644 (file)
--- a/arch/arm/mach-tegra/tegra_emc.c
+++ b/arch/arm/mach-tegra/tegra_emc.c
@@ -30,6 +30,7 @@
 
 static u8 emc_iso_share = 100;
 static unsigned long emc_iso_allocation;
+static unsigned long last_iso_bw;
 
 static struct emc_iso_usage emc_usage_table[TEGRA_EMC_ISO_USE_CASES_MAX_NUM];
 
@@ -44,7 +45,7 @@ void __init tegra_emc_iso_usage_table_init(struct emc_iso_usage *table,
                       size * sizeof(struct emc_iso_usage));
 }
 
-static u8 tegra_emc_get_iso_share(u32 usage_flags)
+static u8 tegra_emc_get_iso_share(u32 usage_flags, unsigned long iso_bw)
 {
        int i;
        u8 iso_share = 100;
@@ -57,6 +58,9 @@ static u8 tegra_emc_get_iso_share(u32 usage_flags)
 
                        if (!flags)
                                continue;
+
+                       if (iso_usage->iso_share_calculator)
+                               share = iso_usage->iso_share_calculator(iso_bw);
                        if (!share) {
                                WARN(1, "%s: entry %d: iso_share 0\n",
                                     __func__, i);
@@ -64,10 +68,10 @@ static u8 tegra_emc_get_iso_share(u32 usage_flags)
                        }
 
                        if ((flags & usage_flags) == flags)
-                               iso_share = min(iso_share,
-                                               iso_usage->iso_usage_share);
+                               iso_share = min(iso_share, share);
                }
        }
+       last_iso_bw = iso_bw;
        emc_iso_share = iso_share;
        return iso_share;
 }
@@ -76,7 +80,7 @@ unsigned long tegra_emc_apply_efficiency(unsigned long total_bw,
        unsigned long iso_bw, unsigned long max_rate, u32 usage_flags,
        unsigned long *iso_bw_min)
 {
-       u8 efficiency = tegra_emc_get_iso_share(usage_flags);
+       u8 efficiency = tegra_emc_get_iso_share(usage_flags, iso_bw);
        if (iso_bw && efficiency && (efficiency < 100)) {
                iso_bw /= efficiency;
                iso_bw = (iso_bw < max_rate / 100) ?
@@ -113,13 +117,20 @@ static int emc_usage_table_show(struct seq_file *s, void *data)
 {
        int i, j;
 
-       seq_printf(s, "EMC USAGE\t\tISO SHARE %%\n");
+       seq_printf(s, "EMC USAGE\t\tISO SHARE %% @ last bw %lu\n", last_iso_bw);
 
        for (i = 0; i < TEGRA_EMC_ISO_USE_CASES_MAX_NUM; i++) {
                u32 flags = emc_usage_table[i].emc_usage_flags;
                u8 share = emc_usage_table[i].iso_usage_share;
+               bool fixed_share = true;
                bool first = false;
 
+               if (emc_usage_table[i].iso_share_calculator) {
+                       share = emc_usage_table[i].iso_share_calculator(
+                               last_iso_bw);
+                       fixed_share = false;
+               }
+
                seq_printf(s, "[%d]: ", i);
                if (!flags) {
                        seq_printf(s, "reserved\n");
@@ -134,7 +145,8 @@ static int emc_usage_table_show(struct seq_file *s, void *data)
                                   emc_user_names[j]);
                        first = true;
                }
-               seq_printf(s, "\r\t\t\t= %d\n", share);
+               seq_printf(s, "\r\t\t\t= %d(%s across bw)\n",
+                          share, fixed_share ? "fixed" : "vary");
        }
        return 0;
 }

diff --git a/arch/arm/mach-tegra/tegra_emc.h b/arch/arm/mach-tegra/tegra_emc.h
index 723550fade16e188c49f33cba33cd722aea5999a..4dfe9b907def4d5ed893695369b7e404c039291a 100644 (file)
--- a/arch/arm/mach-tegra/tegra_emc.h
+++ b/arch/arm/mach-tegra/tegra_emc.h
@@ -44,6 +44,7 @@ enum emc_user_id {
 struct emc_iso_usage {
        u32 emc_usage_flags;
        u8 iso_usage_share;
+       u8 (*iso_share_calculator)(unsigned long iso_bw);
 };
 
 struct clk;