Merge tag 'platform-drivers-x86-v6.4-1' of... (088e0c18) · Commits · EulixOS / Software / Kernel

Documentation/ABI/testing/sysfs-platform-intel-ifs

+14 −3

Original line number	Diff line number	Diff line
		Device instance to test mapping
		intel_ifs_0 -> Scan Test
		intel_ifs_1 -> Array BIST test

		What: /sys/devices/virtual/misc/intel_ifs_<N>/run_test
		Date: Nov 16 2022
		KernelVersion: 6.2
		@@ -8,6 +12,7 @@ Description: Write <cpu#> to trigger IFS test for one online core.
		completes the test for the core containing that thread.
		Example: to test the core containing cpu5: echo 5 >
		/sys/devices/virtual/misc/intel_ifs_<N>/run_test
		Devices: all

		What: /sys/devices/virtual/misc/intel_ifs_<N>/status
		Date: Nov 16 2022
		@@ -15,21 +20,25 @@ KernelVersion: 6.2
		Contact: "Jithu Joseph" <jithu.joseph@intel.com>
		Description: The status of the last test. It can be one of "pass", "fail"
		or "untested".
		Devices: all

		What: /sys/devices/virtual/misc/intel_ifs_<N>/details
		Date: Nov 16 2022
		KernelVersion: 6.2
		Contact: "Jithu Joseph" <jithu.joseph@intel.com>
		Description: Additional information regarding the last test. The details file reports
		the hex value of the SCAN_STATUS MSR. Note that the error_code field
		the hex value of the STATUS MSR for this test. Note that the error_code field
		may contain driver defined software code not defined in the Intel SDM.
		Devices: all

		What: /sys/devices/virtual/misc/intel_ifs_<N>/image_version
		Date: Nov 16 2022
		KernelVersion: 6.2
		Contact: "Jithu Joseph" <jithu.joseph@intel.com>
		Description: Version (hexadecimal) of loaded IFS binary image. If no scan image
		is loaded reports "none".
		Description: Version (hexadecimal) of loaded IFS test image. If no test image
		is loaded reports "none". Only present for device instances where a test image
		is applicable.
		Devices: intel_ifs_0

		What: /sys/devices/virtual/misc/intel_ifs_<N>/current_batch
		Date: Nov 16 2022
		@@ -39,3 +48,5 @@ Description: Write a number less than or equal to 0xff to load an IFS test image
		The number written treated as the 2 digit suffix in the following file name:
		/lib/firmware/intel/ifs_<N>/ff-mm-ss-02x.scan
		Reading the file will provide the suffix of the currently loaded IFS test image.
		This file is present only for device instances where a test image is applicable.
		Devices: intel_ifs_0

Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

+7 −0

Original line number	Diff line number	Diff line
		@@ -68,3 +68,10 @@ Description:
		Wasted burnt and invalid
		Invalid not burnt but marked as valid (error state).
		======= ===============================================

		What: /sys/bus/platform/devices/MLNXBF04:00/bootfifo
		Date: Apr 2023
		KernelVersion: 6.4
		Contact: "Liming Sun <limings@nvidia.com>"
		Description:
		The file used to access the BlueField boot fifo.

MAINTAINERS

+8 −7

Original line number	Diff line number	Diff line
		@@ -14148,6 +14148,13 @@ S: Odd Fixes
		F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
		F: drivers/net/ieee802154/mrf24j40.c

		MSI EC DRIVER
		M: Nikita Kravets <teackot@gmail.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		W: https://github.com/BeardOverflow/msi-ec
		F: drivers/platform/x86/msi-ec.*

		MSI LAPTOP SUPPORT
		M: "Lee, Chun-Yi" <jlee@suse.com>
		L: platform-driver-x86@vger.kernel.org
		@@ -16330,12 +16337,6 @@ S: Maintained
		F: crypto/pcrypt.c
		F: include/crypto/pcrypt.h

		PEAQ WMI HOTKEYS DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/peaq-wmi.c

		PECI HARDWARE MONITORING DRIVERS
		M: Iwona Winiarska <iwona.winiarska@intel.com>
		L: linux-hwmon@vger.kernel.org
		@@ -22725,7 +22726,7 @@ M: Hans de Goede <hdegoede@redhat.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
		F: drivers/platform/x86/x86-android-tablets.c
		F: drivers/platform/x86/x86-android-tablets/

		X86 PLATFORM DRIVERS
		M: Hans de Goede <hdegoede@redhat.com>

arch/x86/include/asm/msr-index.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,8 @@

		/* Abbreviated from Intel SDM name IA32_INTEGRITY_CAPABILITIES */
		#define MSR_INTEGRITY_CAPS 0x000002d9
		#define MSR_INTEGRITY_CAPS_ARRAY_BIST_BIT 2
		#define MSR_INTEGRITY_CAPS_ARRAY_BIST BIT(MSR_INTEGRITY_CAPS_ARRAY_BIST_BIT)
		#define MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT 4
		#define MSR_INTEGRITY_CAPS_PERIODIC_BIST BIT(MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT)

drivers/platform/mellanox/mlxbf-bootctl.c

+87 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@

		#include <linux/acpi.h>
		#include <linux/arm-smccc.h>
		#include <linux/delay.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>

		@@ -44,6 +45,10 @@ static const char * const mlxbf_bootctl_lifecycle_states[] = {
		[3] = "RMA",
		};

		/* Mapped pointer for RSH_BOOT_FIFO_DATA and RSH_BOOT_FIFO_COUNT register. */
		static void __iomem *mlxbf_rsh_boot_data;
		static void __iomem *mlxbf_rsh_boot_cnt;

		/* ARM SMC call which is atomic and no need for lock. */
		static int mlxbf_bootctl_smc(unsigned int smc_op, int smc_arg)
		{
		@@ -244,11 +249,29 @@ static ssize_t secure_boot_fuse_state_show(struct device *dev,
		return buf_len;
		}

		static ssize_t fw_reset_store(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t count)
		{
		unsigned long key;
		int err;

		err = kstrtoul(buf, 16, &key);
		if (err)
		return err;

		if (mlxbf_bootctl_smc(MLXBF_BOOTCTL_FW_RESET, key) < 0)
		return -EINVAL;

		return count;
		}

		static DEVICE_ATTR_RW(post_reset_wdog);
		static DEVICE_ATTR_RW(reset_action);
		static DEVICE_ATTR_RW(second_reset_action);
		static DEVICE_ATTR_RO(lifecycle_state);
		static DEVICE_ATTR_RO(secure_boot_fuse_state);
		static DEVICE_ATTR_WO(fw_reset);

		static struct attribute *mlxbf_bootctl_attrs[] = {
		&dev_attr_post_reset_wdog.attr,
		@@ -256,6 +279,7 @@ static struct attribute *mlxbf_bootctl_attrs[] = {
		&dev_attr_second_reset_action.attr,
		&dev_attr_lifecycle_state.attr,
		&dev_attr_secure_boot_fuse_state.attr,
		&dev_attr_fw_reset.attr,
		NULL
		};

		@@ -268,6 +292,45 @@ static const struct acpi_device_id mlxbf_bootctl_acpi_ids[] = {

		MODULE_DEVICE_TABLE(acpi, mlxbf_bootctl_acpi_ids);

		static ssize_t mlxbf_bootctl_bootfifo_read(struct file *filp,
		struct kobject *kobj,
		struct bin_attribute *bin_attr,
		char *buf, loff_t pos,
		size_t count)
		{
		unsigned long timeout = msecs_to_jiffies(500);
		unsigned long expire = jiffies + timeout;
		u64 data, cnt = 0;
		char *p = buf;

		while (count >= sizeof(data)) {
		/* Give up reading if no more data within 500ms. */
		if (!cnt) {
		cnt = readq(mlxbf_rsh_boot_cnt);
		if (!cnt) {
		if (time_after(jiffies, expire))
		break;
		usleep_range(10, 50);
		continue;
		}
		}

		data = readq(mlxbf_rsh_boot_data);
		memcpy(p, &data, sizeof(data));
		count -= sizeof(data);
		p += sizeof(data);
		cnt--;
		expire = jiffies + timeout;
		}

		return p - buf;
		}

		static struct bin_attribute mlxbf_bootctl_bootfifo_sysfs_attr = {
		.attr = { .name = "bootfifo", .mode = 0400 },
		.read = mlxbf_bootctl_bootfifo_read,
		};

		static bool mlxbf_bootctl_guid_match(const guid_t *guid,
		const struct arm_smccc_res *res)
		{
		@@ -285,6 +348,16 @@ static int mlxbf_bootctl_probe(struct platform_device *pdev)
		guid_t guid;
		int ret;

		/* Get the resource of the bootfifo data register. */
		mlxbf_rsh_boot_data = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(mlxbf_rsh_boot_data))
		return PTR_ERR(mlxbf_rsh_boot_data);

		/* Get the resource of the bootfifo counter register. */
		mlxbf_rsh_boot_cnt = devm_platform_ioremap_resource(pdev, 1);
		if (IS_ERR(mlxbf_rsh_boot_cnt))
		return PTR_ERR(mlxbf_rsh_boot_cnt);

		/* Ensure we have the UUID we expect for this service. */
		arm_smccc_smc(MLXBF_BOOTCTL_SIP_SVC_UID, 0, 0, 0, 0, 0, 0, 0, &res);
		guid_parse(mlxbf_bootctl_svc_uuid_str, &guid);
		@@ -302,11 +375,25 @@ static int mlxbf_bootctl_probe(struct platform_device *pdev)
		if (ret < 0)
		dev_warn(&pdev->dev, "Unable to reset the EMMC boot mode\n");

		ret = sysfs_create_bin_file(&pdev->dev.kobj,
		&mlxbf_bootctl_bootfifo_sysfs_attr);
		if (ret)
		pr_err("Unable to create bootfifo sysfs file, error %d\n", ret);

		return ret;
		}

		static int mlxbf_bootctl_remove(struct platform_device *pdev)
		{
		sysfs_remove_bin_file(&pdev->dev.kobj,
		&mlxbf_bootctl_bootfifo_sysfs_attr);

		return 0;
		}

		static struct platform_driver mlxbf_bootctl_driver = {
		.probe = mlxbf_bootctl_probe,
		.remove = mlxbf_bootctl_remove,
		.driver = {
		.name = "mlxbf-bootctl",
		.dev_groups = mlxbf_bootctl_groups,