On Wed, Nov 08, 2017 at 10:05:38PM +0100, Stefan Sperling wrote:
> Because the switch port is not usable anyway, perhaps device probing
> should skip it. Does the following patch work correctly on the router?
> cvs:~visa/bsd.probefix is a kernel with the patch.
>
> I do not have an ERPoe-5 myself.
>
> Index: arch/octeon/dev/cn30xxsmi.c
> ===================================================================
> RCS file: src/sys/arch/octeon/dev/cn30xxsmi.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 cn30xxsmi.c
> --- arch/octeon/dev/cn30xxsmi.c 2 May 2017 13:26:49 -0000 1.4
> +++ arch/octeon/dev/cn30xxsmi.c 8 Jun 2017 14:43:36 -0000
> @@ -181,6 +181,11 @@ cn30xxsmi_get_phy(int phandle, int port,
>
> switch (octeon_boot_info->board_type) {
> case BOARD_TYPE_UBIQUITI_E100:
> + /* XXX Skip the switch port on ERPoe-5.
> + * XXX There is no driver for it. */
> + if (port > 1 && octeon_boot_info->board_rev_major == 1)
> + return ENOENT;
> +
> if (port > 2)
> return ENOENT;
> reg = 7 - port;
>
I can confirm that this second patch does skip the switch so no cnmac2
shows up on the ER PoE. That is a big improvement since it avoids the
confusion. Would you like the first patch to be tested also?
Bryan
