From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 8DB683B8D7E for ; Mon, 4 May 2026 11:34:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777894465; cv=none; b=I9ot6ctfpVfYreLXhU9YLsc1z6NBjonTj35AMbnv+nUwQ5DuTrvfT3IBWcztY1BGfttXlhZp+MPnDLYqRchu9oGmvOJ884aaRG4J9tkFB/TCGVXdfZDfpSeotw5HpZj+yWEc0SgGSDHJCDrZe8jMwuWAehuOuOjFxjdp5zRc1ws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777894465; c=relaxed/simple; bh=dVsKZXcxZ5BtGeLdH16h9e8zvXX13Alg2ikK2Z0Ln8M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y0LtIX8JUnykgzhLioVxnsQHp9O/3vQba6VwumMbrTLxlUOP9Zgkz/UdsCuQL33F0YYaC0COf6tuPaRyuYn+uRMTjScjP5Y2zKMXobKthIBWJSMYmTto2YaXEyucexrDvu/NBtARt33tPCuX3EfFfGMY534I7zJlTBXknkbXUbk= 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=YcNmJuJi; arc=none smtp.client-ip=192.198.163.13 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="YcNmJuJi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777894464; x=1809430464; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dVsKZXcxZ5BtGeLdH16h9e8zvXX13Alg2ikK2Z0Ln8M=; b=YcNmJuJinBMqbMaR0fvvsyWGqSdVXRpSa02J+zqcJlVECWZmJTpdKhNh bRjSVKVLITNiP0kcKgiKr0eZpn/j7XIMy2/wEurVTJDTEUevHxUEBQoAK Q3MU3/F+4oDB6XgSRRDv9BHVDjk0FI+ZGuv5AW2+pKakF5qu70raIupgE XmI1WKgpzW7Bijzwwdna5C6sMtl6css6HF9tfCbknkMiy38RdmWIz5k1A bB8JQwlBzT/CIRJ2Enc5MWkPemFNiJmqnpdt7OgZCGqG/8SQqLvoR/Hzm dVYfsS+ir9i2fLiiaI5wzWD3KkydGrB/Fg9Z+bVwVu27i0CZK3Dj811Bn g==; X-CSE-ConnectionGUID: kbDKJXThT26EynEN0Yt5Ag== X-CSE-MsgGUID: 4FlJim5USlq352/uwXMfqQ== X-IronPort-AV: E=McAfee;i="6800,10657,11775"; a="81315220" X-IronPort-AV: E=Sophos;i="6.23,215,1770624000"; d="scan'208";a="81315220" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2026 04:34:23 -0700 X-CSE-ConnectionGUID: KebiJ14yQiOgqiZV/kA60w== X-CSE-MsgGUID: 6vc9fWzsTrm9BG98BaH8Kw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,215,1770624000"; d="scan'208";a="240478284" Received: from hrotuna-mobl2.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.245.92]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2026 04:34:21 -0700 From: Adrian Hunter To: alexandre.belloni@bootlin.com Cc: Frank.Li@nxp.com, linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 11/16] i3c: mipi-i3c-hci: Factor out reset-and-restore helper Date: Mon, 4 May 2026 14:33:47 +0300 Message-ID: <20260504113352.38490-12-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260504113352.38490-1-adrian.hunter@intel.com> References: <20260504113352.38490-1-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit Factor the reset-and-restore sequence out of i3c_hci_rpm_resume() into a separate helper. This allows the same logic to be reused for recovery paths in subsequent changes without duplicating suspend/resume handling. No functional change. Signed-off-by: Adrian Hunter --- Changes in V3: None Changes in V2: Drop redundant i3c_hci_sync_irq_inactive(hci) from i3c_hci_reset_and_restore() because it is called by hci->io->suspend() anyway drivers/i3c/master/mipi-i3c-hci/core.c | 19 +++++++++++++++++-- drivers/i3c/master/mipi-i3c-hci/hci.h | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c index 8274c84b16be..12a0122fb709 100644 --- a/drivers/i3c/master/mipi-i3c-hci/core.c +++ b/drivers/i3c/master/mipi-i3c-hci/core.c @@ -798,9 +798,8 @@ int i3c_hci_rpm_suspend(struct device *dev) } EXPORT_SYMBOL_GPL(i3c_hci_rpm_suspend); -int i3c_hci_rpm_resume(struct device *dev) +static int i3c_hci_do_reset_and_restore(struct i3c_hci *hci) { - struct i3c_hci *hci = dev_get_drvdata(dev); int ret; ret = i3c_hci_reset_and_init(hci); @@ -821,6 +820,22 @@ int i3c_hci_rpm_resume(struct device *dev) return 0; } + +int i3c_hci_reset_and_restore(struct i3c_hci *hci) +{ + i3c_hci_bus_disable(hci); + + hci->io->suspend(hci); + + return i3c_hci_do_reset_and_restore(hci); +} + +int i3c_hci_rpm_resume(struct device *dev) +{ + struct i3c_hci *hci = dev_get_drvdata(dev); + + return i3c_hci_do_reset_and_restore(hci); +} EXPORT_SYMBOL_GPL(i3c_hci_rpm_resume); static int i3c_hci_runtime_suspend(struct device *dev) diff --git a/drivers/i3c/master/mipi-i3c-hci/hci.h b/drivers/i3c/master/mipi-i3c-hci/hci.h index 97c31a315a6e..a3151c26827e 100644 --- a/drivers/i3c/master/mipi-i3c-hci/hci.h +++ b/drivers/i3c/master/mipi-i3c-hci/hci.h @@ -175,4 +175,6 @@ int i3c_hci_process_xfer(struct i3c_hci *hci, struct hci_xfer *xfer, int n); int i3c_hci_rpm_suspend(struct device *dev); int i3c_hci_rpm_resume(struct device *dev); +int i3c_hci_reset_and_restore(struct i3c_hci *hci); + #endif -- 2.51.0