Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1300160 > unrolled thread
| Started by | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| First post | 2016-01-03 02:30 +0100 |
| Last post | 2016-01-05 04:20 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] ACPICA: Drop Linux-specific waking vector functions "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-01-03 02:30 +0100
RE: [PATCH] ACPICA: Drop Linux-specific waking vector functions "Zheng, Lv" <lv.zheng@intel.com> - 2016-01-04 08:40 +0100
Re: [PATCH] ACPICA: Drop Linux-specific waking vector functions "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-01-04 14:00 +0100
RE: [PATCH] ACPICA: Drop Linux-specific waking vector functions "Zheng, Lv" <lv.zheng@intel.com> - 2016-01-05 04:20 +0100
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-01-03 02:30 +0100 |
| Subject | [PATCH] ACPICA: Drop Linux-specific waking vector functions |
| Message-ID | <qMFEC-7c8-3@gated-at.bofh.it> |
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Commit f06147f9fbf1 (ACPICA: Hardware: Enable firmware waking vector
for both 32-bit and 64-bit FACS) added three functions that aren't
present in upstream ACPICA, acpi_hw_set_firmware_waking_vectors(),
acpi_set_firmware_waking_vectors() and acpi_set_firmware_waking_vector64(),
to allow Linux to use the previously existing API for setting the
platform firmware waking vector.
However, that wasn't necessary, since the ACPI sleep support code
in Linux can be modified to use the upstream ACPICA's API easily
and the additional functions may be dropped which reduces the code
size and puts the kernel's ACPICA code more in line with the upstream.
Make the changes as per the above.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/acpica/hwxfsleep.c | 88 ++++++----------------------------------
drivers/acpi/sleep.c | 4 -
drivers/acpi/sleep.h | 6 ++
include/acpi/acpixf.h | 10 ----
4 files changed, 24 insertions(+), 84 deletions(-)
Index: linux-pm/drivers/acpi/acpica/hwxfsleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/acpica/hwxfsleep.c
+++ linux-pm/drivers/acpi/acpica/hwxfsleep.c
@@ -52,9 +52,9 @@ ACPI_MODULE_NAME("hwxfsleep")
/* Local prototypes */
#if (!ACPI_REDUCED_HARDWARE)
static acpi_status
-acpi_hw_set_firmware_waking_vectors(struct acpi_table_facs *facs,
- acpi_physical_address physical_address,
- acpi_physical_address physical_address64);
+acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
+ acpi_physical_address physical_address,
+ acpi_physical_address physical_address64);
#endif
static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
@@ -79,16 +79,14 @@ static struct acpi_sleep_functions acpi_
/*
* These functions are removed for the ACPI_REDUCED_HARDWARE case:
- * acpi_set_firmware_waking_vectors
* acpi_set_firmware_waking_vector
- * acpi_set_firmware_waking_vector64
* acpi_enter_sleep_state_s4bios
*/
#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
- * FUNCTION: acpi_hw_set_firmware_waking_vectors
+ * FUNCTION: acpi_hw_set_firmware_waking_vector
*
* PARAMETERS: facs - Pointer to FACS table
* physical_address - 32-bit physical address of ACPI real mode
@@ -103,11 +101,11 @@ static struct acpi_sleep_functions acpi_
******************************************************************************/
static acpi_status
-acpi_hw_set_firmware_waking_vectors(struct acpi_table_facs *facs,
- acpi_physical_address physical_address,
- acpi_physical_address physical_address64)
+acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
+ acpi_physical_address physical_address,
+ acpi_physical_address physical_address64)
{
- ACPI_FUNCTION_TRACE(acpi_hw_set_firmware_waking_vectors);
+ ACPI_FUNCTION_TRACE(acpi_hw_set_firmware_waking_vector);
/*
@@ -140,7 +138,7 @@ acpi_hw_set_firmware_waking_vectors(stru
/*******************************************************************************
*
- * FUNCTION: acpi_set_firmware_waking_vectors
+ * FUNCTION: acpi_set_firmware_waking_vector
*
* PARAMETERS: physical_address - 32-bit physical address of ACPI real mode
* entry point.
@@ -154,79 +152,23 @@ acpi_hw_set_firmware_waking_vectors(stru
******************************************************************************/
acpi_status
-acpi_set_firmware_waking_vectors(acpi_physical_address physical_address,
- acpi_physical_address physical_address64)
+acpi_set_firmware_waking_vector(acpi_physical_address physical_address,
+ acpi_physical_address physical_address64)
{
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vectors);
+ ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
if (acpi_gbl_FACS) {
- (void)acpi_hw_set_firmware_waking_vectors(acpi_gbl_FACS,
- physical_address,
- physical_address64);
+ (void)acpi_hw_set_firmware_waking_vector(acpi_gbl_FACS,
+ physical_address,
+ physical_address64);
}
return_ACPI_STATUS(AE_OK);
}
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vectors)
-
-/*******************************************************************************
- *
- * FUNCTION: acpi_set_firmware_waking_vector
- *
- * PARAMETERS: physical_address - 32-bit physical address of ACPI real mode
- * entry point.
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
- *
- ******************************************************************************/
-acpi_status acpi_set_firmware_waking_vector(u32 physical_address)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
-
- status = acpi_set_firmware_waking_vectors((acpi_physical_address)
- physical_address, 0);
-
- return_ACPI_STATUS(status);
-}
-
ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
-#if ACPI_MACHINE_WIDTH == 64
-/*******************************************************************************
- *
- * FUNCTION: acpi_set_firmware_waking_vector64
- *
- * PARAMETERS: physical_address - 64-bit physical address of ACPI protected
- * mode entry point.
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
- * it exists in the table. This function is intended for use with
- * 64-bit host operating systems.
- *
- ******************************************************************************/
-acpi_status acpi_set_firmware_waking_vector64(u64 physical_address)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
-
- status = acpi_set_firmware_waking_vectors(0,
- (acpi_physical_address)
- physical_address);
-
- return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
-#endif
/*******************************************************************************
*
* FUNCTION: acpi_enter_sleep_state_s4bios
Index: linux-pm/include/acpi/acpixf.h
===================================================================
--- linux-pm.orig/include/acpi/acpixf.h
+++ linux-pm/include/acpi/acpixf.h
@@ -863,17 +863,9 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vectors
+ acpi_set_firmware_waking_vector
(acpi_physical_address physical_address,
acpi_physical_address physical_address64))
-ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vector(u32
- physical_address))
-#if ACPI_MACHINE_WIDTH == 64
-ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vector64(u64
- physical_address))
-#endif
/*
* ACPI Timer interfaces
*/
Index: linux-pm/drivers/acpi/sleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/drivers/acpi/sleep.c
@@ -61,7 +61,7 @@ static int acpi_sleep_prepare(u32 acpi_s
if (acpi_state == ACPI_STATE_S3) {
if (!acpi_wakeup_address)
return -EFAULT;
- acpi_set_firmware_waking_vector(acpi_wakeup_address);
+ acpi_set_waking_vector(acpi_wakeup_address);
}
ACPI_FLUSH_CPU_CACHE();
@@ -410,7 +410,7 @@ static void acpi_pm_finish(void)
acpi_leave_sleep_state(acpi_state);
/* reset firmware waking vector */
- acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+ acpi_set_waking_vector(0);
acpi_target_sleep_state = ACPI_STATE_S0;
Index: linux-pm/drivers/acpi/sleep.h
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.h
+++ linux-pm/drivers/acpi/sleep.h
@@ -6,3 +6,9 @@ extern struct list_head acpi_wakeup_devi
extern struct mutex acpi_device_lock;
extern void acpi_resume_power_resources(void);
+
+static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
+{
+ return acpi_set_firmware_waking_vector(
+ (acpi_physical_address)wakeup_address, 0);
+}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | "Zheng, Lv" <lv.zheng@intel.com> |
|---|---|
| Date | 2016-01-04 08:40 +0100 |
| Message-ID | <qN7Ud-i2-1@gated-at.bofh.it> |
| In reply to | #1300160 |
SGksIFJhZmFlbA0KDQpBY2tlLWJ5OiBMdiBaaGVuZyA8bHYuemhlbmdAaW50ZWwuY29tPg0KDQpP bmUgbW9yZSBpbXByb3ZlbWVudCBpczoNCkFmdGVyIGFwcGx5aW5nIHRoaXMgcGF0Y2gsIEkgY2Fu IHN0aWxsIGRldGVjdCB0aGUgZm9sbG93aW5nIGRpZmYgYmxvY2tzIHVzaW5nIEFDUElDQSdzIGRp dmVyZ2VuY2UgY2hlY2tpbmcgdXRpbGl0eToNCmRpZmYgLUUgLWIgLXcgLUIgLXJwdU4gbGludXgt YWNwaWNhL2RyaXZlcnMvYWNwaS9hY3BpY2EvaHd4ZnNsZWVwLmMgYWNwaWNhLWxpbnV4aXplZC9k cml2ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jDQotLS0gbGludXgtYWNwaWNhL2RyaXZlcnMv YWNwaS9hY3BpY2EvaHd4ZnNsZWVwLmMJMjAxNi0wMS0wNCAxNToxNjozMS4wMDAwMDAwMDAgKzA4 MDANCisrKyBhY3BpY2EtbGludXhpemVkL2RyaXZlcnMvYWNwaS9hY3BpY2EvaHd4ZnNsZWVwLmMJ MjAxNi0wMS0wNCAxNToxNzoxOS4wMDAwMDAwMDAgKzA4MDANCkBAIC05MCw5ICs5MCw5IEBAIHN0 YXRpYyBzdHJ1Y3QgYWNwaV9zbGVlcF9mdW5jdGlvbnMgYWNwaV8NCiAgKg0KICAqIFBBUkFNRVRF UlM6ICBmYWNzICAgICAgICAgICAgICAgIC0gUG9pbnRlciB0byBGQUNTIHRhYmxlDQogICogICAg ICAgICAgICAgIHBoeXNpY2FsX2FkZHJlc3MgICAgLSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBv ZiBBQ1BJIHJlYWwgbW9kZQ0KLSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZW50cnkgcG9pbnQuDQorICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnRy eSBwb2ludA0KICAqICAgICAgICAgICAgICBwaHlzaWNhbF9hZGRyZXNzNjQgIC0gNjQtYml0IHBo eXNpY2FsIGFkZHJlc3Mgb2YgQUNQSSBwcm90ZWN0ZWQNCi0gKiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1vZGUgZW50cnkgcG9pbnQuDQorICogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBlbnRyeSBwb2ludA0KICAqDQogICogUkVUVVJOOiAgICAgIFN0YXR1 cw0KICAqDQpAQCAtMTQxLDkgKzE0MCw5IEBAIGFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2luZ192 ZWN0b3Ioc3RydWMNCiAgKiBGVU5DVElPTjogICAgYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3Zl Y3Rvcg0KICAqDQogICogUEFSQU1FVEVSUzogIHBoeXNpY2FsX2FkZHJlc3MgICAgLSAzMi1iaXQg cGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwgbW9kZQ0KLSAqICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZW50cnkgcG9pbnQuDQorICogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlbnRyeSBwb2ludA0KICAqICAgICAgICAgICAgICBwaHlzaWNhbF9hZGRy ZXNzNjQgIC0gNjQtYml0IHBoeXNpY2FsIGFkZHJlc3Mgb2YgQUNQSSBwcm90ZWN0ZWQNCi0gKiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1vZGUgZW50cnkgcG9pbnQuDQorICog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeSBwb2ludA0KICAqDQogICog UkVUVVJOOiAgICAgIFN0YXR1cw0KICAqDQpUaGlzIHNlZW1zIHRvIGJlIGFkZGVkIHJlY2VudGx5 IGluIEFDUElDQSB1cHN0cmVhbS4NCkhvcGUgeW91IGNhbiBoZWxwIHRvIHJlZHVjZSB0aGlzIGlu IHRoZSBzYW1lIHBhdGNoLg0KVGhhbmtzIGluIGFkdmFuY2UuDQoNCkJlc3QgcmVnYXJkcw0KLUx2 DQoNCj4gRnJvbTogUmFmYWVsIEouIFd5c29ja2kgW21haWx0bzpyandAcmp3eXNvY2tpLm5ldF0N Cj4gU2VudDogU3VuZGF5LCBKYW51YXJ5IDMsIDIwMTYgOTo1MSBBTQ0KPiBTdWJqZWN0OiBbUEFU Q0hdIEFDUElDQTogRHJvcCBMaW51eC1zcGVjaWZpYyB3YWtpbmcgdmVjdG9yIGZ1bmN0aW9ucw0K PiANCj4gRnJvbTogUmFmYWVsIEouIFd5c29ja2kgPHJhZmFlbC5qLnd5c29ja2lAaW50ZWwuY29t Pg0KPiANCj4gQ29tbWl0IGYwNjE0N2Y5ZmJmMSAoQUNQSUNBOiBIYXJkd2FyZTogRW5hYmxlIGZp cm13YXJlIHdha2luZyB2ZWN0b3INCj4gZm9yIGJvdGggMzItYml0IGFuZCA2NC1iaXQgRkFDUykg YWRkZWQgdGhyZWUgZnVuY3Rpb25zIHRoYXQgYXJlbid0DQo+IHByZXNlbnQgaW4gdXBzdHJlYW0g QUNQSUNBLCBhY3BpX2h3X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycygpLA0KPiBhY3BpX3Nl dF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycygpIGFuZA0KPiBhY3BpX3NldF9maXJtd2FyZV93YWtp bmdfdmVjdG9yNjQoKSwNCj4gdG8gYWxsb3cgTGludXggdG8gdXNlIHRoZSBwcmV2aW91c2x5IGV4 aXN0aW5nIEFQSSBmb3Igc2V0dGluZyB0aGUNCj4gcGxhdGZvcm0gZmlybXdhcmUgd2FraW5nIHZl Y3Rvci4NCj4gDQo+IEhvd2V2ZXIsIHRoYXQgd2Fzbid0IG5lY2Vzc2FyeSwgc2luY2UgdGhlIEFD UEkgc2xlZXAgc3VwcG9ydCBjb2RlDQo+IGluIExpbnV4IGNhbiBiZSBtb2RpZmllZCB0byB1c2Ug dGhlIHVwc3RyZWFtIEFDUElDQSdzIEFQSSBlYXNpbHkNCj4gYW5kIHRoZSBhZGRpdGlvbmFsIGZ1 bmN0aW9ucyBtYXkgYmUgZHJvcHBlZCB3aGljaCByZWR1Y2VzIHRoZSBjb2RlDQo+IHNpemUgYW5k IHB1dHMgdGhlIGtlcm5lbCdzIEFDUElDQSBjb2RlIG1vcmUgaW4gbGluZSB3aXRoIHRoZSB1cHN0 cmVhbS4NCj4gDQo+IE1ha2UgdGhlIGNoYW5nZXMgYXMgcGVyIHRoZSBhYm92ZS4NCj4gDQo+IFNp Z25lZC1vZmYtYnk6IFJhZmFlbCBKLiBXeXNvY2tpIDxyYWZhZWwuai53eXNvY2tpQGludGVsLmNv bT4NCj4gLS0tDQo+ICBkcml2ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jIHwgICA4OCArKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICBkcml2ZXJzL2FjcGkvc2xl ZXAuYyAgICAgICAgICAgIHwgICAgNCAtDQo+ICBkcml2ZXJzL2FjcGkvc2xlZXAuaCAgICAgICAg ICAgIHwgICAgNiArKw0KPiAgaW5jbHVkZS9hY3BpL2FjcGl4Zi5oICAgICAgICAgICB8ICAgMTAg LS0tLQ0KPiAgNCBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCA4NCBkZWxldGlvbnMo LSkNCj4gDQo+IEluZGV4OiBsaW51eC1wbS9kcml2ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5j DQo+ID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCj4gPT09DQo+IC0tLSBsaW51eC1wbS5vcmlnL2RyaXZlcnMvYWNwaS9hY3Bp Y2EvaHd4ZnNsZWVwLmMNCj4gKysrIGxpbnV4LXBtL2RyaXZlcnMvYWNwaS9hY3BpY2EvaHd4ZnNs ZWVwLmMNCj4gQEAgLTUyLDkgKzUyLDkgQEAgQUNQSV9NT0RVTEVfTkFNRSgiaHd4ZnNsZWVwIikN Cj4gIC8qIExvY2FsIHByb3RvdHlwZXMgKi8NCj4gICNpZiAoIUFDUElfUkVEVUNFRF9IQVJEV0FS RSkNCj4gIHN0YXRpYyBhY3BpX3N0YXR1cw0KPiAtYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5n X3ZlY3RvcnMoc3RydWN0IGFjcGlfdGFibGVfZmFjcyAqZmFjcywNCj4gLQkJCQkgICAgYWNwaV9w aHlzaWNhbF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+IC0JCQkJICAgIGFjcGlfcGh5c2lj YWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpOw0KPiArYWNwaV9od19zZXRfZmlybXdhcmVf d2FraW5nX3ZlY3RvcihzdHJ1Y3QgYWNwaV90YWJsZV9mYWNzICpmYWNzLA0KPiArCQkJCSAgIGFj cGlfcGh5c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzLA0KPiArCQkJCSAgIGFjcGlfcGh5 c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpOw0KPiAgI2VuZGlmDQo+IA0KPiAgc3Rh dGljIGFjcGlfc3RhdHVzIGFjcGlfaHdfc2xlZXBfZGlzcGF0Y2godTggc2xlZXBfc3RhdGUsIHUz MiBmdW5jdGlvbl9pZCk7DQo+IEBAIC03OSwxNiArNzksMTQgQEAgc3RhdGljIHN0cnVjdCBhY3Bp X3NsZWVwX2Z1bmN0aW9ucyBhY3BpXw0KPiANCj4gIC8qDQo+ICAgKiBUaGVzZSBmdW5jdGlvbnMg YXJlIHJlbW92ZWQgZm9yIHRoZSBBQ1BJX1JFRFVDRURfSEFSRFdBUkUgY2FzZToNCj4gLSAqICAg ICAgYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMNCj4gICAqICAgICAgYWNwaV9zZXRf ZmlybXdhcmVfd2FraW5nX3ZlY3Rvcg0KPiAtICogICAgICBhY3BpX3NldF9maXJtd2FyZV93YWtp bmdfdmVjdG9yNjQNCj4gICAqICAgICAgYWNwaV9lbnRlcl9zbGVlcF9zdGF0ZV9zNGJpb3MNCj4g ICAqLw0KPiANCj4gICNpZiAoIUFDUElfUkVEVUNFRF9IQVJEV0FSRSkNCj4gDQo+IC8qKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioN Cj4gKioqKioqKioqKioqKioqKg0KPiAgICoNCj4gLSAqIEZVTkNUSU9OOiAgICBhY3BpX2h3X3Nl dF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycw0KPiArICogRlVOQ1RJT046ICAgIGFjcGlfaHdfc2V0 X2Zpcm13YXJlX3dha2luZ192ZWN0b3INCj4gICAqDQo+ICAgKiBQQVJBTUVURVJTOiAgZmFjcyAg ICAgICAgICAgICAgICAtIFBvaW50ZXIgdG8gRkFDUyB0YWJsZQ0KPiAgICogICAgICAgICAgICAg IHBoeXNpY2FsX2FkZHJlc3MgICAgLSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJl YWwgbW9kZQ0KPiBAQCAtMTAzLDExICsxMDEsMTEgQEAgc3RhdGljIHN0cnVjdCBhY3BpX3NsZWVw X2Z1bmN0aW9ucyBhY3BpXw0KPiANCj4gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKg0KPiAqKioqKioqKioqKioqKi8NCj4gDQo+ ICBzdGF0aWMgYWNwaV9zdGF0dXMNCj4gLWFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0 b3JzKHN0cnVjdCBhY3BpX3RhYmxlX2ZhY3MgKmZhY3MsDQo+IC0JCQkJICAgIGFjcGlfcGh5c2lj YWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzLA0KPiAtCQkJCSAgICBhY3BpX3BoeXNpY2FsX2Fk ZHJlc3MgcGh5c2ljYWxfYWRkcmVzczY0KQ0KPiArYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5n X3ZlY3RvcihzdHJ1Y3QgYWNwaV90YWJsZV9mYWNzICpmYWNzLA0KPiArCQkJCSAgIGFjcGlfcGh5 c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzLA0KPiArCQkJCSAgIGFjcGlfcGh5c2ljYWxf YWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpDQo+ICB7DQo+IC0JQUNQSV9GVU5DVElPTl9UUkFD RShhY3BpX2h3X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycyk7DQo+ICsJQUNQSV9GVU5DVElP Tl9UUkFDRShhY3BpX2h3X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yKTsNCj4gDQo+IA0KPiAg CS8qDQo+IEBAIC0xNDAsNyArMTM4LDcgQEAgYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3Zl Y3RvcnMoc3RydQ0KPiANCj4gDQo+IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioNCj4gKioqKioqKioqKioqKioqKg0KPiAgICoN Cj4gLSAqIEZVTkNUSU9OOiAgICBhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycw0KPiAr ICogRlVOQ1RJT046ICAgIGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3INCj4gICAqDQo+ ICAgKiBQQVJBTUVURVJTOiAgcGh5c2ljYWxfYWRkcmVzcyAgICAtIDMyLWJpdCBwaHlzaWNhbCBh ZGRyZXNzIG9mIEFDUEkgcmVhbA0KPiBtb2RlDQo+ICAgKiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVudHJ5IHBvaW50Lg0KPiBAQCAtMTU0LDc5ICsxNTIsMjMgQEAgYWNwaV9o d19zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMoc3RydQ0KPiANCj4gKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKg0KPiAqKioq KioqKioqKioqKi8NCj4gDQo+ICBhY3BpX3N0YXR1cw0KPiAtYWNwaV9zZXRfZmlybXdhcmVfd2Fr aW5nX3ZlY3RvcnMoYWNwaV9waHlzaWNhbF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+IC0J CQkJIGFjcGlfcGh5c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpDQo+ICthY3BpX3Nl dF9maXJtd2FyZV93YWtpbmdfdmVjdG9yKGFjcGlfcGh5c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9h ZGRyZXNzLA0KPiArCQkJCWFjcGlfcGh5c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQp DQo+ICB7DQo+IA0KPiAtCUFDUElfRlVOQ1RJT05fVFJBQ0UoYWNwaV9zZXRfZmlybXdhcmVfd2Fr aW5nX3ZlY3RvcnMpOw0KPiArCUFDUElfRlVOQ1RJT05fVFJBQ0UoYWNwaV9zZXRfZmlybXdhcmVf d2FraW5nX3ZlY3Rvcik7DQo+IA0KPiAgCWlmIChhY3BpX2dibF9GQUNTKSB7DQo+IC0JCSh2b2lk KWFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3JzKGFjcGlfZ2JsX0ZBQ1MsDQo+IC0J CQkJCQkJICBwaHlzaWNhbF9hZGRyZXNzLA0KPiAtCQkJCQkJCSAgcGh5c2ljYWxfYWRkcmVzczY0 KTsNCj4gKwkJKHZvaWQpYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcihhY3BpX2di bF9GQUNTLA0KPiArCQkJCQkJCSBwaHlzaWNhbF9hZGRyZXNzLA0KPiArCQkJCQkJCSBwaHlzaWNh bF9hZGRyZXNzNjQpOw0KPiAgCX0NCj4gDQo+ICAJcmV0dXJuX0FDUElfU1RBVFVTKEFFX09LKTsN Cj4gIH0NCj4gDQo+IC1BQ1BJX0VYUE9SVF9TWU1CT0woYWNwaV9zZXRfZmlybXdhcmVfd2FraW5n X3ZlY3RvcnMpDQo+IC0NCj4gLQ0KPiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqDQo+ICoqKioqKioqKioqKioqKioNCj4gLSAq DQo+IC0gKiBGVU5DVElPTjogICAgYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3Rvcg0KPiAt ICoNCj4gLSAqIFBBUkFNRVRFUlM6ICBwaHlzaWNhbF9hZGRyZXNzICAgIC0gMzItYml0IHBoeXNp Y2FsIGFkZHJlc3Mgb2YgQUNQSSByZWFsDQo+IG1vZGUNCj4gLSAqICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZW50cnkgcG9pbnQuDQo+IC0gKg0KPiAtICogUkVUVVJOOiAgICAg IFN0YXR1cw0KPiAtICoNCj4gLSAqIERFU0NSSVBUSU9OOiBTZXRzIHRoZSAzMi1iaXQgZmlybXdh cmVfd2FraW5nX3ZlY3RvciBmaWVsZCBvZiB0aGUgRkFDUw0KPiAtICoNCj4gLQ0KPiAqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq DQo+ICoqKioqKioqKioqKioqLw0KPiAtYWNwaV9zdGF0dXMgYWNwaV9zZXRfZmlybXdhcmVfd2Fr aW5nX3ZlY3Rvcih1MzIgcGh5c2ljYWxfYWRkcmVzcykNCj4gLXsNCj4gLQlhY3BpX3N0YXR1cyBz dGF0dXM7DQo+IC0NCj4gLQlBQ1BJX0ZVTkNUSU9OX1RSQUNFKGFjcGlfc2V0X2Zpcm13YXJlX3dh a2luZ192ZWN0b3IpOw0KPiAtDQo+IC0Jc3RhdHVzID0gYWNwaV9zZXRfZmlybXdhcmVfd2FraW5n X3ZlY3RvcnMoKGFjcGlfcGh5c2ljYWxfYWRkcmVzcykNCj4gLQkJCQkJCSAgcGh5c2ljYWxfYWRk cmVzcywgMCk7DQo+IC0NCj4gLQlyZXR1cm5fQUNQSV9TVEFUVVMoc3RhdHVzKTsNCj4gLX0NCj4g LQ0KPiAgQUNQSV9FWFBPUlRfU1lNQk9MKGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3Ip DQo+IA0KPiAtI2lmIEFDUElfTUFDSElORV9XSURUSCA9PSA2NA0KPiAtDQo+IC8qKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioNCj4g KioqKioqKioqKioqKioqKg0KPiAtICoNCj4gLSAqIEZVTkNUSU9OOiAgICBhY3BpX3NldF9maXJt d2FyZV93YWtpbmdfdmVjdG9yNjQNCj4gLSAqDQo+IC0gKiBQQVJBTUVURVJTOiAgcGh5c2ljYWxf YWRkcmVzcyAgICAtIDY0LWJpdCBwaHlzaWNhbCBhZGRyZXNzIG9mIEFDUEkNCj4gcHJvdGVjdGVk DQo+IC0gKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1vZGUgZW50cnkgcG9p bnQuDQo+IC0gKg0KPiAtICogUkVUVVJOOiAgICAgIFN0YXR1cw0KPiAtICoNCj4gLSAqIERFU0NS SVBUSU9OOiBTZXRzIHRoZSA2NC1iaXQgWF9maXJtd2FyZV93YWtpbmdfdmVjdG9yIGZpZWxkIG9m IHRoZSBGQUNTLA0KPiBpZg0KPiAtICogICAgICAgICAgICAgIGl0IGV4aXN0cyBpbiB0aGUgdGFi bGUuIFRoaXMgZnVuY3Rpb24gaXMgaW50ZW5kZWQgZm9yIHVzZSB3aXRoDQo+IC0gKiAgICAgICAg ICAgICAgNjQtYml0IGhvc3Qgb3BlcmF0aW5nIHN5c3RlbXMuDQo+IC0gKg0KPiAtDQo+ICoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioNCj4gKioqKioqKioqKioqKiovDQo+IC1hY3BpX3N0YXR1cyBhY3BpX3NldF9maXJtd2FyZV93 YWtpbmdfdmVjdG9yNjQodTY0IHBoeXNpY2FsX2FkZHJlc3MpDQo+IC17DQo+IC0JYWNwaV9zdGF0 dXMgc3RhdHVzOw0KPiAtDQo+IC0JQUNQSV9GVU5DVElPTl9UUkFDRShhY3BpX3NldF9maXJtd2Fy ZV93YWtpbmdfdmVjdG9yNjQpOw0KPiAtDQo+IC0Jc3RhdHVzID0gYWNwaV9zZXRfZmlybXdhcmVf d2FraW5nX3ZlY3RvcnMoMCwNCj4gLQkJCQkJCSAgKGFjcGlfcGh5c2ljYWxfYWRkcmVzcykNCj4g LQkJCQkJCSAgcGh5c2ljYWxfYWRkcmVzcyk7DQo+IC0NCj4gLQlyZXR1cm5fQUNQSV9TVEFUVVMo c3RhdHVzKTsNCj4gLX0NCj4gLQ0KPiAtQUNQSV9FWFBPUlRfU1lNQk9MKGFjcGlfc2V0X2Zpcm13 YXJlX3dha2luZ192ZWN0b3I2NCkNCj4gLSNlbmRpZg0KPiANCj4gLyoqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKg0KPiAqKioqKioq KioqKioqKioqDQo+ICAgKg0KPiAgICogRlVOQ1RJT046ICAgIGFjcGlfZW50ZXJfc2xlZXBfc3Rh dGVfczRiaW9zDQo+IEluZGV4OiBsaW51eC1wbS9pbmNsdWRlL2FjcGkvYWNwaXhmLmgNCj4gPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KPiA9PT0NCj4gLS0tIGxpbnV4LXBtLm9yaWcvaW5jbHVkZS9hY3BpL2FjcGl4Zi5oDQo+ ICsrKyBsaW51eC1wbS9pbmNsdWRlL2FjcGkvYWNwaXhmLmgNCj4gQEAgLTg2MywxNyArODYzLDkg QEAgQUNQSV9FWFRFUk5BTF9SRVRVUk5fU1RBVFVTKGFjcGlfc3RhdHVzDQo+ICBBQ1BJX0VYVEVS TkFMX1JFVFVSTl9TVEFUVVMoYWNwaV9zdGF0dXMgYWNwaV9sZWF2ZV9zbGVlcF9zdGF0ZSh1OA0K PiBzbGVlcF9zdGF0ZSkpDQo+IA0KPiAgQUNQSV9IV19ERVBFTkRFTlRfUkVUVVJOX1NUQVRVUyhh Y3BpX3N0YXR1cw0KPiAtCQkJCWFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3JzDQo+ICsJ CQkJYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3Rvcg0KPiAgCQkJCShhY3BpX3BoeXNpY2Fs X2FkZHJlc3MgcGh5c2ljYWxfYWRkcmVzcywNCj4gIAkJCQkgYWNwaV9waHlzaWNhbF9hZGRyZXNz IHBoeXNpY2FsX2FkZHJlc3M2NCkpDQo+IC1BQ1BJX0hXX0RFUEVOREVOVF9SRVRVUk5fU1RBVFVT KGFjcGlfc3RhdHVzDQo+IC0JCQkJIGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3IodTMy DQo+IC0NCj4gcGh5c2ljYWxfYWRkcmVzcykpDQo+IC0jaWYgQUNQSV9NQUNISU5FX1dJRFRIID09 IDY0DQo+IC1BQ1BJX0hXX0RFUEVOREVOVF9SRVRVUk5fU1RBVFVTKGFjcGlfc3RhdHVzDQo+IC0J CQkJYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcjY0KHU2NA0KPiAtDQo+IHBoeXNpY2Fs X2FkZHJlc3MpKQ0KPiAtI2VuZGlmDQo+ICAvKg0KPiAgICogQUNQSSBUaW1lciBpbnRlcmZhY2Vz DQo+ICAgKi8NCj4gSW5kZXg6IGxpbnV4LXBtL2RyaXZlcnMvYWNwaS9zbGVlcC5jDQo+ID09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCj4gPT09DQo+IC0tLSBsaW51eC1wbS5vcmlnL2RyaXZlcnMvYWNwaS9zbGVlcC5jDQo+ICsr KyBsaW51eC1wbS9kcml2ZXJzL2FjcGkvc2xlZXAuYw0KPiBAQCAtNjEsNyArNjEsNyBAQCBzdGF0 aWMgaW50IGFjcGlfc2xlZXBfcHJlcGFyZSh1MzIgYWNwaV9zDQo+ICAJaWYgKGFjcGlfc3RhdGUg PT0gQUNQSV9TVEFURV9TMykgew0KPiAgCQlpZiAoIWFjcGlfd2FrZXVwX2FkZHJlc3MpDQo+ICAJ CQlyZXR1cm4gLUVGQVVMVDsNCj4gLQkJYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3Rvcihh Y3BpX3dha2V1cF9hZGRyZXNzKTsNCj4gKwkJYWNwaV9zZXRfd2FraW5nX3ZlY3RvcihhY3BpX3dh a2V1cF9hZGRyZXNzKTsNCj4gDQo+ICAJfQ0KPiAgCUFDUElfRkxVU0hfQ1BVX0NBQ0hFKCk7DQo+ IEBAIC00MTAsNyArNDEwLDcgQEAgc3RhdGljIHZvaWQgYWNwaV9wbV9maW5pc2godm9pZCkNCj4g IAlhY3BpX2xlYXZlX3NsZWVwX3N0YXRlKGFjcGlfc3RhdGUpOw0KPiANCj4gIAkvKiByZXNldCBm aXJtd2FyZSB3YWtpbmcgdmVjdG9yICovDQo+IC0JYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3Zl Y3RvcigoYWNwaV9waHlzaWNhbF9hZGRyZXNzKSAwKTsNCj4gKwlhY3BpX3NldF93YWtpbmdfdmVj dG9yKDApOw0KPiANCj4gIAlhY3BpX3RhcmdldF9zbGVlcF9zdGF0ZSA9IEFDUElfU1RBVEVfUzA7 DQo+IA0KPiBJbmRleDogbGludXgtcG0vZHJpdmVycy9hY3BpL3NsZWVwLmgNCj4gPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K PiA9PT0NCj4gLS0tIGxpbnV4LXBtLm9yaWcvZHJpdmVycy9hY3BpL3NsZWVwLmgNCj4gKysrIGxp bnV4LXBtL2RyaXZlcnMvYWNwaS9zbGVlcC5oDQo+IEBAIC02LDMgKzYsOSBAQCBleHRlcm4gc3Ry dWN0IGxpc3RfaGVhZCBhY3BpX3dha2V1cF9kZXZpDQo+ICBleHRlcm4gc3RydWN0IG11dGV4IGFj cGlfZGV2aWNlX2xvY2s7DQo+IA0KPiAgZXh0ZXJuIHZvaWQgYWNwaV9yZXN1bWVfcG93ZXJfcmVz b3VyY2VzKHZvaWQpOw0KPiArDQo+ICtzdGF0aWMgaW5saW5lIGFjcGlfc3RhdHVzIGFjcGlfc2V0 X3dha2luZ192ZWN0b3IodTMyIHdha2V1cF9hZGRyZXNzKQ0KPiArew0KPiArCXJldHVybiBhY3Bp X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yKA0KPiArCQkJCShhY3BpX3BoeXNpY2FsX2FkZHJl c3Mpd2FrZXVwX2FkZHJlc3MsIDApOw0KPiArfQ0KDQo= -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-01-04 14:00 +0100 |
| Message-ID | <qNcTU-3A2-13@gated-at.bofh.it> |
| In reply to | #1300523 |
On Monday, January 04, 2016 07:33:55 AM Zheng, Lv wrote:
> Hi, Rafael
>
> Acke-by: Lv Zheng <lv.zheng@intel.com>
>
> One more improvement is:
> After applying this patch, I can still detect the following diff blocks using ACPICA's divergence checking utility:
> diff -E -b -w -B -rpuN linux-acpica/drivers/acpi/acpica/hwxfsleep.c acpica-linuxized/drivers/acpi/acpica/hwxfsleep.c
> --- linux-acpica/drivers/acpi/acpica/hwxfsleep.c 2016-01-04 15:16:31.000000000 +0800
> +++ acpica-linuxized/drivers/acpi/acpica/hwxfsleep.c 2016-01-04 15:17:19.000000000 +0800
> @@ -90,9 +90,9 @@ static struct acpi_sleep_functions acpi_
> *
> * PARAMETERS: facs - Pointer to FACS table
> * physical_address - 32-bit physical address of ACPI real mode
> - * entry point.
> + * entry point
> * physical_address64 - 64-bit physical address of ACPI protected
> - * mode entry point.
> + * entry point
> *
> * RETURN: Status
> *
> @@ -141,9 +140,9 @@ acpi_hw_set_firmware_waking_vector(struc
> * FUNCTION: acpi_set_firmware_waking_vector
> *
> * PARAMETERS: physical_address - 32-bit physical address of ACPI real mode
> - * entry point.
> + * entry point
> * physical_address64 - 64-bit physical address of ACPI protected
> - * mode entry point.
> + * entry point
> *
> * RETURN: Status
> *
> This seems to be added recently in ACPICA upstream.
> Hope you can help to reduce this in the same patch.
> Thanks in advance.
So the periods seem to have gone away, right?
OK, what about the following one?
---
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: [PATCH] ACPICA: Drop Linux-specific waking vector functions
Commit f06147f9fbf1 (ACPICA: Hardware: Enable firmware waking vector
for both 32-bit and 64-bit FACS) added three functions that aren't
present in upstream ACPICA, acpi_hw_set_firmware_waking_vectors(),
acpi_set_firmware_waking_vectors() and acpi_set_firmware_waking_vector64(),
to allow Linux to use the previously existing API for setting the
platform firmware waking vector.
However, that wasn't necessary, since the ACPI sleep support code
in Linux can be modified to use the upstream ACPICA's API easily
and the additional functions may be dropped which reduces the code
size and puts the kernel's ACPICA code more in line with the upstream.
Make the changes as per the above. While at it, make the relevant
function desctiption comments reflect the upstream ACPICA's ones.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/hwxfsleep.c | 96 +++++++---------------------------------
drivers/acpi/sleep.c | 4 -
drivers/acpi/sleep.h | 6 ++
include/acpi/acpixf.h | 10 ----
4 files changed, 28 insertions(+), 88 deletions(-)
Index: linux-pm/drivers/acpi/acpica/hwxfsleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/acpica/hwxfsleep.c
+++ linux-pm/drivers/acpi/acpica/hwxfsleep.c
@@ -52,9 +52,9 @@ ACPI_MODULE_NAME("hwxfsleep")
/* Local prototypes */
#if (!ACPI_REDUCED_HARDWARE)
static acpi_status
-acpi_hw_set_firmware_waking_vectors(struct acpi_table_facs *facs,
- acpi_physical_address physical_address,
- acpi_physical_address physical_address64);
+acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
+ acpi_physical_address physical_address,
+ acpi_physical_address physical_address64);
#endif
static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
@@ -79,22 +79,20 @@ static struct acpi_sleep_functions acpi_
/*
* These functions are removed for the ACPI_REDUCED_HARDWARE case:
- * acpi_set_firmware_waking_vectors
* acpi_set_firmware_waking_vector
- * acpi_set_firmware_waking_vector64
* acpi_enter_sleep_state_s4bios
*/
#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
- * FUNCTION: acpi_hw_set_firmware_waking_vectors
+ * FUNCTION: acpi_hw_set_firmware_waking_vector
*
* PARAMETERS: facs - Pointer to FACS table
* physical_address - 32-bit physical address of ACPI real mode
- * entry point.
+ * entry point
* physical_address64 - 64-bit physical address of ACPI protected
- * mode entry point.
+ * mode entry point
*
* RETURN: Status
*
@@ -103,11 +101,11 @@ static struct acpi_sleep_functions acpi_
******************************************************************************/
static acpi_status
-acpi_hw_set_firmware_waking_vectors(struct acpi_table_facs *facs,
- acpi_physical_address physical_address,
- acpi_physical_address physical_address64)
+acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
+ acpi_physical_address physical_address,
+ acpi_physical_address physical_address64)
{
- ACPI_FUNCTION_TRACE(acpi_hw_set_firmware_waking_vectors);
+ ACPI_FUNCTION_TRACE(acpi_hw_set_firmware_waking_vector);
/*
@@ -140,12 +138,12 @@ acpi_hw_set_firmware_waking_vectors(stru
/*******************************************************************************
*
- * FUNCTION: acpi_set_firmware_waking_vectors
+ * FUNCTION: acpi_set_firmware_waking_vector
*
* PARAMETERS: physical_address - 32-bit physical address of ACPI real mode
- * entry point.
+ * entry point
* physical_address64 - 64-bit physical address of ACPI protected
- * mode entry point.
+ * mode entry point
*
* RETURN: Status
*
@@ -154,79 +152,23 @@ acpi_hw_set_firmware_waking_vectors(stru
******************************************************************************/
acpi_status
-acpi_set_firmware_waking_vectors(acpi_physical_address physical_address,
- acpi_physical_address physical_address64)
+acpi_set_firmware_waking_vector(acpi_physical_address physical_address,
+ acpi_physical_address physical_address64)
{
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vectors);
+ ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
if (acpi_gbl_FACS) {
- (void)acpi_hw_set_firmware_waking_vectors(acpi_gbl_FACS,
- physical_address,
- physical_address64);
+ (void)acpi_hw_set_firmware_waking_vector(acpi_gbl_FACS,
+ physical_address,
+ physical_address64);
}
return_ACPI_STATUS(AE_OK);
}
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vectors)
-
-/*******************************************************************************
- *
- * FUNCTION: acpi_set_firmware_waking_vector
- *
- * PARAMETERS: physical_address - 32-bit physical address of ACPI real mode
- * entry point.
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
- *
- ******************************************************************************/
-acpi_status acpi_set_firmware_waking_vector(u32 physical_address)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
-
- status = acpi_set_firmware_waking_vectors((acpi_physical_address)
- physical_address, 0);
-
- return_ACPI_STATUS(status);
-}
-
ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
-#if ACPI_MACHINE_WIDTH == 64
-/*******************************************************************************
- *
- * FUNCTION: acpi_set_firmware_waking_vector64
- *
- * PARAMETERS: physical_address - 64-bit physical address of ACPI protected
- * mode entry point.
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
- * it exists in the table. This function is intended for use with
- * 64-bit host operating systems.
- *
- ******************************************************************************/
-acpi_status acpi_set_firmware_waking_vector64(u64 physical_address)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
-
- status = acpi_set_firmware_waking_vectors(0,
- (acpi_physical_address)
- physical_address);
-
- return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
-#endif
/*******************************************************************************
*
* FUNCTION: acpi_enter_sleep_state_s4bios
Index: linux-pm/include/acpi/acpixf.h
===================================================================
--- linux-pm.orig/include/acpi/acpixf.h
+++ linux-pm/include/acpi/acpixf.h
@@ -863,17 +863,9 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vectors
+ acpi_set_firmware_waking_vector
(acpi_physical_address physical_address,
acpi_physical_address physical_address64))
-ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vector(u32
- physical_address))
-#if ACPI_MACHINE_WIDTH == 64
-ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
- acpi_set_firmware_waking_vector64(u64
- physical_address))
-#endif
/*
* ACPI Timer interfaces
*/
Index: linux-pm/drivers/acpi/sleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/drivers/acpi/sleep.c
@@ -61,7 +61,7 @@ static int acpi_sleep_prepare(u32 acpi_s
if (acpi_state == ACPI_STATE_S3) {
if (!acpi_wakeup_address)
return -EFAULT;
- acpi_set_firmware_waking_vector(acpi_wakeup_address);
+ acpi_set_waking_vector(acpi_wakeup_address);
}
ACPI_FLUSH_CPU_CACHE();
@@ -410,7 +410,7 @@ static void acpi_pm_finish(void)
acpi_leave_sleep_state(acpi_state);
/* reset firmware waking vector */
- acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+ acpi_set_waking_vector(0);
acpi_target_sleep_state = ACPI_STATE_S0;
Index: linux-pm/drivers/acpi/sleep.h
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.h
+++ linux-pm/drivers/acpi/sleep.h
@@ -6,3 +6,9 @@ extern struct list_head acpi_wakeup_devi
extern struct mutex acpi_device_lock;
extern void acpi_resume_power_resources(void);
+
+static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
+{
+ return acpi_set_firmware_waking_vector(
+ (acpi_physical_address)wakeup_address, 0);
+}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Zheng, Lv" <lv.zheng@intel.com> |
|---|---|
| Date | 2016-01-05 04:20 +0100 |
| Message-ID | <qNqka-4nh-3@gated-at.bofh.it> |
| In reply to | #1300735 |
SGksIFJhZmFlbA0KDQo+IEZyb206IFJhZmFlbCBKLiBXeXNvY2tpIFttYWlsdG86cmp3QHJqd3lz b2NraS5uZXRdDQo+IFNlbnQ6IE1vbmRheSwgSmFudWFyeSA0LCAyMDE2IDk6MjggUE0NCj4gU3Vi amVjdDogUmU6IFtQQVRDSF0gQUNQSUNBOiBEcm9wIExpbnV4LXNwZWNpZmljIHdha2luZyB2ZWN0 b3IgZnVuY3Rpb25zDQo+IA0KPiBPbiBNb25kYXksIEphbnVhcnkgMDQsIDIwMTYgMDc6MzM6NTUg QU0gWmhlbmcsIEx2IHdyb3RlOg0KPiA+IEhpLCBSYWZhZWwNCj4gPg0KPiA+IEFja2UtYnk6IEx2 IFpoZW5nIDxsdi56aGVuZ0BpbnRlbC5jb20+DQo+ID4NCj4gPiBPbmUgbW9yZSBpbXByb3ZlbWVu dCBpczoNCj4gPiBBZnRlciBhcHBseWluZyB0aGlzIHBhdGNoLCBJIGNhbiBzdGlsbCBkZXRlY3Qg dGhlIGZvbGxvd2luZyBkaWZmIGJsb2NrcyB1c2luZw0KPiBBQ1BJQ0EncyBkaXZlcmdlbmNlIGNo ZWNraW5nIHV0aWxpdHk6DQo+ID4gZGlmZiAtRSAtYiAtdyAtQiAtcnB1TiBsaW51eC1hY3BpY2Ev ZHJpdmVycy9hY3BpL2FjcGljYS9od3hmc2xlZXAuYyBhY3BpY2EtDQo+IGxpbnV4aXplZC9kcml2 ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jDQo+ID4gLS0tIGxpbnV4LWFjcGljYS9kcml2ZXJz L2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jCTIwMTYtMDEtMDQNCj4gMTU6MTY6MzEuMDAwMDAwMDAw ICswODAwDQo+ID4gKysrIGFjcGljYS1saW51eGl6ZWQvZHJpdmVycy9hY3BpL2FjcGljYS9od3hm c2xlZXAuYwkyMDE2LTAxLTA0DQo+IDE1OjE3OjE5LjAwMDAwMDAwMCArMDgwMA0KPiA+IEBAIC05 MCw5ICs5MCw5IEBAIHN0YXRpYyBzdHJ1Y3QgYWNwaV9zbGVlcF9mdW5jdGlvbnMgYWNwaV8NCj4g PiAgICoNCj4gPiAgICogUEFSQU1FVEVSUzogIGZhY3MgICAgICAgICAgICAgICAgLSBQb2ludGVy IHRvIEZBQ1MgdGFibGUNCj4gPiAgICogICAgICAgICAgICAgIHBoeXNpY2FsX2FkZHJlc3MgICAg LSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwgbW9kZQ0KPiA+IC0gKiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5IHBvaW50Lg0KPiA+ICsgKiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5IHBvaW50DQo+ID4gICAqICAgICAg ICAgICAgICBwaHlzaWNhbF9hZGRyZXNzNjQgIC0gNjQtYml0IHBoeXNpY2FsIGFkZHJlc3Mgb2Yg QUNQSSBwcm90ZWN0ZWQNCj4gPiAtICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtb2RlIGVudHJ5IHBvaW50Lg0KPiA+ICsgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVudHJ5IHBvaW50DQo+ID4gICAqDQo+ID4gICAqIFJFVFVSTjogICAgICBTdGF0dXMN Cj4gPiAgICoNCj4gPiBAQCAtMTQxLDkgKzE0MCw5IEBAIGFjcGlfaHdfc2V0X2Zpcm13YXJlX3dh a2luZ192ZWN0b3Ioc3RydWMNCj4gPiAgICogRlVOQ1RJT046ICAgIGFjcGlfc2V0X2Zpcm13YXJl X3dha2luZ192ZWN0b3INCj4gPiAgICoNCj4gPiAgICogUEFSQU1FVEVSUzogIHBoeXNpY2FsX2Fk ZHJlc3MgICAgLSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwNCj4gbW9kZQ0K PiA+IC0gKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5IHBvaW50Lg0K PiA+ICsgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5IHBvaW50DQo+ ID4gICAqICAgICAgICAgICAgICBwaHlzaWNhbF9hZGRyZXNzNjQgIC0gNjQtYml0IHBoeXNpY2Fs IGFkZHJlc3Mgb2YgQUNQSSBwcm90ZWN0ZWQNCj4gPiAtICogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtb2RlIGVudHJ5IHBvaW50Lg0KPiA+ICsgKiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGVudHJ5IHBvaW50DQo+ID4gICAqDQo+ID4gICAqIFJFVFVSTjog ICAgICBTdGF0dXMNCj4gPiAgICoNCj4gPiBUaGlzIHNlZW1zIHRvIGJlIGFkZGVkIHJlY2VudGx5 IGluIEFDUElDQSB1cHN0cmVhbS4NCj4gPiBIb3BlIHlvdSBjYW4gaGVscCB0byByZWR1Y2UgdGhp cyBpbiB0aGUgc2FtZSBwYXRjaC4NCj4gPiBUaGFua3MgaW4gYWR2YW5jZS4NCj4gDQo+IFNvIHRo ZSBwZXJpb2RzIHNlZW0gdG8gaGF2ZSBnb25lIGF3YXksIHJpZ2h0Pw0KW0x2IFpoZW5nXSANClll cywgdGhlICJtb2RlIiBkZWxldGlvbiBmcm9tIEFDUElDQSB1cHN0cmVhbSBzZWVtcyB0byBiZSB3 cm9uZy4NCg0KPiANCj4gT0ssIHdoYXQgYWJvdXQgdGhlIGZvbGxvd2luZyBvbmU/DQpbTHYgWmhl bmddIA0KTG9va3MgcGVyZmVjdCENCkknbGwgaGVscCB0byByZXN0b3JlICJtb2RlIiBiYWNrIHRv IEFDUElDQSB1cHN0cmVhbS4NCg0KVGhhbmtzIGFuZCBiZXN0IHJlZ2FyZHMNCi1Mdg0KDQo+IA0K PiAtLS0NCj4gRnJvbTogUmFmYWVsIEouIFd5c29ja2kgPHJhZmFlbC5qLnd5c29ja2lAaW50ZWwu Y29tPg0KPiBTdWJqZWN0OiBbUEFUQ0hdIEFDUElDQTogRHJvcCBMaW51eC1zcGVjaWZpYyB3YWtp bmcgdmVjdG9yIGZ1bmN0aW9ucw0KPiANCj4gQ29tbWl0IGYwNjE0N2Y5ZmJmMSAoQUNQSUNBOiBI YXJkd2FyZTogRW5hYmxlIGZpcm13YXJlIHdha2luZyB2ZWN0b3INCj4gZm9yIGJvdGggMzItYml0 IGFuZCA2NC1iaXQgRkFDUykgYWRkZWQgdGhyZWUgZnVuY3Rpb25zIHRoYXQgYXJlbid0DQo+IHBy ZXNlbnQgaW4gdXBzdHJlYW0gQUNQSUNBLCBhY3BpX2h3X3NldF9maXJtd2FyZV93YWtpbmdfdmVj dG9ycygpLA0KPiBhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycygpIGFuZA0KPiBhY3Bp X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yNjQoKSwNCj4gdG8gYWxsb3cgTGludXggdG8gdXNl IHRoZSBwcmV2aW91c2x5IGV4aXN0aW5nIEFQSSBmb3Igc2V0dGluZyB0aGUNCj4gcGxhdGZvcm0g ZmlybXdhcmUgd2FraW5nIHZlY3Rvci4NCj4gDQo+IEhvd2V2ZXIsIHRoYXQgd2Fzbid0IG5lY2Vz c2FyeSwgc2luY2UgdGhlIEFDUEkgc2xlZXAgc3VwcG9ydCBjb2RlDQo+IGluIExpbnV4IGNhbiBi ZSBtb2RpZmllZCB0byB1c2UgdGhlIHVwc3RyZWFtIEFDUElDQSdzIEFQSSBlYXNpbHkNCj4gYW5k IHRoZSBhZGRpdGlvbmFsIGZ1bmN0aW9ucyBtYXkgYmUgZHJvcHBlZCB3aGljaCByZWR1Y2VzIHRo ZSBjb2RlDQo+IHNpemUgYW5kIHB1dHMgdGhlIGtlcm5lbCdzIEFDUElDQSBjb2RlIG1vcmUgaW4g bGluZSB3aXRoIHRoZSB1cHN0cmVhbS4NCj4gDQo+IE1ha2UgdGhlIGNoYW5nZXMgYXMgcGVyIHRo ZSBhYm92ZS4gIFdoaWxlIGF0IGl0LCBtYWtlIHRoZSByZWxldmFudA0KPiBmdW5jdGlvbiBkZXNj dGlwdGlvbiBjb21tZW50cyByZWZsZWN0IHRoZSB1cHN0cmVhbSBBQ1BJQ0EncyBvbmVzLg0KPiAN Cj4gU2lnbmVkLW9mZi1ieTogUmFmYWVsIEouIFd5c29ja2kgPHJhZmFlbC5qLnd5c29ja2lAaW50 ZWwuY29tPg0KPiBBY2tlZC1ieTogTHYgWmhlbmcgPGx2LnpoZW5nQGludGVsLmNvbT4NCj4gLS0t DQo+ICBkcml2ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jIHwgICA5NiArKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICBkcml2ZXJzL2FjcGkvc2xlZXAuYyAgICAg ICAgICAgIHwgICAgNCAtDQo+ICBkcml2ZXJzL2FjcGkvc2xlZXAuaCAgICAgICAgICAgIHwgICAg NiArKw0KPiAgaW5jbHVkZS9hY3BpL2FjcGl4Zi5oICAgICAgICAgICB8ICAgMTAgLS0tLQ0KPiAg NCBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCA4OCBkZWxldGlvbnMoLSkNCj4gDQo+ IEluZGV4OiBsaW51eC1wbS9kcml2ZXJzL2FjcGkvYWNwaWNhL2h3eGZzbGVlcC5jDQo+ID09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCj4gPT09DQo+IC0tLSBsaW51eC1wbS5vcmlnL2RyaXZlcnMvYWNwaS9hY3BpY2EvaHd4ZnNs ZWVwLmMNCj4gKysrIGxpbnV4LXBtL2RyaXZlcnMvYWNwaS9hY3BpY2EvaHd4ZnNsZWVwLmMNCj4g QEAgLTUyLDkgKzUyLDkgQEAgQUNQSV9NT0RVTEVfTkFNRSgiaHd4ZnNsZWVwIikNCj4gIC8qIExv Y2FsIHByb3RvdHlwZXMgKi8NCj4gICNpZiAoIUFDUElfUkVEVUNFRF9IQVJEV0FSRSkNCj4gIHN0 YXRpYyBhY3BpX3N0YXR1cw0KPiAtYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMo c3RydWN0IGFjcGlfdGFibGVfZmFjcyAqZmFjcywNCj4gLQkJCQkgICAgYWNwaV9waHlzaWNhbF9h ZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+IC0JCQkJICAgIGFjcGlfcGh5c2ljYWxfYWRkcmVz cyBwaHlzaWNhbF9hZGRyZXNzNjQpOw0KPiArYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3Zl Y3RvcihzdHJ1Y3QgYWNwaV90YWJsZV9mYWNzICpmYWNzLA0KPiArCQkJCSAgIGFjcGlfcGh5c2lj YWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzLA0KPiArCQkJCSAgIGFjcGlfcGh5c2ljYWxfYWRk cmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpOw0KPiAgI2VuZGlmDQo+IA0KPiAgc3RhdGljIGFjcGlf c3RhdHVzIGFjcGlfaHdfc2xlZXBfZGlzcGF0Y2godTggc2xlZXBfc3RhdGUsIHUzMiBmdW5jdGlv bl9pZCk7DQo+IEBAIC03OSwyMiArNzksMjAgQEAgc3RhdGljIHN0cnVjdCBhY3BpX3NsZWVwX2Z1 bmN0aW9ucyBhY3BpXw0KPiANCj4gIC8qDQo+ICAgKiBUaGVzZSBmdW5jdGlvbnMgYXJlIHJlbW92 ZWQgZm9yIHRoZSBBQ1BJX1JFRFVDRURfSEFSRFdBUkUgY2FzZToNCj4gLSAqICAgICAgYWNwaV9z ZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMNCj4gICAqICAgICAgYWNwaV9zZXRfZmlybXdhcmVf d2FraW5nX3ZlY3Rvcg0KPiAtICogICAgICBhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9y NjQNCj4gICAqICAgICAgYWNwaV9lbnRlcl9zbGVlcF9zdGF0ZV9zNGJpb3MNCj4gICAqLw0KPiAN Cj4gICNpZiAoIUFDUElfUkVEVUNFRF9IQVJEV0FSRSkNCj4gDQo+IC8qKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioNCj4gKioqKioq KioqKioqKioqKg0KPiAgICoNCj4gLSAqIEZVTkNUSU9OOiAgICBhY3BpX2h3X3NldF9maXJtd2Fy ZV93YWtpbmdfdmVjdG9ycw0KPiArICogRlVOQ1RJT046ICAgIGFjcGlfaHdfc2V0X2Zpcm13YXJl X3dha2luZ192ZWN0b3INCj4gICAqDQo+ICAgKiBQQVJBTUVURVJTOiAgZmFjcyAgICAgICAgICAg ICAgICAtIFBvaW50ZXIgdG8gRkFDUyB0YWJsZQ0KPiAgICogICAgICAgICAgICAgIHBoeXNpY2Fs X2FkZHJlc3MgICAgLSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwgbW9kZQ0K PiAtICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeSBwb2ludC4NCj4g KyAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50cnkgcG9pbnQNCj4gICAq ICAgICAgICAgICAgICBwaHlzaWNhbF9hZGRyZXNzNjQgIC0gNjQtYml0IHBoeXNpY2FsIGFkZHJl c3Mgb2YgQUNQSSBwcm90ZWN0ZWQNCj4gLSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbW9kZSBlbnRyeSBwb2ludC4NCj4gKyAqICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbW9kZSBlbnRyeSBwb2ludA0KPiAgICoNCj4gICAqIFJFVFVSTjogICAgICBTdGF0 dXMNCj4gICAqDQo+IEBAIC0xMDMsMTEgKzEwMSwxMSBAQCBzdGF0aWMgc3RydWN0IGFjcGlfc2xl ZXBfZnVuY3Rpb25zIGFjcGlfDQo+IA0KPiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqDQo+ICoqKioqKioqKioqKioqLw0KPiAN Cj4gIHN0YXRpYyBhY3BpX3N0YXR1cw0KPiAtYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3Zl Y3RvcnMoc3RydWN0IGFjcGlfdGFibGVfZmFjcyAqZmFjcywNCj4gLQkJCQkgICAgYWNwaV9waHlz aWNhbF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+IC0JCQkJICAgIGFjcGlfcGh5c2ljYWxf YWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzNjQpDQo+ICthY3BpX2h3X3NldF9maXJtd2FyZV93YWtp bmdfdmVjdG9yKHN0cnVjdCBhY3BpX3RhYmxlX2ZhY3MgKmZhY3MsDQo+ICsJCQkJICAgYWNwaV9w aHlzaWNhbF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+ICsJCQkJICAgYWNwaV9waHlzaWNh bF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3M2NCkNCj4gIHsNCj4gLQlBQ1BJX0ZVTkNUSU9OX1RS QUNFKGFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3JzKTsNCj4gKwlBQ1BJX0ZVTkNU SU9OX1RSQUNFKGFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3IpOw0KPiANCj4gDQo+ ICAJLyoNCj4gQEAgLTE0MCwxMiArMTM4LDEyIEBAIGFjcGlfaHdfc2V0X2Zpcm13YXJlX3dha2lu Z192ZWN0b3JzKHN0cnUNCj4gDQo+IA0KPiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqDQo+ICoqKioqKioqKioqKioqKioNCj4g ICAqDQo+IC0gKiBGVU5DVElPTjogICAgYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMN Cj4gKyAqIEZVTkNUSU9OOiAgICBhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yDQo+ICAg Kg0KPiAgICogUEFSQU1FVEVSUzogIHBoeXNpY2FsX2FkZHJlc3MgICAgLSAzMi1iaXQgcGh5c2lj YWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwNCj4gbW9kZQ0KPiAtICogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBlbnRyeSBwb2ludC4NCj4gKyAqICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZW50cnkgcG9pbnQNCj4gICAqICAgICAgICAgICAgICBwaHlzaWNhbF9h ZGRyZXNzNjQgIC0gNjQtYml0IHBoeXNpY2FsIGFkZHJlc3Mgb2YgQUNQSSBwcm90ZWN0ZWQNCj4g LSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW9kZSBlbnRyeSBwb2ludC4N Cj4gKyAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW9kZSBlbnRyeSBwb2lu dA0KPiAgICoNCj4gICAqIFJFVFVSTjogICAgICBTdGF0dXMNCj4gICAqDQo+IEBAIC0xNTQsNzkg KzE1MiwyMyBAQCBhY3BpX2h3X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycyhzdHJ1DQo+IA0K PiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqDQo+ICoqKioqKioqKioqKioqLw0KPiANCj4gIGFjcGlfc3RhdHVzDQo+IC1hY3Bp X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycyhhY3BpX3BoeXNpY2FsX2FkZHJlc3MgcGh5c2lj YWxfYWRkcmVzcywNCj4gLQkJCQkgYWNwaV9waHlzaWNhbF9hZGRyZXNzIHBoeXNpY2FsX2FkZHJl c3M2NCkNCj4gK2FjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3IoYWNwaV9waHlzaWNhbF9h ZGRyZXNzIHBoeXNpY2FsX2FkZHJlc3MsDQo+ICsJCQkJYWNwaV9waHlzaWNhbF9hZGRyZXNzIHBo eXNpY2FsX2FkZHJlc3M2NCkNCj4gIHsNCj4gDQo+IC0JQUNQSV9GVU5DVElPTl9UUkFDRShhY3Bp X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycyk7DQo+ICsJQUNQSV9GVU5DVElPTl9UUkFDRShh Y3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yKTsNCj4gDQo+ICAJaWYgKGFjcGlfZ2JsX0ZB Q1MpIHsNCj4gLQkJKHZvaWQpYWNwaV9od19zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcnMoYWNw aV9nYmxfRkFDUywNCj4gLQkJCQkJCQkgIHBoeXNpY2FsX2FkZHJlc3MsDQo+IC0JCQkJCQkJICBw aHlzaWNhbF9hZGRyZXNzNjQpOw0KPiArCQkodm9pZClhY3BpX2h3X3NldF9maXJtd2FyZV93YWtp bmdfdmVjdG9yKGFjcGlfZ2JsX0ZBQ1MsDQo+ICsJCQkJCQkJIHBoeXNpY2FsX2FkZHJlc3MsDQo+ ICsJCQkJCQkJIHBoeXNpY2FsX2FkZHJlc3M2NCk7DQo+ICAJfQ0KPiANCj4gIAlyZXR1cm5fQUNQ SV9TVEFUVVMoQUVfT0spOw0KPiAgfQ0KPiANCj4gLUFDUElfRVhQT1JUX1NZTUJPTChhY3BpX3Nl dF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycykNCj4gLQ0KPiAtDQo+IC8qKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioNCj4gKioqKioq KioqKioqKioqKg0KPiAtICoNCj4gLSAqIEZVTkNUSU9OOiAgICBhY3BpX3NldF9maXJtd2FyZV93 YWtpbmdfdmVjdG9yDQo+IC0gKg0KPiAtICogUEFSQU1FVEVSUzogIHBoeXNpY2FsX2FkZHJlc3Mg ICAgLSAzMi1iaXQgcGh5c2ljYWwgYWRkcmVzcyBvZiBBQ1BJIHJlYWwNCj4gbW9kZQ0KPiAtICog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeSBwb2ludC4NCj4gLSAqDQo+ IC0gKiBSRVRVUk46ICAgICAgU3RhdHVzDQo+IC0gKg0KPiAtICogREVTQ1JJUFRJT046IFNldHMg dGhlIDMyLWJpdCBmaXJtd2FyZV93YWtpbmdfdmVjdG9yIGZpZWxkIG9mIHRoZSBGQUNTDQo+IC0g Kg0KPiAtDQo+ICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioNCj4gKioqKioqKioqKioqKiovDQo+IC1hY3BpX3N0YXR1cyBhY3Bp X3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yKHUzMiBwaHlzaWNhbF9hZGRyZXNzKQ0KPiAtew0K PiAtCWFjcGlfc3RhdHVzIHN0YXR1czsNCj4gLQ0KPiAtCUFDUElfRlVOQ1RJT05fVFJBQ0UoYWNw aV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3Rvcik7DQo+IC0NCj4gLQlzdGF0dXMgPSBhY3BpX3Nl dF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycygoYWNwaV9waHlzaWNhbF9hZGRyZXNzKQ0KPiAtCQkJ CQkJICBwaHlzaWNhbF9hZGRyZXNzLCAwKTsNCj4gLQ0KPiAtCXJldHVybl9BQ1BJX1NUQVRVUyhz dGF0dXMpOw0KPiAtfQ0KPiAtDQo+ICBBQ1BJX0VYUE9SVF9TWU1CT0woYWNwaV9zZXRfZmlybXdh cmVfd2FraW5nX3ZlY3RvcikNCj4gDQo+IC0jaWYgQUNQSV9NQUNISU5FX1dJRFRIID09IDY0DQo+ IC0NCj4gLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKg0KPiAqKioqKioqKioqKioqKioqDQo+IC0gKg0KPiAtICogRlVOQ1RJT046 ICAgIGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3I2NA0KPiAtICoNCj4gLSAqIFBBUkFN RVRFUlM6ICBwaHlzaWNhbF9hZGRyZXNzICAgIC0gNjQtYml0IHBoeXNpY2FsIGFkZHJlc3Mgb2Yg QUNQSQ0KPiBwcm90ZWN0ZWQNCj4gLSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbW9kZSBlbnRyeSBwb2ludC4NCj4gLSAqDQo+IC0gKiBSRVRVUk46ICAgICAgU3RhdHVzDQo+ IC0gKg0KPiAtICogREVTQ1JJUFRJT046IFNldHMgdGhlIDY0LWJpdCBYX2Zpcm13YXJlX3dha2lu Z192ZWN0b3IgZmllbGQgb2YgdGhlIEZBQ1MsDQo+IGlmDQo+IC0gKiAgICAgICAgICAgICAgaXQg ZXhpc3RzIGluIHRoZSB0YWJsZS4gVGhpcyBmdW5jdGlvbiBpcyBpbnRlbmRlZCBmb3IgdXNlIHdp dGgNCj4gLSAqICAgICAgICAgICAgICA2NC1iaXQgaG9zdCBvcGVyYXRpbmcgc3lzdGVtcy4NCj4g LSAqDQo+IC0NCj4gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKg0KPiAqKioqKioqKioqKioqKi8NCj4gLWFjcGlfc3RhdHVzIGFj cGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3I2NCh1NjQgcGh5c2ljYWxfYWRkcmVzcykNCj4g LXsNCj4gLQlhY3BpX3N0YXR1cyBzdGF0dXM7DQo+IC0NCj4gLQlBQ1BJX0ZVTkNUSU9OX1RSQUNF KGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3I2NCk7DQo+IC0NCj4gLQlzdGF0dXMgPSBh Y3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9ycygwLA0KPiAtCQkJCQkJICAoYWNwaV9waHlz aWNhbF9hZGRyZXNzKQ0KPiAtCQkJCQkJICBwaHlzaWNhbF9hZGRyZXNzKTsNCj4gLQ0KPiAtCXJl dHVybl9BQ1BJX1NUQVRVUyhzdGF0dXMpOw0KPiAtfQ0KPiAtDQo+IC1BQ1BJX0VYUE9SVF9TWU1C T0woYWNwaV9zZXRfZmlybXdhcmVfd2FraW5nX3ZlY3RvcjY0KQ0KPiAtI2VuZGlmDQo+IA0KPiAv KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqDQo+ICoqKioqKioqKioqKioqKioNCj4gICAqDQo+ICAgKiBGVU5DVElPTjogICAgYWNw aV9lbnRlcl9zbGVlcF9zdGF0ZV9zNGJpb3MNCj4gSW5kZXg6IGxpbnV4LXBtL2luY2x1ZGUvYWNw aS9hY3BpeGYuaA0KPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQo+ID09PQ0KPiAtLS0gbGludXgtcG0ub3JpZy9pbmNsdWRl L2FjcGkvYWNwaXhmLmgNCj4gKysrIGxpbnV4LXBtL2luY2x1ZGUvYWNwaS9hY3BpeGYuaA0KPiBA QCAtODYzLDE3ICs4NjMsOSBAQCBBQ1BJX0VYVEVSTkFMX1JFVFVSTl9TVEFUVVMoYWNwaV9zdGF0 dXMNCj4gIEFDUElfRVhURVJOQUxfUkVUVVJOX1NUQVRVUyhhY3BpX3N0YXR1cyBhY3BpX2xlYXZl X3NsZWVwX3N0YXRlKHU4DQo+IHNsZWVwX3N0YXRlKSkNCj4gDQo+ICBBQ1BJX0hXX0RFUEVOREVO VF9SRVRVUk5fU1RBVFVTKGFjcGlfc3RhdHVzDQo+IC0JCQkJYWNwaV9zZXRfZmlybXdhcmVfd2Fr aW5nX3ZlY3RvcnMNCj4gKwkJCQlhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yDQo+ICAJ CQkJKGFjcGlfcGh5c2ljYWxfYWRkcmVzcyBwaHlzaWNhbF9hZGRyZXNzLA0KPiAgCQkJCSBhY3Bp X3BoeXNpY2FsX2FkZHJlc3MgcGh5c2ljYWxfYWRkcmVzczY0KSkNCj4gLUFDUElfSFdfREVQRU5E RU5UX1JFVFVSTl9TVEFUVVMoYWNwaV9zdGF0dXMNCj4gLQkJCQkgYWNwaV9zZXRfZmlybXdhcmVf d2FraW5nX3ZlY3Rvcih1MzINCj4gLQ0KPiBwaHlzaWNhbF9hZGRyZXNzKSkNCj4gLSNpZiBBQ1BJ X01BQ0hJTkVfV0lEVEggPT0gNjQNCj4gLUFDUElfSFdfREVQRU5ERU5UX1JFVFVSTl9TVEFUVVMo YWNwaV9zdGF0dXMNCj4gLQkJCQlhY3BpX3NldF9maXJtd2FyZV93YWtpbmdfdmVjdG9yNjQodTY0 DQo+IC0NCj4gcGh5c2ljYWxfYWRkcmVzcykpDQo+IC0jZW5kaWYNCj4gIC8qDQo+ICAgKiBBQ1BJ IFRpbWVyIGludGVyZmFjZXMNCj4gICAqLw0KPiBJbmRleDogbGludXgtcG0vZHJpdmVycy9hY3Bp L3NsZWVwLmMNCj4gPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KPiA9PT0NCj4gLS0tIGxpbnV4LXBtLm9yaWcvZHJpdmVycy9h Y3BpL3NsZWVwLmMNCj4gKysrIGxpbnV4LXBtL2RyaXZlcnMvYWNwaS9zbGVlcC5jDQo+IEBAIC02 MSw3ICs2MSw3IEBAIHN0YXRpYyBpbnQgYWNwaV9zbGVlcF9wcmVwYXJlKHUzMiBhY3BpX3MNCj4g IAlpZiAoYWNwaV9zdGF0ZSA9PSBBQ1BJX1NUQVRFX1MzKSB7DQo+ICAJCWlmICghYWNwaV93YWtl dXBfYWRkcmVzcykNCj4gIAkJCXJldHVybiAtRUZBVUxUOw0KPiAtCQlhY3BpX3NldF9maXJtd2Fy ZV93YWtpbmdfdmVjdG9yKGFjcGlfd2FrZXVwX2FkZHJlc3MpOw0KPiArCQlhY3BpX3NldF93YWtp bmdfdmVjdG9yKGFjcGlfd2FrZXVwX2FkZHJlc3MpOw0KPiANCj4gIAl9DQo+ICAJQUNQSV9GTFVT SF9DUFVfQ0FDSEUoKTsNCj4gQEAgLTQxMCw3ICs0MTAsNyBAQCBzdGF0aWMgdm9pZCBhY3BpX3Bt X2ZpbmlzaCh2b2lkKQ0KPiAgCWFjcGlfbGVhdmVfc2xlZXBfc3RhdGUoYWNwaV9zdGF0ZSk7DQo+ IA0KPiAgCS8qIHJlc2V0IGZpcm13YXJlIHdha2luZyB2ZWN0b3IgKi8NCj4gLQlhY3BpX3NldF9m aXJtd2FyZV93YWtpbmdfdmVjdG9yKChhY3BpX3BoeXNpY2FsX2FkZHJlc3MpIDApOw0KPiArCWFj cGlfc2V0X3dha2luZ192ZWN0b3IoMCk7DQo+IA0KPiAgCWFjcGlfdGFyZ2V0X3NsZWVwX3N0YXRl ID0gQUNQSV9TVEFURV9TMDsNCj4gDQo+IEluZGV4OiBsaW51eC1wbS9kcml2ZXJzL2FjcGkvc2xl ZXAuaA0KPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQo+ID09PQ0KPiAtLS0gbGludXgtcG0ub3JpZy9kcml2ZXJzL2FjcGkv c2xlZXAuaA0KPiArKysgbGludXgtcG0vZHJpdmVycy9hY3BpL3NsZWVwLmgNCj4gQEAgLTYsMyAr Niw5IEBAIGV4dGVybiBzdHJ1Y3QgbGlzdF9oZWFkIGFjcGlfd2FrZXVwX2RldmkNCj4gIGV4dGVy biBzdHJ1Y3QgbXV0ZXggYWNwaV9kZXZpY2VfbG9jazsNCj4gDQo+ICBleHRlcm4gdm9pZCBhY3Bp X3Jlc3VtZV9wb3dlcl9yZXNvdXJjZXModm9pZCk7DQo+ICsNCj4gK3N0YXRpYyBpbmxpbmUgYWNw aV9zdGF0dXMgYWNwaV9zZXRfd2FraW5nX3ZlY3Rvcih1MzIgd2FrZXVwX2FkZHJlc3MpDQo+ICt7 DQo+ICsJcmV0dXJuIGFjcGlfc2V0X2Zpcm13YXJlX3dha2luZ192ZWN0b3IoDQo+ICsJCQkJKGFj cGlfcGh5c2ljYWxfYWRkcmVzcyl3YWtldXBfYWRkcmVzcywgMCk7DQo+ICt9DQoNCg== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web