]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cxl/mem: Drop mem_enabled check from wait_for_media()
authorDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2022 23:34:15 +0000 (16:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:30:31 +0000 (10:30 +0200)
[ Upstream commit 2bcf3bbd348fc10260aa6243ff6a22a1882b5b35 ]

Media ready is asserted by the device independent of whether mem_enabled
was ever set. Drop this check to allow for dropping wait_for_media() in
favor of ->wait_media_ready().

Fixes: 8dd2bc0f8e02 ("cxl/mem: Add the cxl_mem driver")
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291685501.1426646.10372821863672431074.stgit@dwillia2-xfh
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cxl/mem.c

index 49a4b1c47299f3308d843ced166c48a04cac0158..44e899f06094c4f8029e4577a7323e21c47ce56b 100644 (file)
 static int wait_for_media(struct cxl_memdev *cxlmd)
 {
        struct cxl_dev_state *cxlds = cxlmd->cxlds;
-       struct cxl_endpoint_dvsec_info *info = &cxlds->info;
        int rc;
 
-       if (!info->mem_enabled)
-               return -EBUSY;
-
        rc = cxlds->wait_media_ready(cxlds);
        if (rc)
                return rc;