Commit 13f05fb2 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'acpi-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI and device properties fixes from Rafael Wysocki:
 "These fix device properties documentation and the ACPI PCC code, add a
  new IRQ override quirk for resource handling and add one more item to
  the list of device IDs to be ignored when returned by _DEP.

  Specifics:

   - Fix the documentation of the *_match_string() family of functions
     to properly cover the return value (Andy Shevchenko)

   - Fix a possible integer overflow during multiplication in the ACPI
     PCC code (Manank Patel)

   - Make the ACPI device resources code skip IRQ override on Asus
     Vivobook S5602ZA (Tamim Khan)

   - Add LATT2021 to the list of device IDs that are ignored when
     returned by _DEP, because there are no drivers for them in the
     kernel and no plans to add such drivers (Hans de Goede)"

* tag 'acpi-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: scan: Add LATT2021 to acpi_ignore_dep_ids[]
  ACPI: resource: Skip IRQ override on Asus Vivobook S5602ZA
  ACPI: PCC: Fix unintentional integer overflow
  device property: Fix documentation for *_match_string() APIs
parents 6b872a5e dd183e32
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* Arbitrary retries in case the remote processor is slow to respond * Arbitrary retries in case the remote processor is slow to respond
* to PCC commands * to PCC commands
*/ */
#define PCC_CMD_WAIT_RETRIES_NUM 500 #define PCC_CMD_WAIT_RETRIES_NUM 500ULL
struct pcc_data { struct pcc_data {
struct pcc_mbox_chan *pcc_chan; struct pcc_mbox_chan *pcc_chan;
......
...@@ -425,6 +425,13 @@ static const struct dmi_system_id asus_laptop[] = { ...@@ -425,6 +425,13 @@ static const struct dmi_system_id asus_laptop[] = {
DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"), DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),
}, },
}, },
{
.ident = "Asus Vivobook S5602ZA",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
},
},
{ } { }
}; };
......
...@@ -789,6 +789,7 @@ static bool acpi_info_matches_ids(struct acpi_device_info *info, ...@@ -789,6 +789,7 @@ static bool acpi_info_matches_ids(struct acpi_device_info *info,
static const char * const acpi_ignore_dep_ids[] = { static const char * const acpi_ignore_dep_ids[] = {
"PNP0D80", /* Windows-compatible System Power Management Controller */ "PNP0D80", /* Windows-compatible System Power Management Controller */
"INT33BD", /* Intel Baytrail Mailbox Device */ "INT33BD", /* Intel Baytrail Mailbox Device */
"LATT2021", /* Lattice FW Update Client Driver */
NULL NULL
}; };
......
...@@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string); ...@@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
* Find a given string in a string array and if it is found return the * Find a given string in a string array and if it is found return the
* index back. * index back.
* *
* Return: %0 if the property was found (success), * Return: index, starting from %0, if the property was found (success),
* %-EINVAL if given arguments are not valid, * %-EINVAL if given arguments are not valid,
* %-ENODATA if the property does not have a value, * %-ENODATA if the property does not have a value,
* %-EPROTO if the property is not an array of strings, * %-EPROTO if the property is not an array of strings,
...@@ -450,7 +450,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string); ...@@ -450,7 +450,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
* Find a given string in a string array and if it is found return the * Find a given string in a string array and if it is found return the
* index back. * index back.
* *
* Return: %0 if the property was found (success), * Return: index, starting from %0, if the property was found (success),
* %-EINVAL if given arguments are not valid, * %-EINVAL if given arguments are not valid,
* %-ENODATA if the property does not have a value, * %-ENODATA if the property does not have a value,
* %-EPROTO if the property is not an array of strings, * %-EPROTO if the property is not an array of strings,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment