Attachment #252943 for bug #280942

View | Details | Raw Unified | Return to bug 280942
Collapse All | Expand All

Lines 60-65 Link Here

(-)src/sys/dev/amdsmn/amdsmn.c (+7 lines)
60	#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630	60	#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630
61	#define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4	61	#define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4
62	#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8	62	#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8
		63	#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8
63		64
64	struct pciid;	65	struct pciid;
65	struct amdsmn_softc {	66	struct amdsmn_softc {
Lines 112-117 Link Here
112	{	113	{
113	.amdsmn_vendorid = CPU_VENDOR_AMD,	114	.amdsmn_vendorid = CPU_VENDOR_AMD,
114	.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_ROOT,	115	.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_ROOT,
		116	.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
		117	.amdsmn_data_reg = F17H_SMN_DATA_REG,
		118	},
		119	{
		120	.amdsmn_vendorid = CPU_VENDOR_AMD,
		121	.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M70H_ROOT,
115	.amdsmn_addr_reg = F17H_SMN_ADDR_REG,	122	.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
116	.amdsmn_data_reg = F17H_SMN_DATA_REG,	123	.amdsmn_data_reg = F17H_SMN_DATA_REG,
117	},	124	},




#define	DEVICEID_AMD_HOSTB17H_M60H_ROOT	0x1630
#define	DEVICEID_AMD_HOSTB19H_M10H_ROOT	0x14a4
#define	DEVICEID_AMD_HOSTB19H_M60H_ROOT	0x14d8
#define	DEVICEID_AMD_HOSTB19H_M70H_ROOT	0x14e8

static const struct amdtemp_product {
	uint16_t	amdtemp_vendorid;

	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },
	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M10H_ROOT, false },
	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M60H_ROOT, false },
	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M70H_ROOT, false },
};

/*

		_Static_assert((int)NUM_CCDS >= 12, "");
		break;
	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */
	case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */
		sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;
		maxreg = 8;
		_Static_assert((int)NUM_CCDS >= 8, "");

Return to bug 280942

Lines 115-120 Link Here

(-)src/sys/dev/amdtemp/amdtemp.c (+3 lines)
115	#define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630	115	#define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630
116	#define DEVICEID_AMD_HOSTB19H_M10H_ROOT 0x14a4	116	#define DEVICEID_AMD_HOSTB19H_M10H_ROOT 0x14a4
117	#define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8	117	#define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8
		118	#define DEVICEID_AMD_HOSTB19H_M70H_ROOT 0x14e8
118		119
119	static const struct amdtemp_product {	120	static const struct amdtemp_product {
120	uint16_t amdtemp_vendorid;	121	uint16_t amdtemp_vendorid;
Lines 141-146 Link Here
141	{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },	142	{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },
142	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M10H_ROOT, false },	143	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M10H_ROOT, false },
143	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false },	144	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false },
		145	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M70H_ROOT, false },
144	};	146	};
145		147
146	/*	148	/*
Lines 873-878 Link Here
873	_Static_assert((int)NUM_CCDS >= 12, "");	875	_Static_assert((int)NUM_CCDS >= 12, "");
874	break;	876	break;
875	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */	877	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */
		878	case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */
876	sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;	879	sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;
877	maxreg = 8;	880	maxreg = 8;
878	_Static_assert((int)NUM_CCDS >= 8, "");	881	_Static_assert((int)NUM_CCDS >= 8, "");