Received-SPF: pass (google.com: domain of linux-kernel+bounces-129697-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Winkler, Tomas" <tomas.winkler@intel.com>
To: "Wu, Wentong" <wentong.wu@intel.com>, "sakari.ailus@linux.intel.com"
	<sakari.ailus@linux.intel.com>, "gregkh@linuxfoundation.org"
	<gregkh@linuxfoundation.org>
CC: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "Yao, Hao"
	<hao.yao@intel.com>, "stable@vger.kernel.org" <stable@vger.kernel.org>,
	Dominik Brodowski <linux@dominikbrodowski.net>
Subject: RE: [PATCH v2 2/2] mei: vsc: Unregister interrupt handler for system
 suspend
Thread-Topic: [PATCH v2 2/2] mei: vsc: Unregister interrupt handler for system
 suspend
Thread-Index: AQHahYLR0U1myVo8H0mYSlHoWp0IkLFWcgWw
Date: Wed, 3 Apr 2024 12:00:57 +0000
Message-ID: <PH7PR11MB76053ECD0313E42CED467542E53D2@PH7PR11MB7605.namprd11.prod.outlook.com>
References: <20240403051341.3534650-1-wentong.wu@intel.com>
 <20240403051341.3534650-2-wentong.wu@intel.com>
In-Reply-To: <20240403051341.3534650-2-wentong.wu@intel.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?7WIUE8hY4zuHhe6hl31dpKFcHRObI4kaDdaEsFswLD2Nh7FmZCsM7VsLKzjK?=
 =?us-ascii?Q?jg7aAIJUCyqfdKH5lP8FwJA6tCsLn2QTp9DESPpiqJZ3KUmis4BvOLa/y2SD?=
 =?us-ascii?Q?D5qsiReDIi+0RjRIRflskqNWISvoxtPr40l9EgzxvBfL9Rdpv5xZpVMKLzJZ?=
 =?us-ascii?Q?odD/1L8zn1PBg3s1UNzK7kRYk8TXgBM5TKh9weDhkEW8c1ujXh1bYl5jo5jA?=
 =?us-ascii?Q?UPFP2ZznAPP0HzDLIjw6/smErkQCc3C0aIRZ1qXHincrGLWa5bEAGdV/PJYi?=
 =?us-ascii?Q?T3q0JNetoUPs50iZTHqUP4LtghHi8qP1tv/pzxEAxhXcChifesWJbyW+zbsF?=
 =?us-ascii?Q?nOydJtDN5NQ/kErTle4/JFB3y1Mu+WxL+2UsIM1zVaAKEdyOp0nnGe6kqBN3?=
 =?us-ascii?Q?+Q5/7RGBBYCBGIvvU4DHKMsW6BS1M91IrUZHYNSFkzH0RQI6kq5CnOpY9IvX?=
 =?us-ascii?Q?eOmYznXqCcVBDZ4/aGjlvih3UeCP+f13ZtRgz0bbDfoDe/ECkJ6XeZgU0iwq?=
 =?us-ascii?Q?zsL/cY85BYq2BTnag5rbRbZsF6QFFqWpU2GJyo6fmKB1GJybH5/dO+2aqkCx?=
 =?us-ascii?Q?MMczznz9yVGv/J6QuwyP19Pp/IVxMZcUR5p+DqO9fI33HyzfT0CbM+n58UGm?=
 =?us-ascii?Q?Ry3kTeR4fUx05c2eX3CDzZc6hsJHl9CxAME6V/WL+6f7nvwcfCMuV3RB+uQ+?=
 =?us-ascii?Q?wLCuQc7+MEdAoMd6UXv0/bazMH6abKGm7+sxrTmig2FwK27m0eGS/6XvKk5d?=
 =?us-ascii?Q?NlOeb9jnzdEsQtFOqaahdiJ7L/zC1Pxa9CKvRfBGmAkzV47VJw4jhPmlJiow?=
 =?us-ascii?Q?22d7ZgFw+/FYXqN08WcwE0k4aq5YEBF75PseazBOXi1Ii7iAJHy3yej+uJsX?=
 =?us-ascii?Q?6+ndbi3KjOS6d41WvWvRMmm40V2eLxuAYZSxRJvJkLVoY+n9Ptxz46Azxv77?=
 =?us-ascii?Q?Y4xJ4fTmVTgWv6H/j1u6La98RLwxVUJ1kWzCjy1bxhmSpS5c6v6vuvekrSNm?=
 =?us-ascii?Q?YyU4OdsSHF4epk5zkMsUpWSHs2hH0R4MjZkjHy5cXqFNvBrvhb3Jenm5DULh?=
 =?us-ascii?Q?1RGQ6sAWXtkBh7e3b3H1whQJpz7dFw9p0bbiuDRKDNDx9UD4j6/3bBr+4gTp?=
 =?us-ascii?Q?UJK+Bf+iNF7YaIrO/UwMFQj9AAdTLWXb38Eymvt0zpXDKtzKNWmo1AAeBjj4?=
 =?us-ascii?Q?vLFoEhrirESUV0nRK9oLrQQExjDFeVqWrVKIBIB/UgLQDoAe3m/QKxoJRfKP?=
 =?us-ascii?Q?fElIlxZB6Xmr8zkW3EztbDuh3hQxCS8khxKUxA9/sRE+v01XQc6OnCiCr6Ri?=
 =?us-ascii?Q?izFGa+l6FiYQ5bS+eaZ6zDeZTH3+BXHEOvIZGPu8DNAMNrAB+BNBcg4cOIy/?=
 =?us-ascii?Q?yQZTQpVtpZyV6vjP+isAQkdfx5Eg274p602VGujDcGueDeuj96GqpV1E+5t3?=
 =?us-ascii?Q?2Zo67RQ8t/t3APBAxh0DEmkziT5w3ppjuW1JZEA+KSQmVlA5jvFGOLETn4Fv?=
 =?us-ascii?Q?A2V4GSrjqSdZtRauLSDM0duKsUOAcrpJI3wRJxO9vl8QVXFLTb1SHfCZw46j?=
 =?us-ascii?Q?ITJ6JvptfNEZo+8PqmcRCDPd+c97gE9jthu6Pg4T?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB7605.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7fbb03-0b29-4483-d1e9-08dc53d5b904
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Apr 2024 12:00:57.6451
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: nlEubPo48JTopWW/PAqBuxvMMUN6lCHgEIShGOLrTPTOm40Cltuy6mPfJACrzWFqf+YmONnjaxesKBLS0CRtXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7182
X-OriginatorOrg: intel.com


>=20
> From: Sakari Ailus <sakari.ailus@linux.intel.com>
>=20
> Unregister the MEI VSC interrupt handler before system suspend and re-
> register it at system resume time. This mirrors implementation of other M=
EI
> devices.
>=20
> This patch fixes the bug that causes continuous stream of MEI VSC errors
> after system resume.
>=20
> Fixes: 386a766c4169 ("mei: Add MEI hardware support for IVSC device")
> Cc: stable@vger.kernel.org # for 6.8
> Reported-by: Dominik Brodowski <linux@dominikbrodowski.net>
> Signed-off-by: Wentong Wu <wentong.wu@intel.com>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>

> ---
>  drivers/misc/mei/platform-vsc.c | 17 ++++++-
>  drivers/misc/mei/vsc-tp.c       | 84 +++++++++++++++++++++++----------
>  drivers/misc/mei/vsc-tp.h       |  3 ++
>  3 files changed, 78 insertions(+), 26 deletions(-)
>=20
> diff --git a/drivers/misc/mei/platform-vsc.c b/drivers/misc/mei/platform-
> vsc.c index 6c9f00bcb94b..b543e6b9f3cf 100644
> --- a/drivers/misc/mei/platform-vsc.c
> +++ b/drivers/misc/mei/platform-vsc.c
> @@ -400,25 +400,40 @@ static void mei_vsc_remove(struct platform_device
> *pdev)  static int mei_vsc_suspend(struct device *dev)  {
>  	struct mei_device *mei_dev =3D dev_get_drvdata(dev);
> +	struct mei_vsc_hw *hw =3D mei_dev_to_vsc_hw(mei_dev);
>=20
>  	mei_stop(mei_dev);
>=20
> +	mei_disable_interrupts(mei_dev);
> +
> +	vsc_tp_free_irq(hw->tp);
> +
>  	return 0;
>  }
>=20
>  static int mei_vsc_resume(struct device *dev)  {
>  	struct mei_device *mei_dev =3D dev_get_drvdata(dev);
> +	struct mei_vsc_hw *hw =3D mei_dev_to_vsc_hw(mei_dev);
>  	int ret;
>=20
> -	ret =3D mei_restart(mei_dev);
> +	ret =3D vsc_tp_request_irq(hw->tp);
>  	if (ret)
>  		return ret;
>=20
> +	ret =3D mei_restart(mei_dev);
> +	if (ret)
> +		goto err_free;
> +
>  	/* start timer if stopped in suspend */
>  	schedule_delayed_work(&mei_dev->timer_work, HZ);
>=20
>  	return 0;
> +
> +err_free:
> +	vsc_tp_free_irq(hw->tp);
> +
> +	return ret;
>  }
>=20
>  static DEFINE_SIMPLE_DEV_PM_OPS(mei_vsc_pm_ops, mei_vsc_suspend,
> mei_vsc_resume); diff --git a/drivers/misc/mei/vsc-tp.c
> b/drivers/misc/mei/vsc-tp.c index 968a92a7425d..e6a98dba8a73 100644
> --- a/drivers/misc/mei/vsc-tp.c
> +++ b/drivers/misc/mei/vsc-tp.c
> @@ -94,6 +94,27 @@ static const struct acpi_gpio_mapping
> vsc_tp_acpi_gpios[] =3D {
>  	{}
>  };
>=20
> +static irqreturn_t vsc_tp_isr(int irq, void *data) {
> +	struct vsc_tp *tp =3D data;
> +
> +	atomic_inc(&tp->assert_cnt);
> +
> +	wake_up(&tp->xfer_wait);
> +
> +	return IRQ_WAKE_THREAD;
> +}
> +
> +static irqreturn_t vsc_tp_thread_isr(int irq, void *data) {
> +	struct vsc_tp *tp =3D data;
> +
> +	if (tp->event_notify)
> +		tp->event_notify(tp->event_notify_context);
> +
> +	return IRQ_HANDLED;
> +}
> +
>  /* wakeup firmware and wait for response */  static int
> vsc_tp_wakeup_request(struct vsc_tp *tp)  { @@ -383,6 +404,37 @@ int
> vsc_tp_register_event_cb(struct vsc_tp *tp, vsc_tp_event_cb_t event_cb,  =
}
> EXPORT_SYMBOL_NS_GPL(vsc_tp_register_event_cb, VSC_TP);
>=20
> +/**
> + * vsc_tp_request_irq - request irq for vsc_tp device
> + * @tp: vsc_tp device handle
> + */
> +int vsc_tp_request_irq(struct vsc_tp *tp) {
> +	struct spi_device *spi =3D tp->spi;
> +	struct device *dev =3D &spi->dev;
> +	int ret;
> +
> +	irq_set_status_flags(spi->irq, IRQ_DISABLE_UNLAZY);
> +	ret =3D request_threaded_irq(spi->irq, vsc_tp_isr, vsc_tp_thread_isr,
> +				   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> +				   dev_name(dev), tp);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_NS_GPL(vsc_tp_request_irq, VSC_TP);
> +
> +/**
> + * vsc_tp_free_irq - free irq for vsc_tp device
> + * @tp: vsc_tp device handle
> + */
> +void vsc_tp_free_irq(struct vsc_tp *tp) {
> +	free_irq(tp->spi->irq, tp);
> +}
> +EXPORT_SYMBOL_NS_GPL(vsc_tp_free_irq, VSC_TP);
> +
>  /**
>   * vsc_tp_intr_synchronize - synchronize vsc_tp interrupt
>   * @tp: vsc_tp device handle
> @@ -413,27 +465,6 @@ void vsc_tp_intr_disable(struct vsc_tp *tp)  }
> EXPORT_SYMBOL_NS_GPL(vsc_tp_intr_disable, VSC_TP);
>=20
> -static irqreturn_t vsc_tp_isr(int irq, void *data) -{
> -	struct vsc_tp *tp =3D data;
> -
> -	atomic_inc(&tp->assert_cnt);
> -
> -	wake_up(&tp->xfer_wait);
> -
> -	return IRQ_WAKE_THREAD;
> -}
> -
> -static irqreturn_t vsc_tp_thread_isr(int irq, void *data) -{
> -	struct vsc_tp *tp =3D data;
> -
> -	if (tp->event_notify)
> -		tp->event_notify(tp->event_notify_context);
> -
> -	return IRQ_HANDLED;
> -}
> -
>  static int vsc_tp_match_any(struct acpi_device *adev, void *data)  {
>  	struct acpi_device **__adev =3D data;
> @@ -490,10 +521,9 @@ static int vsc_tp_probe(struct spi_device *spi)
>  	tp->spi =3D spi;
>=20
>  	irq_set_status_flags(spi->irq, IRQ_DISABLE_UNLAZY);
> -	ret =3D devm_request_threaded_irq(dev, spi->irq, vsc_tp_isr,
> -					vsc_tp_thread_isr,
> -					IRQF_TRIGGER_FALLING |
> IRQF_ONESHOT,
> -					dev_name(dev), tp);
> +	ret =3D request_threaded_irq(spi->irq, vsc_tp_isr, vsc_tp_thread_isr,
> +				   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> +				   dev_name(dev), tp);
>  	if (ret)
>  		return ret;
>=20
> @@ -522,6 +552,8 @@ static int vsc_tp_probe(struct spi_device *spi)
>  err_destroy_lock:
>  	mutex_destroy(&tp->mutex);
>=20
> +	free_irq(spi->irq, tp);
> +
>  	return ret;
>  }
>=20
> @@ -532,6 +564,8 @@ static void vsc_tp_remove(struct spi_device *spi)
>  	platform_device_unregister(tp->pdev);
>=20
>  	mutex_destroy(&tp->mutex);
> +
> +	free_irq(spi->irq, tp);
>  }
>=20
>  static const struct acpi_device_id vsc_tp_acpi_ids[] =3D { diff --git
> a/drivers/misc/mei/vsc-tp.h b/drivers/misc/mei/vsc-tp.h index
> f9513ddc3e40..14ca195cbddc 100644
> --- a/drivers/misc/mei/vsc-tp.h
> +++ b/drivers/misc/mei/vsc-tp.h
> @@ -37,6 +37,9 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void
> *obuf, size_t olen,  int vsc_tp_register_event_cb(struct vsc_tp *tp,
> vsc_tp_event_cb_t event_cb,
>  			     void *context);
>=20
> +int vsc_tp_request_irq(struct vsc_tp *tp); void vsc_tp_free_irq(struct
> +vsc_tp *tp);
> +
>  void vsc_tp_intr_enable(struct vsc_tp *tp);  void vsc_tp_intr_disable(st=
ruct
> vsc_tp *tp);  void vsc_tp_intr_synchronize(struct vsc_tp *tp);
> --
> 2.34.1