Skip to contentSkip to conversation

Remove one more platform_device_add_properties() call

PATCH Superseded Heikki Krogerus 5 participants 16 messages Jan 11, 2021 – Jan 15, 2021

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Heikki Krogerus

author reviewer
#0 lore raw

v2 cover Remove one more platform_device_add_properties() call

Hi Felipe, Rafael,

This is the second version of this series. There are no real changes, but I added the Tiger Lake ID patch to this series in hope that it will make your life a bit easier, assuming that Rafael will still pick these.

The original over letter:

I originally introduced these as part of my series where I was proposing PM ops for software nodes [1], but since that still needs work, I'm sending these two separately.

So basically I'm only modifying dwc3-pci.c so it registers a software node directly at this point. That will remove one more user of platform_device_add_properties().

[1] https://lore.kernel.org/lkml/[email protected]/

thanks,

Heikki Krogerus (3):
software node: Introduce device_add_software_node()
usb: dwc3: pci: Register a software node for the dwc3 platform device
usb: dwc3: pci: ID for Tiger Lake CPU

 drivers/base/swnode.c       | 69 ++++++++++++++++++++++++++++++++-----
 drivers/usb/dwc3/dwc3-pci.c | 65 +++++++++++++++++++++-------------
 include/linux/property.h    |  3 ++
 3 files changed, 104 insertions(+), 33 deletions(-)
Signature · 1 line
2.29.2
author reviewer
#1 lore raw

PATCH v2 1/3 software node: Introduce device_add_software_node()

This helper will register a software node and then assign it to device at the same time. The function will also make sure that the device can't have more than one software node.

---
 drivers/base/swnode.c    | 69 ++++++++++++++++++++++++++++++++++------
 include/linux/property.h |  3 ++
 2 files changed, 63 insertions(+), 9 deletions(-)
drivers/base/swnode.c +60 -9
index 4a4b2008fbc26..60a8501a4976c 100644
@@ -48,6 +48,19 @@ EXPORT_SYMBOL_GPL(is_software_node);
 				     struct swnode, fwnode) : NULL;	\
 	})
 
+static inline struct swnode *dev_to_swnode(struct device *dev)
+{
+	struct fwnode_handle *fwnode = dev_fwnode(dev);
+
+	if (!fwnode)
+		return NULL;
+
+	if (!is_software_node(fwnode))
+		fwnode = fwnode->secondary;
+
+	return to_swnode(fwnode);
+}
+
 static struct swnode *
 software_node_to_swnode(const struct software_node *node)
 {
@@ -843,22 +856,60 @@ void fwnode_remove_software_node(struct fwnode_handle *fwnode)
 }
 EXPORT_SYMBOL_GPL(fwnode_remove_software_node);
 
+/**
+ * device_add_software_node - Assign software node to a device
+ * @dev: The device the software node is meant for.
+ * @swnode: The software node.
+ *
+ * This function will register @swnode and make it the secondary firmware node
+ * pointer of @dev. If @dev has no primary node, then @swnode will become the primary
+ * node.
+ */
+int device_add_software_node(struct device *dev, const struct software_node *swnode)
+{
+	int ret;
+
+	/* Only one software node per device. */
+	if (dev_to_swnode(dev))
+		return -EBUSY;
+
+	ret = software_node_register(swnode);
+	if (ret)
+		return ret;
+
+	set_secondary_fwnode(dev, software_node_fwnode(swnode));
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(device_add_software_node);
+
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);
+
 int software_node_notify(struct device *dev, unsigned long action)
 {
-	struct fwnode_handle *fwnode = dev_fwnode(dev);
 	struct swnode *swnode;
 	int ret;
 
-	if (!fwnode)
-		return 0;
-
-	if (!is_software_node(fwnode))
-		fwnode = fwnode->secondary;
-	if (!is_software_node(fwnode))
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
 		return 0;
 
-	swnode = to_swnode(fwnode);
-
 	switch (action) {
 	case KOBJ_ADD:
 		ret = sysfs_create_link(&dev->kobj, &swnode->kobj,
include/linux/property.h +3 -0
index 0a9001fe7aeab..b0e413dc59271 100644
@@ -488,4 +488,7 @@ fwnode_create_software_node(const struct property_entry *properties,
 			    const struct fwnode_handle *parent);
 void fwnode_remove_software_node(struct fwnode_handle *fwnode);
 
+int device_add_software_node(struct device *dev, const struct software_node *swnode);
+void device_remove_software_node(struct device *dev);
+
 #endif /* _LINUX_PROPERTY_H_ */
Signature · 1 line
2.29.2
reviewer Reviewed-by on v2 1/3
#2 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Hi Heikki

Quoted 7 lines · Heikki Krogerus

This helper will register a software node and then assign it to device at the same time. The function will also make sure that the device can't have more than one software node.

---

I like this change. One comment below, but for what it's worth:

Quoted 7 lines
drivers/base/swnode.c +7 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 10 lines
drivers/base/swnode.c +10 -0
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Quoted 35 lines
drivers/base/swnode.c +3 -9
+
 int software_node_notify(struct device *dev, unsigned long action)
 {
-	struct fwnode_handle *fwnode = dev_fwnode(dev);
 	struct swnode *swnode;
 	int ret;
 
-	if (!fwnode)
-		return 0;
-
-	if (!is_software_node(fwnode))
-		fwnode = fwnode->secondary;
-	if (!is_software_node(fwnode))
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
 		return 0;
 
-	swnode = to_swnode(fwnode);
-
 	switch (action) {
 	case KOBJ_ADD:
 		ret = sysfs_create_link(&dev->kobj, &swnode->kobj,
include/linux/property.h +3 -0
index 0a9001fe7aeab..b0e413dc59271 100644
@@ -488,4 +488,7 @@ fwnode_create_software_node(const struct property_entry *properties,
 			    const struct fwnode_handle *parent);
 void fwnode_remove_software_node(struct fwnode_handle *fwnode);
 
+int device_add_software_node(struct device *dev, const struct software_node *swnode);
+void device_remove_software_node(struct device *dev);
+
 #endif /* _LINUX_PROPERTY_H_ */
author reviewer
#3 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Hi Daniel,

Quoted 7 lines · Daniel Scally

Hi Heikki

Quoted 4 lines · Heikki Krogerus

This helper will register a software node and then assign it to device at the same time. The function will also make sure that the device can't have more than one software node.

Quoted 7 lines
Quoted 3 lines

---

I like this change. One comment below, but for what it's worth:

Thanks!

Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

We can't do that here unfortunately. Other places still have a reference to the swnode at this point and they may still need to access it using the dev_fwnode(dev)->secondary pointer.

Signature · 1 line
heikki
#4 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Quoted 2 lines · Heikki Krogerus
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Actually it's a good question.

Quoted 3 lines

We can't do that here unfortunately. Other places still have a reference to the swnode at this point and they may still need to access it using the dev_fwnode(dev)->secondary pointer.

Yeah, but in this case we potentially leave a dangling pointer when last of the user gone and kobject_put() will call for release.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#5 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Quoted 27 lines · Andy Shevchenko
Quoted 2 lines · Heikki Krogerus
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Quoted 8 lines

Actually it's a good question.

Quoted 3 lines

We can't do that here unfortunately. Other places still have a reference to the swnode at this point and they may still need to access it using the dev_fwnode(dev)->secondary pointer.

Yeah, but in this case we potentially leave a dangling pointer when last of the user gone and kobject_put() will call for release.

The caller has to be responsible of setting the secondary back to ERR_PTR(-ENODEV). We can not do anything here like I explained. We can not even do that in software_node_notify() when the association to the struct device is removed, because the fwnode->secondary is still accessed after that. The caller needs to remove both the node and the device, and only after that it is safe to set the secondary back to ERR_PTR(-ENODEV).

This clearly needs to explained in the comment... I'll fix it.

thanks,

Signature · 1 line
heikki
author reviewer
#6 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Quoted 37 lines · Heikki Krogerus
Quoted 27 lines · Andy Shevchenko
Quoted 2 lines · Heikki Krogerus
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Quoted 8 lines

Actually it's a good question.

Quoted 3 lines

We can't do that here unfortunately. Other places still have a reference to the swnode at this point and they may still need to access it using the dev_fwnode(dev)->secondary pointer.

Yeah, but in this case we potentially leave a dangling pointer when last of the user gone and kobject_put() will call for release.

Quoted 7 lines

The caller has to be responsible of setting the secondary back to ERR_PTR(-ENODEV). We can not do anything here like I explained. We can not even do that in software_node_notify() when the association to the struct device is removed, because the fwnode->secondary is still accessed after that. The caller needs to remove both the node and the device, and only after that it is safe to set the secondary back to ERR_PTR(-ENODEV).

I studied the code again, and it actually looks like this is only a problem when device_add_properties() is used and there is an expectation that the node/properties are removed automatically in device_del().

When this new API is used, the only place that needs to access the swnode using the secondary pointer is software_node_notify(), so if we simply handle that separately here, we should be able to clear the secondary pointer after all. It would look something like this:

        void device_remove_software_node(struct device *dev)
        {
        	struct swnode *swnode;
        
        	swnode = dev_to_swnode(dev);
        	if (!swnode)
        		return;
        
                software_node_notify(dev, KOBJ_REMOVE);
                set_secondary_fwnode(dev, NULL);
        	kobject_put(&swnode->kobj);
        }

I'll test that, and if it works, and you guys don't see any problems with it, I'll use it in v3.

Br,

Signature · 1 line
heikki
#7 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

In reply to Daniel Scally
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Looking more into this code I think we need to call

	set_secondary_fwnode(dev, NULL);

among these lines.

The real problem is that set_primary_fwnode() and set_secondary_fwnode() have no reference counting. If we have a chain ->primary->secondary->-ENODEV is being used somewhere we can't tell from here.

So, in practice it means that we lack of some kind of primary node to increment reference count of the secondary node when the latter is chained to the given primary. But it makes things too complicated. Any other options for shared primary-secondary chain? Standalone primary along with standalone (exclusive) secondary doesn't need this AFAICS. Perhaps a flag to primary like shared / exclusive that will prevent breaking the chain in set_secondary_fwnode()?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#8 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Quoted 36 lines · Andy Shevchenko
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Looking more into this code I think we need to call

	set_secondary_fwnode(dev, NULL);

among these lines.

The real problem is that set_primary_fwnode() and set_secondary_fwnode() have no reference counting. If we have a chain ->primary->secondary->-ENODEV is being used somewhere we can't tell from here.

Quoted 6 lines

So, in practice it means that we lack of some kind of primary node to increment reference count of the secondary node when the latter is chained to the given primary. But it makes things too complicated. Any other options for shared primary-secondary chain? Standalone primary along with standalone (exclusive) secondary doesn't need this AFAICS. Perhaps a flag to primary like shared / exclusive that will prevent breaking the chain in set_secondary_fwnode()?

Or maybe I imagined only theoretical cases and we have no such issue?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#9 lore raw

Re: [PATCH v2 1/3] software node: Introduce device_add_software_node()

Quoted 37 lines · Andy Shevchenko
Quoted 36 lines · Andy Shevchenko
Quoted 1 line · Daniel Scally

On 11/01/2021 14:10, Heikki Krogerus wrote:

...

Quoted 12 lines
Quoted 12 lines
drivers/base/swnode.c +12 -0
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+	struct swnode *swnode;
+
+	swnode = dev_to_swnode(dev);
+	if (!swnode)
Quoted 8 lines

drivers/base/swnode.c void fwnode_remove_software_node(struct fwnode_handle *fwnode) · line 902

Quoted 5 lines
drivers/base/swnode.c +5 -0
+		return;
+
+	kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);

I wonder if this also ought to set dev_fwnode(dev)->secondary back to ERR_PTR(-ENODEV)?

Looking more into this code I think we need to call

	set_secondary_fwnode(dev, NULL);

among these lines.

The real problem is that set_primary_fwnode() and set_secondary_fwnode() have no reference counting. If we have a chain ->primary->secondary->-ENODEV is being used somewhere we can't tell from here.

Quoted 8 lines
Quoted 6 lines

So, in practice it means that we lack of some kind of primary node to increment reference count of the secondary node when the latter is chained to the given primary. But it makes things too complicated. Any other options for shared primary-secondary chain? Standalone primary along with standalone (exclusive) secondary doesn't need this AFAICS. Perhaps a flag to primary like shared / exclusive that will prevent breaking the chain in set_secondary_fwnode()?

Or maybe I imagined only theoretical cases and we have no such issue?

I think we should really start looking into the possibility of removing the whole secondary coupling, because that is the thing that is crippling us.

Br,

Signature · 1 line
heikki
author reviewer
#10 lore raw

PATCH v2 2/3 usb: dwc3: pci: Register a software node for the dwc3 platform device

In reply to Heikki Krogerus

By registering the software node directly instead of just the properties in it, the driver can take advantage of also the other features the software nodes have.

---
 drivers/usb/dwc3/dwc3-pci.c | 61 ++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 24 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +37 -24
index bae6a70664c80..037bc21bffa66 100644
@@ -142,6 +142,18 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
 	{}
 };
 
+static const struct software_node dwc3_pci_intel_swnode = {
+	.properties = dwc3_pci_intel_properties,
+};
+
+static const struct software_node dwc3_pci_intel_mrfld_swnode = {
+	.properties = dwc3_pci_mrfld_properties,
+};
+
+static const struct software_node dwc3_pci_amd_swnode = {
+	.properties = dwc3_pci_amd_properties,
+};
+
 static int dwc3_pci_quirks(struct dwc3_pci *dwc)
 {
 	struct pci_dev			*pdev = dwc->pci;
@@ -222,7 +234,6 @@ static void dwc3_pci_resume_work(struct work_struct *work)
 
 static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 {
-	struct property_entry *p = (struct property_entry *)id->driver_data;
 	struct dwc3_pci		*dwc;
 	struct resource		res[2];
 	int			ret;
@@ -265,7 +276,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	dwc->dwc3->dev.parent = dev;
 	ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev));
 
-	ret = platform_device_add_properties(dwc->dwc3, p);
+	ret = device_add_software_node(&dwc->dwc3->dev, (void *)id->driver_data);
 	if (ret < 0)
 		goto err;
 
@@ -288,6 +299,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 
 	return 0;
 err:
+	device_remove_software_node(&dwc->dwc3->dev);
 	platform_device_put(dwc->dwc3);
 	return ret;
 }
@@ -304,75 +316,76 @@ static void dwc3_pci_remove(struct pci_dev *pci)
 #endif
 	device_init_wakeup(&pci->dev, false);
 	pm_runtime_get(&pci->dev);
+	device_remove_software_node(&dwc->dwc3->dev);
 	platform_device_unregister(dwc->dwc3);
 }
 
 static const struct pci_device_id dwc3_pci_id_table[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BSW),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BYT),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),
-	  (kernel_ulong_t) &dwc3_pci_mrfld_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTH),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT_M),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_APL),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_KBP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_GLK),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPH),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPV),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPH),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),
-	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),
-	  (kernel_ulong_t) &dwc3_pci_amd_properties, },
+	  (kernel_ulong_t) &dwc3_pci_amd_swnode, },
 	{  }	/* Terminating Entry */
 };
 MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
Signature · 1 line
2.29.2
author reviewer
#11 lore raw

PATCH v2 3/3 usb: dwc3: pci: ID for Tiger Lake CPU

In reply to Heikki Krogerus

Tiger Lake SOC (the versions of it that have integrated USB4 controller) may have two DWC3 controllers. One is part of the PCH (Platform Controller Hub, i.e. the chipset) as usual, and the other is inside the actual CPU block.

On all Intel platforms that have the two separate DWC3 controllers, the one inside the CPU handles USB3 and only USB3 traffic, while the PCH version handles USB2 and USB2 alone. The reason for splitting the two busses like this is to allow easy USB3 tunneling over USB4 connections. As USB2 is not tunneled over USB4, it has dedicated USB controllers (both xHCI and DWC3).

---
 drivers/usb/dwc3/dwc3-pci.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +4 -0
index 037bc21bffa66..51029cec119ed 100644
@@ -41,6 +41,7 @@
 #define PCI_DEVICE_ID_INTEL_TGPH		0x43ee
 #define PCI_DEVICE_ID_INTEL_JSP			0x4dee
 #define PCI_DEVICE_ID_INTEL_ADLS		0x7ae1
+#define PCI_DEVICE_ID_INTEL_TGL			0x9a15
 
 #define PCI_INTEL_BXT_DSM_GUID		"732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
 #define PCI_INTEL_BXT_FUNC_PMU_PWR	4
@@ -384,6 +385,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),
 	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL),
+	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },
+
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),
 	  (kernel_ulong_t) &dwc3_pci_amd_swnode, },
 	{  }	/* Terminating Entry */
Signature · 1 line
2.29.2
Acked-by on the v2 series
#12 lore raw
In reply to Heikki Krogerus
Quoted 18 lines · Heikki Krogerus

Hi Felipe, Rafael,

This is the second version of this series. There are no real changes, but I added the Tiger Lake ID patch to this series in hope that it will make your life a bit easier, assuming that Rafael will still pick these.

The original over letter:

I originally introduced these as part of my series where I was proposing PM ops for software nodes [1], but since that still needs work, I'm sending these two separately.

So basically I'm only modifying dwc3-pci.c so it registers a software node directly at this point. That will remove one more user of platform_device_add_properties().

Quoted 8 lines

[1] https://lore.kernel.org/lkml/[email protected]/

thanks,

Heikki Krogerus (3):
software node: Introduce device_add_software_node()
usb: dwc3: pci: Register a software node for the dwc3 platform device
usb: dwc3: pci: ID for Tiger Lake CPU

Looks good to me.

Signature · 1 line
balbi
#13 lore raw
In reply to Heikki Krogerus
Quoted 6 lines · Heikki Krogerus

Hi Felipe, Rafael,

This is the second version of this series. There are no real changes, but I added the Tiger Lake ID patch to this series in hope that it will make your life a bit easier, assuming that Rafael will still pick these.

I can take all 3 of these if that makes it easier. Rafael, let me know what you want to do, either is fine with me.

thanks,

greg k-h

#14 lore raw
Quoted 10 lines · Greg KH
Quoted 6 lines · Heikki Krogerus

Hi Felipe, Rafael,

This is the second version of this series. There are no real changes, but I added the Tiger Lake ID patch to this series in hope that it will make your life a bit easier, assuming that Rafael will still pick these.

I can take all 3 of these if that makes it easier. Rafael, let me know what you want to do, either is fine with me.

I've added it to my usb-next branch now.

thanks,

greg k-h

#15 lore raw
Quoted 9 lines · Greg KH
Quoted 8 lines · Greg KH
Quoted 6 lines · Heikki Krogerus

Hi Felipe, Rafael,

This is the second version of this series. There are no real changes, but I added the Tiger Lake ID patch to this series in hope that it will make your life a bit easier, assuming that Rafael will still pick these.

Quoted 4 lines
Quoted 2 lines

I can take all 3 of these if that makes it easier. Rafael, let me know what you want to do, either is fine with me.

I've added it to my usb-next branch now.

Argh, grabbed the wrong one, will drop this and grab v3...