mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 13:50:52 +07:00
Pull misc-for-upstream into release branch
This commit is contained in:
commit
54b8c39fbd
@ -3066,11 +3066,10 @@ L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
|
||||
SONY VAIO CONTROL DEVICE DRIVER
|
||||
P: Stelian Pop
|
||||
M: stelian@popies.net
|
||||
P: Mattia Dongili
|
||||
M: malattia@linux.it
|
||||
W: http://popies.net/sonypi/
|
||||
L: linux-acpi@vger.kernel.org
|
||||
W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
|
||||
S: Maintained
|
||||
|
||||
SOUND
|
||||
|
@ -13,6 +13,7 @@ config IA64
|
||||
bool
|
||||
select PCI if (!IA64_HP_SIM)
|
||||
select ACPI if (!IA64_HP_SIM)
|
||||
select PM if (!IA64_HP_SIM)
|
||||
default y
|
||||
help
|
||||
The Itanium Processor Family is Intel's 64-bit successor to
|
||||
|
@ -300,6 +300,11 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
|
||||
/*
|
||||
* 2) Enable all wakeup GPEs
|
||||
*/
|
||||
status = acpi_hw_disable_all_gpes();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
||||
acpi_gbl_system_awake_and_running = FALSE;
|
||||
|
||||
status = acpi_hw_enable_all_wakeup_gpes();
|
||||
|
@ -2507,7 +2507,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
|
||||
ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
|
||||
if (ret < 0) {
|
||||
printk(IBM_ERR "%s device not present\n", ibm->name);
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
acpi_driver_data(ibm->device) = ibm;
|
||||
@ -2516,8 +2516,13 @@ static int __init setup_notify(struct ibm_struct *ibm)
|
||||
status = acpi_install_notify_handler(*ibm->handle, ibm->type,
|
||||
dispatch_notify, ibm);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
|
||||
ibm->name, status);
|
||||
if (status == AE_ALREADY_EXISTS) {
|
||||
printk(IBM_NOTICE "another device driver is already handling %s events\n",
|
||||
ibm->name);
|
||||
} else {
|
||||
printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
|
||||
ibm->name, status);
|
||||
}
|
||||
return -ENODEV;
|
||||
}
|
||||
ibm->notify_installed = 1;
|
||||
@ -2553,6 +2558,8 @@ static int __init register_driver(struct ibm_struct *ibm)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void ibm_exit(struct ibm_struct *ibm);
|
||||
|
||||
static int __init ibm_init(struct ibm_struct *ibm)
|
||||
{
|
||||
int ret;
|
||||
@ -2594,6 +2601,12 @@ static int __init ibm_init(struct ibm_struct *ibm)
|
||||
|
||||
if (ibm->notify) {
|
||||
ret = setup_notify(ibm);
|
||||
if (ret == -ENODEV) {
|
||||
printk(IBM_NOTICE "disabling subdriver %s\n",
|
||||
ibm->name);
|
||||
ibm_exit(ibm);
|
||||
return 0;
|
||||
}
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
@ -344,7 +344,7 @@ typedef u32 acpi_integer;
|
||||
|
||||
/* 64-bit integers */
|
||||
|
||||
typedef u64 acpi_integer;
|
||||
typedef unsigned long long acpi_integer;
|
||||
#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
|
||||
#define ACPI_INTEGER_BIT_SIZE 64
|
||||
#define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */
|
||||
|
Loading…
Reference in New Issue
Block a user