Index: /branches/rel_apv_10_7_1/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_pci.c =================================================================== --- /branches/rel_apv_10_7_1/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_pci.c (revision 38207) +++ /branches/rel_apv_10_7_1/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_pci.c (working copy) @@ -453,6 +453,9 @@ } else if (chipset_id == CHIPSET_ID_CB1920) { total_pcib = find_pcib(93, NULL, 0); total_pcib += find_pcib(23, NULL, 0); + total_pcib += find_pcib(58, NULL, 0); + total_pcib += find_pcib(133, NULL, 1); + total_pcib += find_pcib(174, NULL, 1); } else if (chipset_id == CHIPSET_ID_CAR5060) { total_pcib = find_pcib(0, NULL, 0); total_pcib += find_pcib(22, NULL, 0); @@ -515,9 +518,12 @@ total_pcib = find_pcib(178, pcib_nicdevs, 0); total_pcib += find_pcib(100, &pcib_nicdevs[total_pcib], 0); total_pcib += find_pcib(22, &pcib_nicdevs[total_pcib], 0); - } else if (chipset_id == CHIPSET_ID_CB1920) { + } else if (chipset_id == CHIPSET_ID_CB1920) { total_pcib = find_pcib(93, pcib_nicdevs, 0); total_pcib += find_pcib(23, &pcib_nicdevs[total_pcib], 0); + total_pcib += find_pcib(58, &pcib_nicdevs[total_pcib], 0); + total_pcib += find_pcib(133, &pcib_nicdevs[total_pcib], 1); + total_pcib += find_pcib(174, &pcib_nicdevs[total_pcib], 1); } else if (chipset_id == CHIPSET_ID_CAR5060) { total_pcib = find_pcib(0, pcib_nicdevs, 0); total_pcib += find_pcib(22, &pcib_nicdevs[total_pcib], 0); Index: /branches/rel_apv_10_7_1/usr/click/tools/hugepage_config.sh =================================================================== --- /branches/rel_apv_10_7_1/usr/click/tools/hugepage_config.sh (revision 38207) +++ /branches/rel_apv_10_7_1/usr/click/tools/hugepage_config.sh (working copy) @@ -55,8 +55,8 @@ hugepagesz=2M hugepagenr=1024 else - if [ "$array_id" = "911900" ]; then - #reserve 1/5 for system + if [ "$array_id" = "911900" || "$array_id" = "907900" || "$array_id" = "909900" ]; then + #reserve 1/5 for system with more than 4 NIC slots. Otherwise system will crash loop during boot time. hugepagesz=1G hugepagenr=`expr $mem_total \* 4 / 5` else Index: /branches/rel_apv_10_7_1/usr/src/sys/click/net/if_cafw.c =================================================================== --- /branches/rel_apv_10_7_1/usr/src/sys/click/net/if_cafw.c (revision 38207) +++ /branches/rel_apv_10_7_1/usr/src/sys/click/net/if_cafw.c (working copy) @@ -442,21 +442,46 @@ // Maybe some hardware/firmware version changed between development to testing. // [root@yv2eM4Xp ca_log]# lspci -vt +// +-[0000:ae]-+-00.0-[af-b0]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | +-02.0-[b1-b2]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// +-[0000:3a]-+-00.0-[3b-3c]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | +-02.0-[3d-3e]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// +-[0000:85]-+-00.0-[86-87]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | +-02.0-[88-89]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ // +-[0000:5d]-+-02.0-[5e-61]----00.0-[5f-61]----03.0-[60-61]--+-00.0 Intel Corporation Device 37d3 // | | +-00.1 Intel Corporation Device 37d3 // | | +-00.2 Intel Corporation Device 37d3 // | | \-00.3 Intel Corporation Device 37d3 -// +-[0000:17]-+-00.0-[18-19]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ +// +-[0000:17]-+-00.0-[18]----00.0 Cavium, Inc. Device 0012 +// | +-02.0-[19-1a]--+-00.0 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ // | | +-00.1 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ // | | +-00.2 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ // | | \-00.3 Intel Corporation Ethernet Controller X710 for 10GbE SFP+ -// TODO: Only test 1 add-on NIC. Need add-on NIC options provided from PM +// Now I'm the "PM" :( static struct pcib_slot_map nic_slot_map_pcib_CB1920[MAX_SUBMAP][MAX_SLOTS] = { { {0, 0}, {-1, -1}, }, { - {1, 0}, {-1, -1}, + {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}, {-1, -1}, }, };