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

Commit 4b129ae3 authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio: ddr timeout 



Adds support for ddr_timeout during device init.

Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <rvatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5a20472

drivers/net/ethernet/cavium/liquidio/lio_main.c

+9 −4
Original line number Diff line number Diff line
@@ -3805,14 +3805,19 @@ static int octeon_device_init(struct octeon_device *octeon_dev) 


	dev_dbg(&octeon_dev->pci_dev->dev, "Waiting for DDR initialization...\n");



	if (ddr_timeout == 0) {

		dev_info(&octeon_dev->pci_dev->dev,

			 "WAITING. Set ddr_timeout to non-zero value to proceed with initialization.\n");

	}

	if (ddr_timeout == 0)

		dev_info(&octeon_dev->pci_dev->dev, "WAITING. Set ddr_timeout to non-zero value to proceed with initialization.\n");



	schedule_timeout_uninterruptible(HZ * LIO_RESET_SECS);



	/* Wait for the octeon to initialize DDR after the soft-reset. */

	while (ddr_timeout == 0) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (schedule_timeout(HZ / 10)) {

			/* user probably pressed Control-C */

			return 1;

		}

	}

	ret = octeon_wait_for_ddr_init(octeon_dev, &ddr_timeout);

	if (ret) {

		dev_err(&octeon_dev->pci_dev->dev,

drivers/net/ethernet/cavium/liquidio/octeon_device.c

+0 −3
Original line number Diff line number Diff line
@@ -1284,9 +1284,6 @@ int octeon_wait_for_ddr_init(struct octeon_device *oct, u32 *timeout) 
	if (!timeout)

		return ret;



	while (*timeout == 0)

		schedule_timeout_uninterruptible(HZ / 10);



	for (ms = 0; (ret != 0) && ((*timeout == 0) || (ms <= *timeout));

	     ms += HZ / 10) {

		ret = octeon_mem_access_ok(oct);