diff --git a/src/soc/intel/common/block/cse/disable_heci.c b/src/soc/intel/common/block/cse/disable_heci.c
index 664a2f7b30..1256fd1810 100644
--- a/src/soc/intel/common/block/cse/disable_heci.c
+++ b/src/soc/intel/common/block/cse/disable_heci.c
@@ -36,7 +36,7 @@ void heci_disable(void)
 	p2sb_unhide();
 
 	/* Send SBI command to make HECI#1 function disable */
-	status = pcr_execute_sideband_msg(&msg, &data32, &response);
+	status = pcr_execute_sideband_msg(PCH_DEV_P2SB, &msg, &data32, &response);
 	if (status || response)
 		printk(BIOS_ERR, "Fail to make CSME function disable\n");
 
diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c
index a833aaebb9..e70fcaab48 100644
--- a/src/soc/intel/common/block/gpio/gpio.c
+++ b/src/soc/intel/common/block/gpio/gpio.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#define __SIMPLE_DEVICE__
+
 #include <assert.h>
 #include <bootstate.h>
 #include <console/console.h>
@@ -10,6 +12,7 @@
 #include <intelblocks/itss.h>
 #include <intelblocks/p2sb.h>
 #include <intelblocks/pcr.h>
+#include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <stdlib.h>
 #include <types.h>
@@ -531,7 +534,7 @@ int gpio_lock_pads(const struct gpio_lock_config *pad_list, const size_t count)
 			if (CONFIG(DEBUG_GPIO))
 				printk(BIOS_INFO, "%s: Locking pad %d configuration\n",
 						__func__, pad);
-			status = pcr_execute_sideband_msg(&msg, &data, &response);
+			status = pcr_execute_sideband_msg(PCH_DEV_P2SB, &msg, &data, &response);
 			if ((err = sideband_msg_err(status, response)) != 0) {
 				err_response = err;
 				continue;
@@ -543,7 +546,7 @@ int gpio_lock_pads(const struct gpio_lock_config *pad_list, const size_t count)
 				printk(BIOS_INFO, "%s: Locking pad %d TX state\n",
 						__func__, pad);
 			msg.offset += sizeof(uint32_t);
-			status = pcr_execute_sideband_msg(&msg, &data, &response);
+			status = pcr_execute_sideband_msg(PCH_DEV_P2SB, &msg, &data, &response);
 			if ((err = sideband_msg_err(status, response)) != 0) {
 				err_response = err;
 				continue;
diff --git a/src/soc/intel/common/block/include/intelblocks/pcr.h b/src/soc/intel/common/block/include/intelblocks/pcr.h
index e4a9fb82f8..fbd2b8c3c2 100644
--- a/src/soc/intel/common/block/include/intelblocks/pcr.h
+++ b/src/soc/intel/common/block/include/intelblocks/pcr.h
@@ -8,6 +8,7 @@
 
 #if !defined(__ACPI__)
 #include <types.h>
+#include <device/pci_ops.h>
 
 uint32_t pcr_read32(uint8_t pid, uint16_t offset);
 uint16_t pcr_read16(uint8_t pid, uint16_t offset);
@@ -62,7 +63,7 @@ struct pcr_sbi_msg {
  * 0: SBI message is successfully completed
  * -1: SBI message failure
  */
-int pcr_execute_sideband_msg(struct pcr_sbi_msg *msg, uint32_t *data,
+int pcr_execute_sideband_msg(pci_devfn_t dev, struct pcr_sbi_msg *msg, uint32_t *data,
 		uint8_t *response);
 
 /* Get the starting address of the port's registers. */
diff --git a/src/soc/intel/common/block/pcr/pcr.c b/src/soc/intel/common/block/pcr/pcr.c
index 989805d125..ba49f7c30f 100644
--- a/src/soc/intel/common/block/pcr/pcr.c
+++ b/src/soc/intel/common/block/pcr/pcr.c
@@ -240,10 +240,9 @@ static int pcr_wait_for_completion(const pci_devfn_t dev)
  * 0: SBI message is successfully completed
  * -1: SBI message failure
  */
-int pcr_execute_sideband_msg(struct pcr_sbi_msg *msg, uint32_t *data,
+int pcr_execute_sideband_msg(pci_devfn_t dev, struct pcr_sbi_msg *msg, uint32_t *data,
 		uint8_t *response)
 {
-	const pci_devfn_t dev = PCH_DEV_P2SB;
 	uint32_t sbi_data;
 	uint16_t sbi_status;
 	uint16_t sbi_rid;