From owner-svn-src-head@freebsd.org Thu Aug 31 14:51:00 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 AE668E206BA; Thu, 31 Aug 2017 14:51:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 118827F498; Thu, 31 Aug 2017 14:51:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi0-f50.google.com with SMTP id t75so7389023oie.3; Thu, 31 Aug 2017 07:51:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=rBxbpr7OLpROhIZPmK5kGN/ykkHKRElWV+gtT4spXQg=; b=e8gjnodjHbLERw8vzBZjR8tg7cuAxFs6dqE3zLh1o9iI8f2LxO4sck8KNoumJHOZ0T 6cEvKQdrJlg4MBMhbyX+4NkEPfmA8+gCKD5/3UTRUUphym9jcibR1OGcPHSCl7E0umye untmv3HkxvhazdTwfW6TYWqtbd3Ekh51j9EzQCOG0h7PTpOdpKUQ+BxSAnLjfukWLzqW uuWLLVX2y4rQj11OHSYqEhWUS1GKs4MnZf47W53XgrUrTaIV7feizZ62RH1xlsl6upix NUGwzfbaQgMs8TjL+7A+YGGRKRjWAWQNUSl45qRVC3Re+s8b9ZvykNsO2tCxmzZHgUju RWdQ== X-Gm-Message-State: AHYfb5hW7wRaTK9fGAeTDBrK+S4zt8QuabZANnb/rPrE51kCNYd0+EiA 2OLS7o8/2BZrTlCweqE= X-Received: by 10.202.4.130 with SMTP id 124mr6417962oie.246.1504190596524; Thu, 31 Aug 2017 07:43:16 -0700 (PDT) Received: from mail-io0-f181.google.com (mail-io0-f181.google.com. [209.85.223.181]) by smtp.gmail.com with ESMTPSA id c187sm9406356oih.52.2017.08.31.07.43.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 07:43:15 -0700 (PDT) Received: by mail-io0-f181.google.com with SMTP id d78so22657621ioe.4; Thu, 31 Aug 2017 07:43:15 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7go8bEXlHoLj2iCuXejrXSH4rG29PfBH3rNqgjHVx/yJXIiRkYVO/0FuqeHlKdoAss50HwVKPg0qF+fLwE8Ww= X-Received: by 10.36.34.65 with SMTP id o62mr991308ito.151.1504190595246; Thu, 31 Aug 2017 07:43:15 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.81.131 with HTTP; Thu, 31 Aug 2017 07:43:14 -0700 (PDT) In-Reply-To: <201708311341.v7VDfirg037860@repo.freebsd.org> References: <201708311341.v7VDfirg037860@repo.freebsd.org> From: Conrad Meyer Date: Thu, 31 Aug 2017 07:43:14 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r323053 - head/sys/dev/ntb/ntb_hw To: Alexander Motin Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 14:51:00 -0000 Hi Mav, On Thu, Aug 31, 2017 at 6:41 AM, Alexander Motin wrote: > 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); > } > To me, the duplication strongly suggests that this should be a macro. Best, Conrad