12 files changed, 62 insertions, 0 deletions

diff --git a/src/soc/intel/elkhartlake/gpio.c b/src/soc/intel/elkhartlake/gpio.c
index 452f7cfbf2..91ab9601fd 100644
--- a/src/soc/intel/elkhartlake/gpio.c
+++ b/src/soc/intel/elkhartlake/gpio.c
@@ -83,6 +83,8 @@ static const struct pad_community ehl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_BTG",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -103,6 +105,8 @@ static const struct pad_community ehl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_VHDU",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -143,6 +147,8 @@ static const struct pad_community ehl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_SA",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -163,6 +169,8 @@ static const struct pad_community ehl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_CFE",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -183,6 +191,8 @@ static const struct pad_community ehl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_RR",
 		.acpi_path = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/elkhartlake/include/soc/gpio_defs.h b/src/soc/intel/elkhartlake/include/soc/gpio_defs.h
index 52c83dc975..61d7f6a9bc 100644
--- a/src/soc/intel/elkhartlake/include/soc/gpio_defs.h
+++ b/src/soc/intel/elkhartlake/include/soc/gpio_defs.h
@@ -331,6 +331,8 @@
 #define GPI_INT_EN_0				0x120
 #define GPI_SMI_STS_0				0x180
 #define GPI_SMI_EN_0				0x1a0
+#define GPI_NMI_STS_0				0x1c0
+#define GPI_NMI_EN_0				0x1e0
 #define PAD_CFG_BASE				0x700
 
 #endif
diff --git a/src/soc/intel/icelake/gpio.c b/src/soc/intel/icelake/gpio.c
index 3ee17e6754..7febd01b53 100644
--- a/src/soc/intel/icelake/gpio.c
+++ b/src/soc/intel/icelake/gpio.c
@@ -74,6 +74,8 @@ static const struct pad_community icl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_GBA",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -94,6 +96,8 @@ static const struct pad_community icl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_HDF",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -114,6 +118,8 @@ static const struct pad_community icl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPD",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -134,6 +140,8 @@ static const struct pad_community icl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_CE",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -154,6 +162,8 @@ static const struct pad_community icl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_RS",
 		.acpi_path = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/icelake/include/soc/gpio_defs.h b/src/soc/intel/icelake/include/soc/gpio_defs.h
index 577ca5f427..b9238a5d2b 100644
--- a/src/soc/intel/icelake/include/soc/gpio_defs.h
+++ b/src/soc/intel/icelake/include/soc/gpio_defs.h
@@ -255,6 +255,8 @@
 #define GPI_INT_EN_0				0x110
 #define GPI_SMI_STS_0				0x180
 #define GPI_SMI_EN_0				0x1A0
+#define GPI_NMI_STS_0				0x1b0
+#define GPI_NMI_EN_0				0x1d0
 #define PAD_CFG_BASE				0x600
 
 #endif
diff --git a/src/soc/intel/jasperlake/gpio.c b/src/soc/intel/jasperlake/gpio.c
index 391eaae3b5..7ffc2aa8de 100644
--- a/src/soc/intel/jasperlake/gpio.c
+++ b/src/soc/intel/jasperlake/gpio.c
@@ -76,6 +76,8 @@ static const struct pad_community jsl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_FBASR",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -96,6 +98,8 @@ static const struct pad_community jsl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_HDC",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -136,6 +140,8 @@ static const struct pad_community jsl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_E",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -156,6 +162,8 @@ static const struct pad_community jsl_communities[TOTAL_GPIO_COMM] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_G",
 		.acpi_path = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/jasperlake/include/soc/gpio_defs.h b/src/soc/intel/jasperlake/include/soc/gpio_defs.h
index 77fbf2c45c..51ef5314d9 100644
--- a/src/soc/intel/jasperlake/include/soc/gpio_defs.h
+++ b/src/soc/intel/jasperlake/include/soc/gpio_defs.h
@@ -254,6 +254,8 @@
 #define GPI_INT_EN_0				0x120
 #define GPI_SMI_STS_0				0x180
 #define GPI_SMI_EN_0				0x1a0
+#define GPI_NMI_STS_0				0x1c0
+#define GPI_NMI_EN_0				0x1e0
 #define PAD_CFG_BASE				0x600
 #define PAD_CFG_LOCK				0x80
 
diff --git a/src/soc/intel/tigerlake/gpio.c b/src/soc/intel/tigerlake/gpio.c
index 62d57fe772..9a37117072 100644
--- a/src/soc/intel/tigerlake/gpio.c
+++ b/src/soc/intel/tigerlake/gpio.c
@@ -99,6 +99,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_BTA",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -122,6 +124,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_SDHU",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -144,6 +148,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPD",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -164,6 +170,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_FCE",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -187,6 +195,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_CPU_VBPIO",
 		.acpi_path = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/tigerlake/gpio_pch_h.c b/src/soc/intel/tigerlake/gpio_pch_h.c
index 9752b3363b..96f07a6938 100644
--- a/src/soc/intel/tigerlake/gpio_pch_h.c
+++ b/src/soc/intel/tigerlake/gpio_pch_h.c
@@ -84,6 +84,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_ARB",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -103,6 +105,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_DCSG",
 		.acpi_path = "\\_SB.PCI0.GPIO",
@@ -141,6 +145,8 @@ static const struct pad_community tgl_communities[] = {
 		.gpi_int_en_reg_0 = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0 = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0 = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0 = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0 = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name = "GPP_EF",
 		.acpi_path = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/tigerlake/include/soc/gpio_defs.h b/src/soc/intel/tigerlake/include/soc/gpio_defs.h
index 7f0827d5f6..c90931d80c 100644
--- a/src/soc/intel/tigerlake/include/soc/gpio_defs.h
+++ b/src/soc/intel/tigerlake/include/soc/gpio_defs.h
@@ -292,6 +292,8 @@
 #define GPI_INT_EN_0				0x110
 #define GPI_SMI_STS_0				0x180
 #define GPI_SMI_EN_0				0x1A0
+#define GPI_NMI_STS_0				0x1c0
+#define GPI_NMI_EN_0				0x1e0
 #define PAD_CFG_BASE				0x700
 
 #endif
diff --git a/src/soc/intel/tigerlake/include/soc/gpio_defs_pch_h.h b/src/soc/intel/tigerlake/include/soc/gpio_defs_pch_h.h
index e27415e4ac..1a9b2f3b0d 100644
--- a/src/soc/intel/tigerlake/include/soc/gpio_defs_pch_h.h
+++ b/src/soc/intel/tigerlake/include/soc/gpio_defs_pch_h.h
@@ -310,6 +310,8 @@
 #define GPI_INT_EN_0				0x120
 #define GPI_SMI_STS_0				0x180
 #define GPI_SMI_EN_0				0x1A0
+#define GPI_NMI_STS_0				0x1c0
+#define GPI_NMI_EN_0				0x1e0
 #define PAD_CFG_BASE				0x600
 
 #endif
diff --git a/src/soc/intel/xeon_sp/gpio.c b/src/soc/intel/xeon_sp/gpio.c
index 5f75991e76..7fd7a3ed87 100644
--- a/src/soc/intel/xeon_sp/gpio.c
+++ b/src/soc/intel/xeon_sp/gpio.c
@@ -62,6 +62,8 @@ static const struct pad_community lewisburg_gpio_communities[] = {
 		.gpi_int_en_reg_0   = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0  = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0   = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0  = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0   = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name               = "GPIO_COM0",
 		.acpi_path          = "\\_SB.PCI0.GPIO",
@@ -81,6 +83,8 @@ static const struct pad_community lewisburg_gpio_communities[] = {
 		.gpi_int_en_reg_0   = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0  = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0   = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0  = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0   = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name               = "GPIO_COM1",
 		.acpi_path          = "\\_SB.PCI0.GPIO",
@@ -100,6 +104,8 @@ static const struct pad_community lewisburg_gpio_communities[] = {
 		.gpi_int_en_reg_0   = GPI_INT_EN_0,
 		.gpi_smi_sts_reg_0  = GPI_SMI_STS_0,
 		.gpi_smi_en_reg_0   = GPI_SMI_EN_0,
+		.gpi_nmi_sts_reg_0  = GPI_NMI_STS_0,
+		.gpi_nmi_en_reg_0   = GPI_NMI_EN_0,
 		.max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
 		.name               = "GPIO_COM3",
 		.acpi_path          = "\\_SB.PCI0.GPIO",
diff --git a/src/soc/intel/xeon_sp/include/soc/lewisburg_pch_gpio_defs.h b/src/soc/intel/xeon_sp/include/soc/lewisburg_pch_gpio_defs.h
index 8c37a843ad..2ad5fba38b 100644
--- a/src/soc/intel/xeon_sp/include/soc/lewisburg_pch_gpio_defs.h
+++ b/src/soc/intel/xeon_sp/include/soc/lewisburg_pch_gpio_defs.h
@@ -662,5 +662,7 @@
 #define GPI_INT_EN_0		0x120
 #define GPI_SMI_STS_0		0x180
 #define GPI_SMI_EN_0		0x1a0
+#define GPI_NMI_STS_0		0x160
+#define GPI_NMI_EN_0		0x170
 
 #endif /* LEWISBURG_GPIO_DEFS_H */