iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: gvp11.c: Fix DMA mask calculation error

Browse Source 
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.

Link: https://lore.kernel.org/r/6d1d88ee-1cf6-c735-1e6d-bafd2096e322@gmail.com
Link: https://lore.kernel.org/r/20220713074913.7873-1-schmitzmic@gmail.com
Fixes: 158da6bcae ("scsi: gvp11: Convert m68k WD33C93 drivers to DMA API")
CC: linux-scsi@vger.kernel.org
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Michael Schmitz 2022-07-13 19:49:13 +12:00 committed by Martin K. Petersen
parent c641ffdb59
commit f712e24c0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/gvp11.c
View File

@ -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;