Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9dd467d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dwc3-msm: Don't unmap IPA GSI channel related doorbell register mapping"

parents 081f0cd0 24de5f68

drivers/usb/dwc3/dwc3-msm.c

+13 −10
Original line number Diff line number Diff line
@@ -937,21 +937,24 @@ static void gsi_store_ringbase_dbl_info(struct usb_ep *ep, 
		GSI_RING_BASE_ADDR_L(mdwc->gsi_reg[RING_BASE_ADDR_L], (n)),

		dwc3_trb_dma_offset(dep, &dep->trb_pool[0]));



	if (request->mapped_db_reg_phs_addr_lsb)

		dma_unmap_resource(dwc->sysdev,

			request->mapped_db_reg_phs_addr_lsb,

	if (!request->mapped_db_reg_phs_addr_lsb) {

		request->mapped_db_reg_phs_addr_lsb =

			dma_map_resource(dwc->sysdev,

				(phys_addr_t)request->db_reg_phs_addr_lsb,

				PAGE_SIZE, DMA_BIDIRECTIONAL, 0);



	request->mapped_db_reg_phs_addr_lsb = dma_map_resource(dwc->sysdev,

			(phys_addr_t)request->db_reg_phs_addr_lsb, PAGE_SIZE,

			DMA_BIDIRECTIONAL, 0);

	if (dma_mapping_error(dwc->sysdev, request->mapped_db_reg_phs_addr_lsb))

		if (dma_mapping_error(dwc->sysdev,

				request->mapped_db_reg_phs_addr_lsb))

			dev_err(mdwc->dev, "mapping error for db_reg_phs_addr_lsb\n");

	}



	dev_dbg(mdwc->dev, "ep:%s dbl_addr_lsb:%x mapped_dbl_addr_lsb:%llx\n",

		ep->name, request->db_reg_phs_addr_lsb,

		(unsigned long long)request->mapped_db_reg_phs_addr_lsb);



	dbg_log_string("ep:%s dbl_addr_lsb:%x mapped_addr:%llx\n",

		ep->name, request->db_reg_phs_addr_lsb,

		(unsigned long long)request->mapped_db_reg_phs_addr_lsb);



	dwc3_msm_write_reg(mdwc->base,

		GSI_DBL_ADDR_L(mdwc->gsi_reg[DBL_ADDR_L], (n)),

		(u32)request->mapped_db_reg_phs_addr_lsb);