lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 109/239] scsi: ufs: Fix race conditions related to driver data
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit 21ad0e49085deb22c094f91f9da57319a97188e4 ]

    The driver data pointer must be set before any callbacks are registered
    that use that pointer. Hence move the initialization of that pointer from
    after the ufshcd_init() call to inside ufshcd_init().

    Link: https://lore.kernel.org/r/20211203231950.193369-7-bvanassche@acm.org
    Fixes: 3b1d05807a9a ("[SCSI] ufs: Segregate PCI Specific Code")
    Reported-by: Alexey Dobriyan <adobriyan@gmail.com>
    Tested-by: Bean Huo <beanhuo@micron.com>
    Reviewed-by: Bean Huo <beanhuo@micron.com>
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 -
    drivers/scsi/ufs/ufshcd-pltfrm.c | 2 --
    drivers/scsi/ufs/ufshcd.c | 7 +++++++
    3 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/ufs/tc-dwc-g210-pci.c b/drivers/scsi/ufs/tc-dwc-g210-pci.c
    index 2f41722a8c28d..2c6cb7f6b61a6 100644
    --- a/drivers/scsi/ufs/tc-dwc-g210-pci.c
    +++ b/drivers/scsi/ufs/tc-dwc-g210-pci.c
    @@ -138,7 +138,6 @@ tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    return err;
    }

    - pci_set_drvdata(pdev, hba);
    pm_runtime_put_noidle(&pdev->dev);
    pm_runtime_allow(&pdev->dev);

    diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
    index 30c22e16b1e34..57985841a879e 100644
    --- a/drivers/scsi/ufs/ufshcd-pltfrm.c
    +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
    @@ -348,8 +348,6 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
    goto dealloc_host;
    }

    - platform_set_drvdata(pdev, hba);
    -
    pm_runtime_set_active(&pdev->dev);
    pm_runtime_enable(&pdev->dev);

    diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
    index b18430efb00fb..fee1989e23f01 100644
    --- a/drivers/scsi/ufs/ufshcd.c
    +++ b/drivers/scsi/ufs/ufshcd.c
    @@ -8046,6 +8046,13 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
    struct Scsi_Host *host = hba->host;
    struct device *dev = hba->dev;

    + /*
    + * dev_set_drvdata() must be called before any callbacks are registered
    + * that use dev_get_drvdata() (frequency scaling, clock scaling, hwmon,
    + * sysfs).
    + */
    + dev_set_drvdata(dev, hba);
    +
    if (!mmio_base) {
    dev_err(hba->dev,
    "Invalid memory reference for mmio_base is NULL\n");
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 20:40    [W:3.324 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site