From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 B31833064A9 for ; Tue, 21 Apr 2026 17:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776794108; cv=none; b=MRmZu/0T0Fwpph9RevR/ru7yPGSo3tujhhrf2H7ZvDJTDSOBCC4Eeej4l9viKwK3cQkEloxTuR+BdH9WAIACfvHSIKczzknGa0skTosFU3UOw07a9GpcXTNCliHOHYKBT09RpTEYThIobANMrkRJpgqQA9wSQmUxTz4UxeWC3g8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776794108; c=relaxed/simple; bh=GpXicQuAUwvk9bRUIWFNMDZTDiSM4cRz2I/RyILus2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oXFVB+a4ncpxdieUWiGoMr9VZ+Oo8O6w6d8OH7eHY3LVe8JFI7YCXFWg1vihtV1KnGXop431IrG22yXJYZG47tB0DKTZCBL0drbOLxc2rGnU5azsOCIcG6TES5XDyhs819z0NFjzEFMfVm0btYfikk4kDy305YrFUdONeXG/lqk= 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=SkMhGAMS; arc=none smtp.client-ip=198.175.65.19 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="SkMhGAMS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776794107; x=1808330107; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GpXicQuAUwvk9bRUIWFNMDZTDiSM4cRz2I/RyILus2A=; b=SkMhGAMSrnuIhs05o1QGbrV8vmUyb/RGRRDBRGU/U2kXjWg6HRWTJfTk MlLWoiaylr/vzW9qZ+rXOWAfMy3Cf5q5Pnx0EGoGVXzpGv8jy3MMjFFIJ 7/p6sK8JktmUHsJhh57Yi+pxBCmYdsJ7xDvyTOx/sdhNIrWkutKQOUjsE 7iAyvAWxJTy+jOkKbyKJzYHSywUnKl0/vXe3yjvSLv5yhvn1ULNoQ63kM 9XFu5xDEGH8lNeX8tUziSs8asOAnzH6llpREKyyA35WgAm3MPJywv+juU uAl10CT/dGSCYlPA+Oj4+yeobm2Q9oXGOg1h4MLu6+B82bw5+4KW0KJZV g==; X-CSE-ConnectionGUID: xdM1Q8AYQqqQmWD+e2m5Eg== X-CSE-MsgGUID: UuaIMUlwR1KCPSOUR5Gprg== X-IronPort-AV: E=McAfee;i="6800,10657,11763"; a="77651402" X-IronPort-AV: E=Sophos;i="6.23,192,1770624000"; d="scan'208";a="77651402" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2026 10:55:07 -0700 X-CSE-ConnectionGUID: mWJaT1fySSO2mXc5ZRxrxg== X-CSE-MsgGUID: ogcOLL9kTDa0Tu5SQFimfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,192,1770624000"; d="scan'208";a="227495000" Received: from hrotuna-mobl2.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.244.242]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2026 10:55:06 -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 V2 11/16] i3c: mipi-i3c-hci: Factor out reset-and-restore helper Date: Tue, 21 Apr 2026 20:54:30 +0300 Message-ID: <20260421175435.122094-12-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260421175435.122094-1-adrian.hunter@intel.com> References: <20260421175435.122094-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 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