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

Commit 19966769 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

[SCSI] aic79xx: use dma_get_required_mask() 



As originally noted by Frederic Temporelli, the aic79xx supports 64
bit addressing, but the initialization code of the driver is wrong: it
tests the available memory size instead of testing the maximum
available memory address.

This patch uses the correct dma_get_required_mask() macros to
determine the correct addressing method.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Cc: Xavier Bru <xavier.bru@bull.net>
CC: Frederic Temporelli <frederic.temporelli@bull.net>

cosmetic fixes
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 55048021

drivers/scsi/aic7xxx/aic79xx_osm.c

+0 −9
Original line number Diff line number Diff line
@@ -1126,15 +1126,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa 
	return 0;

}



uint64_t

ahd_linux_get_memsize(void)

{

	struct sysinfo si;



	si_meminfo(&si);

	return ((uint64_t)si.totalram << PAGE_SHIFT);

}



/*

 * Place the SCSI bus into a known state by either resetting it,

 * or forcing transfer negotiations on the next command to any

drivers/scsi/aic7xxx/aic79xx_osm.h

+0 −2
Original line number Diff line number Diff line
@@ -496,8 +496,6 @@ ahd_insb(struct ahd_softc * ahd, long port, uint8_t *array, int count) 
int		ahd_linux_register_host(struct ahd_softc *,

					struct scsi_host_template *);



uint64_t	ahd_linux_get_memsize(void);



/*************************** Pretty Printing **********************************/

struct info_str {

	char *buffer;

drivers/scsi/aic7xxx/aic79xx_osm_pci.c

+9 −10
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct		 ahd_pci_identity *entry;

	char		*name;

	int		 error;

	struct device	*dev = &pdev->dev;



	pci = pdev;

	entry = ahd_find_pci_device(pci);
@@ -161,20 +162,18 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_set_master(pdev);



	if (sizeof(dma_addr_t) > 4) {

		uint64_t   memsize;

		const uint64_t mask_39bit = 0x7FFFFFFFFFULL;

		const u64 required_mask = dma_get_required_mask(dev);



		memsize = ahd_linux_get_memsize();



		if (memsize >= 0x8000000000ULL

	 	 && pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {

		if (required_mask > DMA_39BIT_MASK &&

		    dma_set_mask(dev, DMA_64BIT_MASK) == 0)

			ahd->flags |= AHD_64BIT_ADDRESSING;

		} else if (memsize > 0x80000000

			&& pci_set_dma_mask(pdev, mask_39bit) == 0) {

		else if (required_mask > DMA_32BIT_MASK &&

			 dma_set_mask(dev, DMA_39BIT_MASK) == 0)

			ahd->flags |= AHD_39BIT_ADDRESSING;

		}

		else

			dma_set_mask(dev, DMA_32BIT_MASK);

	} else {

		pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		dma_set_mask(dev, DMA_32BIT_MASK);

	}

	ahd->dev_softc = pci;

	error = ahd_pci_config(ahd, entry);