diff --git a/hif/inc/hif.h b/hif/inc/hif.h index 2368f2de6e5b..4a2dcf70f5cf 100644 --- a/hif/inc/hif.h +++ b/hif/inc/hif.h @@ -192,8 +192,6 @@ struct qca_napi_info { * @thread_mask: mask for this core within the cluster * @max_freq: maximum clock this core can be clocked at * same for all cpus of the same core. - * @efficiency: a coefficient to mark relative efficiency - * same for all cpus of the same core. * @napis: bitmap of napi instances on this core * cluster_nxt: chain to link cores within the same cluster * @@ -220,7 +218,6 @@ struct qca_napi_cpu { cpumask_t core_mask; cpumask_t thread_mask; unsigned int max_freq; - unsigned long efficiency; uint32_t napis; int cluster_nxt; /* index, not pointer */ }; diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index bf329c10a5e4..04de9598c468 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -692,13 +692,13 @@ static void hnc_dump_cpus(struct qca_napi_data *napid) napid->lilcl_head, napid->bigcl_head); for (i = 0; i < NR_CPUS; i++) { NAPI_DEBUG("CPU[%02d]: state:%d crid=%02d clid=%02d " - "crmk:0x%0lx thmk:0x%0lx frq:%d eff:%ld " + "crmk:0x%0lx thmk:0x%0lx frq:%d " "napi = 0x%08x lnk:%d", i, cpu[i].state, cpu[i].core_id, cpu[i].cluster_id, cpu[i].core_mask.bits[0], cpu[i].thread_mask.bits[0], - cpu[i].max_freq, cpu[i].efficiency, cpu[i].napis, + cpu[i].max_freq, cpu[i].napis, cpu[i].cluster_nxt); } /* return; -- Linus does not like it, I do. */ @@ -740,7 +740,6 @@ static int hnc_link_clusters(struct qca_napi_data *napid) unsigned int lilfrq = INT_MAX; unsigned int bigfrq = 0; unsigned int clfrq; - unsigned long cleff; int prev; struct qca_napi_cpu *cpus = napid->napi_cpu; @@ -773,7 +772,6 @@ static int hnc_link_clusters(struct qca_napi_data *napid) curcl = cl; curclhead = i; /* row */ clfrq = cpus[i].max_freq; - cleff = cpus[i].efficiency; prev = -1; }; if ((curcl >= 0) && (curcl != cl)) { @@ -782,9 +780,6 @@ static int hnc_link_clusters(struct qca_napi_data *napid) cl, curcl); continue; } - if (cpus[i].efficiency != cleff) - NAPI_DEBUG("WARN: ef(%ld)!=clef(%ld)\n", - cpus[i].efficiency, cleff); if (cpus[i].max_freq != clfrq) NAPI_DEBUG("WARN: frq(%d)!=clfrq(%d)\n", cpus[i].max_freq, clfrq); @@ -987,7 +982,6 @@ int hif_napi_cpu_init(void *ctx) cpumask_copy(&(cpus[i].thread_mask), topology_sibling_cpumask(i)); cpus[i].max_freq = cpufreq_quick_get_max(i); - cpus[i].efficiency = arch_get_cpu_efficiency(i); cpus[i].napis = 0x0; cpus[i].cluster_nxt = -1; /* invalid */ }