diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index 82f9658..bb77754 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -48,52 +48,58 @@
 
 void __noreturn pcidev_die(void);
 
-static __always_inline void pcidev_assert(const struct device *dev)
+static __always_inline pci_devfn_t pcidev_bdf(const struct device *dev)
+{
+	return (dev->path.pci.devfn << 12) | (dev->bus->secondary << 20);
+}
+
+static __always_inline pci_devfn_t pcidev_assert(const struct device *dev)
 {
 	if (!dev)
 		pcidev_die();
+	return pcidev_bdf(dev);
 }
 
 static __always_inline
 u8 pci_read_config8(const struct device *dev, u16 reg)
 {
-	pcidev_assert(dev);
-	return pci_bus_ops()->read8(dev, reg);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	return pci_bus_ops()->read8(bdf, reg);
 }
 
 static __always_inline
 u16 pci_read_config16(const struct device *dev, u16 reg)
 {
-	pcidev_assert(dev);
-	return pci_bus_ops()->read16(dev, reg);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	return pci_bus_ops()->read16(bdf, reg);
 }
 
 static __always_inline
 u32 pci_read_config32(const struct device *dev, u16 reg)
 {
-	pcidev_assert(dev);
-	return pci_bus_ops()->read32(dev, reg);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	return pci_bus_ops()->read32(bdf, reg);
 }
 
 static __always_inline
 void pci_write_config8(const struct device *dev, u16 reg, u8 val)
 {
-	pcidev_assert(dev);
-	pci_bus_ops()->write8(dev, reg, val);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	pci_bus_ops()->write8(bdf, reg, val);
 }
 
 static __always_inline
 void pci_write_config16(const struct device *dev, u16 reg, u16 val)
 {
-	pcidev_assert(dev);
-	pci_bus_ops()->write16(dev, reg, val);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	pci_bus_ops()->write16(bdf, reg, val);
 }
 
 static __always_inline
 void pci_write_config32(const struct device *dev, u16 reg, u32 val)
 {
-	pcidev_assert(dev);
-	pci_bus_ops()->write32(dev, reg, val);
+	pci_devfn_t bdf = PCI_BDF(dev);
+	pci_bus_ops()->write32(bdf, reg, val);
 }
 
 #endif