[linux-yocto] [PATCH 5/6] [UPSTREAMED] acpi: add support for configfs

Sullivan, California L california.l.sullivan at intel.com
Thu Jul 21 15:13:55 PDT 2016


In an allmodconfig build I found that configfs (CONFIG_ACPI_CONFIGFS=m
introduced in this patch) fails to compile on both standard/intel/base
and standard/intel/bxt-rebase branches.
Sebastien, could you look into what it takes to fix this?

Thanks,
Cal Sullivan

On 07/11/2016 03:35 PM, Sebastien Boeuf wrote:
> From: Octavian Purdila <octavian.purdila at intel.com>
>
> Register the ACPI subsystem with configfs.
>
> Patch slightly modified because of cherry-pick conflict
> in Makefile.
>
> Signed-off-by: Octavian Purdila <octavian.purdila at intel.com>
> Signed-off-by: Sebastien Boeuf <sebastien.boeuf at intel.com>
>
> Conflicts:
> 	drivers/acpi/Makefile
> ---
>  Documentation/ABI/testing/configfs-acpi |  7 +++++
>  MAINTAINERS                             |  1 +
>  drivers/acpi/Kconfig                    |  9 ++++++
>  drivers/acpi/Makefile                   |  1 +
>  drivers/acpi/configfs.c                 | 53 +++++++++++++++++++++++++++++++++
>  5 files changed, 71 insertions(+)
>  create mode 100644 Documentation/ABI/testing/configfs-acpi
>  create mode 100644 drivers/acpi/configfs.c
>
> diff --git a/Documentation/ABI/testing/configfs-acpi b/Documentation/ABI/testing/configfs-acpi
> new file mode 100644
> index 0000000..17b19dc
> --- /dev/null
> +++ b/Documentation/ABI/testing/configfs-acpi
> @@ -0,0 +1,7 @@
> +What:		/config/acpi
> +Date:		July 2016
> +KernelVersion:	4.8
> +Contact:	linux-acpi at vger.kernel.org
> +Description:
> +		This represents the ACPI subsystem entry point directory. It
> +		contains sub-groups corresponding to ACPI configurable options.
> diff --git a/MAINTAINERS b/MAINTAINERS
> index be51c13..278c0f4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -279,6 +279,7 @@ F:	include/linux/acpi.h
>  F:	include/acpi/
>  F:	Documentation/acpi/
>  F:	Documentation/ABI/testing/sysfs-bus-acpi
> +F:	Documentation/ABI/testing/configfs-acpi
>  F:	drivers/pci/*acpi*
>  F:	drivers/pci/*/*acpi*
>  F:	drivers/pci/*/*/*acpi*
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 1741c68..daa9c90 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -516,4 +516,13 @@ config BXT_WC_PMIC_OPREGION
>  
>  endif
>  
> +config ACPI_CONFIGFS
> +	tristate "ACPI configfs support"
> +	select CONFIGFS_FS
> +	default n
> +	help
> +	  Select this option to enable support for ACPI configuration from
> +	  userspace. The configurable ACPI groups will be visible under
> +	  /config/acpi, assuming configfs is mounted under /config.
> +
>  endif	# ACPI
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index ad48a9e..dcccf2e 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -97,5 +97,6 @@ obj-$(CONFIG_PMIC_OPREGION)	+= pmic/intel_pmic.o
>  obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
>  obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
>  obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
> +obj-$(CONFIG_ACPI_CONFIGFS)	+= configfs.o
>  
>  video-objs			+= acpi_video.o video_detect.o
> diff --git a/drivers/acpi/configfs.c b/drivers/acpi/configfs.c
> new file mode 100644
> index 0000000..44a72ff
> --- /dev/null
> +++ b/drivers/acpi/configfs.c
> @@ -0,0 +1,53 @@
> +/*
> + * ACPI configfs support
> + *
> + * Copyright (c) 2015 Intel Corporation
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 as published by
> + * the Free Software Foundation.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/configfs.h>
> +#include <linux/acpi.h>
> +
> +static struct config_item_type acpi_root_group_type = {
> +	.ct_owner = THIS_MODULE,
> +};
> +
> +static struct configfs_subsystem acpi_configfs = {
> +	.su_group = {
> +		.cg_item = {
> +			.ci_namebuf = "acpi",
> +			.ci_type = &acpi_root_group_type,
> +		},
> +	},
> +	.su_mutex = __MUTEX_INITIALIZER(acpi_configfs.su_mutex),
> +};
> +
> +static int __init acpi_configfs_init(void)
> +{
> +	int ret;
> +	struct config_group *root = &acpi_configfs.su_group;
> +
> +	config_group_init(root);
> +
> +	ret = configfs_register_subsystem(&acpi_configfs);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +module_init(acpi_configfs_init);
> +
> +static void __exit acpi_configfs_exit(void)
> +{
> +	configfs_unregister_subsystem(&acpi_configfs);
> +}
> +module_exit(acpi_configfs_exit);
> +
> +MODULE_AUTHOR("Octavian Purdila <octavian.purdila at intel.com>");
> +MODULE_DESCRIPTION("ACPI configfs support");
> +MODULE_LICENSE("GPL v2");



More information about the linux-yocto mailing list