linux-next: manual merge of the driver-core tree with the pm tree

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
Introduce offline/online callbacks for memory blocks") from the pm tree
and commit 96b2c0fc8e74 ("drivers/base: Use attribute groups to create
sysfs memory files") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/memory.c
index 4ebf97f,e315051..0000000
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@@ -595,6 -493,41 +541,42 @@@ struct memory_block *find_memory_block(
  	return find_memory_block_hinted(section, NULL);
  }
  
+ static struct attribute *memory_memblk_attrs[] = {
+ 	&dev_attr_phys_index.attr,
+ 	&dev_attr_end_phys_index.attr,
+ 	&dev_attr_state.attr,
+ 	&dev_attr_phys_device.attr,
+ 	&dev_attr_removable.attr,
+ 	NULL
+ };
+ 
+ static struct attribute_group memory_memblk_attr_group = {
+ 	.attrs = memory_memblk_attrs,
+ };
+ 
+ static const struct attribute_group *memory_memblk_attr_groups[] = {
+ 	&memory_memblk_attr_group,
+ 	NULL,
+ };
+ 
+ /*
+  * register_memory - Setup a sysfs device for a memory block
+  */
+ static
+ int register_memory(struct memory_block *memory)
+ {
+ 	int error;
+ 
+ 	memory->dev.bus = &memory_subsys;
+ 	memory->dev.id = memory->start_section_nr / sections_per_block;
+ 	memory->dev.release = memory_block_release;
+ 	memory->dev.groups = memory_memblk_attr_groups;
++	memory->dev.offline = memory->state == MEM_OFFLINE;
+ 
+ 	error = device_register(&memory->dev);
+ 	return error;
+ }
+ 
  static int init_memory_block(struct memory_block **memory,
  			     struct mem_section *section, unsigned long state)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Greg KH]

On Fri, Jun 07, 2013 at 02:49:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
> Introduce offline/online callbacks for memory blocks") from the pm tree
> and commit 96b2c0fc8e74 ("drivers/base: Use attribute groups to create
> sysfs memory files") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 807 bytes --]

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/acpi/sleep.c

between commit:

  a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")

from the pm tree and commit:

  418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device")

from the driver-core tree.

I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Andy Shevchenko]

On Mon, Jul 01, 2019 at 06:32:49PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/acpi/sleep.c
> 
> between commit:
> 
>   a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")
> 
> from the pm tree and commit:
> 
>   418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device")
> 
> from the driver-core tree.
> 
> I fixed it up (the former removed the code modified by the latter) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

Thank you, the fix looks correct!

> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/base/platform.c
u
between commit:

  2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")

from the pm tree and commit:

  99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")

from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/base/platform.c
index 0fb5f140f1b0,e1ba610482c0..000000000000
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -447,7 -447,8 +447,7 @@@ void platform_device_del(struct platfor
  {
  	int i;
  
- 	if (pdev) {
+ 	if (!IS_ERR_OR_NULL(pdev)) {
 -		device_remove_properties(&pdev->dev);
  		device_del(&pdev->dev);
  
  		if (pdev->id_auto) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Rafael J. Wysocki]

On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/base/platform.c
> u
> between commit:
> 
>   2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")
> 
> from the pm tree and commit:
> 
>   99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")
> 
> from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The fix looks good to me, thank you!

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Andy Shevchenko]

On Mon, Dec 10, 2018 at 09:58:53AM +0100, Rafael J. Wysocki wrote:
> On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in:
> > 
> >   drivers/base/platform.c
> > u
> > between commit:
> > 
> >   2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")
> > 
> > from the pm tree and commit:
> > 
> >   99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")
> > 
> > from the driver-core tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> The fix looks good to me, thank you!

Confirm, the result looks as it supposed to be.
Thanks!

-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/base/power/main.c

between commit:

  6f75c3fd56da ("PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails")

from the pm tree and commit:

  8c73b4288496 ("PM / sleep: Make async suspend/resume of devices use device links")

from the driver-core tree.

I fixed it up (maybe .. see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/base/power/main.c
index 2932a5bd892f,04bcb11ed8de..000000000000
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -1027,8 -1085,6 +1085,8 @@@ static int __device_suspend_noirq(struc
  	TRACE_DEVICE(dev);
  	TRACE_SUSPEND(0);
  
- 	dpm_wait_for_children(dev, async);
++	dpm_wait_for_subordinate(dev, async);
 +
  	if (async_error)
  		goto Complete;
  
@@@ -1174,8 -1232,6 +1232,8 @@@ static int __device_suspend_late(struc
  
  	__pm_runtime_disable(dev, false);
  
- 	dpm_wait_for_children(dev, async);
++	dpm_wait_for_subordinate(dev, async);
 +
  	if (async_error)
  		goto Complete;
  

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Rafael J. Wysocki]

On Monday, November 14, 2016 01:09:02 PM Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/base/power/main.c
> 
> between commit:
> 
>   6f75c3fd56da ("PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails")
> 
> from the pm tree and commit:
> 
>   8c73b4288496 ("PM / sleep: Make async suspend/resume of devices use device links")
> 
> from the driver-core tree.

Well, right.  The device links series predates the Brian's fix (which is in -rc5
already, BTW).

> I fixed it up (maybe .. see below) and can carry the fix as necessary.

That's the correct one, thanks Stephen!

Cheers,
Rafael

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/Makefile between commit b31384fa5de3 ("Driver core:
Unified device properties interface for platform firmware") from the pm
tree and commit 246246cbde5e ("drivers: base: support cpu cache
information interface to userspace via sysfs") from the driver-core
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/Makefile
index 53c3fe1aeb29,e81a55ca513c..000000000000
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -4,7 -4,7 +4,7 @@@ obj-y			:= component.o core.o bus.o dd.
  			   driver.o class.o platform.o \
  			   cpu.o firmware.o init.o map.o devres.o \
  			   attribute_container.o transport_class.o \
- 			   topology.o container.o property.o
 -			   topology.o container.o cacheinfo.o
++			   topology.o container.o property.o cacheinfo.o
  obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o
  obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
  obj-y			+= power/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Greg KH]

On Tue, Nov 11, 2014 at 03:41:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/Makefile between commit b31384fa5de3 ("Driver core:
> Unified device properties interface for platform firmware") from the pm
> tree and commit 246246cbde5e ("drivers: base: support cpu cache
> information interface to userspace via sysfs") from the driver-core
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/base/Makefile
> index 53c3fe1aeb29,e81a55ca513c..000000000000
> --- a/drivers/base/Makefile
> +++ b/drivers/base/Makefile
> @@@ -4,7 -4,7 +4,7 @@@ obj-y			:= component.o core.o bus.o dd.
>   			   driver.o class.o platform.o \
>   			   cpu.o firmware.o init.o map.o devres.o \
>   			   attribute_container.o transport_class.o \
> - 			   topology.o container.o property.o
>  -			   topology.o container.o cacheinfo.o
> ++			   topology.o container.o property.o cacheinfo.o
>   obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o
>   obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
>   obj-y			+= power/



Looks fine, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
("input: gpio_keys_polled: Make use of device property API") from the
pm tree and commit 1d05726c315c ("input: keyboard: drop owner
assignment from platform_drivers") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/keyboard/gpio_keys_polled.c
index c9c1c8ca7267,10f0098f3c77..000000000000
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@@ -297,8 -307,7 +297,7 @@@ static struct platform_driver gpio_keys
  	.probe	= gpio_keys_polled_probe,
  	.driver	= {
  		.name	= DRV_NAME,
- 		.owner	= THIS_MODULE,
 -		.of_match_table = of_match_ptr(gpio_keys_polled_of_match),
 +		.of_match_table = gpio_keys_polled_of_match,
  	},
  };
  module_platform_driver(gpio_keys_polled_driver);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Greg KH]

On Mon, Nov 10, 2014 at 03:18:56PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
> ("input: gpio_keys_polled: Make use of device property API") from the
> pm tree and commit 1d05726c315c ("input: keyboard: drop owner
> assignment from platform_drivers") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/input/keyboard/gpio_keys_polled.c
> index c9c1c8ca7267,10f0098f3c77..000000000000
> --- a/drivers/input/keyboard/gpio_keys_polled.c
> +++ b/drivers/input/keyboard/gpio_keys_polled.c
> @@@ -297,8 -307,7 +297,7 @@@ static struct platform_driver gpio_keys
>   	.probe	= gpio_keys_polled_probe,
>   	.driver	= {
>   		.name	= DRV_NAME,
> - 		.owner	= THIS_MODULE,
>  -		.of_match_table = of_match_ptr(gpio_keys_polled_of_match),
>  +		.of_match_table = gpio_keys_polled_of_match,
>   	},
>   };
>   module_platform_driver(gpio_keys_polled_driver);


Looks good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
Avoid device hot remove locking issues") from the  tree and commit
86df26870569 ("drivers:base:core: Moved sym export macros to respective
functions") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/core.c
index ac419a1,c7b0925..0000000
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@@ -1489,21 -1450,18 +1475,6 @@@ int __init devices_init(void
  	return -ENOMEM;
  }
  
- EXPORT_SYMBOL_GPL(device_for_each_child);
- EXPORT_SYMBOL_GPL(device_find_child);
- 
- EXPORT_SYMBOL_GPL(device_initialize);
- EXPORT_SYMBOL_GPL(device_add);
- EXPORT_SYMBOL_GPL(device_register);
 -static DEFINE_MUTEX(device_hotplug_lock);
--
- EXPORT_SYMBOL_GPL(device_del);
- EXPORT_SYMBOL_GPL(device_unregister);
- EXPORT_SYMBOL_GPL(get_device);
- EXPORT_SYMBOL_GPL(put_device);
 -void lock_device_hotplug(void)
 -{
 -	mutex_lock(&device_hotplug_lock);
 -}
--
- EXPORT_SYMBOL_GPL(device_create_file);
- EXPORT_SYMBOL_GPL(device_remove_file);
 -void unlock_device_hotplug(void)
 -{
 -	mutex_unlock(&device_hotplug_lock);
 -}
--
  static int device_check_offline(struct device *dev, void *not_used)
  {
  	int ret;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Greg KH]

On Fri, Aug 30, 2013 at 03:26:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
> Avoid device hot remove locking issues") from the  tree and commit
> 86df26870569 ("drivers:base:core: Moved sym export macros to respective
> functions") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Merge looks great, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add
offline/online device operations") from the pm tree and commit
bfd63cd24df6 ("driver core: device.h: fix doc compilation warnings") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/device.h
index eeb3331,9d4835a..0000000
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@@ -655,8 -650,7 +657,9 @@@ struct acpi_dev_node 
   * @release:	Callback to free the device after all references have
   * 		gone away. This should be set by the allocator of the
   * 		device (i.e. the bus driver that discovered the device).
+  * @iommu_group: IOMMU group the device belongs to.
 + * @offline_disabled: If set, the device is permanently online.
 + * @offline:	Set after successful invocation of bus type's .offline().
   *
   * At the lowest level, every device in a Linux system is represented by an
   * instance of struct device. The device structure contains the information

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Greg KH]

On Thu, Jun 27, 2013 at 05:14:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add
> offline/online device operations") from the pm tree and commit
> bfd63cd24df6 ("driver core: device.h: fix doc compilation warnings") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3583 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
offline/online for CPU offline/online") from the pm tree and commit
1c4e2d70afb1 ("cpu: make sure that cpu/online file created before
KOBJ_ADD is emitted") from the driver-core tree.

I fixed it up (they do some bits in common - see below) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/cpu.c
index 7431ba6,c377673..0000000
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -38,39 -34,66 +38,48 @@@ static void change_cpu_under_node(struc
  	cpu->node_id = to_nid;
  }
  
 -static ssize_t show_online(struct device *dev,
 -			   struct device_attribute *attr,
 -			   char *buf)
 +static int __ref cpu_subsys_online(struct device *dev)
  {
  	struct cpu *cpu = container_of(dev, struct cpu, dev);
 +	int cpuid = dev->id;
 +	int from_nid, to_nid;
 +	int ret;
 +
 +	cpu_hotplug_driver_lock();
 +
 +	from_nid = cpu_to_node(cpuid);
 +	ret = cpu_up(cpuid);
 +	/*
 +	 * When hot adding memory to memoryless node and enabling a cpu
 +	 * on the node, node number of the cpu may internally change.
 +	 */
 +	to_nid = cpu_to_node(cpuid);
 +	if (from_nid != to_nid)
 +		change_cpu_under_node(cpu, from_nid, to_nid);
  
 -	return sprintf(buf, "%u\n", !!cpu_online(cpu->dev.id));
 +	cpu_hotplug_driver_unlock();
 +	return ret;
  }
  
 -static ssize_t __ref store_online(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t count)
 +static int cpu_subsys_offline(struct device *dev)
  {
 -	struct cpu *cpu = container_of(dev, struct cpu, dev);
 -	int cpuid = cpu->dev.id;
 -	int from_nid, to_nid;
 -	ssize_t ret;
 +	int ret;
  
  	cpu_hotplug_driver_lock();
 -	switch (buf[0]) {
 -	case '0':
 -		ret = cpu_down(cpuid);
 -		if (!ret)
 -			kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
 -		break;
 -	case '1':
 -		from_nid = cpu_to_node(cpuid);
 -		ret = cpu_up(cpuid);
 -
 -		/*
 -		 * When hot adding memory to memoryless node and enabling a cpu
 -		 * on the node, node number of the cpu may internally change.
 -		 */
 -		to_nid = cpu_to_node(cpuid);
 -		if (from_nid != to_nid)
 -			change_cpu_under_node(cpu, from_nid, to_nid);
 -
 -		if (!ret)
 -			kobject_uevent(&dev->kobj, KOBJ_ONLINE);
 -		break;
 -	default:
 -		ret = -EINVAL;
 -	}
 +	ret = cpu_down(dev->id);
  	cpu_hotplug_driver_unlock();
 -
 -	if (ret >= 0)
 -		ret = count;
  	return ret;
  }
 -static DEVICE_ATTR(online, 0644, show_online, store_online);
  
+ static struct attribute *hotplug_cpu_attrs[] = {
+ 	&dev_attr_online.attr,
+ 	NULL
+ };
+ 
+ static struct attribute_group hotplug_cpu_attr_group = {
+ 	.attrs = hotplug_cpu_attrs,
+ };
+ 
  void unregister_cpu(struct cpu *cpu)
  {
  	int logical_cpu = cpu->dev.id;
@@@ -102,20 -125,8 +111,19 @@@ static ssize_t cpu_release_store(struc
  static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
  static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);
  #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
- 
  #endif /* CONFIG_HOTPLUG_CPU */
  
 +struct bus_type cpu_subsys = {
 +	.name = "cpu",
 +	.dev_name = "cpu",
 +	.match = cpu_subsys_match,
 +#ifdef CONFIG_HOTPLUG_CPU
 +	.online = cpu_subsys_online,
 +	.offline = cpu_subsys_offline,
 +#endif
 +};
 +EXPORT_SYMBOL_GPL(cpu_subsys);
 +
  #ifdef CONFIG_KEXEC
  #include <linux/kexec.h>
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4865 bytes --]

Hi all,

On Wed, 22 May 2013 13:47:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
> offline/online for CPU offline/online") from the pm tree and commit
> 1c4e2d70afb1 ("cpu: make sure that cpu/online file created before
> KOBJ_ADD is emitted") from the driver-core tree.
> 
> I fixed it up (they do some bits in common - see below) and can carry the
> fix as necessary (no action is required).
> 
> diff --cc drivers/base/cpu.c
> index 7431ba6,c377673..0000000
> --- a/drivers/base/cpu.c
> +++ b/drivers/base/cpu.c
> @@@ -38,39 -34,66 +38,48 @@@ static void change_cpu_under_node(struc
>   	cpu->node_id = to_nid;
>   }
>   
>  -static ssize_t show_online(struct device *dev,
>  -			   struct device_attribute *attr,
>  -			   char *buf)
>  +static int __ref cpu_subsys_online(struct device *dev)
>   {
>   	struct cpu *cpu = container_of(dev, struct cpu, dev);
>  +	int cpuid = dev->id;
>  +	int from_nid, to_nid;
>  +	int ret;
>  +
>  +	cpu_hotplug_driver_lock();
>  +
>  +	from_nid = cpu_to_node(cpuid);
>  +	ret = cpu_up(cpuid);
>  +	/*
>  +	 * When hot adding memory to memoryless node and enabling a cpu
>  +	 * on the node, node number of the cpu may internally change.
>  +	 */
>  +	to_nid = cpu_to_node(cpuid);
>  +	if (from_nid != to_nid)
>  +		change_cpu_under_node(cpu, from_nid, to_nid);
>   
>  -	return sprintf(buf, "%u\n", !!cpu_online(cpu->dev.id));
>  +	cpu_hotplug_driver_unlock();
>  +	return ret;
>   }
>   
>  -static ssize_t __ref store_online(struct device *dev,
>  -				  struct device_attribute *attr,
>  -				  const char *buf, size_t count)
>  +static int cpu_subsys_offline(struct device *dev)
>   {
>  -	struct cpu *cpu = container_of(dev, struct cpu, dev);
>  -	int cpuid = cpu->dev.id;
>  -	int from_nid, to_nid;
>  -	ssize_t ret;
>  +	int ret;
>   
>   	cpu_hotplug_driver_lock();
>  -	switch (buf[0]) {
>  -	case '0':
>  -		ret = cpu_down(cpuid);
>  -		if (!ret)
>  -			kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
>  -		break;
>  -	case '1':
>  -		from_nid = cpu_to_node(cpuid);
>  -		ret = cpu_up(cpuid);
>  -
>  -		/*
>  -		 * When hot adding memory to memoryless node and enabling a cpu
>  -		 * on the node, node number of the cpu may internally change.
>  -		 */
>  -		to_nid = cpu_to_node(cpuid);
>  -		if (from_nid != to_nid)
>  -			change_cpu_under_node(cpu, from_nid, to_nid);
>  -
>  -		if (!ret)
>  -			kobject_uevent(&dev->kobj, KOBJ_ONLINE);
>  -		break;
>  -	default:
>  -		ret = -EINVAL;
>  -	}
>  +	ret = cpu_down(dev->id);
>   	cpu_hotplug_driver_unlock();
>  -
>  -	if (ret >= 0)
>  -		ret = count;
>   	return ret;
>   }
>  -static DEVICE_ATTR(online, 0644, show_online, store_online);
>   
> + static struct attribute *hotplug_cpu_attrs[] = {
> + 	&dev_attr_online.attr,
> + 	NULL
> + };
> + 
> + static struct attribute_group hotplug_cpu_attr_group = {
> + 	.attrs = hotplug_cpu_attrs,
> + };
> + 
>   void unregister_cpu(struct cpu *cpu)
>   {
>   	int logical_cpu = cpu->dev.id;
> @@@ -102,20 -125,8 +111,19 @@@ static ssize_t cpu_release_store(struc
>   static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
>   static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);
>   #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
> - 
>   #endif /* CONFIG_HOTPLUG_CPU */
>   
>  +struct bus_type cpu_subsys = {
>  +	.name = "cpu",
>  +	.dev_name = "cpu",
>  +	.match = cpu_subsys_match,
>  +#ifdef CONFIG_HOTPLUG_CPU
>  +	.online = cpu_subsys_online,
>  +	.offline = cpu_subsys_offline,
>  +#endif
>  +};
>  +EXPORT_SYMBOL_GPL(cpu_subsys);
>  +
>   #ifdef CONFIG_KEXEC
>   #include <linux/kexec.h>

OK, after doing that I got this error:

drivers/base/cpu.c:75:3: error: 'dev_attr_online' undeclared here (not in a function)
  &dev_attr_online.attr,
   ^

So I applied this merge fix patch:

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 811bb5a..ff97614 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -71,15 +71,6 @@ static int cpu_subsys_offline(struct device *dev)
 	return ret;
 }
 
-static struct attribute *hotplug_cpu_attrs[] = {
-	&dev_attr_online.attr,
-	NULL
-};
-
-static struct attribute_group hotplug_cpu_attr_group = {
-	.attrs = hotplug_cpu_attrs,
-};
-
 void unregister_cpu(struct cpu *cpu)
 {
 	int logical_cpu = cpu->dev.id;
@@ -182,9 +173,6 @@ static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
 #ifdef CONFIG_KEXEC
 	&crash_note_cpu_attr_group,
 #endif
-#ifdef CONFIG_HOTPLUG_CPU
-	&hotplug_cpu_attr_group,
-#endif
 	NULL
 };
 
Better ideas welcome :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Rafael J. Wysocki]

On Wednesday, May 22, 2013 02:02:13 PM Stephen Rothwell wrote:
> Hi all,

Hi Stephen,

Thanks for fixing this up!

Hi Greg,

What about merging my acpi-hotplug branch into the driver-core tree?

That would make the Linus' life easier going forward I suppose.

Thanks,
Rafael


> On Wed, 22 May 2013 13:47:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
> > offline/online for CPU offline/online") from the pm tree and commit
> > 1c4e2d70afb1 ("cpu: make sure that cpu/online file created before
> > KOBJ_ADD is emitted") from the driver-core tree.
> > 
> > I fixed it up (they do some bits in common - see below) and can carry the
> > fix as necessary (no action is required).
> > 
> > diff --cc drivers/base/cpu.c
> > index 7431ba6,c377673..0000000
> > --- a/drivers/base/cpu.c
> > +++ b/drivers/base/cpu.c
> > @@@ -38,39 -34,66 +38,48 @@@ static void change_cpu_under_node(struc
> >   	cpu->node_id = to_nid;
> >   }
> >   
> >  -static ssize_t show_online(struct device *dev,
> >  -			   struct device_attribute *attr,
> >  -			   char *buf)
> >  +static int __ref cpu_subsys_online(struct device *dev)
> >   {
> >   	struct cpu *cpu = container_of(dev, struct cpu, dev);
> >  +	int cpuid = dev->id;
> >  +	int from_nid, to_nid;
> >  +	int ret;
> >  +
> >  +	cpu_hotplug_driver_lock();
> >  +
> >  +	from_nid = cpu_to_node(cpuid);
> >  +	ret = cpu_up(cpuid);
> >  +	/*
> >  +	 * When hot adding memory to memoryless node and enabling a cpu
> >  +	 * on the node, node number of the cpu may internally change.
> >  +	 */
> >  +	to_nid = cpu_to_node(cpuid);
> >  +	if (from_nid != to_nid)
> >  +		change_cpu_under_node(cpu, from_nid, to_nid);
> >   
> >  -	return sprintf(buf, "%u\n", !!cpu_online(cpu->dev.id));
> >  +	cpu_hotplug_driver_unlock();
> >  +	return ret;
> >   }
> >   
> >  -static ssize_t __ref store_online(struct device *dev,
> >  -				  struct device_attribute *attr,
> >  -				  const char *buf, size_t count)
> >  +static int cpu_subsys_offline(struct device *dev)
> >   {
> >  -	struct cpu *cpu = container_of(dev, struct cpu, dev);
> >  -	int cpuid = cpu->dev.id;
> >  -	int from_nid, to_nid;
> >  -	ssize_t ret;
> >  +	int ret;
> >   
> >   	cpu_hotplug_driver_lock();
> >  -	switch (buf[0]) {
> >  -	case '0':
> >  -		ret = cpu_down(cpuid);
> >  -		if (!ret)
> >  -			kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
> >  -		break;
> >  -	case '1':
> >  -		from_nid = cpu_to_node(cpuid);
> >  -		ret = cpu_up(cpuid);
> >  -
> >  -		/*
> >  -		 * When hot adding memory to memoryless node and enabling a cpu
> >  -		 * on the node, node number of the cpu may internally change.
> >  -		 */
> >  -		to_nid = cpu_to_node(cpuid);
> >  -		if (from_nid != to_nid)
> >  -			change_cpu_under_node(cpu, from_nid, to_nid);
> >  -
> >  -		if (!ret)
> >  -			kobject_uevent(&dev->kobj, KOBJ_ONLINE);
> >  -		break;
> >  -	default:
> >  -		ret = -EINVAL;
> >  -	}
> >  +	ret = cpu_down(dev->id);
> >   	cpu_hotplug_driver_unlock();
> >  -
> >  -	if (ret >= 0)
> >  -		ret = count;
> >   	return ret;
> >   }
> >  -static DEVICE_ATTR(online, 0644, show_online, store_online);
> >   
> > + static struct attribute *hotplug_cpu_attrs[] = {
> > + 	&dev_attr_online.attr,
> > + 	NULL
> > + };
> > + 
> > + static struct attribute_group hotplug_cpu_attr_group = {
> > + 	.attrs = hotplug_cpu_attrs,
> > + };
> > + 
> >   void unregister_cpu(struct cpu *cpu)
> >   {
> >   	int logical_cpu = cpu->dev.id;
> > @@@ -102,20 -125,8 +111,19 @@@ static ssize_t cpu_release_store(struc
> >   static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
> >   static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);
> >   #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
> > - 
> >   #endif /* CONFIG_HOTPLUG_CPU */
> >   
> >  +struct bus_type cpu_subsys = {
> >  +	.name = "cpu",
> >  +	.dev_name = "cpu",
> >  +	.match = cpu_subsys_match,
> >  +#ifdef CONFIG_HOTPLUG_CPU
> >  +	.online = cpu_subsys_online,
> >  +	.offline = cpu_subsys_offline,
> >  +#endif
> >  +};
> >  +EXPORT_SYMBOL_GPL(cpu_subsys);
> >  +
> >   #ifdef CONFIG_KEXEC
> >   #include <linux/kexec.h>
> 
> OK, after doing that I got this error:
> 
> drivers/base/cpu.c:75:3: error: 'dev_attr_online' undeclared here (not in a function)
>   &dev_attr_online.attr,
>    ^
> 
> So I applied this merge fix patch:
> 
> diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
> index 811bb5a..ff97614 100644
> --- a/drivers/base/cpu.c
> +++ b/drivers/base/cpu.c
> @@ -71,15 +71,6 @@ static int cpu_subsys_offline(struct device *dev)
>  	return ret;
>  }
>  
> -static struct attribute *hotplug_cpu_attrs[] = {
> -	&dev_attr_online.attr,
> -	NULL
> -};
> -
> -static struct attribute_group hotplug_cpu_attr_group = {
> -	.attrs = hotplug_cpu_attrs,
> -};
> -
>  void unregister_cpu(struct cpu *cpu)
>  {
>  	int logical_cpu = cpu->dev.id;
> @@ -182,9 +173,6 @@ static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
>  #ifdef CONFIG_KEXEC
>  	&crash_note_cpu_attr_group,
>  #endif
> -#ifdef CONFIG_HOTPLUG_CPU
> -	&hotplug_cpu_attr_group,
> -#endif
>  	NULL
>  };
>  
> Better ideas welcome :-)
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
container driver use struct acpi_scan_handler") from the pm tree and
commit f756f28b84af ("drivers/acpi: remove depends on CONFIG_EXPERIMENTAL")
from the driver-core tree.

I fixed it up and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the pm tree

[Rafael J. Wysocki]

On Monday, February 11, 2013 03:42:55 PM Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
> container driver use struct acpi_scan_handler") from the pm tree and
> commit f756f28b84af ("drivers/acpi: remove depends on CONFIG_EXPERIMENTAL")
> from the driver-core tree.
> 
> I fixed it up and can carry the fix as necessary (no action is required).

Thanks for the notice and for fixing this!

Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.