Add SMBus host interface support for amdpm(4).

ok deraadt@

6 files changed, 294 insertions, 21 deletions

diff --git a/share/man/man4/amdpm.4 b/share/man/man4/amdpm.4
index 383fb9eed6c..5ea40ecfded 100644
--- a/share/man/man4/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: amdpm.4,v 1.5 2004/09/30 19:59:24 mickey Exp $
+.\" $OpenBSD: amdpm.4,v 1.6 2006/01/05 08:54:27 grange Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved
@@ -29,20 +29,26 @@
 .Os
 .Sh NAME
 .Nm amdpm
-.Nd AMD768 Power Management
+.Nd AMD-76x Power Management and SMBus controller
 .Sh SYNOPSIS
-.Cd "amdpm*  at pci?"
+.Cd "amdpm* at pci?"
+.Cd "iic* at amdpm?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the
-.Tn AMD 768 Power Management
-controller, in particular, only the RNG function is supported
-at this time.
-The data generated get fed into the pool of the
+driver provides support for the AMD-76x Power Management and SMBus
+controller.
+The RNG function and the SMBus host interface are supported at this time.
+.Pp
+The data generated by the RNG get fed into the pool of the
 .Xr random 4
 device.
+.Pp
+The SMBus host interface is used with the
+.Xr iic 4
+framework.
 .Sh SEE ALSO
+.Xr iic 4 ,
 .Xr intro 4 ,
 .Xr pci 4 ,
 .Xr random 4
@@ -51,3 +57,5 @@ The
 .Nm
 device driver appeared in
 .Ox 3.2 .
+SMBus host interface support was added in
+.Ox 3.9 .
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 109df9076ee..eb18fd17042 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iic.4,v 1.35 2006/01/04 01:37:33 dlg Exp $
+.\"	$OpenBSD: iic.4,v 1.36 2006/01/05 08:54:27 grange Exp $
 .\"
 .\" Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -60,6 +60,8 @@ it with the
 commands.
 .Sh SUPPORTED MASTERS
 .Bl -tag -width 10n -offset ind -compact
+.It Xr amdpm 4
+AMD-76x SMBus controller
 .It Xr alipm 4
 Acer Labs M7101 Power Management
 .It Xr amdiic 4
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index bfce90d47e5..c5965587410 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.456 2006/01/04 00:40:08 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.457 2006/01/05 08:54:27 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -82,7 +82,6 @@ gscpcib* at pci?		# NS Geode SC1100 PCI-ISA bridge
 gpio*	at gscpcib?
 
 # power management and other environmental stuff
-#amdpm*	at pci?			# AMD768MPX
 elansc*	at pci?			# AMD Elan SC520 System Controller
 gpio*	at elansc?
 geodesc* at pci?		# Geode SC1100/SCx200 IAOC
@@ -99,7 +98,7 @@ gpio*	at nsclpcsio?
 gscsio*	at isa?	port 0x2e		# NS Geode SC1100 Super I/O
 gscsio*	at isa?	port 0x15c
 iic*	at gscsio?			# ACCESS.bus 1 & 2
-piixpm* at pci?			# Intel PIIX PM
+piixpm* at pci?				# Intel PIIX PM
 iic*	at piixpm?
 alipm*	at pci?
 iic*	at alipm?
@@ -111,6 +110,8 @@ amdiic*	at pci?				# AMD-8111 SMBus controller
 iic*	at amdiic?
 #nviic*	at pci?				# NVIDIA nForce2/3/4 SMBus controller
 #iic*	at nviic?
+#amdpm*	at pci?				# AMD-76x PM and SMBus controller
+#iic*	at amdpm?
 
 it0	at isa? port 0x290		# IT8705F, IT8712F and SiS970 hardware
 it1	at isa? port 0xc00		# monitors
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 2cbb9760f5e..6a942978420 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdpm.c,v 1.6 2006/01/02 04:01:43 brad Exp $	*/
+/*	$OpenBSD: amdpm.c,v 1.7 2006/01/05 08:54:27 grange Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,20 +38,35 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
 #include <sys/timeout.h>
 #ifdef __HAVE_TIMECOUNTER
 #include <sys/timetc.h>
 #endif
 
+#include <machine/bus.h>
+
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
-#include <dev/rndvar.h>
 #include <dev/pci/amdpmreg.h>
 
+#include <dev/rndvar.h>
+#include <dev/i2c/i2cvar.h>
+
+#ifdef AMDPM_DEBUG
+#define DPRINTF(x) printf x
+#else
+#define DPRINTF(x)
+#endif
+
+#define AMDPM_SMBUS_DELAY	100
+#define AMDPM_SMBUS_TIMEOUT	1
+
 #ifdef __HAVE_TIMECOUNTER
 u_int amdpm_get_timecount(struct timecounter *tc);
 
@@ -77,6 +92,7 @@ struct amdpm_softc {
 
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;		/* PMxx space */
+	int sc_poll;
 
 	struct timeout sc_rnd_ch;
 #ifdef AMDPM_RND_COUNTERS
@@ -84,12 +100,29 @@ struct amdpm_softc {
 	struct evcnt sc_rnd_miss;
 	struct evcnt sc_rnd_data[256];
 #endif
+
+	struct i2c_controller sc_i2c_tag;
+	struct lock sc_i2c_lock;
+	struct {
+		i2c_op_t op;
+		void *buf;
+		size_t len;
+		int flags;
+		volatile int error;
+	} sc_i2c_xfer;
 };
 
 int	amdpm_match(struct device *, void *, void *);
 void	amdpm_attach(struct device *, struct device *, void *);
 void	amdpm_rnd_callout(void *);
 
+int	amdpm_i2c_acquire_bus(void *, int);
+void	amdpm_i2c_release_bus(void *, int);
+int	amdpm_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t,
+	    void *, size_t, int);
+
+int	amdpm_intr(void *);
+
 struct cfattach amdpm_ca = {
 	sizeof(struct amdpm_softc), amdpm_match, amdpm_attach
 };
@@ -106,7 +139,7 @@ struct cfdriver amdpm_cd = {
 
 const struct pci_matchid amdpm_ids[] = {
 	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_766_PMC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_PMC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_PMC }
 };
 
 int
@@ -121,6 +154,7 @@ amdpm_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct amdpm_softc *sc = (struct amdpm_softc *) self;
 	struct pci_attach_args *pa = aux;
+	struct i2cbus_attach_args iba;
 	struct timeval tv1, tv2;
 	pcireg_t cfg_reg, reg;
 	int i;
@@ -128,6 +162,7 @@ amdpm_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	sc->sc_iot = pa->pa_iot;
+	sc->sc_poll = 1; /* XXX */
 
 	cfg_reg = pci_conf_read(pa->pa_pc, pa->pa_tag, AMDPM_CONFREG);
 	if ((cfg_reg & AMDPM_PMIOEN) == 0) {
@@ -191,6 +226,18 @@ amdpm_attach(struct device *parent, struct device *self, void *aux)
 		amdpm_rnd_callout(sc);
 	}
 
+	/* Attach I2C bus */
+	lockinit(&sc->sc_i2c_lock, PRIBIO | PCATCH, "iiclk", 0, 0);
+	sc->sc_i2c_tag.ic_cookie = sc;
+	sc->sc_i2c_tag.ic_acquire_bus = amdpm_i2c_acquire_bus;
+	sc->sc_i2c_tag.ic_release_bus = amdpm_i2c_release_bus;
+	sc->sc_i2c_tag.ic_exec = amdpm_i2c_exec;
+
+	bzero(&iba, sizeof iba);
+	iba.iba_name = "iic";
+	iba.iba_tag = &sc->sc_i2c_tag;
+	config_found(self, &iba, iicbus_print);
+
 	printf("\n");
 }
 
@@ -239,3 +286,188 @@ amdpm_get_timecount(struct timecounter *tc)
 	return (u2);
 }
 #endif
+
+int
+amdpm_i2c_acquire_bus(void *cookie, int flags)
+{
+	struct amdpm_softc *sc = cookie;
+
+	if (cold || sc->sc_poll || (flags & I2C_F_POLL))
+		return (0);
+
+	return (lockmgr(&sc->sc_i2c_lock, LK_EXCLUSIVE, NULL));
+}
+
+void
+amdpm_i2c_release_bus(void *cookie, int flags)
+{
+	struct amdpm_softc *sc = cookie;
+
+	if (cold || sc->sc_poll || (flags & I2C_F_POLL))
+		return;
+
+	lockmgr(&sc->sc_i2c_lock, LK_RELEASE, NULL);
+}
+
+int
+amdpm_i2c_exec(void *cookie, i2c_op_t op, i2c_addr_t addr,
+    const void *cmdbuf, size_t cmdlen, void *buf, size_t len, int flags)
+{
+	struct amdpm_softc *sc = cookie;
+	u_int8_t *b;
+	u_int16_t st, ctl, data;
+	int retries;
+
+	DPRINTF(("%s: exec: op %d, addr 0x%x, cmdlen %d, len %d, flags 0x%x\n",
+	    sc->sc_dev.dv_xname, op, addr, cmdlen, len, flags));
+
+	/* Check if there's a transfer already running */
+	st = bus_space_read_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBSTAT);
+	DPRINTF(("%s: exec: st 0x%b\n", sc->sc_dev.dv_xname, st,
+	    AMDPM_SMBSTAT_BITS));
+	if (st & AMDPM_SMBSTAT_BSY)
+		return (1);
+
+	if (cold || sc->sc_poll)
+		flags |= I2C_F_POLL;
+
+	if (!I2C_OP_STOP_P(op) || cmdlen > 1 || len > 2)
+		return (1);
+
+	/* Setup transfer */
+	sc->sc_i2c_xfer.op = op;
+	sc->sc_i2c_xfer.buf = buf;
+	sc->sc_i2c_xfer.len = len;
+	sc->sc_i2c_xfer.flags = flags;
+	sc->sc_i2c_xfer.error = 0;
+
+	/* Set slave address and transfer direction */
+	bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBADDR,
+	    AMDPM_SMBADDR_ADDR(addr) |
+	    (I2C_OP_READ_P(op) ? AMDPM_SMBADDR_READ : 0));
+
+	b = (void *)cmdbuf;
+	if (cmdlen > 0)
+		/* Set command byte */
+		bus_space_write_1(sc->sc_iot, sc->sc_ioh, AMDPM_SMBCMD, b[0]);
+
+	if (I2C_OP_WRITE_P(op)) {
+		/* Write data */
+		data = 0;
+		b = buf;
+		if (len > 0)
+			data = b[0];
+		if (len > 1)
+			data |= ((u_int16_t)b[1] << 8);
+		if (len > 0)
+			bus_space_write_2(sc->sc_iot, sc->sc_ioh,
+			    AMDPM_SMBDATA, data);
+	}
+
+	/* Set SMBus command */
+	if (len == 0)
+		ctl = AMDPM_SMBCTL_CMD_BYTE;
+	else if (len == 1)
+		ctl = AMDPM_SMBCTL_CMD_BDATA;
+	else if (len == 2)
+		ctl = AMDPM_SMBCTL_CMD_WDATA;
+
+	if ((flags & I2C_F_POLL) == 0)
+		ctl |= AMDPM_SMBCTL_CYCEN;
+
+	/* Start transaction */
+	ctl |= AMDPM_SMBCTL_START;
+	bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBCTL, ctl);
+
+	if (flags & I2C_F_POLL) {
+		/* Poll for completion */
+		DELAY(AMDPM_SMBUS_DELAY);
+		for (retries = 1000; retries > 0; retries--) {
+			st = bus_space_read_2(sc->sc_iot, sc->sc_ioh,
+			    AMDPM_SMBSTAT);
+			if ((st & AMDPM_SMBSTAT_HBSY) == 0)
+				break;
+			DELAY(AMDPM_SMBUS_DELAY);
+		}
+		if (st & AMDPM_SMBSTAT_HBSY)
+			goto timeout;
+		amdpm_intr(sc);
+	} else {
+		/* Wait for interrupt */
+		if (tsleep(sc, PRIBIO, "iicexec", AMDPM_SMBUS_TIMEOUT * hz))
+			goto timeout;
+	}
+
+	if (sc->sc_i2c_xfer.error)
+		return (1);
+
+	return (0);
+
+timeout:
+	/*
+	 * Transfer timeout. Kill the transaction and clear status bits.
+	 */
+	printf("%s: timeout, status 0x%b\n", sc->sc_dev.dv_xname, st,
+	    AMDPM_SMBSTAT_BITS);
+	bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBCTL,
+	    AMDPM_SMBCTL_ABORT);
+	DELAY(AMDPM_SMBUS_DELAY);
+	st = bus_space_read_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBSTAT);
+	if ((st & AMDPM_SMBSTAT_ABRT) == 0)
+		printf("%s: transaction abort failed, status 0x%b\n",
+		    sc->sc_dev.dv_xname, st, AMDPM_SMBSTAT_BITS);
+	bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBSTAT, st);
+	return (1);
+}
+
+int
+amdpm_intr(void *arg)
+{
+	struct amdpm_softc *sc = arg;
+	u_int16_t st, data;
+	u_int8_t *b;
+	size_t len;
+
+	/* Read status */
+	st = bus_space_read_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBSTAT);
+	if ((st & AMDPM_SMBSTAT_HBSY) != 0 || (st & (AMDPM_SMBSTAT_ABRT |
+	    AMDPM_SMBSTAT_COL | AMDPM_SMBSTAT_PRERR | AMDPM_SMBSTAT_CYC |
+	    AMDPM_SMBSTAT_TO | AMDPM_SMBSTAT_SNP | AMDPM_SMBSTAT_SLV |
+	    AMDPM_SMBSTAT_SMBA)) == 0)
+		/* Interrupt was not for us */
+		return (0);
+
+	DPRINTF(("%s: intr: st 0x%b\n", sc->sc_dev.dv_xname, st,
+	    AMDPM_SMBSTAT_BITS));
+
+	/* Clear status bits */
+	bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMDPM_SMBSTAT, st);
+
+	/* Check for errors */
+	if (st & (AMDPM_SMBSTAT_COL | AMDPM_SMBSTAT_PRERR |
+	    AMDPM_SMBSTAT_TO)) {
+		sc->sc_i2c_xfer.error = 1;
+		goto done;
+	}
+
+	if (st & AMDPM_SMBSTAT_CYC) {
+		if (I2C_OP_WRITE_P(sc->sc_i2c_xfer.op))
+			goto done;
+
+		/* Read data */
+		b = sc->sc_i2c_xfer.buf;
+		len = sc->sc_i2c_xfer.len;
+		if (len > 0) {
+			data = bus_space_read_2(sc->sc_iot, sc->sc_ioh,
+			    AMDPM_SMBDATA);
+			b[0] = data & 0xff;
+		}
+		if (len > 1)
+			b[1] = (data >> 8) & 0xff;
+	}
+
+done:
+	if ((sc->sc_i2c_xfer.flags & I2C_F_POLL) == 0)
+		wakeup(sc);
+	return (1);
+}
diff --git a/sys/dev/pci/amdpmreg.h b/sys/dev/pci/amdpmreg.h
index e19b1703d62..d7819913b4f 100644
--- a/sys/dev/pci/amdpmreg.h
+++ b/sys/dev/pci/amdpmreg.h
@@ -1,5 +1,4 @@
-/*	$OpenBSD: amdpmreg.h,v 1.3 2004/10/01 04:08:46 jsg Exp $	*/
-/*	$NetBSD$	*/
+/*	$OpenBSD: amdpmreg.h,v 1.4 2006/01/05 08:54:27 grange Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,3 +61,34 @@
 #define	AMDPM_RNGDATA	0xf0		/* 32 bit random data register */
 #define	AMDPM_RNGSTAT	0xf4		/* RNG status register */
 #define	AMDPM_RNGDONE	0x00000001	/* Random number generation complete */
+
+#define AMDPM_SMBSTAT	0xe0		/* SMBus status */
+#define AMDPM_SMBSTAT_ABRT	(1 << 0)	/* transfer abort */
+#define AMDPM_SMBSTAT_COL	(1 << 1)	/* collision */
+#define AMDPM_SMBSTAT_PRERR	(1 << 2)	/* protocol error */
+#define AMDPM_SMBSTAT_HBSY	(1 << 3)	/* host controller busy */
+#define AMDPM_SMBSTAT_CYC	(1 << 4)	/* cycle complete */
+#define AMDPM_SMBSTAT_TO	(1 << 5)	/* timeout */
+#define AMDPM_SMBSTAT_SNP	(1 << 8)	/* snoop address match */
+#define AMDPM_SMBSTAT_SLV	(1 << 9)	/* slave address match */
+#define AMDPM_SMBSTAT_SMBA	(1 << 10)	/* SMBALERT# asserted */
+#define AMDPM_SMBSTAT_BSY	(1 << 11)	/* bus busy */
+#define AMDPM_SMBSTAT_BITS	"\020\001ABRT\002COL\003PRERR\004HBSY\005CYC\006TO\011SNP\012SLV\013SMBA\014BSY"
+#define AMDPM_SMBCTL	0xe2		/* SMBus control */
+#define AMDPM_SMBCTL_CMD_QUICK	0		/* QUICK command */
+#define AMDPM_SMBCTL_CMD_BYTE	1		/* BYTE command */
+#define AMDPM_SMBCTL_CMD_BDATA	2		/* BYTE DATA command */
+#define AMDPM_SMBCTL_CMD_WDATA	3		/* WORD DATA command */
+#define AMDPM_SMBCTL_CMD_PCALL	4		/* PROCESS CALL command */
+#define AMDPM_SMBCTL_CMD_BLOCK	5		/* BLOCK command */
+#define AMDPM_SMBCTL_START	(1 << 3)	/* start transfer */
+#define AMDPM_SMBCTL_CYCEN	(1 << 4)	/* intr on cycle complete */
+#define AMDPM_SMBCTL_ABORT	(1 << 5)	/* abort transfer */
+#define AMDPM_SMBCTL_SNPEN	(1 << 8)	/* intr on snoop addr match */
+#define AMDPM_SMBCTL_SLVEN	(1 << 9)	/* intr on slave addr match */
+#define AMDPM_SMBCTL_SMBAEN	(1 << 10)	/* intr on SMBALERT# */
+#define AMDPM_SMBADDR	0xe4		/* SMBus address */
+#define AMDPM_SMBADDR_READ	(1 << 0)	/* read direction */
+#define AMDPM_SMBADDR_ADDR(x)	(((x) & 0x7f) << 1) /* 7-bit address */
+#define AMDPM_SMBDATA	0xe6		/* SMBus data */
+#define AMDPM_SMBCMD	0xe8		/* SMBus command */
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 1d7c52fc635..9c071acc384 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.197 2006/01/04 00:40:08 dlg Exp $
+#	$OpenBSD: files.pci,v 1.198 2006/01/05 08:54:27 grange Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -507,8 +507,8 @@ device	nfe: ether, ifnet, mii, ifmedia, mii_phy
 attach	nfe at pci
 file	dev/pci/if_nfe.c		nfe
 
-# AMD 768MPX power management controller
-device	amdpm {}
+# AMD-76x PM and SMBus controller
+device	amdpm: i2cbus
 attach	amdpm at pci
 file	dev/pci/amdpm.c			amdpm