From: Guenter Roeck <linux@roeck-us.net>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ajay Gupta <ajayg@nvidia.com>, linux-usb@vger.kernel.org
Subject: Re: [PATCH v4 12/18] usb: typec: ucsi: acpi: Move to the new API
Date: Mon, 4 Nov 2019 06:35:42 -0800 [thread overview]
Message-ID: <96e841fd-82bb-8f97-6952-aa75624da7a1@roeck-us.net> (raw)
In-Reply-To: <20191104142435.29960-13-heikki.krogerus@linux.intel.com>
On 11/4/19 6:24 AM, Heikki Krogerus wrote:
> Replacing the old "cmd" and "sync" callbacks with an
> implementation of struct ucsi_operations. The ACPI
> notification (interrupt) handler will from now on read the
> CCI (Command Status and Connector Change Indication)
> register, and call ucsi_connector_change() function and/or
> complete pending command completions based on it.
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/ucsi/ucsi_acpi.c | 91 +++++++++++++++++++++++-------
> 1 file changed, 72 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
> index a18112a83fae..3f1786170098 100644
> --- a/drivers/usb/typec/ucsi/ucsi_acpi.c
> +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
> @@ -19,7 +19,9 @@
> struct ucsi_acpi {
> struct device *dev;
> struct ucsi *ucsi;
> - struct ucsi_ppm ppm;
> + void __iomem *base;
I think it would be a good idea to mention in a comment somewhere that this is not
really iomem and thus doesn't require memcpy_io functions.
Guenter
> + struct completion complete;
> + unsigned long flags;
> guid_t guid;
> };
>
> @@ -39,27 +41,73 @@ static int ucsi_acpi_dsm(struct ucsi_acpi *ua, int func)
> return 0;
> }
>
> -static int ucsi_acpi_cmd(struct ucsi_ppm *ppm, struct ucsi_control *ctrl)
> +static int ucsi_acpi_read(struct ucsi *ucsi, unsigned int offset,
> + void *val, size_t val_len)
> {
> - struct ucsi_acpi *ua = container_of(ppm, struct ucsi_acpi, ppm);
> + struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
> + int ret;
> +
> + ret = ucsi_acpi_dsm(ua, UCSI_DSM_FUNC_READ);
> + if (ret)
> + return ret;
> +
> + memcpy(val, (const void __force *)(ua->base + offset), val_len);
> +
> + return 0;
> +}
> +
> +static int ucsi_acpi_async_write(struct ucsi *ucsi, unsigned int offset,
> + const void *val, size_t val_len)
> +{
> + struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
>
> - ppm->data->ctrl.raw_cmd = ctrl->raw_cmd;
> + memcpy((void __force *)(ua->base + offset), val, val_len);
>
> return ucsi_acpi_dsm(ua, UCSI_DSM_FUNC_WRITE);
> }
>
> -static int ucsi_acpi_sync(struct ucsi_ppm *ppm)
> +static int ucsi_acpi_sync_write(struct ucsi *ucsi, unsigned int offset,
> + const void *val, size_t val_len)
> {
> - struct ucsi_acpi *ua = container_of(ppm, struct ucsi_acpi, ppm);
> + struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
> + int ret;
> +
> + set_bit(COMMAND_PENDING, &ua->flags);
> +
> + ret = ucsi_acpi_async_write(ucsi, offset, val, val_len);
> + if (ret)
> + goto out_clear_bit;
>
> - return ucsi_acpi_dsm(ua, UCSI_DSM_FUNC_READ);
> + if (!wait_for_completion_timeout(&ua->complete, msecs_to_jiffies(5000)))
> + ret = -ETIMEDOUT;
> +
> +out_clear_bit:
> + clear_bit(COMMAND_PENDING, &ua->flags);
> +
> + return ret;
> }
>
> +static const struct ucsi_operations ucsi_acpi_ops = {
> + .read = ucsi_acpi_read,
> + .sync_write = ucsi_acpi_sync_write,
> + .async_write = ucsi_acpi_async_write
> +};
> +
> static void ucsi_acpi_notify(acpi_handle handle, u32 event, void *data)
> {
> struct ucsi_acpi *ua = data;
> + u32 cci;
> + int ret;
> +
> + ret = ucsi_acpi_read(ua->ucsi, UCSI_CCI, &cci, sizeof(cci));
> + if (ret)
> + return;
>
> - ucsi_notify(ua->ucsi);
> + if (test_bit(COMMAND_PENDING, &ua->flags) &&
> + cci & (UCSI_CCI_ACK_COMPLETE | UCSI_CCI_COMMAND_COMPLETE))
> + complete(&ua->complete);
> + else if (UCSI_CCI_CONNECTOR(cci))
> + ucsi_connector_change(ua->ucsi, UCSI_CCI_CONNECTOR(cci));
> }
>
> static int ucsi_acpi_probe(struct platform_device *pdev)
> @@ -90,35 +138,39 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
> * it can not be requested here, and we can not use
> * devm_ioremap_resource().
> */
> - ua->ppm.data = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> - if (!ua->ppm.data)
> + ua->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + if (!ua->base)
> return -ENOMEM;
>
> - if (!ua->ppm.data->version)
> - return -ENODEV;
> -
> ret = guid_parse(UCSI_DSM_UUID, &ua->guid);
> if (ret)
> return ret;
>
> - ua->ppm.cmd = ucsi_acpi_cmd;
> - ua->ppm.sync = ucsi_acpi_sync;
> + init_completion(&ua->complete);
> ua->dev = &pdev->dev;
>
> + ua->ucsi = ucsi_create(&pdev->dev, &ucsi_acpi_ops);
> + if (IS_ERR(ua->ucsi))
> + return PTR_ERR(ua->ucsi);
> +
> + ucsi_set_drvdata(ua->ucsi, ua);
> +
> status = acpi_install_notify_handler(ACPI_HANDLE(&pdev->dev),
> ACPI_DEVICE_NOTIFY,
> ucsi_acpi_notify, ua);
> if (ACPI_FAILURE(status)) {
> dev_err(&pdev->dev, "failed to install notify handler\n");
> + ucsi_destroy(ua->ucsi);
> return -ENODEV;
> }
>
> - ua->ucsi = ucsi_register_ppm(&pdev->dev, &ua->ppm);
> - if (IS_ERR(ua->ucsi)) {
> + ret = ucsi_register(ua->ucsi);
> + if (ret) {
> acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev),
> ACPI_DEVICE_NOTIFY,
> ucsi_acpi_notify);
> - return PTR_ERR(ua->ucsi);
> + ucsi_destroy(ua->ucsi);
> + return ret;
> }
>
> platform_set_drvdata(pdev, ua);
> @@ -130,7 +182,8 @@ static int ucsi_acpi_remove(struct platform_device *pdev)
> {
> struct ucsi_acpi *ua = platform_get_drvdata(pdev);
>
> - ucsi_unregister_ppm(ua->ucsi);
> + ucsi_unregister(ua->ucsi);
> + ucsi_destroy(ua->ucsi);
>
> acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev), ACPI_DEVICE_NOTIFY,
> ucsi_acpi_notify);
>
next prev parent reply other threads:[~2019-11-04 14:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 14:24 [PATCH v4 00/18] usb: typec: API improvements Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 01/18] usb: typec: Copy everything from struct typec_capability during registration Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 02/18] usb: typec: Introduce typec_get_drvdata() Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 03/18] usb: typec: Separate the operations vector Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 04/18] usb: typec: tcpm: Start using struct typec_operations Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 05/18] usb: typec: tps6598x: " Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 06/18] usb: typec: ucsi: " Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 07/18] usb: typec: hd3ss3220: " Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 08/18] usb: typec: Remove the callback members from struct typec_capability Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 09/18] usb: typec: Remove unused " Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 10/18] usb: typec: hd3ss3220: Give the connector fwnode to the port device Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 11/18] usb: typec: ucsi: Simplified registration and I/O API Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 12/18] usb: typec: ucsi: acpi: Move to the new API Heikki Krogerus
2019-11-04 14:35 ` Guenter Roeck [this message]
2019-11-04 18:54 ` Guenter Roeck
2019-11-05 8:46 ` Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 13/18] usb: typec: ucsi: ccg: " Heikki Krogerus
2019-11-04 14:36 ` Guenter Roeck
2019-11-04 14:24 ` [PATCH v4 14/18] usb: typec: ucsi: Remove the old API Heikki Krogerus
2019-11-04 14:38 ` Guenter Roeck
2019-11-04 14:24 ` [PATCH v4 15/18] usb: typec: ucsi: Remove struct ucsi_control Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 16/18] usb: typec: ucsi: Remove all bit-fields Heikki Krogerus
2019-11-04 14:24 ` [PATCH v4 17/18] usb: typec: ucsi: New error codes Heikki Krogerus
2019-11-04 14:41 ` Guenter Roeck
2019-11-04 14:24 ` [PATCH v4 18/18] usb: typec: ucsi: Optimise ucsi_unregister() Heikki Krogerus
2019-11-04 14:42 ` Guenter Roeck
2019-11-04 15:05 ` [PATCH v4 00/18] usb: typec: API improvements Greg Kroah-Hartman
2019-11-04 18:53 ` Guenter Roeck
2019-11-04 20:53 ` Greg Kroah-Hartman
2019-11-04 20:54 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=96e841fd-82bb-8f97-6952-aa75624da7a1@roeck-us.net \
--to=linux@roeck-us.net \
--cc=ajayg@nvidia.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).