diff --git a/cper-parse.c b/cper-parse.c
index 19316bc..7772131 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -16,6 +16,7 @@
 #include "sections/cper-section-memory.h"
 #include "sections/cper-section-pcie.h"
 #include "sections/cper-section-pci-bus.h"
+#include "sections/cper-section-pci-dev.h"
 
 //Private pre-definitions.
 json_object* cper_header_to_ir(EFI_COMMON_ERROR_RECORD_HEADER* header);
@@ -319,8 +320,8 @@
     //     result = cper_section_firmware_error_to_ir(section);
     else if (guid_equal(&descriptor->SectionType, &gEfiPciBusErrorSectionGuid))
         result = cper_section_pci_bus_to_ir(section, descriptor);
-    // if (guid_equal(&descriptor->SectionType, &gEfiPciDevErrorSectionGuid))
-    //     result = cper_section_pci_dev_to_ir(section);
+    else if (guid_equal(&descriptor->SectionType, &gEfiPciDevErrorSectionGuid))
+        result = cper_section_pci_dev_to_ir(section, descriptor);
     // if (guid_equal(&descriptor->SectionType, &gEfiDMArGenericErrorSectionGuid))
     //     result = cper_section_dmar_generic_to_ir(section);
     // if (guid_equal(&descriptor->SectionType, &gEfiDirectedIoDMArErrorSectionGuid))
diff --git a/sections/cper-section-pci-dev.c b/sections/cper-section-pci-dev.c
new file mode 100644
index 0000000..aa3857b
--- /dev/null
+++ b/sections/cper-section-pci-dev.c
@@ -0,0 +1,62 @@
+/**
+ * Describes functions for converting PCI/PCI-X device CPER sections from binary and JSON format
+ * into an intermediate format.
+ * 
+ * Author: Lawrence.Tang@arm.com
+ **/
+#include <stdio.h>
+#include "json.h"
+#include "../edk/Cper.h"
+#include "../cper-utils.h"
+#include "cper-section-pci-dev.h"
+
+//Converts a single PCI/PCI-X device CPER section into JSON IR.
+json_object* cper_section_pci_dev_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor)
+{
+    EFI_PCI_PCIX_DEVICE_ERROR_DATA* dev_error = (EFI_PCI_PCIX_DEVICE_ERROR_DATA*)section;
+    json_object* section_ir = json_object_new_object();
+
+    //Validation bits.
+    json_object* validation = bitfield_to_ir(dev_error->ValidFields, 5, PCI_DEV_ERROR_VALID_BITFIELD_NAMES);
+    json_object_object_add(section_ir, "validationBits", validation);
+
+    //Error status.
+    json_object* error_status = cper_generic_error_status_to_ir(&dev_error->ErrorStatus);
+    json_object_object_add(section_ir, "errorStatus", error_status);
+
+    //ID information.
+    json_object* id_info = json_object_new_object();
+    json_object_object_add(id_info, "vendorID", json_object_new_uint64(dev_error->IdInfo.VendorId));
+    json_object_object_add(id_info, "deviceID", json_object_new_uint64(dev_error->IdInfo.DeviceId));
+    json_object_object_add(id_info, "classCode", json_object_new_uint64(dev_error->IdInfo.ClassCode));
+    json_object_object_add(id_info, "functionNumber", json_object_new_uint64(dev_error->IdInfo.FunctionNumber));
+    json_object_object_add(id_info, "deviceNumber", json_object_new_uint64(dev_error->IdInfo.DeviceNumber));
+    json_object_object_add(id_info, "busNumber", json_object_new_uint64(dev_error->IdInfo.BusNumber));
+    json_object_object_add(id_info, "segmentNumber", json_object_new_uint64(dev_error->IdInfo.SegmentNumber));
+    json_object_object_add(section_ir, "idInfo", id_info);
+
+    //Number of following register data pairs.
+    json_object_object_add(section_ir, "memoryNumber", json_object_new_uint64(dev_error->MemoryNumber));
+    json_object_object_add(section_ir, "ioNumber", json_object_new_uint64(dev_error->IoNumber));
+    int num_data_pairs = dev_error->MemoryNumber + dev_error->IoNumber;
+
+    //Register pairs, described by the numeric fields.
+    //The actual "pairs" of address and data aren't necessarily 8 bytes long, so can't assume the contents.
+    //Hence the naming "firstHalf" and "secondHalf" rather than "address" and "data".
+    json_object* register_data_pair_array = json_object_new_array();
+    UINT64* cur_pos = (UINT64*)(dev_error + 1);
+    for (int i=0; i<num_data_pairs; i++)
+    {
+        //Save current pair to array.
+        json_object* register_data_pair = json_object_new_object();
+        json_object_object_add(register_data_pair, "firstHalf", json_object_new_uint64(*cur_pos));
+        json_object_object_add(register_data_pair, "secondHalf", json_object_new_uint64(*(cur_pos + 1)));
+        json_object_array_add(register_data_pair_array, register_data_pair);
+
+        //Move to next pair.
+        cur_pos += 2;
+    }
+    json_object_object_add(section_ir, "registerDataPairs", register_data_pair_array);
+
+    return section_ir;
+}
\ No newline at end of file
diff --git a/sections/cper-section-pci-dev.h b/sections/cper-section-pci-dev.h
new file mode 100644
index 0000000..43d36ea
--- /dev/null
+++ b/sections/cper-section-pci-dev.h
@@ -0,0 +1,34 @@
+#ifndef CPER_SECTION_PCI_DEV_H
+#define CPER_SECTION_PCI_DEV_H
+
+#include "json.h"
+#include "../edk/Cper.h"
+
+#define PCI_DEV_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"errorStatusValid", "idInfoValid", "memoryNumberValid", \
+    "ioNumberValid", "registerDataPairValid"}
+
+///
+/// PCI/PCI-X Device Error Section
+///
+typedef struct {
+  UINT64 VendorId : 2;
+  UINT64 DeviceId : 2;
+  UINT64 ClassCode : 3;
+  UINT64 FunctionNumber : 1;
+  UINT64 DeviceNumber : 1;
+  UINT64 BusNumber : 1;
+  UINT64 SegmentNumber : 1;
+  UINT64 Reserved : 5;
+} EFI_PCI_PCIX_DEVICE_ID_INFO;
+
+typedef struct {
+  UINT64                      ValidFields;
+  EFI_GENERIC_ERROR_STATUS    ErrorStatus;
+  EFI_PCI_PCIX_DEVICE_ID_INFO IdInfo;
+  UINT32                      MemoryNumber;
+  UINT32                      IoNumber;
+} EFI_PCI_PCIX_DEVICE_ERROR_DATA;
+
+json_object* cper_section_pci_dev_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor);
+
+#endif
\ No newline at end of file