Merge "msm: camera: csid: correction for printing long and short packet info" into camera-kernel.lnx.5.0

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170.h

@@ -284,7 +284,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 	.phy_num_mask                    = 0x3,
 	.vc_mask                         = 0x7C00000,
 	.dt_mask                         = 0x3f0000,
-	.wc_mask                         = 0xffff0000,
+	.wc_mask                         = 0xffff,
 	.calc_crc_mask                   = 0xffff,
 	.expected_crc_mask               = 0xffff,
 	.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170_200.h

@@ -365,7 +365,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 	.phy_num_mask                    = 0x7,
 	.vc_mask                         = 0x7C00000,
 	.dt_mask                         = 0x3f0000,
-	.wc_mask                         = 0xffff0000,
+	.wc_mask                         = 0xffff,
 	.calc_crc_mask                   = 0xffff,
 	.expected_crc_mask               = 0xffff,
 	.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid175.h

@@ -348,7 +348,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 	.phy_num_mask                    = 0x3,
 	.vc_mask                         = 0x7C00000,
 	.dt_mask                         = 0x3f0000,
-	.wc_mask                         = 0xffff0000,
+	.wc_mask                         = 0xffff,
 	.calc_crc_mask                   = 0xffff,
 	.expected_crc_mask               = 0xffff,
 	.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid175_200.h

@@ -367,7 +367,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 	.phy_num_mask                    = 0x7,
 	.vc_mask                         = 0x7C00000,
 	.dt_mask                         = 0x3f0000,
-	.wc_mask                         = 0xffff0000,
+	.wc_mask                         = 0xffff,
 	.calc_crc_mask                   = 0xffff,
 	.expected_crc_mask               = 0xffff,
 	.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid480.h

@@ -404,7 +404,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 	.phy_num_mask                    = 0x7,
 	.vc_mask                         = 0x7C00000,
 	.dt_mask                         = 0x3f0000,
-	.wc_mask                         = 0xffff0000,
+	.wc_mask                         = 0xffff,
 	.calc_crc_mask                   = 0xffff,
 	.expected_crc_mask               = 0xffff,
 	.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid680.h

@@ -1057,7 +1057,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 		.phy_num_mask                    = 0xf,
 		.vc_mask                         = 0x7C00000,
 		.dt_mask                         = 0x3f0000,
-		.wc_mask                         = 0xffff0000,
+		.wc_mask                         = 0xffff,
 		.calc_crc_mask                   = 0xffff,
 		.expected_crc_mask               = 0xffff,
 		.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid780.h

@@ -1119,7 +1119,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 		.phy_num_mask                    = 0xf,
 		.vc_mask                         = 0x7C00000,
 		.dt_mask                         = 0x3f0000,
-		.wc_mask                         = 0xffff0000,
+		.wc_mask                         = 0xffff,
 		.calc_crc_mask                   = 0xffff,
 		.expected_crc_mask               = 0xffff,
 		.ecc_correction_shift_en         = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c

@@ -3797,8 +3797,8 @@ static int cam_ife_csid_ver1_handle_rx_debug_event(
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
 			"Csid :%d Long pkt VC: %d DT: %d WC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
@@ -3821,16 +3821,16 @@ static int cam_ife_csid_ver1_handle_rx_debug_event(
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 			csi2_reg->captured_short_pkt_0_addr);
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
-			"Csid :%d Long pkt VC: %d DT: %d LC: %d",
+			"Csid :%d Short pkt VC: %d DT: %d LC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 			csi2_reg->captured_short_pkt_1_addr);
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
-			"Csid :%d Long pkt ECC: %d",
+			"Csid :%d Short pkt ECC: %d",
 			csid_hw->hw_intf->hw_idx, val);
 		break;
 	case IFE_CSID_VER1_RX_CPHY_PKT_HDR_CAPTURED:
@@ -3840,8 +3840,8 @@ static int cam_ife_csid_ver1_handle_rx_debug_event(
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
 			"Csid :%d CPHY pkt VC: %d DT: %d LC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 		break;
 	case IFE_CSID_VER1_RX_UNMAPPED_VC_DT:

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -794,8 +794,8 @@ static int cam_ife_csid_ver2_handle_rx_debug_event(
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
 			"Csid :%d Long pkt VC: %d DT: %d WC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
@@ -818,16 +818,16 @@ static int cam_ife_csid_ver2_handle_rx_debug_event(
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 			csi2_reg->captured_short_pkt_0_addr);
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
-			"Csid :%d Long pkt VC: %d DT: %d LC: %d",
+			"Csid :%d Short pkt VC: %d DT: %d LC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 
 		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 			csi2_reg->captured_short_pkt_1_addr);
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
-			"Csid :%d Long pkt ECC: %d",
+			"Csid :%d Short pkt ECC: %d",
 			csid_hw->hw_intf->hw_idx, val);
 		break;
 	case IFE_CSID_VER2_RX_CPHY_PKT_HDR_CAPTURED:
@@ -837,8 +837,8 @@ static int cam_ife_csid_ver2_handle_rx_debug_event(
 		CAM_INFO_RATE_LIMIT(CAM_ISP,
 			"Csid :%d CPHY pkt VC: %d DT: %d LC: %d",
 			csid_hw->hw_intf->hw_idx,
-			val & csi2_reg->vc_mask,
-			val & csi2_reg->dt_mask,
+			(val & csi2_reg->vc_mask) >> 22,
+			(val & csi2_reg->dt_mask) >> 16,
 			val & csi2_reg->wc_mask);
 		break;
 	case IFE_CSID_VER2_RX_UNMAPPED_VC_DT:

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite680.h

@@ -431,7 +431,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 		.phy_num_mask                         = 0xf,
 		.vc_mask                              = 0x7C00000,
 		.dt_mask                              = 0x3f0000,
-		.wc_mask                              = 0xffff0000,
+		.wc_mask                              = 0xffff,
 		.calc_crc_mask                        = 0xffff,
 		.expected_crc_mask                    = 0xffff,
 		.ecc_correction_shift_en              = 0,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite780.h

@@ -468,7 +468,7 @@ static struct cam_ife_csid_csi2_rx_reg_info
 		.phy_num_mask                         = 0xf,
 		.vc_mask                              = 0x7C00000,
 		.dt_mask                              = 0x3f0000,
-		.wc_mask                              = 0xffff0000,
+		.wc_mask                              = 0xffff,
 		.calc_crc_mask                        = 0xffff,
 		.expected_crc_mask                    = 0xffff,
 		.ecc_correction_shift_en              = 0,