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

Commit 12e9b5fb authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: remove x86_64 IOMMU dependent code 



This may seem like a DILLIGAF, but after chatting with the F/W folks,
there is no harm in dropping the page calculation as denoted in the
enclosed patch for these older adapters in this new age of 4GB+ memory
sticks. Any resource optimization within the old-old-old adapters for
systems with less than 4G of memory is of little consequence. The
existing AAC_QUIRK_31BIT flag in linit.c should look after the rest of
the legacy hardware DMA limitations.

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 99d19bb7

drivers/scsi/aacraid/comminit.c

+1 −22
Original line number Diff line number Diff line
@@ -92,28 +92,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co 
	init->AdapterFibsPhysicalAddress = cpu_to_le32((u32)phys);

	init->AdapterFibsSize = cpu_to_le32(fibsize);

	init->AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib));

	/* 

	 * number of 4k pages of host physical memory. The aacraid fw needs

	 * this number to be less than 4gb worth of pages. num_physpages is in

	 * system page units. New firmware doesn't have any issues with the

	 * mapping system, but older Firmware did, and had *troubles* dealing

	 * with the math overloading past 32 bits, thus we must limit this

	 * field.

	 *

	 * This assumes the memory is mapped zero->n, which isnt

	 * always true on real computers. It also has some slight problems

	 * with the GART on x86-64. I've btw never tried DMA from PCI space

	 * on this platform but don't be surprised if its problematic.

	 */

#ifndef CONFIG_GART_IOMMU

	if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {

		init->HostPhysMemPages = 

			cpu_to_le32(num_physpages << (PAGE_SHIFT-12));

	} else 

#endif	

	{

	init->HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);

	}



	init->InitFlags = 0;

	if (dev->new_comm_interface) {