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

Commit 0c22db43 authored by Winkler, Tomas's avatar Winkler, Tomas Committed by Jarkko Sakkinen
Browse files

tpm/tpm_crb: open code the crb_init into acpi_add 



This is preparation step for implementing tpm crb
runtime pm. We need to have tpm chip allocated
and populated before we access the runtime handlers.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinn@linux.intel.com>
parent 9514ff19

drivers/char/tpm/tpm_crb.c

+10 −16
Original line number Original line Diff line number Diff line
@@ -265,21 +265,6 @@ static const struct tpm_class_ops tpm_crb = { 
	.req_complete_val = CRB_DRV_STS_COMPLETE,

	.req_complete_val = CRB_DRV_STS_COMPLETE,

};

};





static int crb_init(struct acpi_device *device, struct crb_priv *priv)

{

	struct tpm_chip *chip;



	chip = tpmm_chip_alloc(&device->dev, &tpm_crb);

	if (IS_ERR(chip))

		return PTR_ERR(chip);



	dev_set_drvdata(&chip->dev, priv);

	chip->acpi_dev_handle = device->handle;

	chip->flags = TPM_CHIP_FLAG_TPM2;



	return tpm_chip_register(chip);

}



static int crb_check_resource(struct acpi_resource *ares, void *data)

static int crb_check_resource(struct acpi_resource *ares, void *data)

{

{

	struct resource *io_res = data;

	struct resource *io_res = data;
@@ -401,6 +386,7 @@ static int crb_acpi_add(struct acpi_device *device) 
{

{

	struct acpi_table_tpm2 *buf;

	struct acpi_table_tpm2 *buf;

	struct crb_priv *priv;

	struct crb_priv *priv;

	struct tpm_chip *chip;

	struct device *dev = &device->dev;

	struct device *dev = &device->dev;

	acpi_status status;

	acpi_status status;

	u32 sm;

	u32 sm;
@@ -438,11 +424,19 @@ static int crb_acpi_add(struct acpi_device *device) 
	if (rc)

	if (rc)

		return rc;

		return rc;





	chip = tpmm_chip_alloc(dev, &tpm_crb);

	if (IS_ERR(chip))

		return PTR_ERR(chip);



	dev_set_drvdata(&chip->dev, priv);

	chip->acpi_dev_handle = device->handle;

	chip->flags = TPM_CHIP_FLAG_TPM2;



	rc  = crb_cmd_ready(dev, priv);

	rc  = crb_cmd_ready(dev, priv);

	if (rc)

	if (rc)

		return rc;

		return rc;





	rc = crb_init(device, priv);

	rc = tpm_chip_register(chip);

	if (rc)

	if (rc)

		crb_go_idle(dev, priv);

		crb_go_idle(dev, priv);