of: __of_detach_node() - remove node from phandle cache (5801169a) · Commits · 戴 / test

drivers/of/base.c

+30 −1

Original line number	Diff line number	Diff line
		@@ -169,6 +169,28 @@ int of_free_phandle_cache(void)
		late_initcall_sync(of_free_phandle_cache);
		#endif

		/*
		* Caller must hold devtree_lock.
		*/
		void __of_free_phandle_cache_entry(phandle handle)
		{
		phandle masked_handle;
		struct device_node *np;

		if (!handle)
		return;

		masked_handle = handle & phandle_cache_mask;

		if (phandle_cache) {
		np = phandle_cache[masked_handle];
		if (np && handle == np->phandle) {
		of_node_put(np);
		phandle_cache[masked_handle] = NULL;
		}
		}
		}

		void of_populate_phandle_cache(void)
		{
		unsigned long flags;
		@@ -1214,11 +1236,18 @@ struct device_node *of_find_node_by_phandle(phandle handle)
		if (phandle_cache[masked_handle] &&
		handle == phandle_cache[masked_handle]->phandle)
		np = phandle_cache[masked_handle];
		if (np && of_node_check_flag(np, OF_DETACHED)) {
		WARN_ON(1); /* did not uncache np on node removal */
		of_node_put(np);
		phandle_cache[masked_handle] = NULL;
		np = NULL;
		}
		}

		if (!np) {
		for_each_of_allnodes(np)
		if (np->phandle == handle) {
		if (np->phandle == handle &&
		!of_node_check_flag(np, OF_DETACHED)) {
		if (phandle_cache) {
		/* will put when removed from cache */
		of_node_get(np);

+3 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,9 @@ void __of_detach_node(struct device_node *np)
		}

		of_node_set_flag(np, OF_DETACHED);

		/* race with of_find_node_by_phandle() prevented by devtree_lock */
		__of_free_phandle_cache_entry(np->phandle);
		}

		/**

+4 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,10 @@ static inline void __of_detach_node_sysfs(struct device_node *np) {}
		int of_resolve_phandles(struct device_node *tree);
		#endif

		#if defined(CONFIG_OF_DYNAMIC)
		void __of_free_phandle_cache_entry(phandle handle);
		#endif

		#if defined(CONFIG_OF_OVERLAY)
		void of_overlay_mutex_lock(void);
		void of_overlay_mutex_unlock(void);