From owner-svn-src-head@freebsd.org Thu Aug 31 16:34:39 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 CA0F9E019FF; Thu, 31 Aug 2017 16:34:39 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-wr0-x229.google.com (mail-wr0-x229.google.com [IPv6:2a00:1450:400c:c0c::229]) (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 5AAE4838AD; Thu, 31 Aug 2017 16:34:39 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: by mail-wr0-x229.google.com with SMTP id 40so288267wrv.5; Thu, 31 Aug 2017 09:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=3wY9xy7UTgILGvsbLYfqg+F2S1RYSUtDTiYlNz9NFgo=; b=uDA2Vmcq5wgXYSrFggXHHakxFZHizsvpIGZjb+cDa1CgAZLNj2VgCDFsZTdlCxfXw9 a2FemP84CGtYZe3/SUxiEdh8aDyBaFdCDWhbVkeHPon5ai0XCZHwdmGivQDEUbJ3mdbr BC5H/VObdy2OelDUpDgqD/DE5jl4/uO423Pk/UingEoXg1qDSUfw9D2bDVMe+s1LQjXD 6erDPyGym6++iB5Rbxb9zsQkyY5jJB2LUkv/JYSIxT4X2h52i9hkeHRYiCxkwI7gVPax y/FqpIfkVwczaD4iRhWYFjEl0A7S9wkUOt4H/u09ji7f1dr0YwNxk/jOnlnO4mB+qKcA Necw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=3wY9xy7UTgILGvsbLYfqg+F2S1RYSUtDTiYlNz9NFgo=; b=mM2VmNYTJwwPz0m0QMRGvTRHZEuo/TU9O5yReKK3QkJ7vXuQayGuQ5fcvoot/iQ5do eCzaksw1sGXTB6rgekZvcmXLQtohiW3OP+diApHUJuSkU8USJmklycRZNnLfUP7OToDI zGhcbov6pBu4hPtwx2/zHo6LTju1eIfQRPdvrIKOOWvnx124c6ArLLnHZHMPqi/qiPtx 6wPO6Ahrh/IrV/t8VkMvUSSl90fsp40HICYSU51I4TDEHVQf5Yo1ZUuqwQ7cIyyQx3of 3XGx3SRCC5o0EgSfJGPk7lQKoI3atbnRe4bNpLFA+E4ZssNO1fCk3mTjlFuyOiKR+Uc3 llPA== X-Gm-Message-State: AHYfb5hinKYf1rtifgFXe6nTUsO5x73iqGb0yI4+S/JMS5+HZLPAAXYn 73+2CONrB0oUNrfVHes= X-Google-Smtp-Source: ADKCNb425UsIwSnjic+9NyIuLO39yAZTgnTXOmpGCO/hW4OTBsA9aVcKoFpXHAwyr6iIwylTuljsBQ== X-Received: by 10.223.163.19 with SMTP id c19mr1989113wrb.167.1504197277502; Thu, 31 Aug 2017 09:34:37 -0700 (PDT) Received: from spectre.mavhome.dp.ua ([134.249.139.101]) by smtp.gmail.com with ESMTPSA id x69sm519940wme.34.2017.08.31.09.34.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 09:34:36 -0700 (PDT) Sender: Alexander Motin Subject: Re: svn commit: r323053 - head/sys/dev/ntb/ntb_hw To: cem@freebsd.org Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201708311341.v7VDfirg037860@repo.freebsd.org> From: Alexander Motin Message-ID: <0ec09a2c-9c86-2830-4af0-fca6d1aed3be@FreeBSD.org> Date: Thu, 31 Aug 2017 19:34:35 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 16:34:39 -0000 On 31.08.2017 17:43, Conrad Meyer wrote: >> 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. Added in r323058. -- Alexander Motin