Commit 0a8db05b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86 platform driver fixes from Hans de Goede:
 "Misc small fixes and hw-id additions"

* tag 'platform-drivers-x86-v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: huawei-wmi: Silence ambient light sensor
  platform/x86: msi-laptop: Fix rfkill out-of-sync on MSI Wind U100
  platform/x86: asus-wmi: Fix setting RGB mode on some TUF laptops
  platform/x86: think-lmi: Use kfree_sensitive instead of kfree
  platform/x86/intel/hid: Add HP Dragonfly G2 to VGBS DMI quirks
  platform/x86: intel: hid: Always call BTNL ACPI method
  platform/x86/amd/pmf: Notify OS power slider update
  platform/x86/amd/pmf: reduce verbosity of apmf_get_system_params
  platform/x86: serial-multi-instantiate: Auto detect IRQ resource for CSC3551
  platform/x86/amd: pmc: Use release_mem_region() to undo request_mem_region_muxed()
  platform/x86: touchscreen_dmi.c: small changes for Archos 101 Cesium Educ tablet
parents f40125c0 c2173375

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

+2 −6
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/dmi.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/slab.h>



#include "pmc.h"
@@ -135,12 +134,10 @@ static const struct dmi_system_id fwbug_list[] = { 
 */

static void amd_pmc_skip_nvme_smi_handler(u32 s2idle_bug_mmio)

{

	struct resource *res;

	void __iomem *addr;

	u8 val;



	res = request_mem_region_muxed(s2idle_bug_mmio, 1, "amd_pmc_pm80");

	if (!res)

	if (!request_mem_region_muxed(s2idle_bug_mmio, 1, "amd_pmc_pm80"))

		return;



	addr = ioremap(s2idle_bug_mmio, 1);
@@ -152,8 +149,7 @@ static void amd_pmc_skip_nvme_smi_handler(u32 s2idle_bug_mmio) 


	iounmap(addr);

cleanup_resource:

	release_resource(res);

	kfree(res);

	release_mem_region(s2idle_bug_mmio, 1);

}



void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev)

drivers/platform/x86/amd/pmf/acpi.c

+22 −1
Original line number Diff line number Diff line
@@ -106,6 +106,27 @@ int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev, 
									 data, sizeof(*data));

}



int apmf_os_power_slider_update(struct amd_pmf_dev *pdev, u8 event)

{

	struct os_power_slider args;

	struct acpi_buffer params;

	union acpi_object *info;

	int err = 0;



	args.size = sizeof(args);

	args.slider_event = event;



	params.length = sizeof(args);

	params.pointer = (void *)&args;



	info = apmf_if_call(pdev, APMF_FUNC_OS_POWER_SLIDER_UPDATE, &params);

	if (!info)

		err = -EIO;



	kfree(info);

	return err;

}



static void apmf_sbios_heartbeat_notify(struct work_struct *work)

{

	struct amd_pmf_dev *dev = container_of(work, struct amd_pmf_dev, heart_beat.work);
@@ -289,7 +310,7 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) 


	ret = apmf_get_system_params(pmf_dev);

	if (ret) {

		dev_err(pmf_dev->dev, "APMF apmf_get_system_params failed :%d\n", ret);

		dev_dbg(pmf_dev->dev, "APMF apmf_get_system_params failed :%d\n", ret);

		goto out;

	}

drivers/platform/x86/amd/pmf/core.c

+7 −2
Original line number Diff line number Diff line
@@ -72,8 +72,12 @@ static int amd_pmf_pwr_src_notify_call(struct notifier_block *nb, unsigned long 
			return NOTIFY_DONE;

	}



	if (is_apmf_func_supported(pmf, APMF_FUNC_STATIC_SLIDER_GRANULAR))

		amd_pmf_set_sps_power_limits(pmf);



	if (is_apmf_func_supported(pmf, APMF_FUNC_OS_POWER_SLIDER_UPDATE))

		amd_pmf_power_slider_update_event(pmf);



	return NOTIFY_OK;

}
@@ -297,7 +301,8 @@ static void amd_pmf_init_features(struct amd_pmf_dev *dev) 
	int ret;



	/* Enable Static Slider */

	if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {

	if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR) ||

	    is_apmf_func_supported(dev, APMF_FUNC_OS_POWER_SLIDER_UPDATE)) {

		amd_pmf_init_sps(dev);

		dev->pwr_src_notifier.notifier_call = amd_pmf_pwr_src_notify_call;

		power_supply_reg_notifier(&dev->pwr_src_notifier);

drivers/platform/x86/amd/pmf/pmf.h

+16 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define APMF_FUNC_SBIOS_HEARTBEAT			4

#define APMF_FUNC_AUTO_MODE					5

#define APMF_FUNC_SET_FAN_IDX				7

#define APMF_FUNC_OS_POWER_SLIDER_UPDATE		8

#define APMF_FUNC_STATIC_SLIDER_GRANULAR       9

#define APMF_FUNC_DYN_SLIDER_AC				11

#define APMF_FUNC_DYN_SLIDER_DC				12
@@ -44,6 +45,14 @@ 
#define GET_STT_LIMIT_APU	0x20

#define GET_STT_LIMIT_HS2	0x21



/* OS slider update notification */

#define DC_BEST_PERF		0

#define DC_BETTER_PERF		1

#define DC_BATTERY_SAVER	3

#define AC_BEST_PERF		4

#define AC_BETTER_PERF		5

#define AC_BETTER_BATTERY	6



/* Fan Index for Auto Mode */

#define FAN_INDEX_AUTO		0xFFFFFFFF
@@ -193,6 +202,11 @@ struct amd_pmf_static_slider_granular { 
	struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX][POWER_MODE_MAX];

};



struct os_power_slider {

	u16 size;

	u8 slider_event;

} __packed;



struct fan_table_control {

	bool manual;

	unsigned long fan_id;
@@ -383,6 +397,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 
int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev);

int amd_pmf_get_power_source(void);

int apmf_install_handler(struct amd_pmf_dev *pmf_dev);

int apmf_os_power_slider_update(struct amd_pmf_dev *dev, u8 flag);



/* SPS Layer */

int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
@@ -393,6 +408,7 @@ void amd_pmf_deinit_sps(struct amd_pmf_dev *dev); 
int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,

				    struct apmf_static_slider_granular_output *output);

bool is_pprof_balanced(struct amd_pmf_dev *pmf);

int amd_pmf_power_slider_update_event(struct amd_pmf_dev *dev);





int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx);

drivers/platform/x86/amd/pmf/sps.c

+70 −4
Original line number Diff line number Diff line
@@ -174,14 +174,77 @@ int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf) 
	return mode;

}



int amd_pmf_power_slider_update_event(struct amd_pmf_dev *dev)

{

	u8 mode, flag = 0;

	int src;



	mode = amd_pmf_get_pprof_modes(dev);

	if (mode < 0)

		return mode;



	src = amd_pmf_get_power_source();



	if (src == POWER_SOURCE_AC) {

		switch (mode) {

		case POWER_MODE_PERFORMANCE:

			flag |= BIT(AC_BEST_PERF);

			break;

		case POWER_MODE_BALANCED_POWER:

			flag |= BIT(AC_BETTER_PERF);

			break;

		case POWER_MODE_POWER_SAVER:

			flag |= BIT(AC_BETTER_BATTERY);

			break;

		default:

			dev_err(dev->dev, "unsupported platform profile\n");

			return -EOPNOTSUPP;

		}



	} else if (src == POWER_SOURCE_DC) {

		switch (mode) {

		case POWER_MODE_PERFORMANCE:

			flag |= BIT(DC_BEST_PERF);

			break;

		case POWER_MODE_BALANCED_POWER:

			flag |= BIT(DC_BETTER_PERF);

			break;

		case POWER_MODE_POWER_SAVER:

			flag |= BIT(DC_BATTERY_SAVER);

			break;

		default:

			dev_err(dev->dev, "unsupported platform profile\n");

			return -EOPNOTSUPP;

		}

	}



	apmf_os_power_slider_update(dev, flag);



	return 0;

}



static int amd_pmf_profile_set(struct platform_profile_handler *pprof,

			       enum platform_profile_option profile)

{

	struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);

	int ret = 0;



	pmf->current_profile = profile;



	return amd_pmf_set_sps_power_limits(pmf);

	/* Notify EC about the slider position change */

	if (is_apmf_func_supported(pmf, APMF_FUNC_OS_POWER_SLIDER_UPDATE)) {

		ret = amd_pmf_power_slider_update_event(pmf);

		if (ret)

			return ret;

	}



	if (is_apmf_func_supported(pmf, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {

		ret = amd_pmf_set_sps_power_limits(pmf);

		if (ret)

			return ret;

	}



	return 0;

}



int amd_pmf_init_sps(struct amd_pmf_dev *dev)
@@ -189,10 +252,13 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev) 
	int err;



	dev->current_profile = PLATFORM_PROFILE_BALANCED;



	if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {

		amd_pmf_load_defaults_sps(dev);



		/* update SPS balanced power mode thermals */

		amd_pmf_set_sps_power_limits(dev);

	}



	dev->pprof.profile_get = amd_pmf_profile_get;

	dev->pprof.profile_set = amd_pmf_profile_set;