d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ichwd: add Lewisburg Super SKUs, Cannon and Comet Lake support

Browse Source 
Cannon and Comet Lake PCHs have their PMC hidden, so when reading
the ACPI Base Address fails, we assume a default value.

Obtained from:	Semihalf
Sponsored by:	Stormshield
This commit is contained in:
Paweł Anikiel 2021-07-30 10:57:28 +02:00 committed by Wojciech Macek
parent 062463698e
commit 9da8235cc8
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/ichwd/ichwd.c
View File

@ -296,6 +296,9 @@ static struct ichwd_device ichwd_devices[] = {
static struct ichwd_device ichwd_smb_devices[] = {
{ DEVICEID_LEWISBURG_SMB, "Lewisburg watchdog timer", 10, 4 },
{ DEVICEID_LEWISBURG_SMB_SSKU, "Lewisburg watchdog timer", 10, 4 },
{ DEVICEID_CANNON_SMB, "Cannon Lake watchdog timer", 10, 4, PMC_HIDDEN},
{ DEVICEID_COMET_SMB, "Comet Lake watchdog timer", 10, 4, PMC_HIDDEN},
{ DEVICEID_SRPTLP_SMB, "Sunrise Point-LP watchdog timer", 10, 4 },
{ DEVICEID_C3000, "Intel Atom C3000 watchdog timer", 10, 4 },
{ 0, NULL, 0, 0 },
@ -788,13 +791,23 @@ ichwd_smb_attach(device_t dev)
isab = device_get_parent(device_get_parent(dev));
pmdev = pci_find_dbsf(pci_get_domain(isab), pci_get_bus(isab), 31, 2);
if (pmdev == NULL) {
device_printf(dev, "unable to find Power Management device\n");
return (ENXIO);
}
acpi_base = pci_read_config(pmdev, ICH_PMBASE, 4) & 0xffffff00;
if (acpi_base == 0) {
device_printf(dev, "ACPI base address is not set\n");
return (ENXIO);
if (id_p->quirks & PMC_HIDDEN) {
/*
* Since the PMC is hidden, we take the default value for the
* given device, which happens to be the same for the ones we
* support.
*/
acpi_base = ACPI_DEFAULT_CANNON;
} else {
device_printf(dev, "unable to find Power Management device\n");
return (ENXIO);
}
} else {
acpi_base = pci_read_config(pmdev, ICH_PMBASE, 4) & 0xffffff00;
if (acpi_base == 0) {
device_printf(dev, "ACPI base address is not set\n");
return (ENXIO);
}
}
/* Allocate SMI control I/O register space. */

14
sys/dev/ichwd/ichwd.h
View File

@ -38,6 +38,7 @@ struct ichwd_device {
char *desc;
unsigned int ich_version;
unsigned int tco_version;
uint32_t quirks;
};
struct ichwd_softc {
@ -277,6 +278,9 @@ struct ichwd_softc {
#define DEVICEID_WCPT_LP7 0x9cc7
#define DEVICEID_WCPT_LP9 0x9cc9
#define DEVICEID_LEWISBURG_SMB 0xa1a3
#define DEVICEID_LEWISBURG_SMB_SSKU 0xa223
#define DEVICEID_CANNON_SMB 0xa323
#define DEVICEID_COMET_SMB 0x06a3
#define DEVICEID_SRPTLP_SMB 0x9d23
/* ICH LPC Interface Bridge Registers (ICH5 and older) */
@ -386,6 +390,9 @@ struct ichwd_softc {
#define TCO_INTRD_SEL_INTR 0x0001
#define TCO_INTRD_SEL_SMI 0x0002
/* default ACPI Base values */
#define ACPI_DEFAULT_CANNON 0x1800
/*
* Masks for the TCO timer value field in TCO_RLD.
* If the datasheets are to be believed, the minimum value actually varies
@ -408,4 +415,11 @@ struct ichwd_softc {
*/
#define ICHWD_TCO_V3_TICK 1000000000
/*
* Quirks
*/
/* On Cannon Lake and Commet Lake PHCs, the PMC is hidden */
#define PMC_HIDDEN (1 << 0)
#endif