Commit 8c8d5411 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.13-5' of... 

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

Pull x86 platform driver fixes from Ilpo Järvinen:
 "Fixes and new HW support:

   - amd/pmc: Match IRQ1 wakeup disable with the enable on i8042 side

   - intel: power-domains: Clearwater Forest support

   - intel/pmc: Skip SSRAM setup when no additional devices are present

   - ISST: Clearwater Forest support"

* tag 'platform-drivers-x86-v6.13-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: intel/pmc: Fix ioremap() of bad address
  platform/x86: ISST: Add Clearwater Forest to support list
  platform/x86/intel: power-domains: Add Clearwater Forest support
  platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it
parents b999e7f9 1d7461d0

drivers/platform/x86/amd/pmc/pmc.c

+7 −1
Original line number Diff line number Diff line
@@ -947,6 +947,10 @@ static int amd_pmc_suspend_handler(struct device *dev) 
{

	struct amd_pmc_dev *pdev = dev_get_drvdata(dev);



	/*

	 * Must be called only from the same set of dev_pm_ops handlers

	 * as i8042_pm_suspend() is called: currently just from .suspend.

	 */

	if (pdev->disable_8042_wakeup && !disable_workarounds) {

		int rc = amd_pmc_wa_irq1(pdev);
@@ -959,7 +963,9 @@ static int amd_pmc_suspend_handler(struct device *dev) 
	return 0;

}



static DEFINE_SIMPLE_DEV_PM_OPS(amd_pmc_pm, amd_pmc_suspend_handler, NULL);

static const struct dev_pm_ops amd_pmc_pm = {

	.suspend = amd_pmc_suspend_handler,

};



static const struct pci_device_id pmc_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },

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

+4 −0
Original line number Diff line number Diff line
@@ -269,8 +269,12 @@ pmc_core_ssram_get_pmc(struct pmc_dev *pmcdev, int pmc_idx, u32 offset) 
		/*

		 * The secondary PMC BARS (which are behind hidden PCI devices)

		 * are read from fixed offsets in MMIO of the primary PMC BAR.

		 * If a device is not present, the value will be 0.

		 */

		ssram_base = get_base(tmp_ssram, offset);

		if (!ssram_base)

			return 0;



		ssram = ioremap(ssram_base, SSRAM_HDR_SIZE);

		if (!ssram)

			return -ENOMEM;

drivers/platform/x86/intel/speed_select_if/isst_if_common.c

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ EXPORT_SYMBOL_GPL(isst_if_cdev_unregister); 
static const struct x86_cpu_id isst_cpu_ids[] = {

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,	SST_HPM_SUPPORTED),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X,	SST_HPM_SUPPORTED),

	X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,	SST_HPM_SUPPORTED),

	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,	0),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_D,	SST_HPM_SUPPORTED),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,	SST_HPM_SUPPORTED),

drivers/platform/x86/intel/tpmi_power_domains.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static const struct x86_cpu_id tpmi_cpu_ids[] = { 
	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,	NULL),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X,	NULL),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,	NULL),

	X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,	NULL),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_D,	NULL),

	X86_MATCH_VFM(INTEL_PANTHERCOVE_X,	NULL),

	{}