Commit cfa18822 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen

Revert "tmp/tpm_crb: fix Intel PTT hw bug during idle state"

This reverts commit 9514ff19.
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 2b7926ae
...@@ -318,7 +318,6 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, ...@@ -318,7 +318,6 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
struct list_head resources; struct list_head resources;
struct resource io_res; struct resource io_res;
struct device *dev = &device->dev; struct device *dev = &device->dev;
u32 pa_high, pa_low;
u64 cmd_pa; u64 cmd_pa;
u32 cmd_size; u32 cmd_size;
u64 rsp_pa; u64 rsp_pa;
...@@ -346,27 +345,12 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, ...@@ -346,27 +345,12 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
if (IS_ERR(priv->cca)) if (IS_ERR(priv->cca))
return PTR_ERR(priv->cca); return PTR_ERR(priv->cca);
/* cmd_pa = ((u64) ioread32(&priv->cca->cmd_pa_high) << 32) |
* PTT HW bug w/a: wake up the device to access (u64) ioread32(&priv->cca->cmd_pa_low);
* possibly not retained registers.
*/
ret = crb_cmd_ready(dev, priv);
if (ret)
return ret;
pa_high = ioread32(&priv->cca->cmd_pa_high);
pa_low = ioread32(&priv->cca->cmd_pa_low);
cmd_pa = ((u64)pa_high << 32) | pa_low;
cmd_size = ioread32(&priv->cca->cmd_size); cmd_size = ioread32(&priv->cca->cmd_size);
dev_dbg(dev, "cmd_hi = %X cmd_low = %X cmd_size %X\n",
pa_high, pa_low, cmd_size);
priv->cmd = crb_map_res(dev, priv, &io_res, cmd_pa, cmd_size); priv->cmd = crb_map_res(dev, priv, &io_res, cmd_pa, cmd_size);
if (IS_ERR(priv->cmd)) { if (IS_ERR(priv->cmd))
ret = PTR_ERR(priv->cmd); return PTR_ERR(priv->cmd);
goto out;
}
memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8); memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8);
rsp_pa = le64_to_cpu(rsp_pa); rsp_pa = le64_to_cpu(rsp_pa);
...@@ -374,8 +358,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, ...@@ -374,8 +358,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
if (cmd_pa != rsp_pa) { if (cmd_pa != rsp_pa) {
priv->rsp = crb_map_res(dev, priv, &io_res, rsp_pa, rsp_size); priv->rsp = crb_map_res(dev, priv, &io_res, rsp_pa, rsp_size);
ret = PTR_ERR_OR_ZERO(priv->rsp); return PTR_ERR_OR_ZERO(priv->rsp);
goto out;
} }
/* According to the PTP specification, overlapping command and response /* According to the PTP specification, overlapping command and response
...@@ -383,18 +366,12 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, ...@@ -383,18 +366,12 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
*/ */
if (cmd_size != rsp_size) { if (cmd_size != rsp_size) {
dev_err(dev, FW_BUG "overlapping command and response buffer sizes are not identical"); dev_err(dev, FW_BUG "overlapping command and response buffer sizes are not identical");
ret = -EINVAL; return -EINVAL;
goto out;
} }
priv->cmd_size = cmd_size; priv->cmd_size = cmd_size;
priv->rsp = priv->cmd; priv->rsp = priv->cmd;
return 0;
out:
crb_go_idle(dev, priv);
return ret;
} }
static int crb_acpi_add(struct acpi_device *device) static int crb_acpi_add(struct acpi_device *device)
...@@ -438,15 +415,7 @@ static int crb_acpi_add(struct acpi_device *device) ...@@ -438,15 +415,7 @@ static int crb_acpi_add(struct acpi_device *device)
if (rc) if (rc)
return rc; return rc;
rc = crb_cmd_ready(dev, priv); return crb_init(device, priv);
if (rc)
return rc;
rc = crb_init(device, priv);
if (rc)
crb_go_idle(dev, priv);
return rc;
} }
static int crb_acpi_remove(struct acpi_device *device) static int crb_acpi_remove(struct acpi_device *device)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment