Skip to contentSkip to conversation

Soundwire: Initialize multi_link with fwnode props

RFC PATCH In review Khalid Masum 5 participants 9 messages Aug 14, 2022 – Aug 15, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 Soundwire: Initialize multi_link with fwnode props

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

---
I do not think adding a new flag for fwnode_handle is a good idea. So, what would be the best way to initialize bus->multilink with fwnode props?

-- Khalid Masum

 drivers/soundwire/bus.c   | 4 ++--
 drivers/soundwire/intel.c | 1 +
 include/linux/fwnode.h    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/soundwire/bus.c +2 -2
index a2bfb0434a67..80df1672c60b 100644
@@ -74,9 +74,9 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
 	/*
 	 * Initialize multi_link flag
-	 * TODO: populate this flag by reading property from FW node
 	 */
-	bus->multi_link = false;
+	bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+		== FWNODE_FLAG_MULTI_LINKED;
 	if (bus->ops->read_prop) {
 		ret = bus->ops->read_prop(bus);
 		if (ret < 0) {
drivers/soundwire/intel.c +1 -0
index 505c5ef061e3..034d1c523ddf 100644
@@ -1347,6 +1347,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
 		 */
 		bus->multi_link = true;
 		bus->hw_sync_min_links = 1;
+		dev->fwnode->flags |= FWNODE_FLAG_MULTI_LINKED;
 	}
 
 	/* Initialize shim, controller */
include/linux/fwnode.h +1 -0
index 9a81c4410b9f..446a52744953 100644
@@ -32,6 +32,7 @@ struct device;
 #define FWNODE_FLAG_NOT_DEVICE			BIT(1)
 #define FWNODE_FLAG_INITIALIZED			BIT(2)
 #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD	BIT(3)
+#define FWNODE_FLAG_MULTI_LINKED		BIT(4)
 
 struct fwnode_handle {
 	struct fwnode_handle *secondary;
Signature · 1 line
2.37.1
#1 lore raw
Quoted 52 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

---
I do not think adding a new flag for fwnode_handle is a good idea. So, what would be the best way to initialize bus->multilink with fwnode props?

-- Khalid Masum

 drivers/soundwire/bus.c   | 4 ++--
 drivers/soundwire/intel.c | 1 +
 include/linux/fwnode.h    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/soundwire/bus.c +2 -2
index a2bfb0434a67..80df1672c60b 100644
@@ -74,9 +74,9 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
 	/*
 	 * Initialize multi_link flag
-	 * TODO: populate this flag by reading property from FW node
 	 */
-	bus->multi_link = false;
+	bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+		== FWNODE_FLAG_MULTI_LINKED;
 	if (bus->ops->read_prop) {
 		ret = bus->ops->read_prop(bus);
 		if (ret < 0) {
drivers/soundwire/intel.c +1 -0
index 505c5ef061e3..034d1c523ddf 100644
@@ -1347,6 +1347,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
 		 */
 		bus->multi_link = true;
 		bus->hw_sync_min_links = 1;
+		dev->fwnode->flags |= FWNODE_FLAG_MULTI_LINKED;
 	}
 
 	/* Initialize shim, controller */
include/linux/fwnode.h +0 -0
index 9a81c4410b9f..446a52744953 100644

include/linux/fwnode.h struct device; · line 35

Quoted 4 lines
include/linux/fwnode.h +1 -0
@@ -32,6 +32,7 @@ struct device;
 #define FWNODE_FLAG_NOT_DEVICE			BIT(1)
 #define FWNODE_FLAG_INITIALIZED			BIT(2)
 #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD	BIT(3)
+#define FWNODE_FLAG_MULTI_LINKED		BIT(4)

What does this commit actually change?

Did you test this on real hardware?

thanks,

greg k-h
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#2 lore raw
Quoted 47 lines · Greg KH
Quoted 46 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

---
I do not think adding a new flag for fwnode_handle is a good idea. So, what would be the best way to initialize bus->multilink with fwnode props?

-- Khalid Masum

  drivers/soundwire/bus.c   | 4 ++--
  drivers/soundwire/intel.c | 1 +
  include/linux/fwnode.h    | 1 +
  3 files changed, 4 insertions(+), 2 deletions(-)
drivers/soundwire/bus.c +2 -2
index a2bfb0434a67..80df1672c60b 100644
@@ -74,9 +74,9 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
  	/*
  	 * Initialize multi_link flag
-	 * TODO: populate this flag by reading property from FW node
  	 */
-	bus->multi_link = false;
+	bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+		== FWNODE_FLAG_MULTI_LINKED;
  	if (bus->ops->read_prop) {
  		ret = bus->ops->read_prop(bus);
  		if (ret < 0) {
drivers/soundwire/intel.c +1 -0
index 505c5ef061e3..034d1c523ddf 100644
@@ -1347,6 +1347,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
  		 */
  		bus->multi_link = true;
  		bus->hw_sync_min_links = 1;
+		dev->fwnode->flags |= FWNODE_FLAG_MULTI_LINKED;
  	}
 
Quoted 12 lines

include/linux/fwnode.h struct device; · line 35

Quoted 10 lines
drivers/soundwire/intel.c +0 -0
  	/* Initialize shim, controller */
include/linux/fwnode.h +1 -0
index 9a81c4410b9f..446a52744953 100644
@@ -32,6 +32,7 @@ struct device;
  #define FWNODE_FLAG_NOT_DEVICE			BIT(1)
  #define FWNODE_FLAG_INITIALIZED			BIT(2)
  #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD	BIT(3)
+#define FWNODE_FLAG_MULTI_LINKED		BIT(4)

What does this commit actually change?

The new flag will lets us save if the device has multilink in fwnode_handle whenever needed. Then for soundwire/intel, save the multi_link flag into fwnode during startup. Later at master_add, as written in todo, initialize the multilink flag with fwnode's flag property.

Quoted 2 lines

Did you test this on real hardware?

I did not test this on real hardware.

Quoted 4 lines

thanks,

greg k-h

thanks,
-- Khalid Masum

maintainer
#3 lore raw
Quoted 21 lines · Khalid Masum
Quoted 20 lines · Greg KH
Quoted 19 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

---
I do not think adding a new flag for fwnode_handle is a good idea. So, what would be the best way to initialize bus->multilink with fwnode props?

-- Khalid Masum

  drivers/soundwire/bus.c   | 4 ++--
  drivers/soundwire/intel.c | 1 +
  include/linux/fwnode.h    | 1 +
  3 files changed, 4 insertions(+), 2 deletions(-)
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
drivers/soundwire/bus.c +0 -0
index a2bfb0434a67..80df1672c60b 100644
Quoted 8 lines

drivers/soundwire/bus.c int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, · line 78

Quoted 8 lines
drivers/soundwire/bus.c +2 -2
@@ -74,9 +74,9 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
  	/*
  	 * Initialize multi_link flag
-	 * TODO: populate this flag by reading property from FW node
  	 */
-	bus->multi_link = false;
+	bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+		== FWNODE_FLAG_MULTI_LINKED;

I missed that this was an if statement here, please write this to be more obvious and readable.

Quoted 26 lines
Quoted 17 lines
Quoted 17 lines
drivers/soundwire/bus.c +0 -0
  	if (bus->ops->read_prop) {
  		ret = bus->ops->read_prop(bus);
  		if (ret < 0) {
drivers/soundwire/intel.c +1 -0
index 505c5ef061e3..034d1c523ddf 100644
@@ -1347,6 +1347,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
  		 */
  		bus->multi_link = true;
  		bus->hw_sync_min_links = 1;
+		dev->fwnode->flags |= FWNODE_FLAG_MULTI_LINKED;
  	}
  	/* Initialize shim, controller */
include/linux/fwnode.h +0 -1
index 9a81c4410b9f..446a52744953 100644
--- a/include/linux/fwnode.h
Quoted 8 lines

include/linux/fwnode.h struct device; · line 35

Quoted 6 lines

+++ b/include/linux/fwnode.h

include/linux/fwnode.h +1 -0
@@ -32,6 +32,7 @@ struct device;
  #define FWNODE_FLAG_NOT_DEVICE			BIT(1)
  #define FWNODE_FLAG_INITIALIZED			BIT(2)
  #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD	BIT(3)
+#define FWNODE_FLAG_MULTI_LINKED		BIT(4)

What does this commit actually change?

Quoted 6 lines

The new flag will lets us save if the device has multilink in fwnode_handle whenever needed.
Then for soundwire/intel, save the multi_link flag into fwnode during startup.
Later at master_add, as written in todo, initialize the multilink flag with fwnode's flag property.

And what does that allow to happen? What changes with all of this?

thanks,

greg k-h

#4 lore raw
Quoted 64 lines · Greg KH
Quoted 21 lines · Khalid Masum
Quoted 20 lines · Greg KH
Quoted 19 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

---
I do not think adding a new flag for fwnode_handle is a good idea. So, what would be the best way to initialize bus->multilink with fwnode props?

-- Khalid Masum

   drivers/soundwire/bus.c   | 4 ++--
   drivers/soundwire/intel.c | 1 +
   include/linux/fwnode.h    | 1 +
   3 files changed, 4 insertions(+), 2 deletions(-)
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
drivers/soundwire/bus.c +0 -0
index a2bfb0434a67..80df1672c60b 100644
Quoted 8 lines

drivers/soundwire/bus.c int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, · line 78

Quoted 8 lines
drivers/soundwire/bus.c +2 -2
@@ -74,9 +74,9 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
   	/*
   	 * Initialize multi_link flag
-	 * TODO: populate this flag by reading property from FW node
   	 */
-	bus->multi_link = false;
+	bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+		== FWNODE_FLAG_MULTI_LINKED;

I missed that this was an if statement here, please write this to be more obvious and readable.

Quoted 26 lines
Quoted 25 lines
Quoted 19 lines
drivers/soundwire/bus.c +0 -0
   	if (bus->ops->read_prop) {
   		ret = bus->ops->read_prop(bus);
   		if (ret < 0) {
drivers/soundwire/intel.c +1 -0
index 505c5ef061e3..034d1c523ddf 100644
@@ -1347,6 +1347,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
   		 */
   		bus->multi_link = true;
   		bus->hw_sync_min_links = 1;
+		dev->fwnode->flags |= FWNODE_FLAG_MULTI_LINKED;
   	}
   	/* Initialize shim, controller */
include/linux/fwnode.h +0 -0
index 9a81c4410b9f..446a52744953 100644

include/linux/fwnode.h struct device; · line 35

Quoted 4 lines
include/linux/fwnode.h +1 -0
@@ -32,6 +32,7 @@ struct device;
   #define FWNODE_FLAG_NOT_DEVICE			BIT(1)
   #define FWNODE_FLAG_INITIALIZED			BIT(2)
   #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD	BIT(3)
+#define FWNODE_FLAG_MULTI_LINKED		BIT(4)

What does this commit actually change?

Quoted 8 lines
Quoted 6 lines

The new flag will lets us save if the device has multilink in fwnode_handle whenever needed.
Then for soundwire/intel, save the multi_link flag into fwnode during startup.
Later at master_add, as written in todo, initialize the multilink flag with fwnode's flag property.

And what does that allow to happen? What changes with all of this?

As suggested by Pierre-Louis Bossart these changes are not necessary and the TODO is to be removed. Earlier my intention was to create a new flag that lets us know whether multi_link is to be read from sdw_bus_master_add just as instructed in TODO.

I shall send another patch, that removes the TODO, as suggested by Pierre-Louis Bossart.

Quoted 4 lines

thanks,

greg k-h

thanks,
-- Khalid Masum

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#5 lore raw
In reply to Khalid Masum
Quoted 6 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

...

drivers/soundwire/bus.c int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, · line 79

Quoted 7 lines

/*
* Initialize multi_link flag

drivers/soundwire/bus.c +2 -2
-        * TODO: populate this flag by reading property from FW node
         */
-       bus->multi_link = false;
+       bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+               == FWNODE_FLAG_MULTI_LINKED;

NAK (as far as I understood the context of the comment and the change itself).

These flags are for devlink, we do not mix FW properties with those internal flags anyhow. The comment suggests that this should be a property. Also commit message doesn't explain the relation to devlink.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw
Quoted 18 lines · Andy Shevchenko
Quoted 6 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

...

drivers/soundwire/bus.c int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, · line 79

Quoted 7 lines

/*
* Initialize multi_link flag

drivers/soundwire/bus.c +2 -2
-        * TODO: populate this flag by reading property from FW node
          */
-       bus->multi_link = false;
+       bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED)
+               == FWNODE_FLAG_MULTI_LINKED;
Quoted 6 lines

NAK (as far as I understood the context of the comment and the change itself).

These flags are for devlink, we do not mix FW properties with those internal flags anyhow. The comment suggests that this should be az property. Also commit message doesn't explain the relation to devlink.

That is a good information to know. Thanks.

I shall try to find out if I can somehow get multi_link's value from fwnode in any other way and look into devlink in the process.

If you have any suggestions regarding this TODO, please let me know.

Thanks,
-- Khalid Masum

#7 lore raw
Quoted 27 lines · Khalid Masum
Quoted 19 lines · Andy Shevchenko
Quoted 6 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

...

Quoted 7 lines

         /*
          * Initialize multi_link flag
-        * TODO: populate this flag by reading property from FW node */
-       bus->multi_link = false;
+       bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED) +               == FWNODE_FLAG_MULTI_LINKED;

Quoted 7 lines

NAK (as far as I understood the context of the comment and the change itself).

These flags are for devlink, we do not mix FW properties with those internal flags anyhow. The comment suggests that this should be az property. Also commit message doesn't explain the relation to devlink.

Quoted 6 lines

That is a good information to know. Thanks.

I shall try to find out if I can somehow get multi_link's value from fwnode in any other way and look into devlink in the process.

If you have any suggestions regarding this TODO, please let me know.

The suggestion is to remove the TODO and leave the code as is: the capabilities enabled for multi-link are required as part of the programming sequences, even when a stream uses a single link we still use the syncArm/syncGo sequences.

Please don't change this.

#8 lore raw
Quoted 35 lines · Pierre-Louis Bossart
Quoted 32 lines · Khalid Masum
Quoted 19 lines · Andy Shevchenko
Quoted 6 lines · Khalid Masum

According to the TODO, In sw_bus_master_add, bus->multi_link is to be populated with properties from FW node props. Make this happen by creating a new fwnode_handle flag FWNODE_FLAG_MULTI_LINKED and use the flag to store the multi_link value from intel_link_startup. Use this flag to initialize bus->multi_link.

...

Quoted 7 lines

         /*
          * Initialize multi_link flag
-        * TODO: populate this flag by reading property from FW node
          */
-       bus->multi_link = false;
+       bus->multi_link = (fwnode->flags & FWNODE_FLAG_MULTI_LINKED) +               == FWNODE_FLAG_MULTI_LINKED;

Quoted 7 lines

NAK (as far as I understood the context of the comment and the change itself).

These flags are for devlink, we do not mix FW properties with those internal flags anyhow. The comment suggests that this should be az property. Also commit message doesn't explain the relation to devlink.

That is a good information to know. Thanks.

I shall try to find out if I can somehow get multi_link's value from fwnode in any other way and look into devlink in the process.

Quoted 8 lines
Quoted 1 line

If you have any suggestions regarding this TODO, please let me know.

The suggestion is to remove the TODO and leave the code as is: the capabilities enabled for multi-link are required as part of the programming sequences, even when a stream uses a single link we still use the syncArm/syncGo sequences.

Please don't change this.

Thanks for the suggestion! I shall send a patch with the TODO removed, leaving the code as is.

-- Khalid Masum

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees