Alok Kataria wrote:
> +
> +struct pvscsi_adapter {
> + char *mmioBase;
> + unsigned int irq;
> + u8 rev;
> + bool use_msi;
> + bool use_msix;
> + bool use_msg;
> +
> + spinlock_t hw_lock;
Why not just use host_lock in the scsi_host structure?
> +
> +/*
> + * Map all data buffers for a command into PCI space and
> + * setup the scatter/gather list if needed.
> + */
> +static void pvscsi_map_buffers(struct pvscsi_adapter *adapter,
> + struct pvscsi_ctx *ctx,
> + struct scsi_cmnd *cmd, PVSCSIRingReqDesc *e)
> +{
> + unsigned count;
> + unsigned bufflen = scsi_bufflen(cmd);
> + struct scatterlist *sg;
> +
> + e->dataLen = bufflen;
> + e->dataAddr = 0;
> + if (bufflen == 0)
> + return;
> +
> + sg = scsi_sglist(cmd);
> + count = scsi_sg_count(cmd);
> + if (count != 0) {
> + int segs = pci_map_sg(adapter->dev, sg, count,
> + cmd->sc_data_direction);
Should use scsi_dma_map here instead.
> + if (segs > 1) {
> + pvscsi_create_sg(ctx, sg, segs);
> +
> + e->flags |= PVSCSI_FLAG_CMD_WITH_SG_LIST;
> + ctx->sglPA = pci_map_single(adapter->dev, ctx->sgl,
> + SGL_SIZE, PCI_DMA_TODEVICE);
> + e->dataAddr = ctx->sglPA;
> + } else
> + e->dataAddr = sg_dma_address(sg);
> + } else {
> + /*
> + * In case there is no S/G list, scsi_sglist points
> + * directly to the buffer.
> + */
> + ctx->dataPA = pci_map_single(adapter->dev, sg, bufflen,
> + cmd->sc_data_direction);
> + e->dataAddr = ctx->dataPA;
> + }
> +}
> +
> +static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,
> + struct pvscsi_ctx *ctx)
> +{
> + struct scsi_cmnd *cmd;
> + unsigned bufflen;
> +
> + cmd = ctx->cmd;
> + bufflen = scsi_bufflen(cmd);
> +
> + if (bufflen != 0) {
> + unsigned count = scsi_sg_count(cmd);
> +
> + if (count != 0) {
> + pci_unmap_sg(adapter->dev, scsi_sglist(cmd), count,
> + cmd->sc_data_direction);
Use scsi_dma_unmap here instead.
> + if (ctx->sglPA) {
> + pci_unmap_single(adapter->dev, ctx->sglPA,
> + SGL_SIZE, PCI_DMA_TODEVICE);
> + ctx->sglPA = 0;
> + }
> + } else
> + pci_unmap_single(adapter->dev, ctx->dataPA, bufflen,
> + cmd->sc_data_direction);
> + }
> + if (cmd->sense_buffer)
> + pci_unmap_single(adapter->dev, ctx->sensePA,
> + SCSI_SENSE_BUFFERSIZE, PCI_DMA_FROMDEVICE);
> +}
> +
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
