MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 13:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: aic7xxx: fix EISA support

Browse Source 
[ Upstream commit 144ec97493 ]

Instead of relying on the now removed NULL argument to
pci_alloc_consistent, switch to the generic DMA API, and store the struct
device so that we can pass it.

Fixes: 4167b2ad51 ("PCI: Remove NULL device handling from PCI DMA API")
Reported-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christoph Hellwig 2019-04-18 18:13:58 +02:00 committed by Greg Kroah-Hartman
parent e9697ba264
commit 4176e671a4
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/aic7xxx/aic7770_osm.c
View File

@ -91,6 +91,7 @@ aic7770_probe(struct device *dev)
ahc = ahc_alloc(&aic7xxx_driver_template, name); ahc = ahc_alloc(&aic7xxx_driver_template, name);
if (ahc == NULL) if (ahc == NULL)
return (ENOMEM); return (ENOMEM);
ahc->dev = dev;
error = aic7770_config(ahc, aic7770_ident_table + edev->id.driver_data, error = aic7770_config(ahc, aic7770_ident_table + edev->id.driver_data,
eisaBase); eisaBase);
if (error != 0) { if (error != 0) {

1
drivers/scsi/aic7xxx/aic7xxx.h
View File

@ -943,6 +943,7 @@ struct ahc_softc {
* Platform specific device information. * Platform specific device information.
*/ */
ahc_dev_softc_t dev_softc; ahc_dev_softc_t dev_softc;
struct device *dev;
/* /*
* Bus specific device information. * Bus specific device information.

10
drivers/scsi/aic7xxx/aic7xxx_osm.c
View File

@ -860,8 +860,8 @@ int
ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dma_tag_t dmat, void** vaddr, ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dma_tag_t dmat, void** vaddr,
int flags, bus_dmamap_t *mapp) int flags, bus_dmamap_t *mapp)
{ {
*vaddr = pci_alloc_consistent(ahc->dev_softc, /* XXX: check if we really need the GFP_ATOMIC and unwind this mess! */
dmat->maxsize, mapp); *vaddr = dma_alloc_coherent(ahc->dev, dmat->maxsize, mapp, GFP_ATOMIC);
if (*vaddr == NULL) if (*vaddr == NULL)
return ENOMEM; return ENOMEM;
return 0; return 0;
@ -871,8 +871,7 @@ void
ahc_dmamem_free(struct ahc_softc *ahc, bus_dma_tag_t dmat, ahc_dmamem_free(struct ahc_softc *ahc, bus_dma_tag_t dmat,
void* vaddr, bus_dmamap_t map) void* vaddr, bus_dmamap_t map)
{ {
pci_free_consistent(ahc->dev_softc, dmat->maxsize, dma_free_coherent(ahc->dev, dmat->maxsize, vaddr, map);
vaddr, map);
} }
int int
@ -1123,8 +1122,7 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa
host->transportt = ahc_linux_transport_template; host->transportt = ahc_linux_transport_template;
retval = scsi_add_host(host, retval = scsi_add_host(host, ahc->dev);
(ahc->dev_softc ? &ahc->dev_softc->dev : NULL));
if (retval) { if (retval) {
printk(KERN_WARNING "aic7xxx: scsi_add_host failed\n"); printk(KERN_WARNING "aic7xxx: scsi_add_host failed\n");
scsi_host_put(host); scsi_host_put(host);

1
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
View File

@ -250,6 +250,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
} }
ahc->dev_softc = pci; ahc->dev_softc = pci;
ahc->dev = &pci->dev;
error = ahc_pci_config(ahc, entry); error = ahc_pci_config(ahc, entry);
if (error != 0) { if (error != 0) {
ahc_free(ahc); ahc_free(ahc);