Message ID | 20220907155813.1427526-8-tomas.winkler@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | GSC support for XeHP SDV and DG2 | expand |
On 9/7/2022 8:58 AM, Tomas Winkler wrote: > From: Alexander Usyskin <alexander.usyskin@intel.com> > > Wait for reset work to complete before initiating > stop reset flow sequence. > > Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> This is unchanged from the previously reviewed rev (apart from the fixed date in the header), so this still applies: Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Daniele > --- > drivers/misc/mei/init.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c > index eb052005ca86..bc054baf496c 100644 > --- a/drivers/misc/mei/init.c > +++ b/drivers/misc/mei/init.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > - * Copyright (c) 2012-2019, Intel Corporation. All rights reserved. > + * Copyright (c) 2012-2022, Intel Corporation. All rights reserved. > * Intel Management Engine Interface (Intel MEI) Linux driver > */ > > @@ -320,6 +320,8 @@ void mei_stop(struct mei_device *dev) > > mei_clear_interrupts(dev); > mei_synchronize_irq(dev); > + /* to catch HW-initiated reset */ > + mei_cancel_work(dev); > > mutex_lock(&dev->device_lock); >
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index eb052005ca86..bc054baf496c 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) 2012-2019, Intel Corporation. All rights reserved. + * Copyright (c) 2012-2022, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -320,6 +320,8 @@ void mei_stop(struct mei_device *dev) mei_clear_interrupts(dev); mei_synchronize_irq(dev); + /* to catch HW-initiated reset */ + mei_cancel_work(dev); mutex_lock(&dev->device_lock);