hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm_tis: Use devm_ioremap_resource 

This does a request_resource under the covers which means tis holds a
lock on the memory range it is using so other drivers cannot grab it.
When doing probing it is important to ensure that other drivers are
not using the same range before tis starts touching it.

To do this flow the actual struct resource from the device right
through to devm_ioremap_resource. This ensures all the proper resource
meta-data is carried down.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Wilck, Martin <martin.wilck@ts.fujitsu.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: Peter Huewe <peterhuewe@gmx.de>
This commit is contained in:
Jason Gunthorpe 2016-01-07 17:36:23 -07:00 committed by Jarkko Sakkinen
parent 4d627e672b
commit 51dd43dff7
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/char/tpm/tpm_tis.c
View File

@ -66,8 +66,7 @@ enum tis_defaults {
}; };
struct tpm_info { struct tpm_info {
unsigned long start; struct resource res;
unsigned long len;
/* irq > 0 means: use irq $irq; /* irq > 0 means: use irq $irq;
* irq = 0 means: autoprobe for an irq; * irq = 0 means: autoprobe for an irq;
* irq = -1 means: no irq support * irq = -1 means: no irq support
@ -76,8 +75,11 @@ struct tpm_info {
}; };
static struct tpm_info tis_default_info = { static struct tpm_info tis_default_info = {
.res = {
.start = TIS_MEM_BASE, .start = TIS_MEM_BASE,
.len = TIS_MEM_LEN, .end = TIS_MEM_BASE + TIS_MEM_LEN - 1,
.flags = IORESOURCE_MEM,
},
.irq = 0, .irq = 0,
}; };
@ -691,9 +693,9 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
chip->acpi_dev_handle = acpi_dev_handle; chip->acpi_dev_handle = acpi_dev_handle;
#endif #endif
chip->vendor.iobase = devm_ioremap(dev, tpm_info->start, tpm_info->len); chip->vendor.iobase = devm_ioremap_resource(dev, &tpm_info->res);
if (!chip->vendor.iobase) if (IS_ERR(chip->vendor.iobase))
return -EIO; return PTR_ERR(chip->vendor.iobase);
/* Maximum timeouts */ /* Maximum timeouts */
chip->vendor.timeout_a = TIS_TIMEOUT_A_MAX; chip->vendor.timeout_a = TIS_TIMEOUT_A_MAX;
@ -874,9 +876,12 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
{ {
struct tpm_info tpm_info = {}; struct tpm_info tpm_info = {};
acpi_handle acpi_dev_handle = NULL; acpi_handle acpi_dev_handle = NULL;
struct resource *res;
tpm_info.start = pnp_mem_start(pnp_dev, 0); res = pnp_get_resource(pnp_dev, IORESOURCE_MEM, 0);
tpm_info.len = pnp_mem_len(pnp_dev, 0); if (!res)
return -ENODEV;
tpm_info.res = *res;
if (pnp_irq_valid(pnp_dev, 0)) if (pnp_irq_valid(pnp_dev, 0))
tpm_info.irq = pnp_irq(pnp_dev, 0); tpm_info.irq = pnp_irq(pnp_dev, 0);
@ -939,12 +944,10 @@ static int tpm_check_resource(struct acpi_resource *ares, void *data)
struct tpm_info *tpm_info = (struct tpm_info *) data; struct tpm_info *tpm_info = (struct tpm_info *) data;
struct resource res; struct resource res;
if (acpi_dev_resource_interrupt(ares, 0, &res)) { if (acpi_dev_resource_interrupt(ares, 0, &res))
tpm_info->irq = res.start; tpm_info->irq = res.start;
} else if (acpi_dev_resource_memory(ares, &res)) { else if (acpi_dev_resource_memory(ares, &res))
tpm_info->start = res.start; tpm_info->res = res;
tpm_info->len = resource_size(&res);
}
return 1; return 1;
} }
@ -977,7 +980,7 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev)
acpi_dev_free_resource_list(&resources); acpi_dev_free_resource_list(&resources);
if (tpm_info.start == 0 && tpm_info.len == 0) { if (resource_type(&tpm_info.res) != IORESOURCE_MEM) {
dev_err(&acpi_dev->dev, dev_err(&acpi_dev->dev,
FW_BUG "TPM2 ACPI table does not define a memory resource\n"); FW_BUG "TPM2 ACPI table does not define a memory resource\n");
return -EINVAL; return -EINVAL;