PTL Alpha release kernel 6.14 Ubuntu 24.04 (LT6911GXD)(iot)

Author: zouxiaoh

README.md

@@ -43,6 +43,11 @@ Three ways are available:
 	CONFIG_VIDEO_OV02C10=m
 	CONFIG_VIDEO_OV05C10=m
 	```
+	```conf
+	To enable HDMI2MIPI camera:
+	CONFIG_VIDEO_INTEL_IPU7_ISYS_RESET=y
+	CONFIG_VIDEO_LT6911GXD=m
+	```
 5. Build you kernel
 
 ### 2. Out-of-tree build

drivers/media/pci/intel/ipu7/Kconfig

@@ -1,19 +1,24 @@
 config VIDEO_INTEL_IPU7
 	tristate "Intel IPU7 driver"
-	depends on ACPI
-	depends on MEDIA_SUPPORT
-	depends on MEDIA_PCI_SUPPORT
-	depends on X86_64
-	select IOMMU_API
+	depends on ACPI || COMPILE_TEST
+	depends on VIDEO_DEV
+	depends on X86 && HAS_DMA
+	depends on IPU_BRIDGE || !IPU_BRIDGE
+        #
+        # This driver incorrectly tries to override the dma_ops.  It should
+        # never have done that, but for now keep it working on architectures
+        # that use dma ops
+        #
+        depends on ARCH_HAS_DMA_OPS
+	select AUXILIARY_BUS
 	select IOMMU_IOVA
-	select X86_DEV_DMA_OPS
-	select VIDEOBUF2_DMA_CONTIG
+	select VIDEO_V4L2_SUBDEV_API
+	select MEDIA_CONTROLLER
+	select VIDEOBUF2_DMA_SG
 	select V4L2_FWNODE
-	select PHYS_ADDR_T_64BIT
-	select COMMON_CLK
 	help
-	  This is the Intel imaging processing unit, found in Intel SoCs and
-	  used for capturing images and video from a camera sensor.
+	  This is the 7th Gen Intel Image Processing Unit, found in Intel SoCs
+	  and used for capturing images and video from camera sensors.
 
 	  To compile this driver, say Y here! It contains 3 modules -
 	  intel_ipu7, intel_ipu7_isys and intel_ipu7_psys.
@@ -30,11 +35,11 @@ config VIDEO_INTEL_IPU7_MGC
 	  you must select this option, otherwise no.
 
 config VIDEO_INTEL_IPU7_ISYS_RESET
-	tristate "IPU7 ISYS RESET"
+	bool "IPU7 ISYS RESET"
 	depends on VIDEO_INTEL_IPU7
 	default n
 	help
-	  This is to support ISYS reset in Intel IPU7 IPU driver and
-	  used for HDMI to MIPI device hot plug use cases.
+	  This option enables IPU7 ISYS reset feature to support
+	  HDMI-MIPI converter hot-plugging.
 
-	  To compile this driver, say Y here!
+	  If doubt, say N here.

drivers/media/pci/intel/ipu7/ipu7-boot.c

@@ -19,6 +19,7 @@
 #include "ipu7-boot.h"
 #include "ipu7-bus.h"
 #include "ipu7-buttress-regs.h"
+#include "ipu7-dma.h"
 #include "ipu7-platform-regs.h"
 #include "ipu7-syscom.h"
 
@@ -56,9 +57,9 @@ static const struct ipu7_boot_context contexts[IPU_SUBSYS_NUM] = {
 static u32 get_fw_boot_reg_addr(const struct ipu7_bus_device *adev,
 				enum ia_gofo_buttress_reg_id reg)
 {
-	u32 base = (adev->subsys == IPU_IS) ? 0 : IA_GOFO_FW_BOOT_ID_MAX;
+	u32 base = (adev->subsys == IPU_IS) ? 0U : (u32)IA_GOFO_FW_BOOT_ID_MAX;
 
-	return BUTTRESS_FW_BOOT_PARAMS_ENTRY(base + reg);
+	return BUTTRESS_FW_BOOT_PARAMS_ENTRY(base + (u32)reg);
 }
 
 static void write_fw_boot_param(const struct ipu7_bus_device *adev,
@@ -105,7 +106,7 @@ static int ipu7_boot_cell_reset(const struct ipu7_bus_device *adev)
 	writel(val, base + ucx_ctrl_status);
 
 	ret = readl_poll_timeout(base + ucx_ctrl_status, val2,
-				 (val2 & 0x3) == (val & 0x3), 100, timeout);
+				 (val2 & 0x3U) == (val & 0x3U), 100, timeout);
 	if (ret) {
 		dev_err(dev, "cell enter reset timeout. status: 0x%x\n", val2);
 		return -ETIMEDOUT;
@@ -122,7 +123,7 @@ static int ipu7_boot_cell_reset(const struct ipu7_bus_device *adev)
 	writel(val, base + ucx_ctrl_status);
 
 	ret = readl_poll_timeout(base + ucx_ctrl_status, val2,
-				 (val2 & 0x3) == (val & 0x3), 100, timeout);
+				 (val2 & 0x3U) == (val & 0x3U), 100, timeout);
 	if (ret) {
 		dev_err(dev, "cell exit reset timeout. status: 0x%x\n", val2);
 		return -ETIMEDOUT;
@@ -224,9 +225,9 @@ int ipu7_boot_init_boot_config(struct ipu7_bus_device *adev,
 	/* Allocate boot config. */
 	adev->boot_config_size =
 		sizeof(*cfgs) * num_queues + sizeof(*boot_config);
-	adev->boot_config = dma_alloc_attrs(dev, adev->boot_config_size,
-					    &adev->boot_config_dma_addr,
-					    GFP_KERNEL, 0);
+	adev->boot_config = ipu7_dma_alloc(adev, adev->boot_config_size,
+					   &adev->boot_config_dma_addr,
+					   GFP_KERNEL, 0);
 	if (!adev->boot_config) {
 		dev_err(dev, "Failed to allocate boot config.\n");
 		return -ENOMEM;
@@ -245,8 +246,8 @@ int ipu7_boot_init_boot_config(struct ipu7_bus_device *adev,
 	boot_config->syscom_context_config.max_input_queues =
 		syscom->num_input_queues;
 
-	dma_sync_single_for_device(dev, adev->boot_config_dma_addr,
-				   adev->boot_config_size, DMA_TO_DEVICE);
+	ipu7_dma_sync_single(adev, adev->boot_config_dma_addr,
+			     adev->boot_config_size);
 
 	for (i = 0; i < num_queues; i++) {
 		u32 queue_size = qconfigs[i].max_capacity *
@@ -259,9 +260,9 @@ int ipu7_boot_init_boot_config(struct ipu7_bus_device *adev,
 	}
 
 	/* Allocate queue memory */
-	syscom->queue_mem = dma_alloc_attrs(dev, total_queue_size_aligned,
-					    &syscom->queue_mem_dma_addr,
-					    GFP_KERNEL, 0);
+	syscom->queue_mem = ipu7_dma_alloc(adev, total_queue_size_aligned,
+					   &syscom->queue_mem_dma_addr,
+					   GFP_KERNEL, 0);
 	if (!syscom->queue_mem) {
 		dev_err(dev, "Failed to allocate queue memory.\n");
 		return -ENOMEM;
@@ -281,8 +282,8 @@ int ipu7_boot_init_boot_config(struct ipu7_bus_device *adev,
 		queue_mem_ptr += qconfigs[i].queue_size;
 	}
 
-	dma_sync_single_for_device(dev, syscom->queue_mem_dma_addr,
-				   total_queue_size_aligned, DMA_TO_DEVICE);
+	ipu7_dma_sync_single(adev, syscom->queue_mem_dma_addr,
+			     total_queue_size_aligned);
 
 	return 0;
 }
@@ -295,20 +296,19 @@ EXPORT_SYMBOL_NS_GPL(ipu7_boot_init_boot_config, INTEL_IPU7);
 void ipu7_boot_release_boot_config(struct ipu7_bus_device *adev)
 {
 	struct ipu7_syscom_context *syscom = adev->syscom;
-	struct device *dev = &adev->auxdev.dev;
 
 	if (syscom->queue_mem) {
-		dma_free_attrs(dev, syscom->queue_mem_size,
-			       syscom->queue_mem,
-			       syscom->queue_mem_dma_addr, 0);
+		ipu7_dma_free(adev, syscom->queue_mem_size,
+			      syscom->queue_mem,
+			      syscom->queue_mem_dma_addr, 0);
 		syscom->queue_mem = NULL;
 		syscom->queue_mem_dma_addr = 0;
 	}
 
 	if (adev->boot_config) {
-		dma_free_attrs(dev, adev->boot_config_size,
-			       adev->boot_config,
-			       adev->boot_config_dma_addr, 0);
+		ipu7_dma_free(adev, adev->boot_config_size,
+			      adev->boot_config,
+			      adev->boot_config_dma_addr, 0);
 		adev->boot_config = NULL;
 		adev->boot_config_dma_addr = 0;
 	}

drivers/media/pci/intel/ipu7/ipu7-boot.h

@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (C) 2022 - 2024 Intel Corporation
+ * Copyright (C) 2022 - 2025 Intel Corporation
  */
 
+#ifndef IPU7_BOOT_H
+#define IPU7_BOOT_H
+
 #include <linux/types.h>
 
 struct ipu7_bus_device;
@@ -19,3 +22,4 @@ void ipu7_boot_release_boot_config(struct ipu7_bus_device *adev);
 int ipu7_boot_start_fw(const struct ipu7_bus_device *adev);
 int ipu7_boot_stop_fw(const struct ipu7_bus_device *adev);
 u32 ipu7_boot_get_boot_state(const struct ipu7_bus_device *adev);
+#endif

drivers/media/pci/intel/ipu7/ipu7-bus.c

@@ -82,7 +82,7 @@ static void ipu7_bus_release(struct device *dev)
 struct ipu7_bus_device *
 ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
 			   void *pdata, const struct ipu_buttress_ctrl *ctrl,
-			   char *name)
+			   const char *name)
 {
 	struct auxiliary_device *auxdev;
 	struct ipu7_bus_device *adev;
@@ -93,11 +93,6 @@ ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
 	if (!adev)
 		return ERR_PTR(-ENOMEM);
 
-	if (isp->secure_mode)
-		adev->dma_mask = DMA_BIT_MASK(IPU_MMU_ADDR_BITS);
-	else
-		adev->dma_mask = DMA_BIT_MASK(IPU_MMU_ADDR_BITS_NON_SECURE);
-
 	adev->isp = isp;
 	adev->ctrl = ctrl;
 	adev->pdata = pdata;
@@ -108,10 +103,6 @@ ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
 
 	auxdev->dev.parent = parent;
 	auxdev->dev.release = ipu7_bus_release;
-	auxdev->dev.dma_ops = &ipu7_dma_ops;
-	auxdev->dev.dma_mask = &adev->dma_mask;
-	auxdev->dev.dma_parms = pdev->dev.dma_parms;
-	auxdev->dev.coherent_dma_mask = adev->dma_mask;
 
 	ret = auxiliary_device_init(auxdev);
 	if (ret < 0) {

drivers/media/pci/intel/ipu7/ipu7-bus.h

@@ -63,7 +63,7 @@ struct ipu7_auxdrv_data {
 struct ipu7_bus_device *
 ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
 			   void *pdata, const struct ipu_buttress_ctrl *ctrl,
-			   char *name);
+			   const char *name);
 int ipu7_bus_add_device(struct ipu7_bus_device *adev);
 void ipu7_bus_del_devices(struct pci_dev *pdev);
 #endif

drivers/media/pci/intel/ipu7/ipu7-buttress-regs.h

@@ -289,7 +289,7 @@ enum {
 
 #define BUTTRESS_TSC_CMD_START_TSC_SYNC		BIT(0)
 #define BUTTRESS_PWR_STATUS_HH_STATUS_SHIFT	11
-#define BUTTRESS_PWR_STATUS_HH_STATUS_MASK	(0x3 << 11)
+#define BUTTRESS_PWR_STATUS_HH_STATUS_MASK	(0x3U << 11)
 #define BUTTRESS_TSW_WA_SOFT_RESET		BIT(8)
 /* new for PTL */
 #define BUTTRESS_SEL_PB_TIMESTAMP		BIT(9)
@@ -328,8 +328,8 @@ enum {
 #define BUTTRESS_CSE2IUDATA0_IPC_NACK_MASK 0xffff
 
 /* IS/PS freq control */
-#define BUTTRESS_IS_FREQ_CTL_RATIO_MASK	0xff
-#define BUTTRESS_PS_FREQ_CTL_RATIO_MASK	0xff
+#define BUTTRESS_IS_FREQ_CTL_RATIO_MASK	0xffU
+#define BUTTRESS_PS_FREQ_CTL_RATIO_MASK	0xffU
 #define BUTTRESS_IS_FREQ_CTL_CDYN_MASK	0xff
 #define BUTTRESS_PS_FREQ_CTL_CDYN_MASK	0xff
 
@@ -354,11 +354,11 @@ enum {
 /* buttree power status */
 #define IPU_BUTTRESS_PWR_STATE_IS_PWR_SHIFT	0
 #define IPU_BUTTRESS_PWR_STATE_IS_PWR_MASK	\
-	(0x3 << IPU_BUTTRESS_PWR_STATE_IS_PWR_SHIFT)
+	(0x3U << IPU_BUTTRESS_PWR_STATE_IS_PWR_SHIFT)
 
 #define IPU_BUTTRESS_PWR_STATE_PS_PWR_SHIFT	4
 #define IPU_BUTTRESS_PWR_STATE_PS_PWR_MASK	\
-	(0x3 << IPU_BUTTRESS_PWR_STATE_PS_PWR_SHIFT)
+	(0x3U << IPU_BUTTRESS_PWR_STATE_PS_PWR_SHIFT)
 
 #define IPU_BUTTRESS_PWR_STATE_DN_DONE		0x0
 #define IPU_BUTTRESS_PWR_STATE_UP_PROCESS	0x1