Merge tag 'platform-drivers-x86-v5.9-1' of git://git.infradead.org/linux-platform-drivers-x86 (09a0bd07) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+17 −0

Original line number	Diff line number	Diff line
		@@ -206,3 +206,20 @@ Description: This file exposes the firmware version of burnable voltage
		regulator devices.

		The file is read only.

		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_pn
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_pn
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_pn
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_pn
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_version_min
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_version_min
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version_min
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version_min
		Date: July 2020
		KernelVersion: 5.9
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD part numbers and minor
		versions have been burned CPLD devices equipped on a
		system.

		The files are read only.

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+32 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ detailed description):
		- WAN enable and disable
		- UWB enable and disable
		- LCD Shadow (PrivacyGuard) enable and disable
		- Lap mode sensor

		A compatibility table by model and feature is maintained on the web
		site, http://ibm-acpi.sf.net/. I appreciate any success or failure
		@@ -1432,6 +1433,20 @@ The first command ensures the best viewing angle and the latter one turns
		on the feature, restricting the viewing angles.


		DYTC Lapmode sensor
		------------------

		sysfs: dytc_lapmode

		Newer thinkpads and mobile workstations have the ability to determine if
		the device is in deskmode or lapmode. This feature is used by user space
		to decide if WWAN transmission can be increased to maximum power and is
		also useful for understanding the different thermal modes available as
		they differ between desk and lap mode.

		The property is read-only. If the platform doesn't have support the sysfs
		class is not created.

		EXPERIMENTAL: UWB
		-----------------

		@@ -1470,6 +1485,23 @@ For more details about which buttons will appear depending on the mode, please
		review the laptop's user guide:
		http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

		Battery charge control
		----------------------

		sysfs attributes:
		/sys/class/power_supply/BAT*/charge_control_{start,end}_threshold

		These two attributes are created for those batteries that are supported by the
		driver. They enable the user to control the battery charge thresholds of the
		given battery. Both values may be read and set. `charge_control_start_threshold`
		accepts an integer between 0 and 99 (inclusive); this value represents a battery
		percentage level, below which charging will begin. `charge_control_end_threshold`
		accepts an integer between 1 and 100 (inclusive); this value represents a battery
		percentage level, above which charging will stop.

		The exact semantics of the attributes may be found in
		Documentation/ABI/testing/sysfs-class-power.

		Multiple Commands, Module Parameters
		------------------------------------

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -8610,6 +8610,12 @@ L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/intel_atomisp2_pm.c

		INTEL ATOMISP2 LED DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/intel_atomisp2_led.c

		INTEL BROXTON PMC DRIVER
		M: Mika Westerberg <mika.westerberg@linux.intel.com>
		M: Zha Qipeng <qipeng.zha@intel.com>

drivers/platform/mellanox/mlxreg-hotplug.c

+64 −50

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0+
		/*
		* Copyright (c) 2016-2018 Mellanox Technologies. All rights reserved.
		* Copyright (c) 2016-2018 Vadim Pasternak <vadimp@mellanox.com>
		* Mellanox hotplug driver
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* 3. Neither the names of the copyright holders nor the names of its
		* contributors may be used to endorse or promote products derived from
		* this software without specific prior written permission.
		*
		* Alternatively, this software may be distributed under the terms of the
		* GNU General Public License ("GPL") version 2 as published by the Free
		* Software Foundation.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		* POSSIBILITY OF SUCH DAMAGE.
		* Copyright (C) 2016-2020 Mellanox Technologies
		*/

		#include <linux/bitops.h>
		@@ -42,6 +16,7 @@
		#include <linux/platform_data/mlxreg.h>
		#include <linux/platform_device.h>
		#include <linux/spinlock.h>
		#include <linux/string_helpers.h>
		#include <linux/regmap.h>
		#include <linux/workqueue.h>

		@@ -97,6 +72,23 @@ struct mlxreg_hotplug_priv_data {
		u8 not_asserted;
		};

		/* Environment variables array for udev. */
		static char *mlxreg_hotplug_udev_envp[] = { NULL, NULL };

		static int
		mlxreg_hotplug_udev_event_send(struct kobject *kobj,
		struct mlxreg_core_data *data, bool action)
		{
		char event_str[MLXREG_CORE_LABEL_MAX_SIZE + 2];
		char label[MLXREG_CORE_LABEL_MAX_SIZE] = { 0 };

		mlxreg_hotplug_udev_envp[0] = event_str;
		string_upper(label, data->label);
		snprintf(event_str, MLXREG_CORE_LABEL_MAX_SIZE, "%s=%d", label, !!action);

		return kobject_uevent_env(kobj, KOBJ_CHANGE, mlxreg_hotplug_udev_envp);
		}

		static int mlxreg_hotplug_device_create(struct mlxreg_hotplug_priv_data *priv,
		struct mlxreg_core_data *data)
		{
		@@ -104,7 +96,7 @@ static int mlxreg_hotplug_device_create(struct mlxreg_hotplug_priv_data *priv,
		struct i2c_client *client;

		/* Notify user by sending hwmon uevent. */
		kobject_uevent(&priv->hwmon->kobj, KOBJ_CHANGE);
		mlxreg_hotplug_udev_event_send(&priv->hwmon->kobj, data, true);

		/*
		* Return if adapter number is negative. It could be in case hotplug
		@@ -144,7 +136,7 @@ mlxreg_hotplug_device_destroy(struct mlxreg_hotplug_priv_data *priv,
		struct mlxreg_core_data *data)
		{
		/* Notify user by sending hwmon uevent. */
		kobject_uevent(&priv->hwmon->kobj, KOBJ_CHANGE);
		mlxreg_hotplug_udev_event_send(&priv->hwmon->kobj, data, false);

		if (data->hpdev.client) {
		i2c_unregister_device(data->hpdev.client);
		@@ -199,17 +191,49 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv)
		struct mlxreg_core_hotplug_platform_data *pdata;
		struct mlxreg_core_item *item;
		struct mlxreg_core_data *data;
		int num_attrs = 0, id = 0, i, j;
		unsigned long mask;
		u32 regval;
		int num_attrs = 0, id = 0, i, j, k, ret;

		pdata = dev_get_platdata(&priv->pdev->dev);
		item = pdata->items;

		/* Go over all kinds of items - psu, pwr, fan. */
		for (i = 0; i < pdata->counter; i++, item++) {
		num_attrs += item->count;
		if (item->capability) {
		/*
		* Read group capability register to get actual number
		* of interrupt capable components and set group mask
		* accordingly.
		*/
		ret = regmap_read(priv->regmap, item->capability,
		&regval);
		if (ret)
		return ret;

		item->mask = GENMASK((regval & item->mask) - 1, 0);
		}

		data = item->data;
		/* Go over all units within the item. */
		for (j = 0; j < item->count; j++, data++, id++) {

		/* Go over all unmasked units within item. */
		mask = item->mask;
		k = 0;
		for_each_set_bit(j, &mask, item->count) {
		if (data->capability) {
		/*
		* Read capability register and skip non
		* relevant attributes.
		*/
		ret = regmap_read(priv->regmap,
		data->capability, &regval);
		if (ret)
		return ret;
		if (!(regval & data->bit)) {
		data++;
		continue;
		}
		}
		PRIV_ATTR(id) = &PRIV_DEV_ATTR(id).dev_attr.attr;
		PRIV_ATTR(id)->name = devm_kasprintf(&priv->pdev->dev,
		GFP_KERNEL,
		@@ -227,9 +251,13 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv)
		PRIV_DEV_ATTR(id).dev_attr.show =
		mlxreg_hotplug_attr_show;
		PRIV_DEV_ATTR(id).nr = i;
		PRIV_DEV_ATTR(id).index = j;
		PRIV_DEV_ATTR(id).index = k;
		sysfs_attr_init(&PRIV_DEV_ATTR(id).dev_attr.attr);
		data++;
		id++;
		k++;
		}
		num_attrs += k;
		}

		priv->group.attrs = devm_kcalloc(&priv->pdev->dev,
		@@ -507,20 +535,6 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv)
		item = pdata->items;

		for (i = 0; i < pdata->counter; i++, item++) {
		if (item->capability) {
		/*
		* Read group capability register to get actual number
		* of interrupt capable components and set group mask
		* accordingly.
		*/
		ret = regmap_read(priv->regmap, item->capability,
		&regval);
		if (ret)
		goto out;

		item->mask = GENMASK((regval & item->mask) - 1, 0);
		}

		/* Clear group presense event. */
		ret = regmap_write(priv->regmap, item->reg +
		MLXREG_HOTPLUG_EVENT_OFF, 0);

drivers/platform/mellanox/mlxreg-io.c

+33 −12

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		* @mlxreg_io_dev_attr: sysfs sensor device attribute array;
		* @group: sysfs attribute group;
		* @groups: list of sysfs attribute group for hwmon registration;
		* @regsize: size of a register value;
		*/
		struct mlxreg_io_priv_data {
		struct platform_device *pdev;
		@@ -39,27 +40,30 @@ struct mlxreg_io_priv_data {
		struct sensor_device_attribute mlxreg_io_dev_attr[MLXREG_IO_ATT_NUM];
		struct attribute_group group;
		const struct attribute_group *groups[2];
		int regsize;
		};

		static int
		mlxreg_io_get_reg(void regmap, struct mlxreg_core_data data, u32 in_val,
		bool rw_flag, u32 *regval)
		bool rw_flag, int regsize, u32 *regval)
		{
		int ret;
		int i, val, ret;

		ret = regmap_read(regmap, data->reg, regval);
		if (ret)
		goto access_error;

		/*
		* There are three kinds of attributes: single bit, full register's
		* bits and bit sequence. For the first kind field mask indicates which
		* bits are not related and field bit is set zero. For the second kind
		* field mask is set to zero and field bit is set with all bits one.
		* No special handling for such kind of attributes - pass value as is.
		* For the third kind, field mask indicates which bits are related and
		* field bit is set to the first bit number (from 1 to 32) is the bit
		* sequence.
		* There are four kinds of attributes: single bit, full register's
		* bits, bit sequence, bits in few registers For the first kind field
		* mask indicates which bits are not related and field bit is set zero.
		* For the second kind field mask is set to zero and field bit is set
		* with all bits one. No special handling for such kind of attributes -
		* pass value as is. For the third kind, the field mask indicates which
		* bits are related and the field bit is set to the first bit number
		* (from 1 to 32) is the bit sequence. For the fourth kind - the number
		* of registers which should be read for getting an attribute are
		* specified through 'data->regnum' field.
		*/
		if (!data->bit) {
		/* Single bit. */
		@@ -83,6 +87,19 @@ mlxreg_io_get_reg(void regmap, struct mlxreg_core_data data, u32 in_val,
		/* Clear relevant bits and set them to new value. */
		regval = (regval & ~data->mask) \| in_val;
		}
		} else {
		/*
		* Some attributes could occupied few registers in case regmap
		* bit size is 8 or 16. Compose such attributes from 'regnum'
		* registers. Such attributes contain read-only data.
		*/
		for (i = 1; i < data->regnum; i++) {
		ret = regmap_read(regmap, data->reg + i, &val);
		if (ret)
		goto access_error;

		regval \|= rol32(val, regsize i);
		}
		}

		access_error:
		@@ -99,7 +116,8 @@ mlxreg_io_attr_show(struct device dev, struct device_attribute attr,
		u32 regval = 0;
		int ret;

		ret = mlxreg_io_get_reg(priv->pdata->regmap, data, 0, true, &regval);
		ret = mlxreg_io_get_reg(priv->pdata->regmap, data, 0, true,
		priv->regsize, &regval);
		if (ret)
		goto access_error;

		@@ -128,7 +146,7 @@ mlxreg_io_attr_store(struct device dev, struct device_attribute attr,
		return ret;

		ret = mlxreg_io_get_reg(priv->pdata->regmap, data, input_val, false,
		&regval);
		priv->regsize, &regval);
		if (ret)
		goto access_error;

		@@ -207,6 +225,9 @@ static int mlxreg_io_probe(struct platform_device *pdev)
		}

		priv->pdev = pdev;
		priv->regsize = regmap_get_val_bytes(priv->pdata->regmap);
		if (priv->regsize < 0)
		return priv->regsize;

		err = mlxreg_io_attr_init(priv);
		if (err) {

Admin message