scsi - gvp11.c: fix DMA mask calculation error
PATCH 1/1 scsi - gvp11.c: fix DMA mask calculation error
DMA masks given in the Zorro ID table don't contain the 2 byte alignment quirk seen in the GVP11_XFER_MASK macro from gvp11.h so no need to account for that.
DMA masks passed to dma_set_mask_and_coherent() must be 64 bit, add the missing cast in the TO_DMA_MASK macro used to convert driver DMA masks to DMA API masks.
--- drivers/scsi/gvp11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/gvp11.c +3 -3
@@ -30,7 +30,7 @@ struct gvp11_hostdata { };#define DMA_DIR (d) ((d == DATA_OUT_DIR) ? DMA_TO_DEVICE : DMA_FROM_DEVICE) -#define TO_DMA_MASK (m) ((~(m & 0xfffffff0))-1) +#define TO_DMA_MASK (m) (~((unsigned long long)m & 0xffffffff))static irqreturn_t gvp11_intr (int irq,void *data) {
@@ -334,7 +334,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent)if (dma_set_mask_and_coherent (&z->dev,TO_DMA_MASK (default_dma_xfer_mask))) { -dev_warn (&z->dev,"cannot use DMA mask %x\n" , +dev_warn (&z->dev,"cannot use DMA mask %llx\n" ,TO_DMA_MASK (default_dma_xfer_mask));return -ENODEV ; }
@@ -383,7 +383,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent) hdata->wh.dma_xfer_mask = gvp11_xfer_mask;if (dma_set_mask_and_coherent (&z->dev,TO_DMA_MASK (gvp11_xfer_mask))) { -dev_warn (&z->dev,"cannot use DMA mask %x\n" , +dev_warn (&z->dev,"cannot use DMA mask %llx\n" ,TO_DMA_MASK (gvp11_xfer_mask)); error = -ENODEV ; goto fail_check_or_alloc;
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedMichael,
Quoted 7 lines
DMA masks given in the Zorro ID table don't contain the 2 byte alignment quirk seen in the
GVP11_XFER_MASKmacro fromgvp11.hso no need to account for that.DMA masks passed to
dma_set_mask_and_coherent()must be 64 bit, add the missing cast in theTO_DMA_MASKmacro used to convert driver DMA masks to DMA API masks.
Applied to 5.20/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Michael Schmitz
DMA masks given in the Zorro ID table don't contain the 2 byte alignment quirk seen in the
GVP11_XFER_MASKmacro fromgvp11.hso no need to account for that.DMA masks passed to
dma_set_mask_and_coherent()must be 64 bit, add the missing cast in theTO_DMA_MASKmacro used to convert driver DMA masks to DMA API masks.[...]
Applied to 5.20/scsi-queue, thanks!
[1/1] scsi - gvp11.c: fix DMA mask calculation error
https://git.kernel.org/mkp/scsi/c/f712e24c0b2e
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering