Unverified Commit 7c9aa38a authored by Werner Sembach's avatar Werner Sembach Committed by Ilpo Järvinen
Browse files

platform/x86/uniwill: Implement cTGP setting 



Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000
Series and newer GPUs. This patch implements this setting as a sysfs
attribute.

For one device, the TUXEDO InfinityBook Gen7, the variant with and without
NVIDIA GPU can't be differentiated using only the DMI strings, so the new
probe callback needs to be used to test a bit from the EC memory.

Co-developed-by: default avatarArmin Wolf <W_Armin@gmx.de>
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Signed-off-by: default avatarWerner Sembach <wse@tuxedocomputers.com>
Reviewed-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/20260115154332.402873-2-wse@tuxedocomputers.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent d8c560f7

drivers/platform/x86/uniwill/uniwill-acpi.c

+163 −26
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ 


#define EC_ADDR_GPU_TEMP		0x044F



#define EC_ADDR_SYSTEM_ID		0x0456

#define HAS_GPU				BIT(7)



#define EC_ADDR_MAIN_FAN_RPM_1		0x0464



#define EC_ADDR_MAIN_FAN_RPM_2		0x0465
@@ -122,11 +125,11 @@ 
#define CTGP_DB_DB_ENABLE		BIT(1)

#define CTGP_DB_CTGP_ENABLE		BIT(2)



#define EC_ADDR_CTGP_OFFSET		0x0744

#define EC_ADDR_CTGP_DB_CTGP_OFFSET	0x0744



#define EC_ADDR_TPP_OFFSET		0x0745

#define EC_ADDR_CTGP_DB_TPP_OFFSET	0x0745



#define EC_ADDR_MAX_TGP			0x0746

#define EC_ADDR_CTGP_DB_DB_OFFSET	0x0746



#define EC_ADDR_LIGHTBAR_AC_CTRL	0x0748

#define LIGHTBAR_APP_EXISTS		BIT(0)
@@ -317,6 +320,7 @@ 
#define UNIWILL_FEATURE_LIGHTBAR		BIT(3)

#define UNIWILL_FEATURE_BATTERY			BIT(4)

#define UNIWILL_FEATURE_HWMON			BIT(5)

#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL	BIT(6)



struct uniwill_data {

	struct device *dev;
@@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device *dev, unsigned int reg) 
	case EC_ADDR_LIGHTBAR_BAT_RED:

	case EC_ADDR_LIGHTBAR_BAT_GREEN:

	case EC_ADDR_LIGHTBAR_BAT_BLUE:

	case EC_ADDR_CTGP_DB_CTRL:

	case EC_ADDR_CTGP_DB_CTGP_OFFSET:

	case EC_ADDR_CTGP_DB_TPP_OFFSET:

	case EC_ADDR_CTGP_DB_DB_OFFSET:

		return true;

	default:

		return false;
@@ -547,6 +555,11 @@ static bool uniwill_readable_reg(struct device *dev, unsigned int reg) 
	case EC_ADDR_LIGHTBAR_BAT_RED:

	case EC_ADDR_LIGHTBAR_BAT_GREEN:

	case EC_ADDR_LIGHTBAR_BAT_BLUE:

	case EC_ADDR_SYSTEM_ID:

	case EC_ADDR_CTGP_DB_CTRL:

	case EC_ADDR_CTGP_DB_CTGP_OFFSET:

	case EC_ADDR_CTGP_DB_TPP_OFFSET:

	case EC_ADDR_CTGP_DB_DB_OFFSET:

		return true;

	default:

		return false;
@@ -802,6 +815,70 @@ static ssize_t breathing_in_suspend_show(struct device *dev, struct device_attri 


static DEVICE_ATTR_RW(breathing_in_suspend);



static ssize_t ctgp_offset_store(struct device *dev, struct device_attribute *attr,

				 const char *buf, size_t count)

{

	struct uniwill_data *data = dev_get_drvdata(dev);

	unsigned int value;

	int ret;



	ret = kstrtouint(buf, 0, &value);

	if (ret < 0)

		return ret;



	if (value > U8_MAX)

		return -EINVAL;



	ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value);

	if (ret < 0)

		return ret;



	return count;

}



static ssize_t ctgp_offset_show(struct device *dev, struct device_attribute *attr,

				char *buf)

{

	struct uniwill_data *data = dev_get_drvdata(dev);

	unsigned int value;

	int ret;



	ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value);

	if (ret < 0)

		return ret;



	return sysfs_emit(buf, "%u\n", value);

}



static DEVICE_ATTR_RW(ctgp_offset);



static int uniwill_nvidia_ctgp_init(struct uniwill_data *data)

{

	int ret;



	if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL))

		return 0;



	ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0);

	if (ret < 0)

		return ret;



	ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255);

	if (ret < 0)

		return ret;



	ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25);

	if (ret < 0)

		return ret;



	ret = regmap_set_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL,

			      CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE);

	if (ret < 0)

		return ret;



	return 0;

}



static struct attribute *uniwill_attrs[] = {

	/* Keyboard-related */

	&dev_attr_fn_lock_toggle_enable.attr,
@@ -810,6 +887,8 @@ static struct attribute *uniwill_attrs[] = { 
	/* Lightbar-related */

	&dev_attr_rainbow_animation.attr,

	&dev_attr_breathing_in_suspend.attr,

	/* Power-management-related */

	&dev_attr_ctgp_offset.attr,

	NULL

};
@@ -839,6 +918,11 @@ static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *a 
			return attr->mode;

	}



	if (attr == &dev_attr_ctgp_offset.attr) {

		if (uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL))

			return attr->mode;

	}



	return 0;

}
@@ -1405,6 +1489,10 @@ static int uniwill_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	ret = uniwill_nvidia_ctgp_init(data);

	if (ret < 0)

		return ret;



	return uniwill_input_init(data);

}
@@ -1440,6 +1528,15 @@ static int uniwill_suspend_battery(struct uniwill_data *data) 
	return regmap_read(data->regmap, EC_ADDR_CHARGE_CTRL, &data->last_charge_ctrl);

}



static int uniwill_suspend_nvidia_ctgp(struct uniwill_data *data)

{

	if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL))

		return 0;



	return regmap_clear_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL,

				 CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE);

}



static int uniwill_suspend(struct device *dev)

{

	struct uniwill_data *data = dev_get_drvdata(dev);
@@ -1453,6 +1550,10 @@ static int uniwill_suspend(struct device *dev) 
	if (ret < 0)

		return ret;



	ret = uniwill_suspend_nvidia_ctgp(data);

	if (ret < 0)

		return ret;



	regcache_cache_only(data->regmap, true);

	regcache_mark_dirty(data->regmap);
@@ -1487,6 +1588,15 @@ static int uniwill_resume_battery(struct uniwill_data *data) 
				  data->last_charge_ctrl);

}



static int uniwill_resume_nvidia_ctgp(struct uniwill_data *data)

{

	if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL))

		return 0;



	return regmap_set_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL,

			       CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE);

}



static int uniwill_resume(struct device *dev)

{

	struct uniwill_data *data = dev_get_drvdata(dev);
@@ -1502,7 +1612,11 @@ static int uniwill_resume(struct device *dev) 
	if (ret < 0)

		return ret;



	return uniwill_resume_battery(data);

	ret = uniwill_resume_battery(data);

	if (ret < 0)

		return ret;



	return uniwill_resume_nvidia_ctgp(data);

}



static DEFINE_SIMPLE_DEV_PM_OPS(uniwill_pm_ops, uniwill_suspend, uniwill_resume);
@@ -1545,6 +1659,29 @@ static struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { 
		    UNIWILL_FEATURE_HWMON,

};



static int phxarx1_phxaqf1_probe(struct uniwill_data *data)

{

	unsigned int value;

	int ret;



	ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value);

	if (ret < 0)

		return ret;



	if (value & HAS_GPU)

		data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL;



	return 0;

};



static struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = {

	.probe = phxarx1_phxaqf1_probe,

};



static struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = {

	.features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL,

};



static struct uniwill_device_descriptor empty_descriptor __initdata = {};



static const struct dmi_system_id uniwill_dmi_table[] __initconst = {
@@ -1594,7 +1731,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel",
@@ -1602,7 +1739,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &phxarx1_phxaqf1_descriptor,

	},

	{

		.ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7",
@@ -1610,7 +1747,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8",
@@ -1626,7 +1763,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel",
@@ -1634,7 +1771,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD",
@@ -1802,7 +1939,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Polaris 15/17 Gen2 Intel",
@@ -1810,7 +1947,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD",
@@ -1818,7 +1955,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel",
@@ -1826,7 +1963,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD",
@@ -1834,7 +1971,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 15 Gen4 Intel",
@@ -1842,7 +1979,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Polaris 15/17 Gen5 AMD",
@@ -1850,7 +1987,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen5 AMD",
@@ -1858,7 +1995,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5",
@@ -1866,7 +2003,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris Slim 15 Gen6 AMD",
@@ -1874,7 +2011,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6",
@@ -1882,7 +2019,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6",
@@ -1890,7 +2027,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6",
@@ -1898,7 +2035,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6",
@@ -1906,7 +2043,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen7 AMD",
@@ -1914,7 +2051,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen7 Intel",
@@ -1922,7 +2059,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Stellaris 16 Gen7 Intel",
@@ -1930,7 +2067,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"),

		},

		.driver_data = &empty_descriptor,

		.driver_data = &tux_featureset_1_descriptor,

	},

	{

		.ident = "TUXEDO Book BA15 Gen10 AMD",