5 files changed, 86 insertions, 9 deletions

diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h
index e0218bdde12e..1e398d05ba20 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h
@@ -3,6 +3,10 @@
  *
  * Copyright (c) 2017 Mark Johnston <markj@FreeBSD.org>
  * Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
+ * Copyright (c) 2025 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Björn Zeeb
+ * under sponsorship from the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -31,6 +35,13 @@
 #define _LINUXKPI_ACPI_ACPI_H_
 
 /*
+ * LINUXKPI_WANT_LINUX_ACPI is a temporary workaround to allow drm-kmod
+ * to update all needed branches without breaking builds.
+ * Once that happened and checks are implemented based on __FreeBSD_verison
+ * we will remove these conditions again.
+ */
+
+/*
  * FreeBSD import of ACPICA has a typedef for BOOLEAN which conflicts with
  * amdgpu driver. Workaround it on preprocessor level.
  */
@@ -46,8 +57,8 @@ typedef int64_t			INT64;
 #include <contrib/dev/acpica/include/acpi.h>
 #undef BOOLEAN
 
+typedef	ACPI_IO_ADDRESS		acpi_io_address;
 typedef ACPI_HANDLE		acpi_handle;
-typedef ACPI_OBJECT		acpi_object;
 typedef ACPI_OBJECT_HANDLER	acpi_object_handler;
 typedef ACPI_OBJECT_TYPE	acpi_object_type;
 typedef ACPI_STATUS		acpi_status;
@@ -55,12 +66,62 @@ typedef ACPI_STRING		acpi_string;
 typedef ACPI_SIZE		acpi_size;
 typedef ACPI_WALK_CALLBACK	acpi_walk_callback;
 
+union linuxkpi_acpi_object {
+	acpi_object_type type;
+	struct {
+		acpi_object_type type;
+		UINT64 value;
+	} integer;
+	struct {
+		acpi_object_type type;
+		UINT32 length;
+		char *pointer;
+	} string;
+	struct {
+		acpi_object_type type;
+		UINT32 length;
+		UINT8 *pointer;
+	} buffer;
+	struct {
+		acpi_object_type type;
+		UINT32 count;
+		union linuxkpi_acpi_object *elements;
+	} package;
+	struct {
+		acpi_object_type type;
+		acpi_object_type actual_type;
+		acpi_handle handle;
+	} reference;
+	struct {
+		acpi_object_type type;
+		UINT32 proc_id;
+		acpi_io_address pblk_address;
+		UINT32 pblk_length;
+	} processor;
+	struct {
+		acpi_object_type type;
+		UINT32 system_level;
+		UINT32 resource_order;
+	} power_resource;
+};
+
+#ifdef	LINUXKPI_WANT_LINUX_ACPI
+struct linuxkpi_acpi_buffer {
+	acpi_size length;	/* Length in bytes of the buffer */
+	void *pointer;		/* pointer to buffer */
+};
+
+typedef	struct linuxkpi_acpi_buffer	lkpi_acpi_buffer_t;
+#else
+typedef	ACPI_BUFFER			lkpi_acpi_buffer_t;
+#endif
+
 static inline ACPI_STATUS
 acpi_evaluate_object(ACPI_HANDLE Object, ACPI_STRING Pathname,
-    ACPI_OBJECT_LIST *ParameterObjects, ACPI_BUFFER *ReturnObjectBuffer)
+    ACPI_OBJECT_LIST *ParameterObjects, lkpi_acpi_buffer_t *ReturnObjectBuffer)
 {
 	return (AcpiEvaluateObject(
-	    Object, Pathname, ParameterObjects, ReturnObjectBuffer));
+	    Object, Pathname, ParameterObjects, (ACPI_BUFFER *)ReturnObjectBuffer));
 }
 
 static inline const char *
@@ -83,9 +144,9 @@ acpi_get_data(ACPI_HANDLE ObjHandle, ACPI_OBJECT_HANDLER Handler, void **Data)
 }
 
 static inline ACPI_STATUS
-acpi_get_name(ACPI_HANDLE Object, UINT32 NameType, ACPI_BUFFER *RetPathPtr)
+acpi_get_name(ACPI_HANDLE Object, UINT32 NameType, lkpi_acpi_buffer_t *RetPathPtr)
 {
-	return (AcpiGetName(Object, NameType, RetPathPtr));
+	return (AcpiGetName(Object, NameType, (ACPI_BUFFER *)RetPathPtr));
 }
 
 static inline ACPI_STATUS
@@ -101,4 +162,9 @@ acpi_put_table(ACPI_TABLE_HEADER *Table)
 	AcpiPutTable(Table);
 }
 
+#ifdef	LINUXKPI_WANT_LINUX_ACPI
+#define	acpi_object		linuxkpi_acpi_object
+#define	acpi_buffer		linuxkpi_acpi_buffer
+#endif
+
 #endif /* _LINUXKPI_ACPI_ACPI_H_ */
diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
index 65bcbe7f1bdd..47195e7d66a6 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
@@ -58,4 +58,10 @@ bool		lkpi_acpi_dev_present(const char *hid, const char *uid,
 struct acpi_device *lkpi_acpi_dev_get_first_match_dev(const char *hid,
 		    const char *uid, int64_t hrv);
 
+union linuxkpi_acpi_object;
+
+union linuxkpi_acpi_object *
+acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid,
+    UINT64 rev, UINT64 func, union linuxkpi_acpi_object *arg);
+
 #endif /* _LINUXKPI_ACPI_ACPI_BUS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h
index a5f6874a07f6..2556b0c45e49 100644
--- a/sys/compat/linuxkpi/common/include/linux/device.h
+++ b/sys/compat/linuxkpi/common/include/linux/device.h
@@ -90,6 +90,8 @@ struct dev_pm_ops {
 struct device_driver {
 	const char	*name;
 	const struct dev_pm_ops *pm;
+
+	void (*shutdown) (struct device *);
 };
 
 struct device_type {
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
index 174015ba7a58..af19829f1cbb 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -72,6 +72,10 @@ struct pci_device_id {
 	uintptr_t	driver_data;
 };
 
+#define	MODULE_DEVICE_TABLE_BUS_pci(_bus, _table)			\
+MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice",	\
+    _bus, lkpi_ ## _table, _table, nitems(_table) - 1)
+
 /* Linux has an empty element at the end of the ID table -> nitems() - 1. */
 #define	MODULE_DEVICE_TABLE(_bus, _table)				\
 									\
@@ -85,11 +89,10 @@ static driver_t _ ## _bus ## _ ## _table ## _driver = {			\
 	0								\
 };									\
 									\
-DRIVER_MODULE(lkpi_ ## _table, pci, _ ## _bus ## _ ## _table ## _driver,\
+DRIVER_MODULE(lkpi_ ## _table, _bus, _ ## _bus ## _ ## _table ## _driver,\
 	0, 0);								\
 									\
-MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice",	\
-    _bus, lkpi_ ## _table, _table, nitems(_table) - 1)
+MODULE_DEVICE_TABLE_BUS_ ## _bus(_bus, _table)
 
 #define	PCI_ANY_ID			-1U
 
diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h
index f3a840d9bf4b..efa5c8cb67b3 100644
--- a/sys/compat/linuxkpi/common/include/linux/slab.h
+++ b/sys/compat/linuxkpi/common/include/linux/slab.h
@@ -45,7 +45,7 @@
 
 MALLOC_DECLARE(M_KMALLOC);
 
-#define	kvzalloc(size, flags)		kmalloc(size, (flags) | __GFP_ZERO)
+#define	kvzalloc(size, flags)		kvmalloc(size, (flags) | __GFP_ZERO)
 #define	kvcalloc(n, size, flags)	kvmalloc_array(n, size, (flags) | __GFP_ZERO)
 #define	kzalloc(size, flags)		kmalloc(size, (flags) | __GFP_ZERO)
 #define	kzalloc_node(size, flags, node)	kmalloc_node(size, (flags) | __GFP_ZERO, node)