lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0448/1126] Bluetooth: btmtksdio: refactor btmtksdio_runtime_[suspend|resume]()
    Date
    From: Mark Chen <mark-yw.chen@mediatek.com>

    [ Upstream commit c7e301d7c85544607ccc52ca5f26d20c59485342 ]

    Refactor btmtksdio_runtime_[suspend|resume]() to create the common
    funcitons btmtksdio_[fw|drv]_pmctrl() shared with btmtksdio_[open|close]()
    to avoid the redundant code as well.

    This is also a prerequisite patch for the incoming patches.

    Co-developed-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Mark Chen <mark-yw.chen@mediatek.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bluetooth/btmtksdio.c | 94 ++++++++++++++++++++---------------
    1 file changed, 53 insertions(+), 41 deletions(-)

    diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
    index c05578b52d33..cf757574fb63 100644
    --- a/drivers/bluetooth/btmtksdio.c
    +++ b/drivers/bluetooth/btmtksdio.c
    @@ -282,6 +282,54 @@ static u32 btmtksdio_drv_own_query(struct btmtksdio_dev *bdev)
    return sdio_readl(bdev->func, MTK_REG_CHLPCR, NULL);
    }

    +static int btmtksdio_fw_pmctrl(struct btmtksdio_dev *bdev)
    +{
    + u32 status;
    + int err;
    +
    + sdio_claim_host(bdev->func);
    +
    + /* Return ownership to the device */
    + sdio_writel(bdev->func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, &err);
    + if (err < 0)
    + goto out;
    +
    + err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    + !(status & C_COM_DRV_OWN), 2000, 1000000);
    +
    +out:
    + sdio_release_host(bdev->func);
    +
    + if (err < 0)
    + bt_dev_err(bdev->hdev, "Cannot return ownership to device");
    +
    + return err;
    +}
    +
    +static int btmtksdio_drv_pmctrl(struct btmtksdio_dev *bdev)
    +{
    + u32 status;
    + int err;
    +
    + sdio_claim_host(bdev->func);
    +
    + /* Get ownership from the device */
    + sdio_writel(bdev->func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &err);
    + if (err < 0)
    + goto out;
    +
    + err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    + status & C_COM_DRV_OWN, 2000, 1000000);
    +
    +out:
    + sdio_release_host(bdev->func);
    +
    + if (err < 0)
    + bt_dev_err(bdev->hdev, "Cannot get ownership from device");
    +
    + return err;
    +}
    +
    static int btmtksdio_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
    {
    struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);
    @@ -541,7 +589,7 @@ static void btmtksdio_interrupt(struct sdio_func *func)
    static int btmtksdio_open(struct hci_dev *hdev)
    {
    struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);
    - u32 status, val;
    + u32 val;
    int err;

    sdio_claim_host(bdev->func);
    @@ -552,18 +600,10 @@ static int btmtksdio_open(struct hci_dev *hdev)

    set_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state);

    - /* Get ownership from the device */
    - sdio_writel(bdev->func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &err);
    + err = btmtksdio_drv_pmctrl(bdev);
    if (err < 0)
    goto err_disable_func;

    - err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    - status & C_COM_DRV_OWN, 2000, 1000000);
    - if (err < 0) {
    - bt_dev_err(bdev->hdev, "Cannot get ownership from device");
    - goto err_disable_func;
    - }
    -
    /* Disable interrupt & mask out all interrupt sources */
    sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, &err);
    if (err < 0)
    @@ -633,8 +673,6 @@ static int btmtksdio_open(struct hci_dev *hdev)
    static int btmtksdio_close(struct hci_dev *hdev)
    {
    struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);
    - u32 status;
    - int err;

    sdio_claim_host(bdev->func);

    @@ -645,13 +683,7 @@ static int btmtksdio_close(struct hci_dev *hdev)

    cancel_work_sync(&bdev->txrx_work);

    - /* Return ownership to the device */
    - sdio_writel(bdev->func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, NULL);
    -
    - err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    - !(status & C_COM_DRV_OWN), 2000, 1000000);
    - if (err < 0)
    - bt_dev_err(bdev->hdev, "Cannot return ownership to device");
    + btmtksdio_fw_pmctrl(bdev);

    clear_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state);
    sdio_disable_func(bdev->func);
    @@ -1077,7 +1109,6 @@ static int btmtksdio_runtime_suspend(struct device *dev)
    {
    struct sdio_func *func = dev_to_sdio_func(dev);
    struct btmtksdio_dev *bdev;
    - u32 status;
    int err;

    bdev = sdio_get_drvdata(func);
    @@ -1089,19 +1120,10 @@ static int btmtksdio_runtime_suspend(struct device *dev)

    sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);

    - sdio_claim_host(bdev->func);
    -
    - sdio_writel(bdev->func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, &err);
    - if (err < 0)
    - goto out;
    + err = btmtksdio_fw_pmctrl(bdev);

    - err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    - !(status & C_COM_DRV_OWN), 2000, 1000000);
    -out:
    bt_dev_info(bdev->hdev, "status (%d) return ownership to device", err);

    - sdio_release_host(bdev->func);
    -
    return err;
    }

    @@ -1109,7 +1131,6 @@ static int btmtksdio_runtime_resume(struct device *dev)
    {
    struct sdio_func *func = dev_to_sdio_func(dev);
    struct btmtksdio_dev *bdev;
    - u32 status;
    int err;

    bdev = sdio_get_drvdata(func);
    @@ -1119,19 +1140,10 @@ static int btmtksdio_runtime_resume(struct device *dev)
    if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))
    return 0;

    - sdio_claim_host(bdev->func);
    -
    - sdio_writel(bdev->func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &err);
    - if (err < 0)
    - goto out;
    + err = btmtksdio_drv_pmctrl(bdev);

    - err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,
    - status & C_COM_DRV_OWN, 2000, 1000000);
    -out:
    bt_dev_info(bdev->hdev, "status (%d) get ownership from device", err);

    - sdio_release_host(bdev->func);
    -
    return err;
    }

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 10:39    [W:5.206 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site