From owner-svn-src-head@freebsd.org  Tue Apr 10 08:35:44 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06023F88FD9;
 Tue, 10 Apr 2018 08:35:44 +0000 (UTC) (envelope-from mw@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 914298611D;
 Tue, 10 Apr 2018 08:35:43 +0000 (UTC) (envelope-from mw@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 885522F88;
 Tue, 10 Apr 2018 08:35:43 +0000 (UTC) (envelope-from mw@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3A8ZhMi012720;
 Tue, 10 Apr 2018 08:35:43 GMT (envelope-from mw@FreeBSD.org)
Received: (from mw@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3A8ZhVD012719;
 Tue, 10 Apr 2018 08:35:43 GMT (envelope-from mw@FreeBSD.org)
Message-Id: <201804100835.w3A8ZhVD012719@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org
 using -f
From: Marcin Wojtas <mw@FreeBSD.org>
Date: Tue, 10 Apr 2018 08:35:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332354 - head/sys/dev/etherswitch/e6000sw
X-SVN-Group: head
X-SVN-Commit-Author: mw
X-SVN-Commit-Paths: head/sys/dev/etherswitch/e6000sw
X-SVN-Commit-Revision: 332354
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2018 08:35:44 -0000

Author: mw
Date: Tue Apr 10 08:35:43 2018
New Revision: 332354
URL: https://svnweb.freebsd.org/changeset/base/332354

Log:
  Improve detection of addressing mode in e6000sw
  
  Some devices cannot rely on the switch MDIO address passed in the DTB
  for specifying single/multi-chip addressing mode. Introduce new property
  "single-chip-addressing" which added to DTS will force single-chip mode.
  
  Submitted by: Michal Mazur <mkm@semihalf.com>
  Obtained from: Semihalf
  Sponsored by: Stormshield
  Differential Revision: https://reviews.freebsd.org/D14800

Modified:
  head/sys/dev/etherswitch/e6000sw/e6000sw.c

Modified: head/sys/dev/etherswitch/e6000sw/e6000sw.c
==============================================================================
--- head/sys/dev/etherswitch/e6000sw/e6000sw.c	Tue Apr 10 08:19:14 2018	(r332353)
+++ head/sys/dev/etherswitch/e6000sw/e6000sw.c	Tue Apr 10 08:35:43 2018	(r332354)
@@ -213,7 +213,9 @@ e6000sw_probe(device_t dev)
 	if (OF_getencprop(sc->node, "reg", &sc->sw_addr,
 	    sizeof(sc->sw_addr)) < 0)
 		return (ENXIO);
-	if (sc->sw_addr != 0 && (sc->sw_addr % 2) == 0)
+
+	if (!OF_hasprop(sc->node, "single-chip-addressing") &&
+	    (sc->sw_addr != 0 && (sc->sw_addr % 2) == 0))
 		sc->multi_chip = true;
 
 	/*