Skip to contentSkip to conversation

media: intel/ipu6: move some boot messages to debug level

PATCH Superseded Stanislaw Gruszka 3 participants 3 messages Nov 29, 2024 – Dec 2, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: intel/ipu6: move some boot messages to debug level

When ivsc chip fail to initialise properly we can get plenty of ipu6 messages like this:

[   15.454049] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.456600] intel-ipu6 0000:00:05.0: FW version: 20230925
[   15.458292] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.461186] intel-ipu6 0000:00:05.0: FW version: 20230925
[   15.463616] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.466490] intel-ipu6 0000:00:05.0: FW version: 20230925

Print them only when debugging is enabled to do not flood dmesg on ivsc errors condition.

---
 drivers/media/pci/intel/ipu6/ipu6-buttress.c | 8 ++++----
 drivers/media/pci/intel/ipu6/ipu6-cpd.c      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-buttress.c +4 -4
index e47f84c30e10..e02899dda8d0 100644
@@ -852,10 +852,10 @@ int ipu6_buttress_init(struct ipu6_device *isp)
 	INIT_LIST_HEAD(&b->constraints);
 
 	isp->secure_mode = ipu6_buttress_get_secure_mode(isp);
-	dev_info(&isp->pdev->dev, "IPU6 in %s mode touch 0x%x mask 0x%x\n",
-		 isp->secure_mode ? "secure" : "non-secure",
-		 readl(isp->base + BUTTRESS_REG_SECURITY_TOUCH),
-		 readl(isp->base + BUTTRESS_REG_CAMERA_MASK));
+	dev_dbg(&isp->pdev->dev, "IPU6 in %s mode touch 0x%x mask 0x%x\n",
+		isp->secure_mode ? "secure" : "non-secure",
+		readl(isp->base + BUTTRESS_REG_SECURITY_TOUCH),
+		readl(isp->base + BUTTRESS_REG_CAMERA_MASK));
 
 	b->wdt_cached_value = readl(isp->base + BUTTRESS_REG_WDT);
 	writel(BUTTRESS_IRQS, isp->base + BUTTRESS_REG_ISR_CLEAR);
drivers/media/pci/intel/ipu6/ipu6-cpd.c +1 -1
index 715b21ab4b8e..3dec9e3329d6 100644
@@ -275,7 +275,7 @@ static int ipu6_cpd_validate_moduledata(struct ipu6_device *isp,
 		return -EINVAL;
 	}
 
-	dev_info(&isp->pdev->dev, "FW version: %x\n", mod_hdr->fw_pkg_date);
+	dev_dbg(&isp->pdev->dev, "FW version: %x\n", mod_hdr->fw_pkg_date);
 	ret = ipu6_cpd_validate_cpd(isp, moduledata + mod_hdr->hdr_len,
 				    moduledata_size - mod_hdr->hdr_len,
 				    moduledata_size);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Thank you for your patch.

Quoted 2 lines · Stanislaw Gruszka

When ivsc chip fail to initialise properly we can get plenty of ipu6 messages like this:

s/initialise/initialize/ (if you decide to do a v2)

This does not only happen when the ivsc chip fails to initialize, it also happens while the ipu6 driver is waiting for the ivsc driver to be probed (with ipu6's probe() method returning -EPROBE_DEFER) when the ivsc driver does initialize properly eventually.

Maybe do a v2 with an updated commit msg reflecting this ?

Otherwise the patch looks good to me:

Regards,

Hans

Quoted 47 lines
[   15.454049] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.456600] intel-ipu6 0000:00:05.0: FW version: 20230925
[   15.458292] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.461186] intel-ipu6 0000:00:05.0: FW version: 20230925
[   15.463616] intel-ipu6 0000:00:05.0: IPU6 in non-secure mode touch 0x0 mask 0xff
[   15.466490] intel-ipu6 0000:00:05.0: FW version: 20230925

Print them only when debugging is enabled to do not flood dmesg on ivsc errors condition.

---> drivers/media/pci/intel/ipu6/ipu6-buttress.c | 8 ++++----

 drivers/media/pci/intel/ipu6/ipu6-cpd.c      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-buttress.c +4 -4
index e47f84c30e10..e02899dda8d0 100644
@@ -852,10 +852,10 @@ int ipu6_buttress_init(struct ipu6_device *isp)
 	INIT_LIST_HEAD(&b->constraints);
 
 	isp->secure_mode = ipu6_buttress_get_secure_mode(isp);
-	dev_info(&isp->pdev->dev, "IPU6 in %s mode touch 0x%x mask 0x%x\n",
-		 isp->secure_mode ? "secure" : "non-secure",
-		 readl(isp->base + BUTTRESS_REG_SECURITY_TOUCH),
-		 readl(isp->base + BUTTRESS_REG_CAMERA_MASK));
+	dev_dbg(&isp->pdev->dev, "IPU6 in %s mode touch 0x%x mask 0x%x\n",
+		isp->secure_mode ? "secure" : "non-secure",
+		readl(isp->base + BUTTRESS_REG_SECURITY_TOUCH),
+		readl(isp->base + BUTTRESS_REG_CAMERA_MASK));
 
 	b->wdt_cached_value = readl(isp->base + BUTTRESS_REG_WDT);
 	writel(BUTTRESS_IRQS, isp->base + BUTTRESS_REG_ISR_CLEAR);
drivers/media/pci/intel/ipu6/ipu6-cpd.c +1 -1
index 715b21ab4b8e..3dec9e3329d6 100644
@@ -275,7 +275,7 @@ static int ipu6_cpd_validate_moduledata(struct ipu6_device *isp,
 		return -EINVAL;
 	}
 
-	dev_info(&isp->pdev->dev, "FW version: %x\n", mod_hdr->fw_pkg_date);
+	dev_dbg(&isp->pdev->dev, "FW version: %x\n", mod_hdr->fw_pkg_date);
 	ret = ipu6_cpd_validate_cpd(isp, moduledata + mod_hdr->hdr_len,
 				    moduledata_size - mod_hdr->hdr_len,
 				    moduledata_size);
maintainer
#2 lore raw

Hi Hans,

Quoted 9 lines · Hans de Goede

Hi,

Thank you for your patch.

Quoted 2 lines · Stanislaw Gruszka

When ivsc chip fail to initialise properly we can get plenty of ipu6 messages like this:

s/initialise/initialize/ (if you decide to do a v2)

Both British and American spellings are accepted.

Signature · 1 line
Sakari Ailus