Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae36e95c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux 

Pull device tree updates from Grant Likely:
 "The branch contains the following device tree changes the v3.17 merge
  window:

  Group changes to the device tree.  In preparation for adding device
  tree overlay support, OF_DYNAMIC is reworked so that a set of device
  tree changes can be prepared and applied to the tree all at once.
  OF_RECONFIG notifiers see the most significant change here so that
  users always get a consistent view of the tree.  Notifiers generation
  is moved from before a change to after it, and notifiers for a group
  of changes are emitted after the entire block of changes have been
  applied

  Automatic console selection from DT.  Console drivers can now use
  of_console_check() to see if the device node is specified as a console
  device.  If so then it gets added as a preferred console.  UART
  devices get this support automatically when uart_add_one_port() is
  called.

  DT unit tests no longer depend on pre-loaded data in the device tree.
  Data is loaded dynamically at the start of unit tests, and then
  unloaded again when the tests have completed.

  Also contains a few bugfixes for reserved regions and early memory
  setup"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: (21 commits)
  of: Fixing OF Selftest build error
  drivers: of: add automated assignment of reserved regions to client devices
  of: Use proper types for checking memory overflow
  of: typo fix in __of_prop_dup()
  Adding selftest testdata dynamically into live tree
  of: Add todo tasklist for Devicetree
  of: Transactional DT support.
  of: Reorder device tree changes and notifiers
  of: Move dynamic node fixups out of powerpc and into common code
  of: Make sure attached nodes don't carry along extra children
  of: Make devicetree sysfs update functions consistent.
  of: Create unlocked versions of node and property add/remove functions
  OF: Utility helper functions for dynamic nodes
  of: Move CONFIG_OF_DYNAMIC code into a separate file
  of: rename of_aliases_mutex to just of_mutex
  of/platform: Fix of_platform_device_destroy iteration of devices
  of: Migrate of_find_node_by_name() users to for_each_node_by_name()
  tty: Update hypervisor tty drivers to use core stdout parsing code.
  arm/versatile: Add the uart as the stdout device.
  of: Enable console on serial ports specified by /chosen/stdout-path
  ...
parents cc8a44c6 663d3f7c

Documentation/devicetree/changesets.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
A DT changeset is a method which allows one to apply changes

in the live tree in such a way that either the full set of changes

will be applied, or none of them will be. If an error occurs partway

through applying the changeset, then the tree will be rolled back to the

previous state. A changeset can also be removed after it has been

applied.



When a changeset is applied, all of the changes get applied to the tree

at once before emitting OF_RECONFIG notifiers. This is so that the

receiver sees a complete and consistent state of the tree when it

receives the notifier.



The sequence of a changeset is as follows.



1. of_changeset_init() - initializes a changeset



2. A number of DT tree change calls, of_changeset_attach_node(),

of_changeset_detach_node(), of_changeset_add_property(),

of_changeset_remove_property, of_changeset_update_property() to prepare

a set of changes. No changes to the active tree are made at this point.

All the change operations are recorded in the of_changeset 'entries'

list.



3. mutex_lock(of_mutex) - starts a changeset; The global of_mutex

ensures there can only be one editor at a time.



4. of_changeset_apply() - Apply the changes to the tree. Either the

entire changeset will get applied, or if there is an error the tree will

be restored to the previous state



5. mutex_unlock(of_mutex) - All operations complete, release the mutex



If a successfully applied changeset needs to be removed, it can be done

with the following sequence.



1. mutex_lock(of_mutex)



2. of_changeset_revert()



3. mutex_unlock(of_mutex)

Documentation/devicetree/todo.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Todo list for devicetree:



=== General structure ===

- Switch from custom lists to (h)list_head for nodes and properties structure

- Remove of_allnodes list and iterate using list of child nodes alone



=== CONFIG_OF_DYNAMIC ===

- Switch to RCU for tree updates and get rid of global spinlock

- Document node lifecycle for CONFIG_OF_DYNAMIC

- Always set ->full_name at of_attach_node() time

- pseries: Get rid of open-coded tree modification from arch/powerpc/platforms/pseries/dlpar.c

arch/arm/boot/dts/versatile-ab.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
		i2c0 = &i2c0;

	};



	chosen {

		stdout-path = &uart0;

	};



	memory {

		reg = <0x0 0x08000000>;

	};

arch/arm/boot/dts/versatile-pb.dts

+0 −2
Original line number Diff line number Diff line
@@ -56,5 +56,3 @@ 
		};

	};

};
 


#include <testcases.dtsi>

arch/powerpc/kernel/prom.c

+0 −70
Original line number Diff line number Diff line
@@ -818,76 +818,6 @@ int cpu_to_chip_id(int cpu) 
}

EXPORT_SYMBOL(cpu_to_chip_id);



#ifdef CONFIG_PPC_PSERIES

/*

 * Fix up the uninitialized fields in a new device node:

 * name, type and pci-specific fields

 */



static int of_finish_dynamic_node(struct device_node *node)

{

	struct device_node *parent = of_get_parent(node);

	int err = 0;

	const phandle *ibm_phandle;



	node->name = of_get_property(node, "name", NULL);

	node->type = of_get_property(node, "device_type", NULL);



	if (!node->name)

		node->name = "<NULL>";

	if (!node->type)

		node->type = "<NULL>";



	if (!parent) {

		err = -ENODEV;

		goto out;

	}



	/* We don't support that function on PowerMac, at least

	 * not yet

	 */

	if (machine_is(powermac))

		return -ENODEV;



	/* fix up new node's phandle field */

	if ((ibm_phandle = of_get_property(node, "ibm,phandle", NULL)))

		node->phandle = *ibm_phandle;



out:

	of_node_put(parent);

	return err;

}



static int prom_reconfig_notifier(struct notifier_block *nb,

				  unsigned long action, void *node)

{

	int err;



	switch (action) {

	case OF_RECONFIG_ATTACH_NODE:

		err = of_finish_dynamic_node(node);

		if (err < 0)

			printk(KERN_ERR "finish_node returned %d\n", err);

		break;

	default:

		err = 0;

		break;

	}

	return notifier_from_errno(err);

}



static struct notifier_block prom_reconfig_nb = {

	.notifier_call = prom_reconfig_notifier,

	.priority = 10, /* This one needs to run first */

};



static int __init prom_reconfig_setup(void)

{

	return of_reconfig_notifier_register(&prom_reconfig_nb);

}

__initcall(prom_reconfig_setup);

#endif



bool arch_match_cpu_phys_id(int cpu, u64 phys_id)

{

	return (int)phys_id == get_hard_smp_processor_id(cpu);