Skip to contentSkip to conversation

thunderbolt: thunderbolt: add nvm specific operations for

PATCH In review Szuying Chen 3 participants 3 messages Aug 23, 2022

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

PATCH 2/2 thunderbolt: thunderbolt: add nvm specific operations for

From: Szuying Chen <[email protected]>

The patch depends on patch 1/2. Add nvm specific operations for ASMedia. And add tb_switch_nvm_upgradable() of enable firmware upgrade.

---
 drivers/thunderbolt/nvm.c    | 46 ++++++++++++++++++++++++++++++++++++
 drivers/thunderbolt/switch.c |  3 +++
 drivers/thunderbolt/tb.h     |  2 ++
 3 files changed, 51 insertions(+)
drivers/thunderbolt/nvm.c +46 -0
index 5c7c2a284497..d2ef22f8b19b 100644
@@ -15,6 +15,9 @@
 /* Switch NVM support */
 #define NVM_CSS		0x10
 
+/* ASMedia specific NVM offsets */
+#define ASMEDIA_NVM_VERSION	0x1c
+
 static DEFINE_IDA(nvm_ida);
 
 static inline int nvm_read(struct tb_switch *sw, unsigned int address,
@@ -116,11 +119,39 @@ static int intel_nvm_validate(struct tb_switch *sw)
 	return image_size;
 }
 
+static int asmedia_nvm_version(struct tb_switch *sw)
+{
+	struct tb_nvm *nvm = sw->nvm;
+	u64 val;
+	int ret;
+
+	ret = nvm_read(sw, ASMEDIA_NVM_VERSION, &val, sizeof(val));
+	if (ret)
+		return ret;
+
+	/* ASMedia NVM version show format include Firmware version and date xxxxxx.xxxxxx */
+	nvm->major = (((u8)val >> 0x18) << 0x10 | ((u8)(val >> 0x20)) << 0x8 | (u8)(val >> 0x28));
+	nvm->minor = (((u8)val) << 0x10 | ((u8)(val >> 0x8)) << 0x8 | (u8)(val >> 0x10));
+	nvm->nvm_size = SZ_512K;
+
+	return 0;
+}
+
+static void tb_switch_set_nvm_upgrade(struct tb_switch *sw)
+{
+	sw->no_nvm_upgrade = false;
+}
+
 struct tb_nvm_vendor_ops intel_switch_nvm_ops = {
 	.version = intel_nvm_version,
 	.validate = intel_nvm_validate,
 };
 
+struct tb_nvm_vendor_ops asmedia_switch_nvm_ops = {
+	.nvm_upgrade = tb_switch_set_nvm_upgrade,
+	.version = asmedia_nvm_version,
+};
+
 struct switch_nvm_vendor {
 	u16 vendor;
 	const struct tb_nvm_vendor_ops *vops;
@@ -129,8 +160,23 @@ struct switch_nvm_vendor {
 static const struct switch_nvm_vendor switch_nvm_vendors[] = {
 	{ 0x8086, &intel_switch_nvm_ops },
 	{ 0x8087, &intel_switch_nvm_ops },
+	{ 0x174c, &asmedia_switch_nvm_ops },
 };
 
+void tb_switch_nvm_upgradable(struct tb_switch *sw)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(switch_nvm_vendors); i++) {
+		const struct switch_nvm_vendor *v = &switch_nvm_vendors[i];
+
+		if (v->vendor == sw->config.vendor_id) {
+			if (v->vops->nvm_upgrade)
+				v->vops->nvm_upgrade(sw);
+		}
+	}
+}
+
 /**
  * tb_switch_nvm_alloc() - alloc nvm and set nvm->vops to point
  * the vendor specific operations.
drivers/thunderbolt/switch.c +3 -0
index d257219cb66e..23df70290ca2 100644
@@ -2829,6 +2829,9 @@ int tb_switch_add(struct tb_switch *sw)
 			return ret;
 	}
 
+	/* Enable the NVM firmware upgrade for specific vendors */
+	tb_switch_nvm_upgradable(sw);
+
 	ret = device_add(&sw->dev);
 	if (ret) {
 		dev_err(&sw->dev, "failed to add device: %d\n", ret);
drivers/thunderbolt/tb.h +2 -0
index 73ae2e093a92..8e2887e9c669 100644
@@ -75,6 +75,7 @@ enum tb_nvm_write_ops {
 struct tb_nvm_vendor_ops {
 	int (*version)(struct tb_switch *sw);
 	int (*validate)(struct tb_switch *sw);
+	void (*nvm_upgrade)(struct tb_switch *sw);
 };
 
 #define TB_SWITCH_KEY_SIZE		32
@@ -748,6 +749,7 @@ static inline void tb_domain_put(struct tb *tb)
 	put_device(&tb->dev);
 }
 
+void tb_switch_nvm_upgradable(struct tb_switch *sw);
 struct tb_nvm *tb_switch_nvm_alloc(struct tb_switch *sw);
 struct tb_nvm *tb_nvm_alloc(struct device *dev);
 int tb_nvm_add_active(struct tb_nvm *nvm, size_t size, nvmem_reg_read_t reg_read);

--
2.34.1

maintainer
#1 lore raw
Quoted 3 lines · Szuying Chen

From: Szuying Chen <[email protected]>

The patch depends on patch 1/2.

That's always implicit based on the naming scheme here, you never have to say this in the commit message (hint, look at all of the existing patches on the mailing list for how they are structured, there are thousands of examples.)

Quoted 5 lines

Add nvm specific operations for ASMedia.
And add tb_switch_nvm_upgradable() of enable firmware upgrade.

---

As the documentation asked you to, you did not version this patch set, nor say what is different from your previous ones :(

thanks,

greg k-h

#2 lore raw
In reply to Szuying Chen

Hi,

Quoted 4 lines · Szuying Chen

From: Szuying Chen <[email protected]>

The patch depends on patch 1/2. Add nvm specific operations for ASMedia. And add tb_switch_nvm_upgradable() of enable firmware upgrade.

Again the $subject and please call it NVM (capital letters) everywhere.

Quoted 29 lines
---
 drivers/thunderbolt/nvm.c    | 46 ++++++++++++++++++++++++++++++++++++
 drivers/thunderbolt/switch.c |  3 +++
 drivers/thunderbolt/tb.h     |  2 ++
 3 files changed, 51 insertions(+)
drivers/thunderbolt/nvm.c +6 -0
index 5c7c2a284497..d2ef22f8b19b 100644
@@ -15,6 +15,9 @@
 /* Switch NVM support */
 #define NVM_CSS		0x10
 
+/* ASMedia specific NVM offsets */
+#define ASMEDIA_NVM_VERSION	0x1c
+
 static DEFINE_IDA(nvm_ida);
 
 static inline int nvm_read(struct tb_switch *sw, unsigned int address,
@@ -116,11 +119,39 @@ static int intel_nvm_validate(struct tb_switch *sw)
 	return image_size;
 }
 
+static int asmedia_nvm_version(struct tb_switch *sw)
+{
+	struct tb_nvm *nvm = sw->nvm;

drivers/thunderbolt/nvm.c static int intel_nvm_validate(struct tb_switch *sw) · line 134

Quoted 10 lines
drivers/thunderbolt/nvm.c +10 -0
+	u64 val;
+	int ret;
+
+	ret = nvm_read(sw, ASMEDIA_NVM_VERSION, &val, sizeof(val));
+	if (ret)
+		return ret;
+
+	/* ASMedia NVM version show format include Firmware version and date xxxxxx.xxxxxx */
+	nvm->major = (((u8)val >> 0x18) << 0x10 | ((u8)(val >> 0x20)) << 0x8 | (u8)(val >> 0x28));
+	nvm->minor = (((u8)val) << 0x10 | ((u8)(val >> 0x8)) << 0x8 | (u8)(val >> 0x10));

Can you use some helperes to make this look nicer?

drivers/thunderbolt/nvm.c static int intel_nvm_validate(struct tb_switch *sw) · line 135

Quoted 1 line
drivers/thunderbolt/nvm.c +1 -0
+	nvm->nvm_size = SZ_512K;

Some explanation perhaps why 512K? Is it always the case even for the future NVMs? Can it be read somewhere?

Quoted 5 lines
drivers/thunderbolt/nvm.c +5 -0
+
+	return 0;
+}
+
+static void tb_switch_set_nvm_upgrade(struct tb_switch *sw)

drivers/thunderbolt/nvm.c static int intel_nvm_validate(struct tb_switch *sw) · line 150

Quoted 10 lines
drivers/thunderbolt/nvm.c +5 -0
+{
+	sw->no_nvm_upgrade = false;
+}
+
 struct tb_nvm_vendor_ops intel_switch_nvm_ops = {
 	.version = intel_nvm_version,
 	.validate = intel_nvm_validate,
 };
 
+struct tb_nvm_vendor_ops asmedia_switch_nvm_ops = {

const

drivers/thunderbolt/nvm.c struct switch_nvm_vendor { · line 163

Quoted 12 lines
drivers/thunderbolt/nvm.c +5 -0
+	.nvm_upgrade = tb_switch_set_nvm_upgrade,
+	.version = asmedia_nvm_version,
+};
+
 struct switch_nvm_vendor {
 	u16 vendor;
 	const struct tb_nvm_vendor_ops *vops;
@@ -129,8 +160,23 @@ struct switch_nvm_vendor {
 static const struct switch_nvm_vendor switch_nvm_vendors[] = {
 	{ 0x8086, &intel_switch_nvm_ops },
 	{ 0x8087, &intel_switch_nvm_ops },
+	{ 0x174c, &asmedia_switch_nvm_ops },

Ordering, I commented this already last time :(

drivers/thunderbolt/nvm.c struct switch_nvm_vendor { · line 165

Quoted 2 lines
drivers/thunderbolt/nvm.c +0 -0
 };
 

If you export it outside of this file, please write kernel-doc.

Quoted 36 lines
drivers/thunderbolt/nvm.c +14 -0
+void tb_switch_nvm_upgradable(struct tb_switch *sw)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(switch_nvm_vendors); i++) {
+		const struct switch_nvm_vendor *v = &switch_nvm_vendors[i];
+
+		if (v->vendor == sw->config.vendor_id) {
+			if (v->vops->nvm_upgrade)
+				v->vops->nvm_upgrade(sw);
+		}
+	}
+}
+
 /**
  * tb_switch_nvm_alloc() - alloc nvm and set nvm->vops to point
  * the vendor specific operations.
drivers/thunderbolt/switch.c +3 -0
index d257219cb66e..23df70290ca2 100644
@@ -2829,6 +2829,9 @@ int tb_switch_add(struct tb_switch *sw)
 			return ret;
 	}
 
+	/* Enable the NVM firmware upgrade for specific vendors */
+	tb_switch_nvm_upgradable(sw);
+
 	ret = device_add(&sw->dev);
 	if (ret) {
 		dev_err(&sw->dev, "failed to add device: %d\n", ret);
drivers/thunderbolt/tb.h +0 -0
index 73ae2e093a92..8e2887e9c669 100644

drivers/thunderbolt/tb.h enum tb_nvm_write_ops { · line 78

Quoted 4 lines
drivers/thunderbolt/tb.h +1 -0
@@ -75,6 +75,7 @@ enum tb_nvm_write_ops {
 struct tb_nvm_vendor_ops {
 	int (*version)(struct tb_switch *sw);
 	int (*validate)(struct tb_switch *sw);
+	void (*nvm_upgrade)(struct tb_switch *sw);

Kernel-doc for this too, well and the rest.

drivers/thunderbolt/tb.h static inline void tb_domain_put(struct tb *tb) · line 752

Quoted 8 lines
drivers/thunderbolt/tb.h +1 -0
 };
 
 #define TB_SWITCH_KEY_SIZE		32
@@ -748,6 +749,7 @@ static inline void tb_domain_put(struct tb *tb)
 	put_device(&tb->dev);
 }
 
+void tb_switch_nvm_upgradable(struct tb_switch *sw);

Same comment about the location. Also is it "upgradeable"?

Quoted 5 lines
drivers/thunderbolt/tb.h +0 -1
 struct tb_nvm *tb_switch_nvm_alloc(struct tb_switch *sw);
 struct tb_nvm *tb_nvm_alloc(struct device *dev);
 int tb_nvm_add_active(struct tb_nvm *nvm, size_t size, nvmem_reg_read_t reg_read);
--

2.34.1