Commit f5a26013 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.14-2' of... 

Merge tag 'platform-drivers-x86-v6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - ideapad-laptop: Pass a correct pointer to the driver data

 - intel/ifs: Provide a link to the IFS test images

 - intel/pmc: Use large enough type when decoding LTR value

* tag 'platform-drivers-x86-v6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/intel/ifs: Update documentation with image download path
  platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show()
  platform/x86: ideapad-laptop: pass a correct pointer to the driver data
parents 0de63bb7 a787ab73

drivers/platform/x86/ideapad-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv) 


	/* Create platform_profile structure and register */

	priv->dytc->ppdev = devm_platform_profile_register(&priv->platform_device->dev,

							   "ideapad-laptop", &priv->dytc,

							   "ideapad-laptop", priv->dytc,

							   &dytc_profile_ops);

	if (IS_ERR(priv->dytc->ppdev)) {

		err = PTR_ERR(priv->dytc->ppdev);

drivers/platform/x86/intel/ifs/ifs.h

+4 −5
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ 
 * IFS Image

 * ---------

 *

 * Intel provides a firmware file containing the scan tests via

 * github [#f1]_.  Similar to microcode there is a separate file for each

 * Intel provides firmware files containing the scan tests via the webpage [#f1]_.

 * Look under "In-Field Scan Test Images Download" section towards the

 * end of the page. Similar to microcode, there are separate files for each

 * family-model-stepping. IFS Images are not applicable for some test types.

 * Wherever applicable the sysfs directory would provide a "current_batch" file

 * (see below) for loading the image.

 *

 * .. [#f1] https://intel.com/InFieldScan

 *

 * IFS Image Loading

 * -----------------
@@ -125,9 +127,6 @@ 
 * 2) Hardware allows for some number of cores to be tested in parallel.

 * The driver does not make use of this, it only tests one core at a time.

 *

 * .. [#f1] https://github.com/intel/TBD

 *

 *

 * Structural Based Functional Test at Field (SBAF):

 * -------------------------------------------------

 *

drivers/platform/x86/intel/pmc/core.c

+2 −2
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static u32 convert_ltr_scale(u32 val) 
static int pmc_core_ltr_show(struct seq_file *s, void *unused)

{

	struct pmc_dev *pmcdev = s->private;

	u64 decoded_snoop_ltr, decoded_non_snoop_ltr;

	u32 ltr_raw_data, scale, val;

	u64 decoded_snoop_ltr, decoded_non_snoop_ltr, val;

	u32 ltr_raw_data, scale;

	u16 snoop_ltr, nonsnoop_ltr;

	unsigned int i, index, ltr_index = 0;