Unverified Commit 593ee93a authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'fixes' into for-next 

Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable
applying a few amd/hsmp patches that depend on changes in the fixes
branch.
parents f94ffc3f bfcfe6d3

Documentation/wmi/devices/msi-wmi-platform.rst

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ input data, the meaning of which depends on the subfeature being accessed. 
The output buffer contains a single byte which signals success or failure (``0x00`` on failure)

and 31 bytes of output data, the meaning if which depends on the subfeature being accessed.



.. note::

   The ACPI control method responsible for handling the WMI method calls is not thread-safe.

   This is a firmware bug that needs to be handled inside the driver itself.



WMI method Get_EC()

-------------------

drivers/platform/mellanox/mlxbf-bootctl.c

+2 −2
Original line number Diff line number Diff line
@@ -333,9 +333,9 @@ static ssize_t secure_boot_fuse_state_show(struct device *dev, 
			else

				status = valid ? "Invalid" : "Free";

		}

		buf_len += sysfs_emit(buf + buf_len, "%d:%s ", key, status);

		buf_len += sysfs_emit_at(buf, buf_len, "%d:%s ", key, status);

	}

	buf_len += sysfs_emit(buf + buf_len, "\n");

	buf_len += sysfs_emit_at(buf, buf_len, "\n");



	return buf_len;

}

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

+1 −2
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ 


#include "hsmp.h"



#define DRIVER_NAME		"amd_hsmp"

#define DRIVER_NAME		"hsmp_acpi"

#define DRIVER_VERSION		"2.3"

#define ACPI_HSMP_DEVICE_HID	"AMDI0097"



/* These are the strings specified in ACPI table */

#define MSG_IDOFF_STR		"MsgIdOffset"

drivers/platform/x86/amd/hsmp/hsmp.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#define HSMP_CDEV_NAME		"hsmp_cdev"

#define HSMP_DEVNODE_NAME	"hsmp"

#define ACPI_HSMP_DEVICE_HID    "AMDI0097"



struct hsmp_mbaddr_info {

	u32 base_addr;

drivers/platform/x86/amd/hsmp/plat.c

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <asm/amd_hsmp.h>



#include <linux/acpi.h>

#include <linux/build_bug.h>

#include <linux/device.h>

#include <linux/module.h>
@@ -266,7 +267,7 @@ static bool legacy_hsmp_support(void) 
		}

	case 0x1A:

		switch (boot_cpu_data.x86_model) {

		case 0x00 ... 0x1F:

		case 0x00 ... 0x0F:

			return true;

		default:

			return false;
@@ -288,6 +289,9 @@ static int __init hsmp_plt_init(void) 
		return ret;

	}



	if (acpi_dev_present(ACPI_HSMP_DEVICE_HID, NULL, -1))

		return -ENODEV;



	hsmp_pdev = get_hsmp_pdev();

	if (!hsmp_pdev)

		return -ENOMEM;