Module Name: src
Committed By: martin
Date: Tue Aug 6 16:02:54 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: piixpm.c piixpmreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1327):
sys/dev/pci/piixpmreg.h: revision 1.8
sys/dev/pci/piixpm.c: revision 1.53
sys/dev/pci/piixpm.c: revision 1.54
Sync with OpenBSD's piixpm.c up to rev. 1.35:
- Print "polling" correctly when in the attach function. Same as OpenBSD
rev. 1.22-23.
- Improve debug printf()'s. Part of OpenBSD 1.24.
- Do not bus_space_map devices which are at address 0 (it's uninitialized).
Same as OpenBSD rev. 1.25.
- Add ServerWorks HT1100 device from OpenBSD. Same as OpenBSD rev. 1.32
- Use unique wait channel. From OpenBSD rev. 1.35
Improve SB800 and newer chipsets support:
- Add newer chipset (e.g. X370/X399 and newer) support that the PCI device id
is 0x790b. The register definitions are mainly taken from FreeBSD.
- Rename PIIXPM_INDIRECTIO_* to SB800_INDIRECTIO_* because those are only
for SB800 and newer chipsets.
- SB800 also support 4 ports.
- SB800's interrupt configuration bit is different from others.
Use SB800_SMB_HOSTC's bit 0.
- Do not bus_space_map devices which are at address 0 (it's uninitialized)
in piixpm_attach().
- Add the port number to the dmesg output.
- Avoid uninitiliazed use of ctl and corresponding warnings. From OpenBSD rev.
1.38
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.7 -r1.7.22.1 src/sys/dev/pci/piixpmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.52 src/sys/dev/pci/piixpm.c:1.52.6.1
--- src/sys/dev/pci/piixpm.c:1.52 Wed Mar 29 09:04:36 2017
+++ src/sys/dev/pci/piixpm.c Tue Aug 6 16:02:54 2019
@@ -1,5 +1,5 @@
-/* $NetBSD: piixpm.c,v 1.52 2017/03/29 09:04:36 msaitoh Exp $ */
-/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
+/* $NetBSD: piixpm.c,v 1.52.6.1 2019/08/06 16:02:54 martin Exp $ */
+/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko <gra...@openbsd.org>
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.52 2017/03/29 09:04:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.52.6.1 2019/08/06 16:02:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,12 +49,27 @@ __KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1
#define DPRINTF(x)
#endif
-#define PIIXPM_IS_CSB5(id) \
- (PCI_VENDOR((id)) == PCI_VENDOR_SERVERWORKS && \
- PCI_PRODUCT((id)) == PCI_PRODUCT_SERVERWORKS_CSB5)
+#define PIIXPM_IS_CSB5(sc) \
+ (PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_SERVERWORKS && \
+ PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_SERVERWORKS_CSB5)
#define PIIXPM_DELAY 200
#define PIIXPM_TIMEOUT 1
+#define PIIXPM_IS_SB800GRP(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_ATI) && \
+ ((PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_ATI_SB600_SMB) && \
+ ((sc)->sc_rev >= 0x40)))
+
+#define PIIXPM_IS_HUDSON(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_AMD) && \
+ (PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_AMD_HUDSON_SMB))
+
+#define PIIXPM_IS_KERNCZ(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_AMD) && \
+ (PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_AMD_KERNCZ_SMB))
+
+#define PIIXPM_IS_FCHGRP(sc) (PIIXPM_IS_HUDSON(sc) || PIIXPM_IS_KERNCZ(sc))
+
struct piixpm_smbus {
int sda;
struct piixpm_softc *softc;
@@ -75,6 +90,7 @@ struct piixpm_softc {
pci_chipset_tag_t sc_pc;
pcitag_t sc_pcitag;
pcireg_t sc_id;
+ pcireg_t sc_rev;
int sc_numbusses;
device_t sc_i2c_device[4];
@@ -142,12 +158,14 @@ piixpm_match(device_t parent, cfdata_t m
case PCI_PRODUCT_SERVERWORKS_CSB5:
case PCI_PRODUCT_SERVERWORKS_CSB6:
case PCI_PRODUCT_SERVERWORKS_HT1000SB:
+ case PCI_PRODUCT_SERVERWORKS_HT1100SB:
return 1;
}
break;
case PCI_VENDOR_AMD:
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_AMD_HUDSON_SMB:
+ case PCI_PRODUCT_AMD_KERNCZ_SMB:
return 1;
}
break;
@@ -164,6 +182,7 @@ piixpm_attach(device_t parent, device_t
pcireg_t base, conf;
pcireg_t pmmisc;
pci_intr_handle_t ih;
+ bool usesmi = false;
const char *intrstr = NULL;
int i, flags;
char intrbuf[PCI_INTRSTR_LEN];
@@ -171,6 +190,7 @@ piixpm_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_iot = pa->pa_iot;
sc->sc_id = pa->pa_id;
+ sc->sc_rev = PCI_REVISION(pa->pa_class);
sc->sc_pc = pa->pa_pc;
sc->sc_pcitag = pa->pa_tag;
sc->sc_numbusses = 1;
@@ -180,10 +200,6 @@ piixpm_attach(device_t parent, device_t
if (!pmf_device_register(self, piixpm_suspend, piixpm_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
- /* Read configuration */
- conf = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_HOSTC);
- DPRINTF(("%s: conf 0x%x\n", device_xname(self), conf));
-
if ((PCI_VENDOR(pa->pa_id) != PCI_VENDOR_INTEL) ||
(PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_INTEL_82371AB_PMC))
goto nopowermanagement;
@@ -195,7 +211,7 @@ piixpm_attach(device_t parent, device_t
/* Map I/O space */
base = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_PM_BASE);
- if (bus_space_map(sc->sc_pm_iot, PCI_MAPREG_IO_ADDR(base),
+ if (base == 0 || bus_space_map(sc->sc_pm_iot, PCI_MAPREG_IO_ADDR(base),
PIIX_PM_SIZE, 0, &sc->sc_pm_ioh)) {
aprint_error_dev(self,
"can't map power management I/O space\n");
@@ -207,69 +223,76 @@ piixpm_attach(device_t parent, device_t
* PIIX4 and PIIX4E have a bug in the timer latch, see Errata #20
* in the "Specification update" (document #297738).
*/
- acpipmtimer_attach(self, sc->sc_pm_iot, sc->sc_pm_ioh,
- PIIX_PM_PMTMR,
- (PCI_REVISION(pa->pa_class) < 3) ? ACPIPMT_BADLATCH : 0 );
+ acpipmtimer_attach(self, sc->sc_pm_iot, sc->sc_pm_ioh, PIIX_PM_PMTMR,
+ (PCI_REVISION(pa->pa_class) < 3) ? ACPIPMT_BADLATCH : 0);
nopowermanagement:
- /* SB800 rev 0x40+ and AMD HUDSON need special initialization */
- if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_AMD &&
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_HUDSON_SMB) {
- if (piixpm_sb800_init(sc) == 0) {
- goto attach_i2c;
- }
- aprint_normal_dev(self, "SMBus initialization failed\n");
- return;
- }
- if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ATI &&
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_SB600_SMB &&
- PCI_REVISION(pa->pa_class) >= 0x40) {
+ /* SB800 rev 0x40+, AMD HUDSON and newer need special initialization */
+ if (PIIXPM_IS_FCHGRP(sc) || PIIXPM_IS_SB800GRP(sc)) {
if (piixpm_sb800_init(sc) == 0) {
sc->sc_numbusses = 4;
- goto attach_i2c;
+
+ /* Read configuration */
+ conf = pci_conf_read(pa->pa_pc, pa->pa_tag,
+ SB800_SMB_HOSTC);
+ DPRINTF(("%s: conf 0x%08x\n", device_xname(self),
+ conf));
+
+ usesmi = conf & SB800_SMB_HOSTC_SMI;
+ goto setintr;
}
aprint_normal_dev(self, "SMBus initialization failed\n");
return;
}
+ /* Read configuration */
+ conf = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_HOSTC);
+ DPRINTF(("%s: conf 0x%08x\n", device_xname(self), conf));
+
if ((conf & PIIX_SMB_HOSTC_HSTEN) == 0) {
aprint_normal_dev(self, "SMBus disabled\n");
return;
}
+ usesmi = (conf & PIIX_SMB_HOSTC_INTMASK) == PIIX_SMB_HOSTC_SMI;
/* Map I/O space */
base = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_BASE) & 0xffff;
- if (bus_space_map(sc->sc_smb_iot, PCI_MAPREG_IO_ADDR(base),
+ if (base == 0 ||
+ bus_space_map(sc->sc_smb_iot, PCI_MAPREG_IO_ADDR(base),
PIIX_SMB_SIZE, 0, &sc->sc_smb_ioh)) {
aprint_error_dev(self, "can't map smbus I/O space\n");
return;
}
+setintr:
sc->sc_poll = 1;
aprint_normal_dev(self, "");
- if ((conf & PIIX_SMB_HOSTC_INTMASK) == PIIX_SMB_HOSTC_SMI) {
+ if (usesmi) {
/* No PCI IRQ */
aprint_normal("interrupting at SMI, ");
- } else if ((conf & PIIX_SMB_HOSTC_INTMASK) == PIIX_SMB_HOSTC_IRQ) {
- /* Install interrupt handler */
- if (pci_intr_map(pa, &ih) == 0) {
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf,
- sizeof(intrbuf));
- sc->sc_smb_ih = pci_intr_establish_xname(pa->pa_pc, ih,
- IPL_BIO, piixpm_intr, sc, device_xname(sc->sc_dev));
- if (sc->sc_smb_ih != NULL) {
- aprint_normal("interrupting at %s", intrstr);
- sc->sc_poll = 0;
+ } else {
+ if ((conf & PIIX_SMB_HOSTC_INTMASK) == PIIX_SMB_HOSTC_IRQ) {
+ /* Install interrupt handler */
+ if (pci_intr_map(pa, &ih) == 0) {
+ intrstr = pci_intr_string(pa->pa_pc, ih,
+ intrbuf, sizeof(intrbuf));
+ sc->sc_smb_ih = pci_intr_establish_xname(
+ pa->pa_pc, ih, IPL_BIO, piixpm_intr,
+ sc, device_xname(sc->sc_dev));
+ if (sc->sc_smb_ih != NULL) {
+ aprint_normal("interrupting at %s",
+ intrstr);
+ sc->sc_poll = 0;
+ }
}
}
+ if (sc->sc_poll)
+ aprint_normal("polling");
}
- if (sc->sc_poll)
- aprint_normal("polling");
aprint_normal("\n");
-attach_i2c:
for (i = 0; i < sc->sc_numbusses; i++)
sc->sc_i2c_device[i] = NULL;
@@ -279,6 +302,20 @@ attach_i2c:
}
static int
+piixpm_iicbus_print(void *aux, const char *pnp)
+{
+ struct i2cbus_attach_args *iba = aux;
+ struct i2c_controller *tag = iba->iba_tag;
+ struct piixpm_smbus *bus = tag->ic_cookie;
+ struct piixpm_softc *sc = bus->softc;
+
+ iicbus_print(aux, pnp);
+ if (sc->sc_numbusses != 0)
+ aprint_normal(" port %d", bus->sda);
+
+ return UNCONF;
+}
+static int
piixpm_rescan(device_t self, const char *ifattr, const int *flags)
{
struct piixpm_softc *sc = device_private(self);
@@ -303,7 +340,7 @@ piixpm_rescan(device_t self, const char
iba.iba_type = I2C_TYPE_SMBUS;
iba.iba_tag = &sc->sc_i2c_tags[i];
sc->sc_i2c_device[i] = config_found_ia(self, ifattr, &iba,
- iicbus_print);
+ piixpm_iicbus_print);
}
return 0;
@@ -362,39 +399,53 @@ piixpm_sb800_init(struct piixpm_softc *s
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh; /* indirect I/O handle */
uint16_t val, base_addr;
+ bool enabled;
/* Fetch SMB base address */
if (bus_space_map(iot,
- PIIXPM_INDIRECTIO_BASE, PIIXPM_INDIRECTIO_SIZE, 0, &ioh)) {
+ SB800_INDIRECTIO_BASE, SB800_INDIRECTIO_SIZE, 0, &ioh)) {
device_printf(sc->sc_dev, "couldn't map indirect I/O space\n");
return EBUSY;
}
- bus_space_write_1(iot, ioh, PIIXPM_INDIRECTIO_INDEX,
- SB800_PM_SMBUS0EN_LO);
- val = bus_space_read_1(iot, ioh, PIIXPM_INDIRECTIO_DATA);
- bus_space_write_1(iot, ioh, PIIXPM_INDIRECTIO_INDEX,
- SB800_PM_SMBUS0EN_HI);
- val |= bus_space_read_1(iot, ioh, PIIXPM_INDIRECTIO_DATA) << 8;
- sc->sc_sb800_ioh = ioh;
-
- if ((val & SB800_PM_SMBUS0EN_ENABLE) == 0)
- return ENOENT;
-
- base_addr = val & SB800_PM_SMBUS0EN_BADDR;
+ if (PIIXPM_IS_FCHGRP(sc)) {
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_INDEX,
+ AMDFCH41_PM_DECODE_EN0);
+ val = bus_space_read_1(iot, ioh, SB800_INDIRECTIO_DATA);
+ enabled = val & AMDFCH41_SMBUS_EN;
+ if (!enabled)
+ return ENOENT;
+
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_INDEX,
+ AMDFCH41_PM_DECODE_EN1);
+ val = bus_space_read_1(iot, ioh, SB800_INDIRECTIO_DATA) << 8;
+ base_addr = val;
+ } else {
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_INDEX,
+ SB800_PM_SMBUS0EN_LO);
+ val = bus_space_read_1(iot, ioh, SB800_INDIRECTIO_DATA);
+ enabled = val & SB800_PM_SMBUS0EN_ENABLE;
+ if (!enabled)
+ return ENOENT;
+
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_INDEX,
+ SB800_PM_SMBUS0EN_HI);
+ val |= bus_space_read_1(iot, ioh, SB800_INDIRECTIO_DATA) << 8;
+ base_addr = val & SB800_PM_SMBUS0EN_BADDR;
+
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_INDEX,
+ SB800_PM_SMBUS0SELEN);
+ bus_space_write_1(iot, ioh, SB800_INDIRECTIO_DATA,
+ SB800_PM_SMBUS0EN_ENABLE);
+ }
+ sc->sc_sb800_ioh = ioh;
aprint_debug_dev(sc->sc_dev, "SMBus @ 0x%04x\n", base_addr);
- bus_space_write_1(iot, ioh, PIIXPM_INDIRECTIO_INDEX,
- SB800_PM_SMBUS0SELEN);
- bus_space_write_1(iot, ioh, PIIXPM_INDIRECTIO_DATA, 1); /* SMBUS0SEL */
-
if (bus_space_map(iot, PCI_MAPREG_IO_ADDR(base_addr),
PIIX_SMB_SIZE, 0, &sc->sc_smb_ioh)) {
aprint_error_dev(sc->sc_dev, "can't map smbus I/O space\n");
return EBUSY;
}
- aprint_normal_dev(sc->sc_dev, "polling (SB800)\n");
- sc->sc_poll = 1;
return 0;
}
@@ -429,12 +480,16 @@ piixpm_i2c_acquire_bus(void *cookie, int
if (!cold)
mutex_enter(&sc->sc_i2c_mutex);
- if (smbus->sda > 0) /* SB800 */
- {
+ if (PIIXPM_IS_KERNCZ(sc)) {
bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
- PIIXPM_INDIRECTIO_INDEX, SB800_PM_SMBUS0SEL);
+ SB800_INDIRECTIO_INDEX, AMDFCH41_PM_PORT_INDEX);
bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
- PIIXPM_INDIRECTIO_DATA, smbus->sda << 1);
+ SB800_INDIRECTIO_DATA, smbus->sda << 3);
+ } else if (PIIXPM_IS_SB800GRP(sc) || PIIXPM_IS_HUDSON(sc)) {
+ bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
+ SB800_INDIRECTIO_INDEX, SB800_PM_SMBUS0SEL);
+ bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
+ SB800_INDIRECTIO_DATA, smbus->sda << 1);
}
return 0;
@@ -446,16 +501,20 @@ piixpm_i2c_release_bus(void *cookie, int
struct piixpm_smbus *smbus = cookie;
struct piixpm_softc *sc = smbus->softc;
- if (smbus->sda > 0) /* SB800 */
- {
+ if (PIIXPM_IS_KERNCZ(sc)) {
+ bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
+ SB800_INDIRECTIO_INDEX, AMDFCH41_PM_PORT_INDEX);
+ bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
+ SB800_INDIRECTIO_DATA, 0);
+ } else if (PIIXPM_IS_SB800GRP(sc) || PIIXPM_IS_HUDSON(sc)) {
/*
* HP Microserver hangs after reboot if not set to SDA0.
* Also add shutdown hook?
*/
bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
- PIIXPM_INDIRECTIO_INDEX, SB800_PM_SMBUS0SEL);
+ SB800_INDIRECTIO_INDEX, SB800_PM_SMBUS0SEL);
bus_space_write_1(sc->sc_iot, sc->sc_sb800_ioh,
- PIIXPM_INDIRECTIO_DATA, 0);
+ SB800_INDIRECTIO_DATA, 0);
}
if (!cold)
@@ -468,12 +527,13 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
{
struct piixpm_smbus *smbus = cookie;
struct piixpm_softc *sc = smbus->softc;
- const u_int8_t *b;
- u_int8_t ctl = 0, st;
+ const uint8_t *b;
+ uint8_t ctl = 0, st;
int retries;
- DPRINTF(("%s: exec: op %d, addr 0x%x, cmdlen %zu, len %zu, flags 0x%x\n",
- device_xname(sc->sc_dev), op, addr, cmdlen, len, flags));
+ DPRINTF(("%s: exec: op %d, addr 0x%02x, cmdlen %zu, len %zu, "
+ "flags 0x%x\n",
+ device_xname(sc->sc_dev), op, addr, cmdlen, len, flags));
/* Clear status bits */
bus_space_write_1(sc->sc_smb_iot, sc->sc_smb_ioh, PIIX_SMB_HS,
@@ -543,6 +603,8 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
ctl = PIIX_SMB_HC_CMD_BDATA;
else if (len == 2)
ctl = PIIX_SMB_HC_CMD_WDATA;
+ else
+ panic("%s: unexpected len %zu", __func__, len);
if ((flags & I2C_F_POLL) == 0)
ctl |= PIIX_SMB_HC_INTREN;
@@ -553,7 +615,7 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
if (flags & I2C_F_POLL) {
/* Poll for completion */
- if (PIIXPM_IS_CSB5(sc->sc_id))
+ if (PIIXPM_IS_CSB5(sc))
DELAY(2*PIIXPM_DELAY);
else
DELAY(PIIXPM_DELAY);
@@ -569,7 +631,7 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
piixpm_intr(sc);
} else {
/* Wait for interrupt */
- if (tsleep(sc, PRIBIO, "iicexec", PIIXPM_TIMEOUT * hz))
+ if (tsleep(sc, PRIBIO, "piixpm", PIIXPM_TIMEOUT * hz))
goto timeout;
}
@@ -594,7 +656,7 @@ timeout:
/*
* CSB5 needs hard reset to unlock the smbus after timeout.
*/
- if (PIIXPM_IS_CSB5(sc->sc_id))
+ if (PIIXPM_IS_CSB5(sc))
piixpm_csb5_reset(sc);
return (1);
}
@@ -603,8 +665,8 @@ static int
piixpm_intr(void *arg)
{
struct piixpm_softc *sc = arg;
- u_int8_t st;
- u_int8_t *b;
+ uint8_t st;
+ uint8_t *b;
size_t len;
/* Read status */
Index: src/sys/dev/pci/piixpmreg.h
diff -u src/sys/dev/pci/piixpmreg.h:1.7 src/sys/dev/pci/piixpmreg.h:1.7.22.1
--- src/sys/dev/pci/piixpmreg.h:1.7 Tue Mar 18 18:20:42 2014
+++ src/sys/dev/pci/piixpmreg.h Tue Aug 6 16:02:54 2019
@@ -1,6 +1,34 @@
-/* $NetBSD: piixpmreg.h,v 1.7 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: piixpmreg.h,v 1.7.22.1 2019/08/06 16:02:54 martin Exp $ */
/* $OpenBSD: piixreg.h,v 1.3 2006/01/03 22:39:03 grange Exp $ */
+/*-
+ * Copyright (c) 2016 Andriy Gapon <a...@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/dev/amdsbwd/amd_chipset.h 333269 2018-05-05 05:22:11Z avg $
+ */
+
/*
* Copyright (c) 2005 Alexander Yurchenko <gra...@openbsd.org>
*
@@ -75,10 +103,16 @@
#define PIIX_PM_SIZE 0x38 /* Power management I/O space size */
#define PIIX_SMB_SIZE 0x10 /* SMBus I/O space size */
-#define PIIXPM_INDIRECTIO_BASE 0xcd6
-#define PIIXPM_INDIRECTIO_SIZE 2
-#define PIIXPM_INDIRECTIO_INDEX 0
-#define PIIXPM_INDIRECTIO_DATA 1
+/*
+ * AMD SB800 and compatible chipset's configuration registers.
+ * See SB8xx RRG 2.3.3, etc.
+ */
+
+/* In the I/O area */
+#define SB800_INDIRECTIO_BASE 0xcd6
+#define SB800_INDIRECTIO_SIZE 2
+#define SB800_INDIRECTIO_INDEX 0
+#define SB800_INDIRECTIO_DATA 1
#define SB800_PM_SMBUS0EN_LO 0x2c
#define SB800_PM_SMBUS0EN_HI 0x2d
@@ -88,4 +122,28 @@
#define SB800_PM_SMBUS0EN_ENABLE 0x0001
#define SB800_PM_SMBUS0EN_BADDR 0xffe0
+/* In the PCI config space */
+#define SB800_SMB_HOSTC 0x10 /* I2C bus configuration */
+#define SB800_SMB_HOSTC_SMI (1 << 0) /* SMI */
+
+/*
+ * Newer FCH registers in the PMIO space.
+ * See BKDG for Family 16h Models 30h-3Fh 3.26.13 PMx00 and PMx04.
+ */
+#define AMDFCH41_PM_DECODE_EN0 0x00
+#define AMDFCH41_SMBUS_EN 0x10
+#define AMDFCH41_WDT_EN 0x80
+#define AMDFCH41_PM_DECODE_EN1 0x01
+#define AMDFCH41_PM_PORT_INDEX 0x02
+#define AMDFCH41_PM_DECODE_EN3 0x03
+#define AMDFCH41_WDT_RES_MASK 0x03
+#define AMDFCH41_WDT_RES_32US 0x00
+#define AMDFCH41_WDT_RES_10MS 0x01
+#define AMDFCH41_WDT_RES_100MS 0x02
+#define AMDFCH41_WDT_RES_1S 0x03
+#define AMDFCH41_WDT_EN_MASK 0x0c
+#define AMDFCH41_WDT_ENABLE 0x00
+#define AMDFCH41_PM_ISA_CTRL 0x04
+#define AMDFCH41_MMIO_EN 0x02
+
#endif /* !_DEV_PCI_PIIXREG_H_ */
