From nobody Tue Nov 26 04:18:07 2024 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAEEC19C559 for ; Tue, 22 Oct 2024 10:53:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729594438; cv=none; b=dTtZlKDExeK9wv1dt/jsyZ5d7HHuWjWdZ9cNgefbjjpltNBSbCA6FmoXKREsWzCQdsS4T67uTK0w2ehlmUpQgq0zX2Old2hyEDHRFCbwgBmZy/mTxCk0u6XiBZ03JG3LSp2zmNQ+FyWlzMPGDQsTxC+JFC5Y1Rj/Gzo3Sr80TtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729594438; c=relaxed/simple; bh=eLhDtt7GQAXpdnOXXxGcPgiO4KfNcvWt1OUQcUnHNJs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JCQhCWtf410AcSX8qDGggu0le2SwhwEOQuCU57ZQoa0gVMA+Icm8G+whbgRxHR0M68JOE5oT024qmAh2Z1sBpWygvJItv1eoV6HpcjIu3O96GHvbKI9aYhJNYZjME98e6zEN4H20RJHI7kULHs4Y8CLbGy5vozw4eGyJaRP7pkg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=dN5d3PN3; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dN5d3PN3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729594437; x=1761130437; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eLhDtt7GQAXpdnOXXxGcPgiO4KfNcvWt1OUQcUnHNJs=; b=dN5d3PN3nuM88SPdzyYtf16xcFbbLfJagk/agpAMyMBgA89t1WIWV8ie yvunFtz13toYtRMZRHicL5LsS+1w+MAA6+aJrUk8MOkBi79Trew5Hep2M SUoP1Q7qhLaIscq9KgkHUBl5KVoH6tKFqzmLd1TL0Cdp2DibEhCMnMgj9 8i6dCFfiN1+xIvUrqBrlcKgxEjfemws+EmSBd/zUyEEPz6Ymz92Vgq+Ed hO2uBsgtj45bvVTfmc+GxC74sMZQq5idk1kOTdjdzYUKvShZlIClLBJup zNM9H0LEBGLdP/N2pAdjq2MVcPQIqEqjsn9u10ERoMg/dOmweRdp1iWjC A==; X-CSE-ConnectionGUID: B4yzjMZKRgah/Mw/HpAVmw== X-CSE-MsgGUID: oWxMB+irRqiTdCkq13YJEg== X-IronPort-AV: E=McAfee;i="6700,10204,11232"; a="39705053" X-IronPort-AV: E=Sophos;i="6.11,223,1725346800"; d="scan'208";a="39705053" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 03:53:47 -0700 X-CSE-ConnectionGUID: JRvHS2IjQ1e0tdzg3PrPvA== X-CSE-MsgGUID: D4KJXkXyS/KKxJCw5fomwQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,223,1725346800"; d="scan'208";a="79847654" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 03:53:36 -0700 From: Alexander Usyskin To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin Cc: Oren Weil , linux-mtd@lists.infradead.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alexander Usyskin Subject: [PATCH 06/10] mtd: intel-dg: wake card on operations Date: Tue, 22 Oct 2024 13:41:15 +0300 Message-ID: <20241022104119.3149051-7-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241022104119.3149051-1-alexander.usyskin@intel.com> References: <20241022104119.3149051-1-alexander.usyskin@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable runtime PM in mtd driver to notify graphics driver that whole card should be kept awake while nvm operations are performed through this driver. CC: Lucas De Marchi Signed-off-by: Alexander Usyskin --- drivers/mtd/devices/mtd-intel-dg.c | 73 +++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/devices/mtd-intel-dg.c b/drivers/mtd/devices/mtd-i= ntel-dg.c index 4951438e8faf..3d53f35478e8 100644 --- a/drivers/mtd/devices/mtd-intel-dg.c +++ b/drivers/mtd/devices/mtd-intel-dg.c @@ -15,11 +15,14 @@ #include #include #include +#include #include #include #include #include =20 +#define INTEL_DG_NVM_RPM_TIMEOUT 500 + struct intel_dg_nvm { struct kref refcnt; struct mtd_info mtd; @@ -462,6 +465,7 @@ static int intel_dg_mtd_erase(struct mtd_info *mtd, str= uct erase_info *info) loff_t from; size_t len; size_t total_len; + int ret =3D 0; =20 if (WARN_ON(!nvm)) return -EINVAL; @@ -476,20 +480,28 @@ static int intel_dg_mtd_erase(struct mtd_info *mtd, s= truct erase_info *info) total_len =3D info->len; addr =3D info->addr; =20 + ret =3D pm_runtime_resume_and_get(mtd->dev.parent); + if (ret < 0) { + dev_err(&mtd->dev, "rpm: get failed %d\n", ret); + return ret; + } + guard(mutex)(&nvm->lock); =20 while (total_len > 0) { if (!IS_ALIGNED(addr, SZ_4K) || !IS_ALIGNED(total_len, SZ_4K)) { dev_err(&mtd->dev, "unaligned erase %llx %zx\n", addr, total_len); info->fail_addr =3D addr; - return -ERANGE; + ret =3D -ERANGE; + goto out; } =20 idx =3D idg_nvm_get_region(nvm, addr); if (idx >=3D nvm->nregions) { dev_err(&mtd->dev, "out of range"); info->fail_addr =3D MTD_FAIL_ADDR_UNKNOWN; - return -ERANGE; + ret =3D -ERANGE; + goto out; } =20 from =3D addr - nvm->regions[idx].offset; @@ -505,14 +517,18 @@ static int intel_dg_mtd_erase(struct mtd_info *mtd, s= truct erase_info *info) if (bytes < 0) { dev_dbg(&mtd->dev, "erase failed with %zd\n", bytes); info->fail_addr +=3D nvm->regions[idx].offset; - return bytes; + ret =3D bytes; + goto out; } =20 addr +=3D len; total_len -=3D len; } =20 - return 0; +out: + pm_runtime_mark_last_busy(mtd->dev.parent); + pm_runtime_put_autosuspend(mtd->dev.parent); + return ret; } =20 static int intel_dg_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, @@ -541,17 +557,25 @@ static int intel_dg_mtd_read(struct mtd_info *mtd, lo= ff_t from, size_t len, if (len > nvm->regions[idx].size - from) len =3D nvm->regions[idx].size - from; =20 + ret =3D pm_runtime_resume_and_get(mtd->dev.parent); + if (ret < 0) { + dev_err(&mtd->dev, "rpm: get failed %zd\n", ret); + return ret; + } + guard(mutex)(&nvm->lock); =20 ret =3D idg_read(nvm, region, from, len, buf); if (ret < 0) { dev_dbg(&mtd->dev, "read failed with %zd\n", ret); - return ret; + } else { + *retlen =3D ret; + ret =3D 0; } =20 - *retlen =3D ret; - - return 0; + pm_runtime_mark_last_busy(mtd->dev.parent); + pm_runtime_put_autosuspend(mtd->dev.parent); + return ret; } =20 static int intel_dg_mtd_write(struct mtd_info *mtd, loff_t to, size_t len, @@ -580,17 +604,25 @@ static int intel_dg_mtd_write(struct mtd_info *mtd, l= off_t to, size_t len, if (len > nvm->regions[idx].size - to) len =3D nvm->regions[idx].size - to; =20 + ret =3D pm_runtime_resume_and_get(mtd->dev.parent); + if (ret < 0) { + dev_err(&mtd->dev, "rpm: get failed %zd\n", ret); + return ret; + } + guard(mutex)(&nvm->lock); =20 ret =3D idg_write(nvm, region, to, len, buf); if (ret < 0) { dev_dbg(&mtd->dev, "write failed with %zd\n", ret); - return ret; + } else { + *retlen =3D ret; + ret =3D 0; } =20 - *retlen =3D ret; - - return 0; + pm_runtime_mark_last_busy(mtd->dev.parent); + pm_runtime_put_autosuspend(mtd->dev.parent); + return ret; } =20 static void intel_dg_nvm_release(struct kref *kref) @@ -722,6 +754,17 @@ static int intel_dg_mtd_probe(struct auxiliary_device = *aux_dev, n++; } =20 + pm_runtime_enable(device); + + pm_runtime_set_autosuspend_delay(device, INTEL_DG_NVM_RPM_TIMEOUT); + pm_runtime_use_autosuspend(device); + + ret =3D pm_runtime_resume_and_get(device); + if (ret < 0) { + dev_err(device, "rpm: get failed %d\n", ret); + goto err_norpm; + } + nvm->base =3D devm_ioremap_resource(device, &invm->bar); if (IS_ERR(nvm->base)) { dev_err(device, "mmio not mapped\n"); @@ -744,9 +787,13 @@ static int intel_dg_mtd_probe(struct auxiliary_device = *aux_dev, =20 dev_set_drvdata(&aux_dev->dev, nvm); =20 + pm_runtime_put(device); return 0; =20 err: + pm_runtime_put(device); +err_norpm: + pm_runtime_disable(device); kref_put(&nvm->refcnt, intel_dg_nvm_release); return ret; } @@ -758,6 +805,8 @@ static void intel_dg_mtd_remove(struct auxiliary_device= *aux_dev) if (!nvm) return; =20 + pm_runtime_disable(&aux_dev->dev); + mtd_device_unregister(&nvm->mtd); =20 dev_set_drvdata(&aux_dev->dev, NULL); --=20 2.43.0