From owner-svn-src-stable@freebsd.org Fri Mar 27 15:20:28 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 207642784E8; Fri, 27 Mar 2020 15:20:28 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48plsk6W4fz4G3h; Fri, 27 Mar 2020 15:20:26 +0000 (UTC) (envelope-from jhibbits@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 E5447232CC; Fri, 27 Mar 2020 15:20:19 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RFKJa2095371; Fri, 27 Mar 2020 15:20:19 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RFKJFL095370; Fri, 27 Mar 2020 15:20:19 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202003271520.02RFKJFL095370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 27 Mar 2020 15:20:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r359360 - in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt X-SVN-Group: stable-11 X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt X-SVN-Commit-Revision: 359360 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:20:28 -0000 Author: jhibbits Date: Fri Mar 27 15:20:19 2020 New Revision: 359360 URL: https://svnweb.freebsd.org/changeset/base/359360 Log: MFC r359279: ismt: Fix ISMT_DESC_ADDR_RW macro, slave addresses are already left-shifted Reverts r293369. The macro was orginally correct, since our SMBus framework, unlike i2c, already requires addresses to be 8-bit, LSB-cleared. Sponsored by: Juniper Networks, Inc Modified: stable/11/sys/dev/ismt/ismt.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/dev/ichwd/ichwd.c stable/12/sys/dev/ichwd/ichwd.h stable/12/sys/dev/ismt/ismt.c Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/dev/ismt/ismt.c ============================================================================== --- stable/11/sys/dev/ismt/ismt.c Fri Mar 27 13:29:53 2020 (r359359) +++ stable/11/sys/dev/ismt/ismt.c Fri Mar 27 15:20:19 2020 (r359360) @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #define ISMT_DESC_LPR 0x80 /* Large Packet Received */ /* Macros */ -#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr << 1) | (is_read)) +#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr) | (is_read)) /* iSMT General Register address offsets (SMBBAR + ) */ #define ISMT_GR_GCTRL 0x000 /* General Control */