diff --git a/src/etnaviv/common/.clang-format b/src/etnaviv/common/.clang-format
new file mode 100644
index 0000000000000..b1a43d91fe2b0
--- /dev/null
+++ b/src/etnaviv/common/.clang-format
@@ -0,0 +1,7 @@
+
+BasedOnStyle: InheritParentConfig
+DisableFormat: false
+
+AlignConsecutiveBitFields: true
+ColumnLimit: 100
+BreakStringLiterals: false
diff --git a/src/etnaviv/common/etna_core_info.h b/src/etnaviv/common/etna_core_info.h
new file mode 100644
index 0000000000000..c5e4531e3cf1b
--- /dev/null
+++ b/src/etnaviv/common/etna_core_info.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright © 2024 Igalia S.L.
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+struct etna_core_info {
+   uint32_t model;
+   uint32_t revision;
+};
diff --git a/src/etnaviv/common/meson.build b/src/etnaviv/common/meson.build
new file mode 100644
index 0000000000000..9ee0cea96dd34
--- /dev/null
+++ b/src/etnaviv/common/meson.build
@@ -0,0 +1,9 @@
+#
+# Copyright © 2024 Igalia S.L.
+# SPDX-License-Identifier: MIT
+#
+
+# Headers-only dependency
+idep_etna_common = declare_dependency(
+  include_directories : include_directories('.'),
+)
diff --git a/src/etnaviv/meson.build b/src/etnaviv/meson.build
index 2150aae1b3b94..5fcd884079afb 100644
--- a/src/etnaviv/meson.build
+++ b/src/etnaviv/meson.build
@@ -20,6 +20,7 @@
 
 inc_etnaviv = include_directories(['.'])
 
+subdir('common')
 subdir('drm')
 subdir('isa')