From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063Ab3F0P7R (ORCPT ); Thu, 27 Jun 2013 11:59:17 -0400 Received: from mga02.intel.com ([134.134.136.20]:34386 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753695Ab3F0P7P convert rfc822-to-8bit (ORCPT ); Thu, 27 Jun 2013 11:59:15 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,953,1363158000"; d="scan'208";a="356714732" From: "Moore, Robert" To: Jan Beulich , Ben Guthro , "Zheng, Lv" , "Box, David E" , "Brown, Len" CC: "xen-devel@lists.xen.org" , Konrad Rzeszutek Wilk , "Rafaell J . Wysocki" , "linux-acpi@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH v4 3/5] acpi: Adjust linux acpi OS functions to new extended parameter Thread-Topic: [PATCH v4 3/5] acpi: Adjust linux acpi OS functions to new extended parameter Thread-Index: AQHOc0dpl7G7TargmEKMBkRA2R2VNJlKIASA//+XarA= Date: Thu, 27 Jun 2013 15:59:12 +0000 Message-ID: <94F2FBAB4432B54E8AACC7DFDE6C92E36FE969D3@ORSMSX103.amr.corp.intel.com> References: <1372345323-9266-1-git-send-email-benjamin.guthro@citrix.com> <1372345323-9266-4-git-send-email-benjamin.guthro@citrix.com> <51CC724702000078000E149B@nat28.tlf.novell.com> In-Reply-To: <51CC724702000078000E149B@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.22.254.139] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I have not seen a discussion of the details on this, so can someone explain to me just why acpi_os_prepare_sleep is needed, what does it do, and why these changes are being made to ACPICA code? Thanks, Bob > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Thursday, June 27, 2013 8:12 AM > To: Ben Guthro > Cc: Moore, Robert; xen-devel@lists.xen.org; Konrad Rzeszutek Wilk; Rafaell > J . Wysocki; linux-acpi@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 3/5] acpi: Adjust linux acpi OS functions to new > extended parameter > > >>> On 27.06.13 at 17:02, Ben Guthro wrote: > > Change the function definitions of acpi_os_prepare_sleep() and > > acpi_os_set_prepare_sleep() to pass along the new extended sleep > > parameter. > > > > Signed-off-by: Jan Beulich > > Signed-off-by: Ben Guthro > > Cc: Bob Moore > > Cc: Rafaell J. Wysocki > > Cc: linux-acpi@vger.kernel.org > > --- > > drivers/acpi/osl.c | 16 ++++++++-------- > > include/linux/acpi.h | 6 +++--- > > 2 files changed, 11 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index > > e721863..0251c9b 100644 > > --- a/drivers/acpi/osl.c > > +++ b/drivers/acpi/osl.c > > @@ -77,8 +77,8 @@ EXPORT_SYMBOL(acpi_in_debugger); extern char > > line_buf[80]; > > #endif /*ENABLE_DEBUGGER */ > > > > -static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl, > > - u32 pm1b_ctrl); > > +static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 val_a, u32 > val_b, > > + bool extended); > > So from here till patch 5 the build will be half broken because of the > type mismatches? I think at least the types of the consumers need to be > changed in this patch; leaving the meat of the Xen change to patch 4 is > perhaps fine. > > Jan > > > > > static acpi_osd_handler acpi_irq_handler; static void > > *acpi_irq_context; @@ -1757,13 +1757,13 @@ acpi_status > > acpi_os_terminate(void) > > return AE_OK; > > } > > > > -acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, > > - u32 pm1b_control) > > +acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 val_a, u32 val_b, > > + u8 extended) > > { > > int rc = 0; > > if (__acpi_os_prepare_sleep) > > - rc = __acpi_os_prepare_sleep(sleep_state, > > - pm1a_control, pm1b_control); > > + rc = __acpi_os_prepare_sleep(sleep_state, val_a, val_b, > > + extended); > > if (rc < 0) > > return AE_ERROR; > > else if (rc > 0) > > @@ -1772,8 +1772,8 @@ acpi_status acpi_os_prepare_sleep(u8 > > sleep_state, u32 pm1a_control, > > return AE_OK; > > } > > > > -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, > > - u32 pm1a_ctrl, u32 pm1b_ctrl)) > > +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, > > + u32 val_b, bool extended)) > > { > > __acpi_os_prepare_sleep = func; > > } > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h index > > 709a2f2..26f9996 100644 > > --- a/include/linux/acpi.h > > +++ b/include/linux/acpi.h > > @@ -477,8 +477,8 @@ static inline bool acpi_driver_match_device(struct > > device *dev, > > #endif /* !CONFIG_ACPI */ > > > > #ifdef CONFIG_ACPI > > -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, > > - u32 pm1a_ctrl, u32 pm1b_ctrl)); > > +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, > > + u32 val_b, bool extended)); > > #ifdef CONFIG_X86 > > void arch_reserve_mem_area(acpi_physical_address addr, size_t size); > > #else @@ -488,7 +488,7 @@ static inline void > > arch_reserve_mem_area(acpi_physical_address addr, } #endif /* > > CONFIG_X86 */ #else -#define acpi_os_set_prepare_sleep(func, > > pm1a_ctrl, pm1b_ctrl) do { } while > > (0) > > +#define acpi_os_set_prepare_sleep(func, val_a, val_b, ext) do { } > > +while (0) > > #endif > > > > #if defined(CONFIG_ACPI) && defined(CONFIG_PM_RUNTIME) > > -- > > 1.7.9.5 > >