Re: [PATCH v1] bluetooth: hci_qca: Fix suspend/resume functionality failure

From: Matthias Kaehlcke
Date: Thu May 28 2020 - 12:16:36 EST


Hi Zijun,

On Thu, May 28, 2020 at 06:38:22PM +0800, Zijun Hu wrote:
> @dev parameter of qca_suspend()/qca_resume() represents
> serdev_device, but it is mistook for hci_dev and causes
> succedent unexpected memory access.
>
> Fix by taking @dev as serdev_device.
>
> Signed-off-by: Zijun Hu <zijuhu@xxxxxxxxxxxxxx>

Please add:

Fixes: 41d5b25fed0 ("Bluetooth: hci_qca: add PM support")

and add stable@xxxxxxxxxx to cc:

> ---
> drivers/bluetooth/hci_qca.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index e4a6823..c159161 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1977,8 +1977,10 @@ static void qca_serdev_remove(struct serdev_device *serdev)
>
> static int __maybe_unused qca_suspend(struct device *dev)
> {
> - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev);
> - struct hci_uart *hu = hci_get_drvdata(hdev);
> + struct serdev_device *serdev = to_serdev_device(dev);
> + struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
> + struct hci_uart *hu = &qcadev->serdev_hu;
> + struct hci_dev *hdev __maybe_unused = hu->hdev;

hdev is not used, please remove

> struct qca_data *qca = hu->priv;
> unsigned long flags;
> int ret = 0;
> @@ -2057,8 +2059,10 @@ static int __maybe_unused qca_suspend(struct device *dev)
>
> static int __maybe_unused qca_resume(struct device *dev)
> {
> - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev);
> - struct hci_uart *hu = hci_get_drvdata(hdev);
> + struct serdev_device *serdev = to_serdev_device(dev);
> + struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
> + struct hci_uart *hu = &qcadev->serdev_hu;
> + struct hci_dev *hdev __maybe_unused = hu->hdev;

hdev is not used, please remove

> struct qca_data *qca = hu->priv;
>
> clear_bit(QCA_SUSPENDING, &qca->flags);
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
>