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

Commit 5565461e authored by Chad Dupuis's avatar Chad Dupuis Committed by Christoph Hellwig
Browse files

bnx2fc: fix incorrect DMA memory mapping in bnx2fc_unmap_sg_list() 



This patch is based on a problem and solution from Maurizio Lombardi
where bnx2fc isn't consistent in which device struct we using for DMA
map and unmap operations.  Make them consistent by using dma_sg_unmap
in bnx2fc_unmap_sg_list like bnx2fc_map_sg.

Reviewed-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent fd10ccfa

drivers/scsi/bnx2fc/bnx2fc_io.c

+13 −2
Original line number Diff line number Diff line
@@ -1654,6 +1654,10 @@ static int bnx2fc_map_sg(struct bnx2fc_cmd *io_req) 
	u64 addr;

	int i;



	/*

	 * Use dma_map_sg directly to ensure we're using the correct

	 * dev struct off of pcidev.

	 */

	sg_count = dma_map_sg(&hba->pcidev->dev, scsi_sglist(sc),

			      scsi_sg_count(sc), sc->sc_data_direction);

	scsi_for_each_sg(sc, sg, sg_count, i) {
@@ -1703,9 +1707,16 @@ static int bnx2fc_build_bd_list_from_sg(struct bnx2fc_cmd *io_req) 
static void bnx2fc_unmap_sg_list(struct bnx2fc_cmd *io_req)

{

	struct scsi_cmnd *sc = io_req->sc_cmd;

	struct bnx2fc_interface *interface = io_req->port->priv;

	struct bnx2fc_hba *hba = interface->hba;



	if (io_req->bd_tbl->bd_valid && sc) {

		scsi_dma_unmap(sc);

	/*

	 * Use dma_unmap_sg directly to ensure we're using the correct

	 * dev struct off of pcidev.

	 */

	if (io_req->bd_tbl->bd_valid && sc && scsi_sg_count(sc)) {

		dma_unmap_sg(&hba->pcidev->dev, scsi_sglist(sc),

		    scsi_sg_count(sc), sc->sc_data_direction);

		io_req->bd_tbl->bd_valid = 0;

	}

}