IPU6 and IPU7 driver fixes
cover IPU6 and IPU7 driver fixes
From: Bingbu Cao <[email protected]>
This patchsets contains some fixes for IPU7 driver, and also cover a code cleanup for IPU6 driver. It also update the CPHY settings for IPU7 according to the PHY specification update.
Bingbu Cao (4):
media: staging/ipu7: ignore interrupts when device is suspended
media: staging/ipu7: call synchronous RPM suspend in probe failure
media: ipu7: update CDPHY register settings
media: ipu6/7: fix typo and coding errors in IPU mmu driver
drivers/media/pci/intel/ipu6/ipu6-mmu.c | 4 ++-- drivers/staging/media/ipu7/ipu7-buttress.c | 12 ++++++++++-- drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 15 +++++++++++---- drivers/staging/media/ipu7/ipu7-mmu.c | 2 +- drivers/staging/media/ipu7/ipu7.c | 6 +++++- 5 files changed, 29 insertions(+), 10 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 media: staging/ipu7: ignore interrupts when device is suspended
From: Bingbu Cao <[email protected]>
IPU7 devices have shared interrupts with others. In some case when IPU7 device is suspended, driver get unexpected interrupt and invalid irq status 0xffffffff from ISR_STATUS and PB LOCAL_STATUS registers as interrupt is triggered from other device on shared irq line.
In order to avoid this issue use pm_runtime_get_if_active() to check if IPU7 device is resumed, ignore the invalid irq status and use synchronize_irq() in suspend.
--- drivers/staging/media/ipu7/ipu7-buttress.c | 12 ++++++++++-- drivers/staging/media/ipu7/ipu7.c | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/staging/media/ipu7/ipu7-buttress.c +10 -2
@@ -342,14 +342,22 @@ irqreturn_t ipu_buttress_isr(int irq, void *isp_ptr)u32 disable_irqs =0 ;u32 irq_status;unsigned int i; +int active; -pm_runtime_get_noresume (dev); + active =pm_runtime_get_if_active (dev); +if (active <=0 ) +return IRQ_NONE ; pb_irq =readl (isp->pb_base +INTERRUPT_STATUS );writel (pb_irq, isp->pb_base +INTERRUPT_STATUS );/* check btrs ATS, CFI and IMR errors, BIT(0) is unused for IPU */ pb_local_irq =readl (isp->pb_base +BTRS_LOCAL_INTERRUPT_MASK ); +if (WARN_ON_ONCE (pb_local_irq ==0xffffffff )) { +pm_runtime_put_noidle (dev); +return IRQ_NONE ; + } +if (pb_local_irq & ~BIT (0 )) {dev_warn (dev,"PB interrupt status 0x%x local 0x%x\n" , pb_irq, pb_local_irq);
@@ -365,7 +373,7 @@ irqreturn_t ipu_buttress_isr(int irq, void *isp_ptr) } irq_status =readl (isp->base +BUTTRESS_REG_IRQ_STATUS ); -if (!irq_status) { +if (!irq_status ||WARN_ON_ONCE (irq_status ==0xffffffff )) {pm_runtime_put_noidle (dev);return IRQ_NONE ; }
drivers/staging/media/ipu7/ipu7.c +4 -0
@@ -2684,6 +2684,10 @@ static void ipu7_pci_reset_done(struct pci_dev *pdev)*/ static int ipu7_suspend (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev); + +synchronize_irq (pdev->irq); +return 0 ; }
Signature · 1 line
2.34.1
PATCH 2/4 media: staging/ipu7: call synchronous RPM suspend in probe failure
In reply to [email protected]From: Bingbu Cao <[email protected]>
If firmware authentication failed during driver probe, driver call an asynchronous API to suspend the psys device but the bus device will be removed soon, thus runtime PM of bus device will be disabled soon, that will cancel the suspend request, so use synchronous suspend to make sure the runtime suspend before disabling its RPM.
IPU7 hardware has constraints that the PSYS device must be powered off before ISYS, otherwise it will cause machine check error.
--- drivers/staging/media/ipu7/ipu7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/ipu7/ipu7.c +1 -1
@@ -2620,7 +2620,7 @@ static int ipu7_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (!IS_ERR_OR_NULL (isp->isys) && !IS_ERR_OR_NULL (isp->isys->mmu))ipu7_mmu_cleanup (isp->isys->mmu);if (!IS_ERR_OR_NULL (isp->psys)) -pm_runtime_put (&isp->psys->auxdev.dev); +pm_runtime_put_sync (&isp->psys->auxdev.dev);ipu7_bus_del_devices (pdev);release_firmware (isp->cpd_fw); buttress_exit:
Signature · 1 line
2.34.1
PATCH 3/4 media: ipu7: update CDPHY register settings
In reply to [email protected]From: Bingbu Cao <[email protected]>
Some CPHY settings needs to updated according to the latest guide from SNPS. Program 45ohm for tuning resistance to fix CPHY problem and update the ITMINRX and GMODE for CPHY.
--- drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/staging/media/ipu7/ipu7-isys-csi-phy.c +11 -4
@@ -124,6 +124,7 @@ static const struct cdr_fbk_cap_prog_params table7[] = { { 1350, 1589, 4 }, { 1590, 1949, 5 }, { 1950, 2499, 6 }, + { 2500, 3500, 7 }, { } };
@@ -730,7 +731,7 @@ static void ipu7_isys_cphy_config(struct ipu7_isys *isys, u8 id, u8 lanes,u16 deass_thresh;u16 delay_thresh;u16 reset_thresh; -u16 cap_prog =6U ; +u16 cap_prog;u16 reg;u16 val;u32 i;
@@ -838,9 +839,10 @@ static void ipu7_isys_cphy_config(struct ipu7_isys *isys, u8 id, u8 lanes,dwc_phy_write_mask (isys, id, reg +0x400 * i, reset_thresh,9 ,11 ); +/* Tuning ITMINRX to 2 for CPHY */ reg =CORE_DIG_CLANE_0_RW_LP_0 ;for (i =0 ; i < trios; i++) -dwc_phy_write_mask (isys, id, reg +0x400 * i,1 ,12 ,15 ); +dwc_phy_write_mask (isys, id, reg +0x400 * i,2 ,12 ,15 ); reg =CORE_DIG_CLANE_0_RW_LP_2 ;for (i =0 ; i < trios; i++)
@@ -860,7 +862,11 @@ static void ipu7_isys_cphy_config(struct ipu7_isys *isys, u8 id, u8 lanes,for (i =0 ; i < (lanes +1 ); i++) { reg =CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_9 +0x400 * i;dwc_phy_write_mask (isys, id, reg,4U ,0 ,2 ); -dwc_phy_write_mask (isys, id, reg,0U ,3 ,4 ); +/* Set GMODE to 2 when CPHY >= 1.5Gsps */ +if (mbps >=1500 ) +dwc_phy_write_mask (isys, id, reg,2U ,3 ,4 ); +else +dwc_phy_write_mask (isys, id, reg,0U ,3 ,4 ); reg =CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_7 +0x400 * i;dwc_phy_write_mask (isys, id, reg, cap_prog,10 ,12 );
@@ -930,8 +936,9 @@ static int ipu7_isys_phy_config(struct ipu7_isys *isys, u8 id, u8 lanes, 7, 12, 14);dwc_phy_write_mask (isys, id,CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_7 ,0 ,8 ,10 ); +/* resistance tuning: 1 for 45ohm, 0 for 50ohm */ dwc_phy_write_mask (isys, id,CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_5 , -0 ,8 ,8 ); +1 ,8 ,8 );if (aggregation) phy_mode = isys->csi2[0 ].phy_mode;
Signature · 1 line
2.34.1
PATCH 4/4 media: ipu6/7: fix typo and coding errors in IPU mmu driver
In reply to [email protected]From: Bingbu Cao <[email protected]>
Fix the coding errors in ipu6-mmu.c and ipu7-mmu.c, it has no impact on current driver functionality, however it needs a fix.
--- drivers/media/pci/intel/ipu6/ipu6-mmu.c | 4 ++-- drivers/staging/media/ipu7/ipu7-mmu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-mmu.c +2 -2
@@ -102,7 +102,7 @@ static void page_table_dump(struct ipu6_mmu_info *mmu_info)if (mmu_info->l1_pt[l1_idx] == mmu_info->dummy_l2_pteval)continue ; - l2_phys = TBL_PHYS_ADDR(mmu_info->l1_pt[l1_idx];) + l2_phys =TBL_PHYS_ADDR (mmu_info->l1_pt[l1_idx]);dev_dbg (mmu_info->dev,"l1 entry %u; iovas 0x%8.8x-0x%8.8x, at %pap\n" , l1_idx, iova, iova +ISP_PAGE_SIZE , &l2_phys);
@@ -248,7 +248,7 @@ static u32 *alloc_l2_pt(struct ipu6_mmu_info *mmu_info)dev_dbg (mmu_info->dev,"alloc_l2: get_zeroed_page() = %p\n" , pt); -for (i =0 ; i <ISP_L1PT_PTES ; i++) +for (i =0 ; i <ISP_L2PT_PTES ; i++) pt[i] = mmu_info->dummy_page_pteval;return pt;
drivers/staging/media/ipu7/ipu7-mmu.c +1 -1
@@ -231,7 +231,7 @@ static u32 *alloc_l2_pt(struct ipu7_mmu_info *mmu_info)dev_dbg (mmu_info->dev,"alloc_l2: get_zeroed_page() = %p\n" , pt); -for (i =0 ; i <ISP_L1PT_PTES ; i++) +for (i =0 ; i <ISP_L2PT_PTES ; i++) pt[i] = mmu_info->dummy_page_pteval;return pt;
Signature · 1 line
2.34.1