mlx4: Use official names for supported devices
Subsystems (2)
PATCH 1/1 mlx4: Use official names for supported devices
Use the official names for the supported devices as they are documented in
http://pciids.sourceforge.net/v2.2/pci.ids. The patch also removes device ID 0x6354 from the list of supported devices which is a none existent device.
--- drivers/net/mlx4/main.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)
drivers/net/mlx4/main.c +9 -10
@@ -1272,16 +1272,15 @@ int mlx4_restart_one(struct pci_dev *pdev) }static struct pci_device_id mlx4_pci_table[] = { - {PCI_VDEVICE (MELLANOX ,0x6340 ) },/* MT25408 "Hermon" SDR */ - {PCI_VDEVICE (MELLANOX ,0x634a ) },/* MT25408 "Hermon" DDR */ - {PCI_VDEVICE (MELLANOX ,0x6354 ) },/* MT25408 "Hermon" QDR */ - {PCI_VDEVICE (MELLANOX ,0x6732 ) },/* MT25408 "Hermon" DDR PCIe gen2 */ - {PCI_VDEVICE (MELLANOX ,0x673c ) },/* MT25408 "Hermon" QDR PCIe gen2 */ - {PCI_VDEVICE (MELLANOX ,0x6368 ) },/* MT25408 "Hermon" EN 10GigE */ - {PCI_VDEVICE (MELLANOX ,0x6750 ) },/* MT25408 "Hermon" EN 10GigE PCIe gen2 */ - {PCI_VDEVICE (MELLANOX ,0x6372 ) },/* MT25458 ConnectX EN 10GBASE-T 10GigE */ - {PCI_VDEVICE (MELLANOX ,0x675a ) },/* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */ - {PCI_VDEVICE (MELLANOX ,0x6764 ) },/* MT26468 ConnectX EN 10GigE PCIe gen2*/ + {PCI_VDEVICE (MELLANOX ,0x6340 ) },/* MT25408 [ConnectX VPI - IB SDR / 10GigE] */ + {PCI_VDEVICE (MELLANOX ,0x634a ) },/* MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE] */ + {PCI_VDEVICE (MELLANOX ,0x6732 ) },/* MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE] */ + {PCI_VDEVICE (MELLANOX ,0x673c ) },/* MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE] */ + {PCI_VDEVICE (MELLANOX ,0x6368 ) },/* MT25448 [ConnectX EN 10GigE, PCIe 2.0 2.5GT/s] */ + {PCI_VDEVICE (MELLANOX ,0x6750 ) },/* MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s] */ + {PCI_VDEVICE (MELLANOX ,0x6372 ) },/* MT25458 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s] */ + {PCI_VDEVICE (MELLANOX ,0x675a ) },/* MT26458 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s] */ + {PCI_VDEVICE (MELLANOX ,0x6764 ) },/* MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s] */ {0 , } };
Signature · 6 lines
1.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
This patch doesn't apply since e76d0b67 ("mlx4_core: Add 40GigE device ID") which adds ID 0x676e for 40GE.
Also if we're going to churn all these comments, I think it would be a good idea to at least make the names follow a consistent scheme:
A) choose either "PCIe 2.0" or "PCIe Gen2" and use that everywhere, not:
drivers/net/mlx4/main.c int mlx4_restart_one(struct pci_dev *pdev) · line 1281
Quoted 1 line
drivers/net/mlx4/main.c +1
-0+ { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s] */
vs.
> + { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT26458 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s] */B) decide whether the external port type goes before or after the PCIe
speed, use that everywhere, not:
> + { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE] */
vs.
> + { PCI_VDEVICE(MELLANOX, 0x6368) }, /* MT25448 [ConnectX EN 10GigE, PCIe 2.0 2.5GT/s] */To be honest even if we did that I don't see that much value in this patch -- it replaces readable comments with longer ones that wrap around the edge of my terminal, which say pretty much the same thing.
- R.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · Roland Dreier
This patch doesn't apply since
e76d0b67("mlx4_core: Add 40GigE device ID") which adds ID0x676efor 40GE.
I was used your "master" branch to create the patches. I see the commit you mention on "for-linus" so I'll fix that.
Quoted 21 lines
Also if we're going to churn all these comments, I think it would be a good idea to at least make the names follow a consistent scheme:
A) choose either "PCIe 2.0" or "PCIe Gen2" and use that everywhere, not:
drivers/net/mlx4/main.c int mlx4_restart_one(struct pci_dev *pdev) · line 1281
Quoted 1 line
drivers/net/mlx4/main.c +1
-0+ { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s] */vs. > + { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT26458 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s] */B) decide whether the external port type goes before or after the PCIe
speed, use that everywhere, not: > + { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE] */ vs. > + { PCI_VDEVICE(MELLANOX, 0x6368) }, /* MT25448 [ConnectX EN 10GigE, PCIe 2.0 2.5GT/s] */
Quoted 3 lines
To be honest even if we did that I don't see that much value in this patch -- it replaces readable comments with longer ones that wrap around the edge of my terminal, which say pretty much the same thing.
I will re-send once I get the correct official phrasing. The patch fixes inconsistencies in between hex values and decimal values of device IDs so I think it is needed.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html