Merge tag 'devprop-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (35f7a952) · Commits · 戴 / test

drivers/acpi/property.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1210,7 +1210,7 @@ static struct fwnode_handle *acpi_graph_get_child_prop_value(


		/**
		* acpi_graph_get_remote_enpoint - Parses and returns remote end of an endpoint
		* acpi_graph_get_remote_endpoint - Parses and returns remote end of an endpoint
		* @fwnode: Endpoint firmware node pointing to a remote device
		* @endpoint: Firmware node of remote endpoint is filled here if not %NULL
		*

drivers/base/swnode.c

+38 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ EXPORT_SYMBOL_GPL(is_software_node);
		static struct swnode *
		software_node_to_swnode(const struct software_node *node)
		{
		struct swnode *swnode;
		struct swnode *swnode = NULL;
		struct kobject *k;

		if (!node)
		@@ -620,6 +620,43 @@ static const struct fwnode_operations software_node_ops = {

		/* -------------------------------------------------------------------------- */

		/**
		* software_node_find_by_name - Find software node by name
		* @parent: Parent of the software node
		* @name: Name of the software node
		*
		* The function will find a node that is child of @parent and that is named
		* @name. If no node is found, the function returns NULL.
		*
		* NOTE: you will need to drop the reference with fwnode_handle_put() after use.
		*/
		const struct software_node *
		software_node_find_by_name(const struct software_node parent, const char name)
		{
		struct swnode *swnode = NULL;
		struct kobject *k;

		if (!name)
		return NULL;

		spin_lock(&swnode_kset->list_lock);

		list_for_each_entry(k, &swnode_kset->list, entry) {
		swnode = kobj_to_swnode(k);
		if (parent == swnode->node->parent && swnode->node->name &&
		!strcmp(name, swnode->node->name)) {
		kobject_get(&swnode->kobj);
		break;
		}
		swnode = NULL;
		}

		spin_unlock(&swnode_kset->list_lock);

		return swnode ? swnode->node : NULL;
		}
		EXPORT_SYMBOL_GPL(software_node_find_by_name);

		static int
		software_node_register_properties(struct software_node *node,
		const struct property_entry *properties)

drivers/platform/x86/intel_cht_int33fe.c

+10 −47

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ enum {
		INT33FE_NODE_MAX17047,
		INT33FE_NODE_PI3USB30532,
		INT33FE_NODE_DISPLAYPORT,
		INT33FE_NODE_ROLE_SWITCH,
		INT33FE_NODE_USB_CONNECTOR,
		INT33FE_NODE_MAX,
		};
		@@ -45,7 +44,6 @@ struct cht_int33fe_data {
		struct i2c_client *pi3usb30532;

		struct fwnode_handle *dp;
		struct fwnode_handle *mux;
		};

		static const struct software_node nodes[];
		@@ -139,46 +137,10 @@ static const struct software_node nodes[] = {
		{ "max17047", NULL, max17047_props },
		{ "pi3usb30532" },
		{ "displayport" },
		{ "usb-role-switch" },
		{ "connector", &nodes[0], usb_connector_props, usb_connector_refs },
		{ }
		};

		static int cht_int33fe_setup_mux(struct cht_int33fe_data *data)
		{
		struct fwnode_handle *fwnode;
		struct device *dev;
		struct device *p;

		fwnode = software_node_fwnode(&nodes[INT33FE_NODE_ROLE_SWITCH]);
		if (!fwnode)
		return -ENODEV;

		/* First finding the platform device */
		p = bus_find_device_by_name(&platform_bus_type, NULL,
		"intel_xhci_usb_sw");
		if (!p)
		return -EPROBE_DEFER;

		/* Then the mux child device */
		dev = device_find_child_by_name(p, "intel_xhci_usb_sw-role-switch");
		put_device(p);
		if (!dev)
		return -EPROBE_DEFER;

		/* If there already is a node for the mux, using that one. */
		if (dev->fwnode)
		fwnode_remove_software_node(fwnode);
		else
		dev->fwnode = fwnode;

		data->mux = fwnode_handle_get(dev->fwnode);
		put_device(dev);
		mux_ref.node = to_software_node(data->mux);

		return 0;
		}

		static int cht_int33fe_setup_dp(struct cht_int33fe_data *data)
		{
		struct fwnode_handle *fwnode;
		@@ -211,10 +173,9 @@ static void cht_int33fe_remove_nodes(struct cht_int33fe_data *data)
		{
		software_node_unregister_nodes(nodes);

		if (data->mux) {
		fwnode_handle_put(data->mux);
		if (mux_ref.node) {
		fwnode_handle_put(software_node_fwnode(mux_ref.node));
		mux_ref.node = NULL;
		data->mux = NULL;
		}

		if (data->dp) {
		@@ -235,14 +196,16 @@ static int cht_int33fe_add_nodes(struct cht_int33fe_data *data)
		/* The devices that are not created in this driver need extra steps. */

		/*
		* There is no ACPI device node for the USB role mux, so we need to find
		* the mux device and assign our node directly to it. That means we
		* depend on the mux driver. This function will return -PROBE_DEFER
		* until the mux device is registered.
		* There is no ACPI device node for the USB role mux, so we need to wait
		* until the mux driver has created software node for the mux device.
		* It means we depend on the mux driver. This function will return
		* -EPROBE_DEFER until the mux device is registered.
		*/
		ret = cht_int33fe_setup_mux(data);
		if (ret)
		mux_ref.node = software_node_find_by_name(NULL, "intel-xhci-usb-sw");
		if (!mux_ref.node) {
		ret = -EPROBE_DEFER;
		goto err_remove_nodes;
		}

		/*
		* The DP connector does have ACPI device node. In this case we can just

drivers/usb/roles/intel-xhci-usb-role-switch.c

+20 −7

Original line number	Diff line number	Diff line
		@@ -39,6 +39,10 @@ struct intel_xhci_usb_data {
		void __iomem *base;
		};

		static const struct software_node intel_xhci_usb_node = {
		"intel-xhci-usb-sw",
		};

		static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
		{
		struct intel_xhci_usb_data *data = dev_get_drvdata(dev);
		@@ -122,17 +126,13 @@ static enum usb_role intel_xhci_usb_get_role(struct device *dev)
		return role;
		}

		static const struct usb_role_switch_desc sw_desc = {
		.set = intel_xhci_usb_set_role,
		.get = intel_xhci_usb_get_role,
		.allow_userspace_control = true,
		};

		static int intel_xhci_usb_probe(struct platform_device *pdev)
		{
		struct usb_role_switch_desc sw_desc = { };
		struct device *dev = &pdev->dev;
		struct intel_xhci_usb_data *data;
		struct resource *res;
		int ret;

		data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
		if (!data)
		@@ -147,9 +147,20 @@ static int intel_xhci_usb_probe(struct platform_device *pdev)

		platform_set_drvdata(pdev, data);

		ret = software_node_register(&intel_xhci_usb_node);
		if (ret)
		return ret;

		sw_desc.set = intel_xhci_usb_set_role,
		sw_desc.get = intel_xhci_usb_get_role,
		sw_desc.allow_userspace_control = true,
		sw_desc.fwnode = software_node_fwnode(&intel_xhci_usb_node);

		data->role_sw = usb_role_switch_register(dev, &sw_desc);
		if (IS_ERR(data->role_sw))
		if (IS_ERR(data->role_sw)) {
		fwnode_handle_put(sw_desc.fwnode);
		return PTR_ERR(data->role_sw);
		}

		pm_runtime_set_active(dev);
		pm_runtime_enable(dev);
		@@ -164,6 +175,8 @@ static int intel_xhci_usb_remove(struct platform_device *pdev)
		pm_runtime_disable(&pdev->dev);

		usb_role_switch_unregister(data->role_sw);
		fwnode_handle_put(software_node_fwnode(&intel_xhci_usb_node));

		return 0;
		}

include/linux/fwnode.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -110,10 +110,11 @@ struct fwnode_operations {
		(fwnode ? (fwnode_has_op(fwnode, op) ? \
		(fwnode)->ops->op(fwnode, ## __VA_ARGS__) : -ENXIO) : \
		-EINVAL)

		#define fwnode_call_bool_op(fwnode, op, ...) \
		(fwnode ? (fwnode_has_op(fwnode, op) ? \
		(fwnode)->ops->op(fwnode, ## __VA_ARGS__) : false) : \
		false)
		(fwnode_has_op(fwnode, op) ? \
		(fwnode)->ops->op(fwnode, ## __VA_ARGS__) : false)

		#define fwnode_call_ptr_op(fwnode, op, ...) \
		(fwnode_has_op(fwnode, op) ? \
		(fwnode)->ops->op(fwnode, ## __VA_ARGS__) : NULL)

Admin message