From owner-svn-src-head@freebsd.org Thu Aug 31 13:41:45 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A71DE1EE84; Thu, 31 Aug 2017 13:41:45 +0000 (UTC) (envelope-from mav@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 mx1.freebsd.org (Postfix) with ESMTPS id 57FAD7C849; Thu, 31 Aug 2017 13:41:45 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VDfi2q037861; Thu, 31 Aug 2017 13:41:44 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VDfirg037860; Thu, 31 Aug 2017 13:41:44 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201708311341.v7VDfirg037860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 31 Aug 2017 13:41:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323053 - head/sys/dev/ntb/ntb_hw X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/ntb/ntb_hw X-SVN-Commit-Revision: 323053 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.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2017 13:41:45 -0000 Author: mav Date: Thu Aug 31 13:41:44 2017 New Revision: 323053 URL: https://svnweb.freebsd.org/changeset/base/323053 Log: Fix port control for PEX 8749. That chip has three Station Ports, so previous address math was incorrect. MFC after: 13 days Sponsored by: iXsystems, Inc. Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c Thu Aug 31 13:32:01 2017 (r323052) +++ head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c Thu Aug 31 13:41:44 2017 (r323053) @@ -473,7 +473,7 @@ ntb_plx_link_enable(device_t dev, enum ntb_speed speed return (0); } - reg = (sc->port < 8) ? 0x00208 : 0x08208; + reg = ((sc->port & ~7) << 12) | 0x208; val = bus_read_4(sc->conf_res, reg); if ((val & (1 << (sc->port & 7))) == 0) { /* If already enabled, generate fake link event and exit. */ @@ -495,7 +495,7 @@ ntb_plx_link_disable(device_t dev) if (sc->link) return (0); - reg = (sc->port < 8) ? 0x00208 : 0x08208; + reg = ((sc->port & ~7) << 12) | 0x208; val = bus_read_4(sc->conf_res, reg); val |= (1 << (sc->port & 7)); bus_write_4(sc->conf_res, reg, val); @@ -512,7 +512,7 @@ ntb_plx_link_enabled(device_t dev) if (sc->link) return (TRUE); - reg = (sc->port < 8) ? 0x00208 : 0x08208; + reg = ((sc->port & ~7) << 12) | 0x208; val = bus_read_4(sc->conf_res, reg); return ((val & (1 << (sc->port & 7))) == 0); }