Skip to contentSkip to conversation

cxgb4: Allow for backward compatibility with new VPD scheme.

PATCH Applied Vipul Pandya 2 participants 8 messages Mar 8, 2013 – Mar 12, 2013

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

PATCH 1/1 cxgb4: Allow for backward compatibility with new VPD scheme.

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

---
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +9 -3
index 4ce6203..8049268 100644
@@ -497,8 +497,9 @@ int t4_memory_write(struct adapter *adap, int mtype, u32 addr, u32 len,
 }
 
 #define EEPROM_STAT_ADDR   0x7bfc
-#define VPD_BASE           0
 #define VPD_LEN            512
+#define VPD_BASE           0x400
+#define VPD_BASE_OLD       0
 
 /**
  *	t4_seeprom_wp - enable/disable EEPROM write protection
@@ -524,7 +525,7 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable)
 int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
 {
 	u32 cclk_param, cclk_val;
-	int i, ret;
+	int i, ret, addr;
 	int ec, sn;
 	u8 *vpd, csum;
 	unsigned int vpdr_len, kw_offset, id_len;
@@ -533,7 +534,12 @@ int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
 	if (!vpd)
 		return -ENOMEM;
 
-	ret = pci_read_vpd(adapter->pdev, VPD_BASE, VPD_LEN, vpd);
+	ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(u32), vpd);
+	if (ret < 0)
+		goto out;
+	addr = *vpd == 0x82 ? VPD_BASE : VPD_BASE_OLD;
+
+	ret = pci_read_vpd(adapter->pdev, addr, VPD_LEN, vpd);
 	if (ret < 0)
 		goto out;
 
Signature · 1 line
1.7.1
maintainer
#1 lore raw

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Isn't this a fix which is better targetted at 'net' than 'net-next'?

#2 lore raw
Quoted 10 lines · David Miller

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 7 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Quoted 5 lines
Quoted 2 lines

Isn't this a fix which is better targetted at 'net' than 'net-next'?

We have very soon new patch series coming up for net-next. This patch requires for that patch series to work correctly. So, we would like to get this merge in net-next tree.

Thanks,
Vipul

maintainer
#3 lore raw

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 11:21:51 +0530

Quoted 16 lines · David Miller
Quoted 13 lines

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Quoted 6 lines
Quoted 2 lines

Isn't this a fix which is better targetted at 'net' than 'net-next'?

We have very soon new patch series coming up for net-next. This patch requires for that patch series to work correctly. So, we would like to get this merge in net-next tree.

But you can achieve that by asking me to apply this to 'net' and then when the patch series that depends upon it is posted, you tell me about this dependency.

#4 lore raw
Quoted 22 lines · David Miller

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 11:21:51 +0530

Quoted 19 lines · David Miller
Quoted 15 lines

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Isn't this a fix which is better targetted at 'net' than 'net-next'?

Quoted 8 lines
Quoted 3 lines

We have very soon new patch series coming up for net-next. This patch requires for that patch series to work correctly. So, we would like to get this merge in net-next tree.

But you can achieve that by asking me to apply this to 'net' and then when the patch series that depends upon it is posted, you tell me about this dependency.

Ok. I was not aware of this. However there can be a merge conflict at the time of merging 'net' and 'net-next' tree if this patch gets applied in 'net' tree and our new patch series gets applied in 'net-next'. To avoid it we recommended the same. The merge conflict wont be a major and if it is alright to resolve it we can apply this patch to 'net' tree.

Thanks,
Vipul

maintainer
#5 lore raw

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 12:23:12 +0530

Quoted 33 lines · David Miller
Quoted 22 lines

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 11:21:51 +0530

Quoted 19 lines · David Miller
Quoted 15 lines

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Isn't this a fix which is better targetted at 'net' than 'net-next'?

Quoted 8 lines
Quoted 3 lines

We have very soon new patch series coming up for net-next. This patch requires for that patch series to work correctly. So, we would like to get this merge in net-next tree.

But you can achieve that by asking me to apply this to 'net' and then when the patch series that depends upon it is posted, you tell me about this dependency.

Quoted 5 lines

Ok. I was not aware of this. However there can be a merge conflict at the time of merging 'net' and 'net-next' tree if this patch gets applied in 'net' tree and our new patch series gets applied in 'net-next'. To avoid it we recommended the same. The merge conflict wont be a major and if it is alright to resolve it we can apply this patch to 'net' tree.

That's why you tell me to first pull net into net-next, and you send me a patch set for net-next which assumes the fix from 'net' is already applied.

#6 lore raw
Quoted 42 lines · David Miller

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 12:23:12 +0530

Quoted 33 lines · David Miller
Quoted 22 lines

From: Vipul Pandya <[email protected]>
Date: Mon, 11 Mar 2013 11:21:51 +0530

Quoted 19 lines · David Miller
Quoted 15 lines

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Isn't this a fix which is better targetted at 'net' than 'net-next'?

Quoted 8 lines
Quoted 3 lines

We have very soon new patch series coming up for net-next. This patch requires for that patch series to work correctly. So, we would like to get this merge in net-next tree.

But you can achieve that by asking me to apply this to 'net' and then when the patch series that depends upon it is posted, you tell me about this dependency.

Quoted 5 lines

Ok. I was not aware of this. However there can be a merge conflict at the time of merging 'net' and 'net-next' tree if this patch gets applied in 'net' tree and our new patch series gets applied in 'net-next'. To avoid it we recommended the same. The merge conflict wont be a major and if it is alright to resolve it we can apply this patch to 'net' tree.

Quoted 4 lines

That's why you tell me to first pull net into net-next, and you send me a patch set for net-next which assumes the fix from 'net' is already applied.

Ok, I will inform you about the patch dependency on 'net' tree when I post the patch series targeted for 'net-next'. Please consider applying this patch to net tree.

Thanks,
Vipul

maintainer Applied
#7 lore raw
In reply to Vipul Pandya

From: Vipul Pandya <[email protected]>
Date: Fri, 8 Mar 2013 19:05:29 +0530

Quoted 9 lines

From: Santosh Rastapur <[email protected]>

New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset 0x400 of the function. If no 3rd party VPD is present, then a copy of Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which requires the VPD to be present at offset 0x0.

Applied to 'net'.