pci.h: add pci_write/read_mmio_qword support

1. optimize the macro, add () for the marco arguments; 2. add pci_write_mmio_qword() and pci_read_mmio_qword() api; Signed-off-by: wangyongrong <[email protected]>
apache · Oct 11, 2024 · c67750e · c67750e
1 parent 976c417
commit c67750e
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/include/nuttx/pci/pci.h b/include/nuttx/pci/pci.h
@@ -192,22 +192,38 @@
   while (0)
 
 #define pci_write_mmio_byte(dev, addr, val)  \
-  (*((FAR volatile uint8_t *)(addr))) = val
+  *((FAR volatile uint8_t *)(addr)) = val
 
 #define pci_write_mmio_word(dev, addr, val)  \
-  (*((FAR volatile uint16_t *)(addr))) = val
+  *((FAR volatile uint16_t *)(addr)) = val
 
 #define pci_write_mmio_dword(dev, addr, val)  \
-  (*((FAR volatile uint32_t *)(addr))) = val
+  *((FAR volatile uint32_t *)(addr)) = val
+
+#define pci_write_mmio_qword(dev, addr, val)  \
+  do \
+    { \
+      *((FAR volatile uint32_t *)(addr)) = (uint32_t)(val); \
+      *((FAR volatile uint32_t *)((FAR char *)(addr) + sizeof(uint32_t))) = (val) >> 32; \
+    } \
+  while (0)
 
 #define pci_read_mmio_byte(dev, addr, val)    \
-  (*val) = *((FAR volatile uint8_t *)(addr))
+  *(val) = *((FAR volatile uint8_t *)(addr))
 
 #define pci_read_mmio_word(dev, addr, val)    \
-  (*val) = *((FAR volatile uint16_t *)(addr))
+  *(val) = *((FAR volatile uint16_t *)(addr))
 
 #define pci_read_mmio_dword(dev, addr, val)   \
-  (*val) = *((FAR volatile uint32_t *)(addr))
+  *(val) = *((FAR volatile uint32_t *)(addr))
+
+#define pci_read_mmio_qword(dev, addr, val)  \
+  do \
+    { \
+      *(val) = *((FAR volatile uint32_t *)(addr)) | \
+               *((FAR volatile uint32_t *)((FAR char *)(addr) + sizeof(uint32_t))); \
+    } \
+  while (0)
 
 #define pci_map_region(dev, start, size) pci_bus_map_region((dev)->bus, start, size)