Date: Thu, 20 Feb 2020 01:42:11 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358149 - in stable/12/sys/dev: amdsbwd intpm Message-ID: <202002200142.01K1gBYE098554@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Thu Feb 20 01:42:11 2020 New Revision: 358149 URL: https://svnweb.freebsd.org/changeset/base/358149 Log: MFC r357869: amdsbwd, intpm: Add Hygon Dhyana support. Modified: stable/12/sys/dev/amdsbwd/amd_chipset.h stable/12/sys/dev/amdsbwd/amdsbwd.c stable/12/sys/dev/intpm/intpm.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/amdsbwd/amd_chipset.h ============================================================================== --- stable/12/sys/dev/amdsbwd/amd_chipset.h Thu Feb 20 01:41:12 2020 (r358148) +++ stable/12/sys/dev/amdsbwd/amd_chipset.h Thu Feb 20 01:42:11 2020 (r358149) @@ -146,3 +146,5 @@ #define AMDCZ_SMBUS_DEVID 0x790b1022 #define AMDCZ49_SMBUS_REVID 0x49 +#define HYGONCZ_SMBUS_DEVID 0x790b1d94 + Modified: stable/12/sys/dev/amdsbwd/amdsbwd.c ============================================================================== --- stable/12/sys/dev/amdsbwd/amdsbwd.c Thu Feb 20 01:41:12 2020 (r358148) +++ stable/12/sys/dev/amdsbwd/amdsbwd.c Thu Feb 20 01:42:11 2020 (r358149) @@ -59,6 +59,8 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <sys/rman.h> +#include <machine/cputypes.h> +#include <machine/md_var.h> #include <machine/resource.h> #include <sys/watchdog.h> @@ -268,7 +270,8 @@ amdsbwd_identify(driver_t *driver, device_t parent) return; if (pci_get_devid(smb_dev) != AMDSB_SMBUS_DEVID && pci_get_devid(smb_dev) != AMDFCH_SMBUS_DEVID && - pci_get_devid(smb_dev) != AMDCZ_SMBUS_DEVID) + pci_get_devid(smb_dev) != AMDCZ_SMBUS_DEVID && + pci_get_devid(smb_dev) != HYGONCZ_SMBUS_DEVID) return; child = BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "amdsbwd", -1); @@ -377,6 +380,7 @@ static void amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) { uint8_t val; + char buf[36]; val = pmio_read(pmres, AMDFCH41_PM_ISA_CTRL); if ((val & AMDFCH41_MMIO_EN) != 0) { @@ -415,7 +419,9 @@ amdsbwd_probe_fch41(device_t dev, struct resource *pmr amdsbwd_verbose_printf(dev, "AMDFCH41_PM_DECODE_EN3 value = %#04x\n", val); #endif - device_set_desc(dev, "AMD FCH Rev 41h+ Watchdog Timer"); + snprintf(buf, sizeof(buf), "%s FCH Rev 41h+ Watchdog Timer", + cpu_vendor_id == CPU_VENDOR_HYGON ? "Hygon" : "AMD"); + device_set_desc_copy(dev, buf); } static int Modified: stable/12/sys/dev/intpm/intpm.c ============================================================================== --- stable/12/sys/dev/intpm/intpm.c Thu Feb 20 01:41:12 2020 (r358148) +++ stable/12/sys/dev/intpm/intpm.c Thu Feb 20 01:42:11 2020 (r358149) @@ -102,6 +102,7 @@ const struct intsmb_device { { AMDSB_SMBUS_DEVID, "AMD SB600/7xx/8xx/9xx SMBus Controller" }, { AMDFCH_SMBUS_DEVID, "AMD FCH SMBus Controller" }, { AMDCZ_SMBUS_DEVID, "AMD FCH SMBus Controller" }, + { HYGONCZ_SMBUS_DEVID, "Hygon FCH SMBus Controller" }, }; static int @@ -243,6 +244,7 @@ intsmb_attach(device_t dev) break; case AMDFCH_SMBUS_DEVID: case AMDCZ_SMBUS_DEVID: + case HYGONCZ_SMBUS_DEVID: sc->sb8xx = 1; break; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002200142.01K1gBYE098554>