Commit 994e99a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v5.8-2' of... 

Merge tag 'platform-drivers-x86-v5.8-2' of git://git.infradead.org/linux-platform-drivers-x86 into master

Pull x86 platform driver fixes from Andriy Shevchenko:
 "Small fixes for this cycle:

   - Fix procfs handling in Thinkpad ACPI driver

   - Fix battery management on new ASUS laptops

   - New IDs (Sapphire Rapids) in ISST tool"

* tag 'platform-drivers-x86-v5.8-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: asus-wmi: allow BAT1 battery name
  platform/x86: ISST: Add new PCI device ids
  platform/x86: thinkpad_acpi: Revert "Use strndup_user() in dispatch_proc_write()"
parents 0665a4e9 9a33e375

drivers/platform/x86/asus-wmi.c

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static int asus_wmi_battery_add(struct power_supply *battery) 
	 * battery is named BATT.

	 */

	if (strcmp(battery->desc->name, "BAT0") != 0 &&

	    strcmp(battery->desc->name, "BAT1") != 0 &&

	    strcmp(battery->desc->name, "BATT") != 0)

		return -ENODEV;

drivers/platform/x86/intel_speed_select_if/isst_if_common.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#define INTEL_RAPL_PRIO_DEVID_0	0x3451

#define INTEL_CFG_MBOX_DEVID_0	0x3459



#define INTEL_RAPL_PRIO_DEVID_1 0x3251

#define INTEL_CFG_MBOX_DEVID_1  0x3259



/*

 * Validate maximum commands in a single request.

 * This is enough to handle command to every core in one ioctl, or all

drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static long isst_if_mbox_proc_cmd(u8 *cmd_ptr, int *write_only, int resume) 


static const struct pci_device_id isst_if_mbox_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_0)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_1)},

	{ 0 },

};

MODULE_DEVICE_TABLE(pci, isst_if_mbox_ids);

drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static long isst_if_mmio_rd_wr(u8 *cmd_ptr, int *write_only, int resume) 


static const struct pci_device_id isst_if_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_0)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_1)},

	{ 0 },

};

MODULE_DEVICE_TABLE(pci, isst_if_ids);

drivers/platform/x86/thinkpad_acpi.c

+11 −3
Original line number Diff line number Diff line
@@ -885,11 +885,19 @@ static ssize_t dispatch_proc_write(struct file *file, 


	if (!ibm || !ibm->write)

		return -EINVAL;

	if (count > PAGE_SIZE - 1)

		return -EINVAL;



	kernbuf = kmalloc(count + 1, GFP_KERNEL);

	if (!kernbuf)

		return -ENOMEM;



	kernbuf = strndup_user(userbuf, PAGE_SIZE);

	if (IS_ERR(kernbuf))

		return PTR_ERR(kernbuf);

	if (copy_from_user(kernbuf, userbuf, count)) {

		kfree(kernbuf);

		return -EFAULT;

	}



	kernbuf[count] = 0;

	ret = ibm->write(kernbuf);

	if (ret == 0)

		ret = count;

CRA Git | Maintained and supported by SUSTech CRA and CCSE