@@ -372,7 +372,7 @@ static ssize_t field ## _show(struct device *dev, \
372
372
if (stdev->gen == SWITCHTEC_GEN3) \
373
373
return io_string_show(buf, &si->gen3.field, \
374
374
sizeof(si->gen3.field)); \
375
- else if (stdev->gen = = SWITCHTEC_GEN4) \
375
+ else if (stdev->gen > = SWITCHTEC_GEN4) \
376
376
return io_string_show(buf, &si->gen4.field, \
377
377
sizeof(si->gen4.field)); \
378
378
else \
@@ -663,7 +663,7 @@ static int ioctl_flash_info(struct switchtec_dev *stdev,
663
663
if (stdev -> gen == SWITCHTEC_GEN3 ) {
664
664
info .flash_length = ioread32 (& fi -> gen3 .flash_length );
665
665
info .num_partitions = SWITCHTEC_NUM_PARTITIONS_GEN3 ;
666
- } else if (stdev -> gen = = SWITCHTEC_GEN4 ) {
666
+ } else if (stdev -> gen > = SWITCHTEC_GEN4 ) {
667
667
info .flash_length = ioread32 (& fi -> gen4 .flash_length );
668
668
info .num_partitions = SWITCHTEC_NUM_PARTITIONS_GEN4 ;
669
669
} else {
@@ -870,7 +870,7 @@ static int ioctl_flash_part_info(struct switchtec_dev *stdev,
870
870
ret = flash_part_info_gen3 (stdev , & info );
871
871
if (ret )
872
872
return ret ;
873
- } else if (stdev -> gen = = SWITCHTEC_GEN4 ) {
873
+ } else if (stdev -> gen > = SWITCHTEC_GEN4 ) {
874
874
ret = flash_part_info_gen4 (stdev , & info );
875
875
if (ret )
876
876
return ret ;
@@ -1610,7 +1610,7 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,
1610
1610
1611
1611
if (stdev -> gen == SWITCHTEC_GEN3 )
1612
1612
part_id = & stdev -> mmio_sys_info -> gen3 .partition_id ;
1613
- else if (stdev -> gen = = SWITCHTEC_GEN4 )
1613
+ else if (stdev -> gen > = SWITCHTEC_GEN4 )
1614
1614
part_id = & stdev -> mmio_sys_info -> gen4 .partition_id ;
1615
1615
else
1616
1616
return - EOPNOTSUPP ;
@@ -1727,63 +1727,99 @@ static void switchtec_pci_remove(struct pci_dev *pdev)
1727
1727
}
1728
1728
1729
1729
static const struct pci_device_id switchtec_pci_tbl [] = {
1730
- SWITCHTEC_PCI_DEVICE (0x8531 , SWITCHTEC_GEN3 ), //PFX 24xG3
1731
- SWITCHTEC_PCI_DEVICE (0x8532 , SWITCHTEC_GEN3 ), //PFX 32xG3
1732
- SWITCHTEC_PCI_DEVICE (0x8533 , SWITCHTEC_GEN3 ), //PFX 48xG3
1733
- SWITCHTEC_PCI_DEVICE (0x8534 , SWITCHTEC_GEN3 ), //PFX 64xG3
1734
- SWITCHTEC_PCI_DEVICE (0x8535 , SWITCHTEC_GEN3 ), //PFX 80xG3
1735
- SWITCHTEC_PCI_DEVICE (0x8536 , SWITCHTEC_GEN3 ), //PFX 96xG3
1736
- SWITCHTEC_PCI_DEVICE (0x8541 , SWITCHTEC_GEN3 ), //PSX 24xG3
1737
- SWITCHTEC_PCI_DEVICE (0x8542 , SWITCHTEC_GEN3 ), //PSX 32xG3
1738
- SWITCHTEC_PCI_DEVICE (0x8543 , SWITCHTEC_GEN3 ), //PSX 48xG3
1739
- SWITCHTEC_PCI_DEVICE (0x8544 , SWITCHTEC_GEN3 ), //PSX 64xG3
1740
- SWITCHTEC_PCI_DEVICE (0x8545 , SWITCHTEC_GEN3 ), //PSX 80xG3
1741
- SWITCHTEC_PCI_DEVICE (0x8546 , SWITCHTEC_GEN3 ), //PSX 96xG3
1742
- SWITCHTEC_PCI_DEVICE (0x8551 , SWITCHTEC_GEN3 ), //PAX 24XG3
1743
- SWITCHTEC_PCI_DEVICE (0x8552 , SWITCHTEC_GEN3 ), //PAX 32XG3
1744
- SWITCHTEC_PCI_DEVICE (0x8553 , SWITCHTEC_GEN3 ), //PAX 48XG3
1745
- SWITCHTEC_PCI_DEVICE (0x8554 , SWITCHTEC_GEN3 ), //PAX 64XG3
1746
- SWITCHTEC_PCI_DEVICE (0x8555 , SWITCHTEC_GEN3 ), //PAX 80XG3
1747
- SWITCHTEC_PCI_DEVICE (0x8556 , SWITCHTEC_GEN3 ), //PAX 96XG3
1748
- SWITCHTEC_PCI_DEVICE (0x8561 , SWITCHTEC_GEN3 ), //PFXL 24XG3
1749
- SWITCHTEC_PCI_DEVICE (0x8562 , SWITCHTEC_GEN3 ), //PFXL 32XG3
1750
- SWITCHTEC_PCI_DEVICE (0x8563 , SWITCHTEC_GEN3 ), //PFXL 48XG3
1751
- SWITCHTEC_PCI_DEVICE (0x8564 , SWITCHTEC_GEN3 ), //PFXL 64XG3
1752
- SWITCHTEC_PCI_DEVICE (0x8565 , SWITCHTEC_GEN3 ), //PFXL 80XG3
1753
- SWITCHTEC_PCI_DEVICE (0x8566 , SWITCHTEC_GEN3 ), //PFXL 96XG3
1754
- SWITCHTEC_PCI_DEVICE (0x8571 , SWITCHTEC_GEN3 ), //PFXI 24XG3
1755
- SWITCHTEC_PCI_DEVICE (0x8572 , SWITCHTEC_GEN3 ), //PFXI 32XG3
1756
- SWITCHTEC_PCI_DEVICE (0x8573 , SWITCHTEC_GEN3 ), //PFXI 48XG3
1757
- SWITCHTEC_PCI_DEVICE (0x8574 , SWITCHTEC_GEN3 ), //PFXI 64XG3
1758
- SWITCHTEC_PCI_DEVICE (0x8575 , SWITCHTEC_GEN3 ), //PFXI 80XG3
1759
- SWITCHTEC_PCI_DEVICE (0x8576 , SWITCHTEC_GEN3 ), //PFXI 96XG3
1760
- SWITCHTEC_PCI_DEVICE (0x4000 , SWITCHTEC_GEN4 ), //PFX 100XG4
1761
- SWITCHTEC_PCI_DEVICE (0x4084 , SWITCHTEC_GEN4 ), //PFX 84XG4
1762
- SWITCHTEC_PCI_DEVICE (0x4068 , SWITCHTEC_GEN4 ), //PFX 68XG4
1763
- SWITCHTEC_PCI_DEVICE (0x4052 , SWITCHTEC_GEN4 ), //PFX 52XG4
1764
- SWITCHTEC_PCI_DEVICE (0x4036 , SWITCHTEC_GEN4 ), //PFX 36XG4
1765
- SWITCHTEC_PCI_DEVICE (0x4028 , SWITCHTEC_GEN4 ), //PFX 28XG4
1766
- SWITCHTEC_PCI_DEVICE (0x4100 , SWITCHTEC_GEN4 ), //PSX 100XG4
1767
- SWITCHTEC_PCI_DEVICE (0x4184 , SWITCHTEC_GEN4 ), //PSX 84XG4
1768
- SWITCHTEC_PCI_DEVICE (0x4168 , SWITCHTEC_GEN4 ), //PSX 68XG4
1769
- SWITCHTEC_PCI_DEVICE (0x4152 , SWITCHTEC_GEN4 ), //PSX 52XG4
1770
- SWITCHTEC_PCI_DEVICE (0x4136 , SWITCHTEC_GEN4 ), //PSX 36XG4
1771
- SWITCHTEC_PCI_DEVICE (0x4128 , SWITCHTEC_GEN4 ), //PSX 28XG4
1772
- SWITCHTEC_PCI_DEVICE (0x4200 , SWITCHTEC_GEN4 ), //PAX 100XG4
1773
- SWITCHTEC_PCI_DEVICE (0x4284 , SWITCHTEC_GEN4 ), //PAX 84XG4
1774
- SWITCHTEC_PCI_DEVICE (0x4268 , SWITCHTEC_GEN4 ), //PAX 68XG4
1775
- SWITCHTEC_PCI_DEVICE (0x4252 , SWITCHTEC_GEN4 ), //PAX 52XG4
1776
- SWITCHTEC_PCI_DEVICE (0x4236 , SWITCHTEC_GEN4 ), //PAX 36XG4
1777
- SWITCHTEC_PCI_DEVICE (0x4228 , SWITCHTEC_GEN4 ), //PAX 28XG4
1778
- SWITCHTEC_PCI_DEVICE (0x4352 , SWITCHTEC_GEN4 ), //PFXA 52XG4
1779
- SWITCHTEC_PCI_DEVICE (0x4336 , SWITCHTEC_GEN4 ), //PFXA 36XG4
1780
- SWITCHTEC_PCI_DEVICE (0x4328 , SWITCHTEC_GEN4 ), //PFXA 28XG4
1781
- SWITCHTEC_PCI_DEVICE (0x4452 , SWITCHTEC_GEN4 ), //PSXA 52XG4
1782
- SWITCHTEC_PCI_DEVICE (0x4436 , SWITCHTEC_GEN4 ), //PSXA 36XG4
1783
- SWITCHTEC_PCI_DEVICE (0x4428 , SWITCHTEC_GEN4 ), //PSXA 28XG4
1784
- SWITCHTEC_PCI_DEVICE (0x4552 , SWITCHTEC_GEN4 ), //PAXA 52XG4
1785
- SWITCHTEC_PCI_DEVICE (0x4536 , SWITCHTEC_GEN4 ), //PAXA 36XG4
1786
- SWITCHTEC_PCI_DEVICE (0x4528 , SWITCHTEC_GEN4 ), //PAXA 28XG4
1730
+ SWITCHTEC_PCI_DEVICE (0x8531 , SWITCHTEC_GEN3 ), /* PFX 24xG3 */
1731
+ SWITCHTEC_PCI_DEVICE (0x8532 , SWITCHTEC_GEN3 ), /* PFX 32xG3 */
1732
+ SWITCHTEC_PCI_DEVICE (0x8533 , SWITCHTEC_GEN3 ), /* PFX 48xG3 */
1733
+ SWITCHTEC_PCI_DEVICE (0x8534 , SWITCHTEC_GEN3 ), /* PFX 64xG3 */
1734
+ SWITCHTEC_PCI_DEVICE (0x8535 , SWITCHTEC_GEN3 ), /* PFX 80xG3 */
1735
+ SWITCHTEC_PCI_DEVICE (0x8536 , SWITCHTEC_GEN3 ), /* PFX 96xG3 */
1736
+ SWITCHTEC_PCI_DEVICE (0x8541 , SWITCHTEC_GEN3 ), /* PSX 24xG3 */
1737
+ SWITCHTEC_PCI_DEVICE (0x8542 , SWITCHTEC_GEN3 ), /* PSX 32xG3 */
1738
+ SWITCHTEC_PCI_DEVICE (0x8543 , SWITCHTEC_GEN3 ), /* PSX 48xG3 */
1739
+ SWITCHTEC_PCI_DEVICE (0x8544 , SWITCHTEC_GEN3 ), /* PSX 64xG3 */
1740
+ SWITCHTEC_PCI_DEVICE (0x8545 , SWITCHTEC_GEN3 ), /* PSX 80xG3 */
1741
+ SWITCHTEC_PCI_DEVICE (0x8546 , SWITCHTEC_GEN3 ), /* PSX 96xG3 */
1742
+ SWITCHTEC_PCI_DEVICE (0x8551 , SWITCHTEC_GEN3 ), /* PAX 24XG3 */
1743
+ SWITCHTEC_PCI_DEVICE (0x8552 , SWITCHTEC_GEN3 ), /* PAX 32XG3 */
1744
+ SWITCHTEC_PCI_DEVICE (0x8553 , SWITCHTEC_GEN3 ), /* PAX 48XG3 */
1745
+ SWITCHTEC_PCI_DEVICE (0x8554 , SWITCHTEC_GEN3 ), /* PAX 64XG3 */
1746
+ SWITCHTEC_PCI_DEVICE (0x8555 , SWITCHTEC_GEN3 ), /* PAX 80XG3 */
1747
+ SWITCHTEC_PCI_DEVICE (0x8556 , SWITCHTEC_GEN3 ), /* PAX 96XG3 */
1748
+ SWITCHTEC_PCI_DEVICE (0x8561 , SWITCHTEC_GEN3 ), /* PFXL 24XG3 */
1749
+ SWITCHTEC_PCI_DEVICE (0x8562 , SWITCHTEC_GEN3 ), /* PFXL 32XG3 */
1750
+ SWITCHTEC_PCI_DEVICE (0x8563 , SWITCHTEC_GEN3 ), /* PFXL 48XG3 */
1751
+ SWITCHTEC_PCI_DEVICE (0x8564 , SWITCHTEC_GEN3 ), /* PFXL 64XG3 */
1752
+ SWITCHTEC_PCI_DEVICE (0x8565 , SWITCHTEC_GEN3 ), /* PFXL 80XG3 */
1753
+ SWITCHTEC_PCI_DEVICE (0x8566 , SWITCHTEC_GEN3 ), /* PFXL 96XG3 */
1754
+ SWITCHTEC_PCI_DEVICE (0x8571 , SWITCHTEC_GEN3 ), /* PFXI 24XG3 */
1755
+ SWITCHTEC_PCI_DEVICE (0x8572 , SWITCHTEC_GEN3 ), /* PFXI 32XG3 */
1756
+ SWITCHTEC_PCI_DEVICE (0x8573 , SWITCHTEC_GEN3 ), /* PFXI 48XG3 */
1757
+ SWITCHTEC_PCI_DEVICE (0x8574 , SWITCHTEC_GEN3 ), /* PFXI 64XG3 */
1758
+ SWITCHTEC_PCI_DEVICE (0x8575 , SWITCHTEC_GEN3 ), /* PFXI 80XG3 */
1759
+ SWITCHTEC_PCI_DEVICE (0x8576 , SWITCHTEC_GEN3 ), /* PFXI 96XG3 */
1760
+ SWITCHTEC_PCI_DEVICE (0x4000 , SWITCHTEC_GEN4 ), /* PFX 100XG4 */
1761
+ SWITCHTEC_PCI_DEVICE (0x4084 , SWITCHTEC_GEN4 ), /* PFX 84XG4 */
1762
+ SWITCHTEC_PCI_DEVICE (0x4068 , SWITCHTEC_GEN4 ), /* PFX 68XG4 */
1763
+ SWITCHTEC_PCI_DEVICE (0x4052 , SWITCHTEC_GEN4 ), /* PFX 52XG4 */
1764
+ SWITCHTEC_PCI_DEVICE (0x4036 , SWITCHTEC_GEN4 ), /* PFX 36XG4 */
1765
+ SWITCHTEC_PCI_DEVICE (0x4028 , SWITCHTEC_GEN4 ), /* PFX 28XG4 */
1766
+ SWITCHTEC_PCI_DEVICE (0x4100 , SWITCHTEC_GEN4 ), /* PSX 100XG4 */
1767
+ SWITCHTEC_PCI_DEVICE (0x4184 , SWITCHTEC_GEN4 ), /* PSX 84XG4 */
1768
+ SWITCHTEC_PCI_DEVICE (0x4168 , SWITCHTEC_GEN4 ), /* PSX 68XG4 */
1769
+ SWITCHTEC_PCI_DEVICE (0x4152 , SWITCHTEC_GEN4 ), /* PSX 52XG4 */
1770
+ SWITCHTEC_PCI_DEVICE (0x4136 , SWITCHTEC_GEN4 ), /* PSX 36XG4 */
1771
+ SWITCHTEC_PCI_DEVICE (0x4128 , SWITCHTEC_GEN4 ), /* PSX 28XG4 */
1772
+ SWITCHTEC_PCI_DEVICE (0x4200 , SWITCHTEC_GEN4 ), /* PAX 100XG4 */
1773
+ SWITCHTEC_PCI_DEVICE (0x4284 , SWITCHTEC_GEN4 ), /* PAX 84XG4 */
1774
+ SWITCHTEC_PCI_DEVICE (0x4268 , SWITCHTEC_GEN4 ), /* PAX 68XG4 */
1775
+ SWITCHTEC_PCI_DEVICE (0x4252 , SWITCHTEC_GEN4 ), /* PAX 52XG4 */
1776
+ SWITCHTEC_PCI_DEVICE (0x4236 , SWITCHTEC_GEN4 ), /* PAX 36XG4 */
1777
+ SWITCHTEC_PCI_DEVICE (0x4228 , SWITCHTEC_GEN4 ), /* PAX 28XG4 */
1778
+ SWITCHTEC_PCI_DEVICE (0x4352 , SWITCHTEC_GEN4 ), /* PFXA 52XG4 */
1779
+ SWITCHTEC_PCI_DEVICE (0x4336 , SWITCHTEC_GEN4 ), /* PFXA 36XG4 */
1780
+ SWITCHTEC_PCI_DEVICE (0x4328 , SWITCHTEC_GEN4 ), /* PFXA 28XG4 */
1781
+ SWITCHTEC_PCI_DEVICE (0x4452 , SWITCHTEC_GEN4 ), /* PSXA 52XG4 */
1782
+ SWITCHTEC_PCI_DEVICE (0x4436 , SWITCHTEC_GEN4 ), /* PSXA 36XG4 */
1783
+ SWITCHTEC_PCI_DEVICE (0x4428 , SWITCHTEC_GEN4 ), /* PSXA 28XG4 */
1784
+ SWITCHTEC_PCI_DEVICE (0x4552 , SWITCHTEC_GEN4 ), /* PAXA 52XG4 */
1785
+ SWITCHTEC_PCI_DEVICE (0x4536 , SWITCHTEC_GEN4 ), /* PAXA 36XG4 */
1786
+ SWITCHTEC_PCI_DEVICE (0x4528 , SWITCHTEC_GEN4 ), /* PAXA 28XG4 */
1787
+ SWITCHTEC_PCI_DEVICE (0x5000 , SWITCHTEC_GEN5 ), /* PFX 100XG5 */
1788
+ SWITCHTEC_PCI_DEVICE (0x5084 , SWITCHTEC_GEN5 ), /* PFX 84XG5 */
1789
+ SWITCHTEC_PCI_DEVICE (0x5068 , SWITCHTEC_GEN5 ), /* PFX 68XG5 */
1790
+ SWITCHTEC_PCI_DEVICE (0x5052 , SWITCHTEC_GEN5 ), /* PFX 52XG5 */
1791
+ SWITCHTEC_PCI_DEVICE (0x5036 , SWITCHTEC_GEN5 ), /* PFX 36XG5 */
1792
+ SWITCHTEC_PCI_DEVICE (0x5028 , SWITCHTEC_GEN5 ), /* PFX 28XG5 */
1793
+ SWITCHTEC_PCI_DEVICE (0x5100 , SWITCHTEC_GEN5 ), /* PSX 100XG5 */
1794
+ SWITCHTEC_PCI_DEVICE (0x5184 , SWITCHTEC_GEN5 ), /* PSX 84XG5 */
1795
+ SWITCHTEC_PCI_DEVICE (0x5168 , SWITCHTEC_GEN5 ), /* PSX 68XG5 */
1796
+ SWITCHTEC_PCI_DEVICE (0x5152 , SWITCHTEC_GEN5 ), /* PSX 52XG5 */
1797
+ SWITCHTEC_PCI_DEVICE (0x5136 , SWITCHTEC_GEN5 ), /* PSX 36XG5 */
1798
+ SWITCHTEC_PCI_DEVICE (0x5128 , SWITCHTEC_GEN5 ), /* PSX 28XG5 */
1799
+ SWITCHTEC_PCI_DEVICE (0x5200 , SWITCHTEC_GEN5 ), /* PAX 100XG5 */
1800
+ SWITCHTEC_PCI_DEVICE (0x5284 , SWITCHTEC_GEN5 ), /* PAX 84XG5 */
1801
+ SWITCHTEC_PCI_DEVICE (0x5268 , SWITCHTEC_GEN5 ), /* PAX 68XG5 */
1802
+ SWITCHTEC_PCI_DEVICE (0x5252 , SWITCHTEC_GEN5 ), /* PAX 52XG5 */
1803
+ SWITCHTEC_PCI_DEVICE (0x5236 , SWITCHTEC_GEN5 ), /* PAX 36XG5 */
1804
+ SWITCHTEC_PCI_DEVICE (0x5228 , SWITCHTEC_GEN5 ), /* PAX 28XG5 */
1805
+ SWITCHTEC_PCI_DEVICE (0x5300 , SWITCHTEC_GEN5 ), /* PFXA 100XG5 */
1806
+ SWITCHTEC_PCI_DEVICE (0x5384 , SWITCHTEC_GEN5 ), /* PFXA 84XG5 */
1807
+ SWITCHTEC_PCI_DEVICE (0x5368 , SWITCHTEC_GEN5 ), /* PFXA 68XG5 */
1808
+ SWITCHTEC_PCI_DEVICE (0x5352 , SWITCHTEC_GEN5 ), /* PFXA 52XG5 */
1809
+ SWITCHTEC_PCI_DEVICE (0x5336 , SWITCHTEC_GEN5 ), /* PFXA 36XG5 */
1810
+ SWITCHTEC_PCI_DEVICE (0x5328 , SWITCHTEC_GEN5 ), /* PFXA 28XG5 */
1811
+ SWITCHTEC_PCI_DEVICE (0x5400 , SWITCHTEC_GEN5 ), /* PSXA 100XG5 */
1812
+ SWITCHTEC_PCI_DEVICE (0x5484 , SWITCHTEC_GEN5 ), /* PSXA 84XG5 */
1813
+ SWITCHTEC_PCI_DEVICE (0x5468 , SWITCHTEC_GEN5 ), /* PSXA 68XG5 */
1814
+ SWITCHTEC_PCI_DEVICE (0x5452 , SWITCHTEC_GEN5 ), /* PSXA 52XG5 */
1815
+ SWITCHTEC_PCI_DEVICE (0x5436 , SWITCHTEC_GEN5 ), /* PSXA 36XG5 */
1816
+ SWITCHTEC_PCI_DEVICE (0x5428 , SWITCHTEC_GEN5 ), /* PSXA 28XG5 */
1817
+ SWITCHTEC_PCI_DEVICE (0x5500 , SWITCHTEC_GEN5 ), /* PAXA 100XG5 */
1818
+ SWITCHTEC_PCI_DEVICE (0x5584 , SWITCHTEC_GEN5 ), /* PAXA 84XG5 */
1819
+ SWITCHTEC_PCI_DEVICE (0x5568 , SWITCHTEC_GEN5 ), /* PAXA 68XG5 */
1820
+ SWITCHTEC_PCI_DEVICE (0x5552 , SWITCHTEC_GEN5 ), /* PAXA 52XG5 */
1821
+ SWITCHTEC_PCI_DEVICE (0x5536 , SWITCHTEC_GEN5 ), /* PAXA 36XG5 */
1822
+ SWITCHTEC_PCI_DEVICE (0x5528 , SWITCHTEC_GEN5 ), /* PAXA 28XG5 */
1787
1823
{0 }
1788
1824
};
1789
1825
MODULE_DEVICE_TABLE (pci , switchtec_pci_tbl );
0 commit comments