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

Commit 4e530973 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.15-soc' of... 

Merge tag 'tegra-for-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Pull "soc/tegra: Changes for v4.15-rc1" from Thierry Reding:

Contains a fix to the generic power domain driver to properly report
errors propagated from BPMP.

* tag 'tegra-for-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: bpmp: Check BPMP response return code
parents 097924c6 775dba87

drivers/soc/tegra/powergate-bpmp.c

+13 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static int tegra_bpmp_powergate_set_state(struct tegra_bpmp *bpmp, 
{

	struct mrq_pg_request request;

	struct tegra_bpmp_message msg;

	int err;



	memset(&request, 0, sizeof(request));

	request.cmd = CMD_PG_SET_STATE;
@@ -53,7 +54,13 @@ static int tegra_bpmp_powergate_set_state(struct tegra_bpmp *bpmp, 
	msg.tx.data = &request;

	msg.tx.size = sizeof(request);



	return tegra_bpmp_transfer(bpmp, &msg);

	err = tegra_bpmp_transfer(bpmp, &msg);

	if (err < 0)

		return err;

	else if (msg.rx.ret < 0)

		return -EINVAL;



	return 0;

}



static int tegra_bpmp_powergate_get_state(struct tegra_bpmp *bpmp,
@@ -80,6 +87,8 @@ static int tegra_bpmp_powergate_get_state(struct tegra_bpmp *bpmp, 
	err = tegra_bpmp_transfer(bpmp, &msg);

	if (err < 0)

		return PG_STATE_OFF;

	else if (msg.rx.ret < 0)

		return -EINVAL;



	return response.get_state.state;

}
@@ -106,6 +115,8 @@ static int tegra_bpmp_powergate_get_max_id(struct tegra_bpmp *bpmp) 
	err = tegra_bpmp_transfer(bpmp, &msg);

	if (err < 0)

		return err;

	else if (msg.rx.ret < 0)

		return -EINVAL;



	return response.get_max_id.max_id;

}
@@ -132,7 +143,7 @@ static char *tegra_bpmp_powergate_get_name(struct tegra_bpmp *bpmp, 
	msg.rx.size = sizeof(response);



	err = tegra_bpmp_transfer(bpmp, &msg);

	if (err < 0)

	if (err < 0 || msg.rx.ret < 0)

		return NULL;



	return kstrdup(response.get_name.name, GFP_KERNEL);