Re: [PATCH v6 2/5] platform/x86: uniwill-laptop: Implement USB-C power priority setting

["Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>]

On Thu, 12 Mar 2026, Werner Sembach wrote:

> On some devices Uniwill offers the option to set the USB-C port to
> prioritise charging or performance. This patch exposes this setting to the
> userspace via sysfs for all TUXEDO devices supporting it.
> 
> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
> Reviewed-by: Armin Wolf <W_Armin@gmx.de>
> ---
>  drivers/platform/x86/uniwill/uniwill-acpi.c | 145 +++++++++++++++++++-
>  1 file changed, 138 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c
> index 048b265bff374..22ae5fccd6a06 100644
> --- a/drivers/platform/x86/uniwill/uniwill-acpi.c
> +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c
> @@ -266,8 +266,8 @@
>  #define BATTERY_CHARGE_FULL_OVER_24H	BIT(3)
>  #define BATTERY_ERM_STATUS_REACHED	BIT(4)
>  
> -#define EC_ADDR_CHARGE_PRIO		0x07CC
> -#define CHARGING_PERFORMANCE		BIT(7)
> +#define EC_ADDR_USB_C_POWER_PRIORITY	0x07CC
> +#define USB_C_POWER_PRIORITY		BIT(7)
>  
>  /* Same bits as EC_ADDR_LIGHTBAR_AC_CTRL except LIGHTBAR_S3_OFF */
>  #define EC_ADDR_LIGHTBAR_BAT_CTRL	0x07E2
> @@ -324,6 +324,12 @@
>  #define UNIWILL_FEATURE_PRIMARY_FAN		BIT(7)
>  #define UNIWILL_FEATURE_SECONDARY_FAN		BIT(8)
>  #define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL	BIT(9)
> +#define UNIWILL_FEATURE_USB_C_POWER_PRIORITY	BIT(10)
> +
> +enum usb_c_power_priority_options {
> +	USB_C_POWER_PRIORITY_CHARGING = 0,
> +	USB_C_POWER_PRIORITY_PERFORMANCE,
> +};
>  
>  struct uniwill_data {
>  	struct device *dev;
> @@ -343,6 +349,8 @@ struct uniwill_data {
>  	struct mutex input_lock;	/* Protects input sequence during notify */
>  	struct input_dev *input_device;
>  	struct notifier_block nb;
> +	struct mutex usb_c_power_priority_lock; /* Protects dependent bit write and state safe */
> +	enum usb_c_power_priority_options last_usb_c_power_priority_option;
>  };
>  
>  struct uniwill_battery_entry {
> @@ -527,6 +535,7 @@ static bool uniwill_writeable_reg(struct device *dev, unsigned int reg)
>  	case EC_ADDR_CTGP_DB_CTGP_OFFSET:
>  	case EC_ADDR_CTGP_DB_TPP_OFFSET:
>  	case EC_ADDR_CTGP_DB_DB_OFFSET:
> +	case EC_ADDR_USB_C_POWER_PRIORITY:
>  		return true;
>  	default:
>  		return false;
> @@ -565,6 +574,7 @@ static bool uniwill_readable_reg(struct device *dev, unsigned int reg)
>  	case EC_ADDR_CTGP_DB_CTGP_OFFSET:
>  	case EC_ADDR_CTGP_DB_TPP_OFFSET:
>  	case EC_ADDR_CTGP_DB_DB_OFFSET:
> +	case EC_ADDR_USB_C_POWER_PRIORITY:
>  		return true;
>  	default:
>  		return false;
> @@ -587,6 +597,7 @@ static bool uniwill_volatile_reg(struct device *dev, unsigned int reg)
>  	case EC_ADDR_TRIGGER:
>  	case EC_ADDR_SWITCH_STATUS:
>  	case EC_ADDR_CHARGE_CTRL:
> +	case EC_ADDR_USB_C_POWER_PRIORITY:
>  		return true;
>  	default:
>  		return false;
> @@ -883,6 +894,104 @@ static int uniwill_nvidia_ctgp_init(struct uniwill_data *data)
>  	return 0;
>  }
>  

> +static const char * const USB_C_POWER_PRIORITY_TEXT[] = {

> +static const u8 USB_C_POWER_PRIORITY_VALUE[] = {

These two arrays need to be lowercase as they're not macros.

--
 i.