Commit cfd7ca02 authored by Mario Limonciello's avatar Mario Limonciello Committed by Herbert Xu
Browse files

crypto: ccp - Drop extra doorbell checks 



The doorbell register set used for I2C arbitration is dedicated for this
purpose and there is no need to utilize other safety checks the platform
access register set uses.

Suggested-by: default avatarMark Hasemeyer <markhas@chromium.org>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarMark Hasemeyer <markhas@chromium.org>
Tested-by: default avatarMark Hasemeyer <markhas@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c79a3169

drivers/crypto/ccp/platform-access.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -20,14 +20,6 @@ 




#define PSP_CMD_TIMEOUT_US	(500 * USEC_PER_MSEC)

#define PSP_CMD_TIMEOUT_US	(500 * USEC_PER_MSEC)





/* Doorbell shouldn't be ringing */

static int check_doorbell(u32 __iomem *doorbell)

{

	u32 tmp;



	return readl_poll_timeout(doorbell, tmp, tmp != 0, 0, PSP_CMD_TIMEOUT_US);

}



/* Recovery field should be equal 0 to start sending commands */

/* Recovery field should be equal 0 to start sending commands */

static int check_recovery(u32 __iomem *cmd)

static int check_recovery(u32 __iomem *cmd)

{

{
@@ -156,18 +148,6 @@ int psp_ring_platform_doorbell(int msg) 




	mutex_lock(&pa_dev->doorbell_mutex);

	mutex_lock(&pa_dev->doorbell_mutex);





	if (check_doorbell(button)) {

		dev_dbg(psp->dev, "doorbell is not ready\n");

		ret = -EBUSY;

		goto unlock;

	}



	if (check_recovery(cmd)) {

		dev_dbg(psp->dev, "doorbell command in recovery\n");

		ret = -EBUSY;

		goto unlock;

	}



	if (wait_cmd(cmd)) {

	if (wait_cmd(cmd)) {

		dev_dbg(psp->dev, "doorbell command not done processing\n");

		dev_dbg(psp->dev, "doorbell command not done processing\n");

		ret = -EBUSY;

		ret = -EBUSY;