From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S934597AbcJMWA1 (ORCPT <rfc822;w@1wt.eu>);
        Thu, 13 Oct 2016 18:00:27 -0400
Received: from cloudserver094114.home.net.pl ([79.96.170.134]:61424 "HELO
        cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with SMTP id S1755511AbcJMWAO (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 13 Oct 2016 18:00:14 -0400
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Juergen Gross <jgross@suse.com>
Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xen.org,
        linux-acpi@vger.kernel.org, lenb@kernel.org
Subject: Re: [PATCH] acpi: don't register acpi_pad driver if running as xen dom0
Date: Fri, 14 Oct 2016 00:00:08 +0200
Message-ID: <2390542.It4zVIG3Mc@vostro.rjw.lan>
User-Agent: KMail/4.11.5 (Linux/4.8.0-rc2+; KDE/4.11.5; x86_64; ; )
In-Reply-To: <1476270705-16209-1-git-send-email-jgross@suse.com>
References: <1476270705-16209-1-git-send-email-jgross@suse.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wednesday, October 12, 2016 01:11:45 PM Juergen Gross wrote:
> When running as Xen dom0 a special processor_aggregator driver is
> needed. Don't register the standard driver in this case.
> 
> Without that check an error message:
> 
> "Error: Driver 'processor_aggregator' is already registered,
> aborting..."
> 
> will be displayed.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
>  drivers/acpi/acpi_pad.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
> index 8ea8211..1c3be12 100644
> --- a/drivers/acpi/acpi_pad.c
> +++ b/drivers/acpi/acpi_pad.c
> @@ -26,6 +26,7 @@
>  #include <linux/slab.h>
>  #include <linux/acpi.h>
>  #include <asm/mwait.h>
> +#include <xen/xen.h>
>  
>  #define ACPI_PROCESSOR_AGGREGATOR_CLASS	"acpi_pad"
>  #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
> @@ -477,6 +478,10 @@ static struct acpi_driver acpi_pad_driver = {
>  
>  static int __init acpi_pad_init(void)
>  {
> +	/* Xen acpi pad is responsible when running as Xen Dom0. */
> +	if (xen_initial_domain())
> +		return -ENODEV;
> +
>  	power_saving_mwait_init();
>  	if (power_saving_mwait_eax == 0)
>  		return -EINVAL;
> 

Applied.

Thanks,
Rafael