Skip to content

Commit 3976c6e

Browse files
gkammelajwrdegoede
authored andcommitted
platform/x86: intel_pmc_core: Clean up: Remove the duplicate comments and reorganize
Some of the Cannon Lake PCH IPs are reused by most of the platforms such as Ice Lake, Tiger Lake, Elkhart Lake, Jasper Lake and can be reused by future platforms as well. The same was mentioned via comments not once but twice in an array of bit map structs for Cannon Lake (cnp_pfear_map). Hence, remove the duplicate comments and reorganize them. Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: David E. Box <david.e.box@intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Rui Zhang <rui.zhang@intel.com> Suggested-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com> Signed-off-by: David E. Box <david.e.box@linux.intel.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com> Link: https://lore.kernel.org/r/20201007035108.31078-2-david.e.box@linux.intel.com Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 025f26d commit 3976c6e

1 file changed

Lines changed: 20 additions & 12 deletions

File tree

drivers/platform/x86/intel_pmc_core.c

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ static const struct pmc_bit_map spt_pfear_map[] = {
118118
};
119119

120120
static const struct pmc_bit_map *ext_spt_pfear_map[] = {
121+
/*
122+
* Check intel_pmc_core_ids[] users of spt_reg_map for
123+
* a list of core SoCs using this.
124+
*/
121125
spt_pfear_map,
122126
NULL
123127
};
@@ -167,7 +171,6 @@ static const struct pmc_reg_map spt_reg_map = {
167171

168172
/* Cannon Lake: PGD PFET Enable Ack Status Register(s) bitmap */
169173
static const struct pmc_bit_map cnp_pfear_map[] = {
170-
/* Reserved for Cannon Lake but valid for Comet Lake */
171174
{"PMC", BIT(0)},
172175
{"OPI-DMI", BIT(1)},
173176
{"SPI/eSPI", BIT(2)},
@@ -193,10 +196,6 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
193196
{"SDX", BIT(4)},
194197
{"SPE", BIT(5)},
195198
{"Fuse", BIT(6)},
196-
/*
197-
* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake,
198-
* Tiger Lake, Elkhart Lake and Jasper Lake.
199-
*/
200199
{"SBR8", BIT(7)},
201200

202201
{"CSME_FSC", BIT(0)},
@@ -240,23 +239,22 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
240239
{"HDA_PGD4", BIT(2)},
241240
{"HDA_PGD5", BIT(3)},
242241
{"HDA_PGD6", BIT(4)},
243-
/*
244-
* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake,
245-
* Tiger Lake, ELkhart Lake and Jasper Lake.
246-
*/
247242
{"PSF6", BIT(5)},
248243
{"PSF7", BIT(6)},
249244
{"PSF8", BIT(7)},
250245
{}
251246
};
252247

253248
static const struct pmc_bit_map *ext_cnp_pfear_map[] = {
249+
/*
250+
* Check intel_pmc_core_ids[] users of cnp_reg_map for
251+
* a list of core SoCs using this.
252+
*/
254253
cnp_pfear_map,
255254
NULL
256255
};
257256

258257
static const struct pmc_bit_map icl_pfear_map[] = {
259-
/* Ice Lake and Jasper Lake generation onwards only */
260258
{"RES_65", BIT(0)},
261259
{"RES_66", BIT(1)},
262260
{"RES_67", BIT(2)},
@@ -269,13 +267,16 @@ static const struct pmc_bit_map icl_pfear_map[] = {
269267
};
270268

271269
static const struct pmc_bit_map *ext_icl_pfear_map[] = {
270+
/*
271+
* Check intel_pmc_core_ids[] users of icl_reg_map for
272+
* a list of core SoCs using this.
273+
*/
272274
cnp_pfear_map,
273275
icl_pfear_map,
274276
NULL
275277
};
276278

277279
static const struct pmc_bit_map tgl_pfear_map[] = {
278-
/* Tiger Lake and Elkhart Lake generation onwards only */
279280
{"PSF9", BIT(0)},
280281
{"RES_66", BIT(1)},
281282
{"RES_67", BIT(2)},
@@ -287,6 +288,10 @@ static const struct pmc_bit_map tgl_pfear_map[] = {
287288
};
288289

289290
static const struct pmc_bit_map *ext_tgl_pfear_map[] = {
291+
/*
292+
* Check intel_pmc_core_ids[] users of tgl_reg_map for
293+
* a list of core SoCs using this.
294+
*/
290295
cnp_pfear_map,
291296
tgl_pfear_map,
292297
NULL
@@ -370,7 +375,10 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = {
370375
{"ISH", CNP_PMC_LTR_ISH},
371376
{"UFSX2", CNP_PMC_LTR_UFSX2},
372377
{"EMMC", CNP_PMC_LTR_EMMC},
373-
/* Reserved for Cannon Lake but valid for Ice Lake */
378+
/*
379+
* Check intel_pmc_core_ids[] users of cnp_reg_map for
380+
* a list of core SoCs using this.
381+
*/
374382
{"WIGIG", ICL_PMC_LTR_WIGIG},
375383
/* Below two cannot be used for LTR_IGNORE */
376384
{"CURRENT_PLATFORM", CNP_PMC_LTR_CUR_PLT},

0 commit comments

Comments
 (0)