iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec: ucsi: acpi: Map the mailbox with memremap()

Browse Source 
The UCSI mailbox is always in main memory.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Heikki Krogerus 2022-04-25 14:45:43 +03:00 committed by Rafael J. Wysocki
parent af2d861d4c
commit cdc3d2abf4
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/typec/ucsi/ucsi_acpi.c
View File

@ -19,7 +19,7 @@
struct ucsi_acpi { struct ucsi_acpi {
struct device *dev; struct device *dev;
struct ucsi *ucsi; struct ucsi *ucsi;
void __iomem *base; void *base;
struct completion complete; struct completion complete;
unsigned long flags; unsigned long flags;
guid_t guid; guid_t guid;
@ -51,7 +51,7 @@ static int ucsi_acpi_read(struct ucsi *ucsi, unsigned int offset,
if (ret) if (ret)
return ret; return ret;
memcpy(val, (const void __force *)(ua->base + offset), val_len); memcpy(val, ua->base + offset, val_len);
return 0; return 0;
} }
@ -61,7 +61,7 @@ static int ucsi_acpi_async_write(struct ucsi *ucsi, unsigned int offset,
{ {
struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi); struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
memcpy((void __force *)(ua->base + offset), val, val_len); memcpy(ua->base + offset, val, val_len);
return ucsi_acpi_dsm(ua, UCSI_DSM_FUNC_WRITE); return ucsi_acpi_dsm(ua, UCSI_DSM_FUNC_WRITE);
} }
@ -132,18 +132,7 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
/* This will make sure we can use ioremap() */ ua->base = devm_memremap(&pdev->dev, res->start, resource_size(res), MEMREMAP_WB);
status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);
if (ACPI_FAILURE(status))
return -ENOMEM;
/*
* NOTE: The memory region for the data structures is used also in an
* operation region, which means ACPI has already reserved it. Therefore
* it can not be requested here, and we can not use
* devm_ioremap_resource().
*/
ua->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!ua->base) if (!ua->base)
return -ENOMEM; return -ENOMEM;