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

Merge tag 'platform-drivers-x86-v6.7-6' of... 

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

Pull x86 platform driver fixes from Ilpo Järvinen:

 - Intel PMC GBE LTR regression

 - P2SB / PCI deadlock fix

* tag 'platform-drivers-x86-v6.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/intel/pmc: Move GBE LTR ignore to suspend callback
  platform/x86/intel/pmc: Allow reenabling LTRs
  platform/x86/intel/pmc: Add suspend callback
  platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe
parents 09c57a76 70681aa0

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

+3 −6
Original line number Diff line number Diff line
@@ -314,16 +314,13 @@ int adl_core_init(struct pmc_dev *pmcdev) 
	struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];

	int ret;



	pmcdev->suspend = cnl_suspend;

	pmcdev->resume = cnl_resume;



	pmc->map = &adl_reg_map;

	ret = get_primary_reg_base(pmc);

	if (ret)

		return ret;



	/* Due to a hardware limitation, the GBE LTR blocks PC10

	 * when a cable is attached. Tell the PMC to ignore it.

	 */

	dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");

	pmc_core_send_ltr_ignore(pmcdev, 3);



	return 0;

}

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

+20 −6
Original line number Diff line number Diff line
@@ -204,21 +204,35 @@ const struct pmc_reg_map cnp_reg_map = { 
	.etr3_offset = ETR3_OFFSET,

};



void cnl_suspend(struct pmc_dev *pmcdev)

{

	/*

	 * Due to a hardware limitation, the GBE LTR blocks PC10

	 * when a cable is attached. To unblock PC10 during suspend,

	 * tell the PMC to ignore it.

	 */

	pmc_core_send_ltr_ignore(pmcdev, 3, 1);

}



int cnl_resume(struct pmc_dev *pmcdev)

{

	pmc_core_send_ltr_ignore(pmcdev, 3, 0);



	return pmc_core_resume_common(pmcdev);

}



int cnp_core_init(struct pmc_dev *pmcdev)

{

	struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];

	int ret;



	pmcdev->suspend = cnl_suspend;

	pmcdev->resume = cnl_resume;



	pmc->map = &cnp_reg_map;

	ret = get_primary_reg_base(pmc);

	if (ret)

		return ret;



	/* Due to a hardware limitation, the GBE LTR blocks PC10

	 * when a cable is attached. Tell the PMC to ignore it.

	 */

	dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");

	pmc_core_send_ltr_ignore(pmcdev, 3);



	return 0;

}

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

+9 −3
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int pmc_core_pll_show(struct seq_file *s, void *unused) 
}

DEFINE_SHOW_ATTRIBUTE(pmc_core_pll);



int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value)

int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore)

{

	struct pmc *pmc;

	const struct pmc_reg_map *map;
@@ -498,7 +498,10 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value) 
	mutex_lock(&pmcdev->lock);



	reg = pmc_core_reg_read(pmc, map->ltr_ignore_offset);

	if (ignore)

		reg |= BIT(ltr_index);

	else

		reg &= ~BIT(ltr_index);

	pmc_core_reg_write(pmc, map->ltr_ignore_offset, reg);



	mutex_unlock(&pmcdev->lock);
@@ -521,7 +524,7 @@ static ssize_t pmc_core_ltr_ignore_write(struct file *file, 
	if (err)

		return err;



	err = pmc_core_send_ltr_ignore(pmcdev, value);

	err = pmc_core_send_ltr_ignore(pmcdev, value, 1);



	return err == 0 ? count : err;

}
@@ -1279,6 +1282,9 @@ static __maybe_unused int pmc_core_suspend(struct device *dev) 
	struct pmc_dev *pmcdev = dev_get_drvdata(dev);

	struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];



	if (pmcdev->suspend)

		pmcdev->suspend(pmcdev);



	/* Check if the syspend will actually use S0ix */

	if (pm_suspend_via_firmware())

		return 0;

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

+6 −1
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct pmc { 
 * @s0ix_counter:	S0ix residency (step adjusted)

 * @num_lpm_modes:	Count of enabled modes

 * @lpm_en_modes:	Array of enabled modes from lowest to highest priority

 * @suspend:		Function to perform platform specific suspend

 * @resume:		Function to perform platform specific resume

 *

 * pmc_dev contains info about power management controller device.
@@ -379,6 +380,7 @@ struct pmc_dev { 
	u64 s0ix_counter;

	int num_lpm_modes;

	int lpm_en_modes[LPM_MAX_NUM_MODES];

	void (*suspend)(struct pmc_dev *pmcdev);

	int (*resume)(struct pmc_dev *pmcdev);



	bool has_die_c6;
@@ -486,7 +488,7 @@ extern const struct pmc_bit_map *mtl_ioem_lpm_maps[]; 
extern const struct pmc_reg_map mtl_ioem_reg_map;



extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev);

extern int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value);

int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore);



int pmc_core_resume_common(struct pmc_dev *pmcdev);

int get_primary_reg_base(struct pmc *pmc);
@@ -500,6 +502,9 @@ int tgl_core_init(struct pmc_dev *pmcdev); 
int adl_core_init(struct pmc_dev *pmcdev);

int mtl_core_init(struct pmc_dev *pmcdev);



void cnl_suspend(struct pmc_dev *pmcdev);

int cnl_resume(struct pmc_dev *pmcdev);



#define pmc_for_each_mode(i, mode, pmcdev)		\

	for (i = 0, mode = pmcdev->lpm_en_modes[i];	\

	     i < pmcdev->num_lpm_modes;			\

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

+3 −6
Original line number Diff line number Diff line
@@ -979,6 +979,8 @@ static void mtl_d3_fixup(void) 
static int mtl_resume(struct pmc_dev *pmcdev)

{

	mtl_d3_fixup();

	pmc_core_send_ltr_ignore(pmcdev, 3, 0);



	return pmc_core_resume_common(pmcdev);

}
@@ -989,6 +991,7 @@ int mtl_core_init(struct pmc_dev *pmcdev) 


	mtl_d3_fixup();



	pmcdev->suspend = cnl_suspend;

	pmcdev->resume = mtl_resume;



	pmcdev->regmap_list = mtl_pmc_info_list;
@@ -1002,11 +1005,5 @@ int mtl_core_init(struct pmc_dev *pmcdev) 
			return ret;

	}



	/* Due to a hardware limitation, the GBE LTR blocks PC10

	 * when a cable is attached. Tell the PMC to ignore it.

	 */

	dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");

	pmc_core_send_ltr_ignore(pmcdev, 3);



	return 0;

}