Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] mptsas: Fix issue with chain pools allocation on katmai

Since commit 9d2e9d66a3f032667934144cd61c396ba49f090d
mptsas driver fails to allocate memory for the MPT chain buffers
for second LSI adapter on PPC440SPe Katmai platform:
...
ioc1: LSISAS1068E B3: Capabilities={Initiator}
mptbase: ioc1: ERROR - Unable to allocate Reply, Request, Chain Buffers!
mptbase: ioc1: ERROR - didn't initialize properly! (-3)
mptsas: probe of 0002:31:00.0 failed with error -3

This commit increased MPT_FC_CAN_QUEUE value but initChainBuffers()
doesn't differentiate between SAS and FC causing increased allocation
for SAS case, too. Later pci_alloc_consistent() fails to allocate
increased chain buffer pool size for SAS case.

Provide a fix by looking at the bus type and using appropriate
MPT_SAS_CAN_QUEUE value while calculation of the number of chain
buffers.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Kashyap Desai <kashyap.desai@lsi.com>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

authored by

Anatolij Gustschin and committed by
James Bottomley
f1053a7c cacb6dc3

+2
+2
drivers/message/fusion/mptbase.c
··· 4330 4330 4331 4331 if (ioc->bus_type == SPI) 4332 4332 num_chain *= MPT_SCSI_CAN_QUEUE; 4333 + else if (ioc->bus_type == SAS) 4334 + num_chain *= MPT_SAS_CAN_QUEUE; 4333 4335 else 4334 4336 num_chain *= MPT_FC_CAN_QUEUE; 4335 4337