Could someone with a Portwell CAM-0100 test this diff to verify that
the built-in network interfaces still attach? The diff makes a PHY
address lookup bail out rather than use bogus data if the system board
is unhandled.
Index: arch/octeon/dev/cn30xxgmx.c
===================================================================
RCS file: src/sys/arch/octeon/dev/cn30xxgmx.c,v
retrieving revision 1.26
diff -u -p -r1.26 cn30xxgmx.c
--- arch/octeon/dev/cn30xxgmx.c 4 Aug 2016 13:10:31 -0000 1.26
+++ arch/octeon/dev/cn30xxgmx.c 21 Oct 2016 14:05:31 -0000
@@ -196,10 +215,13 @@ cn30xxgmx_port_phy_addr(int port)
return port - 16; /* GMX1: eth[0-3] */
return -1;
- default:
+ case BOARD_TYPE_CN3010_EVB_HS5:
if (port >= nitems(octeon_eth_phy_table))
return -1;
return octeon_eth_phy_table[port];
+
+ default:
+ return -1;
}
}
Index: arch/octeon/include/octeonvar.h
===================================================================
RCS file: src/sys/arch/octeon/include/octeonvar.h,v
retrieving revision 1.31
diff -u -p -r1.31 octeonvar.h
--- arch/octeon/include/octeonvar.h 16 Jul 2016 10:19:55 -0000 1.31
+++ arch/octeon/include/octeonvar.h 21 Oct 2016 14:05:31 -0000
@@ -178,6 +178,7 @@ struct octeon_fau_map {
* NB: BOARD_TYPE_UBIQUITI_E100 is also used by other vendors, but we don't run
* on those boards yet.
*/
+#define BOARD_TYPE_CN3010_EVB_HS5 11
#define BOARD_TYPE_UBIQUITI_E100 20002
#define BOARD_TYPE_UBIQUITI_E200 20003
#define BOARD_TYPE_DSR_500 20015
