From owner-svn-src-stable-12@freebsd.org Fri Mar 27 15:26:05 2020 Return-Path: Delivered-To: svn-src-stable-12@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 A47A82787AC; Fri, 27 Mar 2020 15:26:05 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48plzy5F5gz4J4s; Fri, 27 Mar 2020 15:25:50 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-il1-f193.google.com with SMTP id 7so9107118ill.2; Fri, 27 Mar 2020 08:25:50 -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:references:in-reply-to:from:date :message-id:subject:to; bh=v2/2iJZbOC/50st9Lgwh+2xx6UVMV/7Lr2BOZPaJ7nI=; b=ezo3V1wyN5DEKlPSvKe4Wsgmb4meKWSJ8b0SrqPIvPIC7SFjiJ+YKCyPJuAjV482lT eyQsEV5aFzqT77fkLEOOItmpIcMYIDt1RWHDTc7D+d9+iaDpnYzbX7ZtBb1JYm2BlJCV PwJgOx+AV+ZydMcxsBV3VaMRfSLF9ttp8eq/89/NAhFmsmqQjLZApNNKoi13nVn5g0by sIKjcmxVjnrmzljlWPAsE6tbdITBlX1gPH/r51aeRWdv5XBbvLq9/oIsewa6nBlRbQQk MnDAiu0WBB2EVK26UnswJf8Ndq67tZ784jSyACB32+jj/UKWH4Fcgl9virkoR5mw+Gx6 EC9A== X-Gm-Message-State: ANhLgQ2psycEqTilztiMLXrUISTqSfBYYu4Nn0tRSSVHb+RQ2oo0X9Tp glSy0XgA6D81yXIGNWrIFtgT/vyKmsKr0n/0KWClWzuvZUM= X-Google-Smtp-Source: ADFU+vtQ5d+We17JknS+ZEkqOhg0XLzzqjyj3By/HtT4R4cP8cGH0GY4wmYI5G0F4GWM1WJ1M0Qh+oPwJ/vQo34rlss= X-Received: by 2002:a92:88d0:: with SMTP id m77mr13330270ilh.282.1585322741902; Fri, 27 Mar 2020 08:25:41 -0700 (PDT) MIME-Version: 1.0 References: <202003271520.02RFKJN9095377@repo.freebsd.org> In-Reply-To: <202003271520.02RFKJN9095377@repo.freebsd.org> From: Justin Hibbits Date: Fri, 27 Mar 2020 10:25:30 -0500 Message-ID: Subject: Re: svn commit: r359360 - in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt To: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48plzy5F5gz4J4s X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of chmeeedalf@gmail.com designates 209.85.166.193 as permitted sender) smtp.mailfrom=chmeeedalf@gmail.com X-Spamd-Result: default: False [-2.33 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-0.34)[ip: (-0.03), ipnet: 209.85.128.0/17(-1.13), asn: 15169(-0.47), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[193.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[jhibbits@freebsd.org,chmeeedalf@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[193.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[jhibbits@freebsd.org,chmeeedalf@gmail.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:26:05 -0000 On Fri, Mar 27, 2020 at 10:21 AM Justin Hibbits wrote: > > 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/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) > > Changes in other areas also in this revision: > Modified: > stable/11/sys/dev/ismt/ismt.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/12/sys/dev/ichwd/ichwd.c > ============================================================================== > --- stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 15:20:19 2020 (r359360) > @@ -296,6 +296,7 @@ static struct ichwd_device ichwd_devices[] = { > static struct ichwd_device ichwd_smb_devices[] = { > { DEVICEID_LEWISBURG_SMB, "Lewisburg watchdog timer", 10, 4 }, > { DEVICEID_SRPTLP_SMB, "Sunrise Point-LP watchdog timer", 10, 4 }, > + { DEVICEID_C3000, "Intel Atom C3000 watchdog timer", 10, 4 }, > { 0, NULL, 0, 0 }, > }; > > > Modified: stable/12/sys/dev/ichwd/ichwd.h > ============================================================================== > --- stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 15:20:19 2020 (r359360) > @@ -67,6 +67,7 @@ struct ichwd_softc { > > #define VENDORID_INTEL 0x8086 > #define DEVICEID_BAYTRAIL 0x0f1c > +#define DEVICEID_C3000 0x19df > #define DEVICEID_CPT0 0x1c40 > #define DEVICEID_CPT1 0x1c41 > #define DEVICEID_CPT2 0x1c42 > > Modified: stable/12/sys/dev/ismt/ismt.c > ============================================================================== > --- stable/12/sys/dev/ismt/ismt.c Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/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 */ And this includes the changes to be MFC'd by r359285. MFC'ing that now, so not reverting. Oops. - Justin