svn commit: r359360 - in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt

[Justin Hibbits]

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 + <addr>) */
 #define ISMT_GR_GCTRL		0x000	/* General Control */