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

Commit 55664051 authored by Stefan Richter's avatar Stefan Richter Committed by Jody McIntyre
Browse files

sbp2: check for ARM failure 



Sbp2 did not check for successful registration of the lower address range
when CONFIG_IEEE1394_SBP2_PHYS_DMA was set. If hpsb_register_addrspace
failed, a "login timed-out" would occur which is misleading. Now sbp2 logs
a sensible error message.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJody McIntyre <scjody@modernduck.com>
parent 180a4304

drivers/ieee1394/sbp2.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -749,9 +749,13 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud 




#ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA

#ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA

		/* Handle data movement if physical dma is not

		/* Handle data movement if physical dma is not

		 * enabled/supportedon host controller */

		 * enabled or not supported on host controller */

		hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host, &sbp2_physdma_ops,

		if (!hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host,

					0x0ULL, 0xfffffffcULL);

					     &sbp2_physdma_ops,

					     0x0ULL, 0xfffffffcULL)) {

			SBP2_ERR("failed to register lower 4GB address range");

			goto failed_alloc;

		}

#endif

#endif

	}

	}