Date: Sat, 7 Jan 2006 05:25:47 +0100
From: Petr Vandrovec <petr@vmware.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] Pass proper device from BusLogic to SCSI layer
Message-ID: <20060107042547.GA4255@vana.vc.cvut.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.11
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1988
Lines: 47

Hi Andrew,
  
While trying to get SUSE's SLES9 working on system with more than 4GB
we've noticed that SCSI layer happilly passes addresses over 4GB to
the buslogic driver, which is quite a big problem as buslogic can
generate only 32bit busmastering cycles.

Fortunately in the current kernels this problem does not exist anymore
as SCSI layer now assumes 4GB capable device by default, but it is
still good idea to pass correct device structure to the SCSI layer.
If nothing else, /sys/block/sda/device now points to
/sys/devices/pci0000:00/0000:00:10.0/host0/... instead of
/sys/devices/platform/host0/... like it did in the past.

Change does nothing for ISA based BusLogic adapters, they'll still
end under platform (and they are probably broken for long time as
I do not see anything forcing ISA 16MB limit for them).

					Thanks,
						Petr Vandrovec


diff -urdN linux/drivers/scsi/BusLogic.c linux/drivers/scsi/BusLogic.c
--- linux/drivers/scsi/BusLogic.c	2006-01-01 16:22:50.000000000 +0100
+++ linux/drivers/scsi/BusLogic.c	2006-01-01 16:34:43.000000000 +0100
@@ -2216,6 +2216,7 @@
 		HostAdapter->PCI_Address = ProbeInfo->PCI_Address;
 		HostAdapter->Bus = ProbeInfo->Bus;
 		HostAdapter->Device = ProbeInfo->Device;
+		HostAdapter->PCI_Device = ProbeInfo->PCI_Device;
 		HostAdapter->IRQ_Channel = ProbeInfo->IRQ_Channel;
 		HostAdapter->AddressCount = BusLogic_HostAdapterAddressCount[HostAdapter->HostAdapterType];
 		/*
@@ -2296,7 +2297,7 @@
 				scsi_host_put(Host);
 			} else {
 				BusLogic_InitializeHostStructure(HostAdapter, Host);
-				scsi_add_host(Host, NULL);
+				scsi_add_host(Host, HostAdapter->PCI_Device ? &HostAdapter->PCI_Device->dev : NULL);
 				scsi_scan_host(Host);
 				BusLogicHostAdapterCount++;
 			}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/