Message ID | 1418746353-3481-2-git-send-email-octavian.purdila@intel.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Rafael Wysocki |
Headers | show |
Hello. On 12/16/2014 07:12 PM, Octavian Purdila wrote: > acpi_tb_delete_namespace_by_owner expects ACPI_MTX_INTERPRETER to be > taken. This fixes the following issue: > ACPI Error: Mutex [0x0] is not acquired, cannot release (20141107/utmutex-322) > Call Trace: > [<ffffffff81b0bd28>] dump_stack+0x4f/0x7b > [<ffffffff81546bfc>] acpi_ut_release_mutex+0x47/0x67 > [<ffffffff81542cf1>] acpi_tb_delete_namespace_by_owner+0x57/0x8d > [<ffffffff81543ef1>] acpi_unload_table_id+0x3a/0x5e > Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> > --- > drivers/acpi/acpica/tbxface.c | 7 +++++++ > 1 file changed, 7 insertions(+) > diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c > index 6482b0d..9520ae1 100644 > --- a/drivers/acpi/acpica/tbxface.c > +++ b/drivers/acpi/acpica/tbxface.c > @@ -281,6 +281,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) > > ACPI_FUNCTION_TRACE(acpi_unload_table_id); > > + status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER); > + if (ACPI_FAILURE(status)) { > + return_ACPI_STATUS(status); > + } {} not needed here. Please run your patches thru scripts/checkpatch.pl, it should complain in this case. > + > /* Find table in the global table list */ > for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) { > if (id != acpi_gbl_root_table_list.tables[i].owner_id) { > @@ -297,6 +302,8 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) > acpi_tb_set_table_loaded_flag(i, FALSE); > break; > } > + > + (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); Cast to *void* not necessary either. [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Dec 16, 2014 at 8:14 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > Hello. > > On 12/16/2014 07:12 PM, Octavian Purdila wrote: > >> acpi_tb_delete_namespace_by_owner expects ACPI_MTX_INTERPRETER to be >> taken. This fixes the following issue: > > >> ACPI Error: Mutex [0x0] is not acquired, cannot release >> (20141107/utmutex-322) >> Call Trace: >> [<ffffffff81b0bd28>] dump_stack+0x4f/0x7b >> [<ffffffff81546bfc>] acpi_ut_release_mutex+0x47/0x67 >> [<ffffffff81542cf1>] acpi_tb_delete_namespace_by_owner+0x57/0x8d >> [<ffffffff81543ef1>] acpi_unload_table_id+0x3a/0x5e > > >> Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> >> --- >> drivers/acpi/acpica/tbxface.c | 7 +++++++ >> 1 file changed, 7 insertions(+) > > >> diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c >> index 6482b0d..9520ae1 100644 >> --- a/drivers/acpi/acpica/tbxface.c >> +++ b/drivers/acpi/acpica/tbxface.c >> @@ -281,6 +281,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) >> >> ACPI_FUNCTION_TRACE(acpi_unload_table_id); >> >> + status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER); >> + if (ACPI_FAILURE(status)) { >> + return_ACPI_STATUS(status); >> + } > > > {} not needed here. Please run your patches thru scripts/checkpatch.pl, > it should complain in this case. > I always run checkpatch. It does not complain. >> + >> /* Find table in the global table list */ >> for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) >> { >> if (id != acpi_gbl_root_table_list.tables[i].owner_id) { >> @@ -297,6 +302,8 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) >> acpi_tb_set_table_loaded_flag(i, FALSE); >> break; >> } >> + >> + (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); > > > Cast to *void* not necessary either. > AFAICS ACPICA has a slight different coding style than the rest of the kernel and I kept using it in these patches. Rafael, please let me know if I am wrong. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday, December 16, 2014 06:12:30 PM Octavian Purdila wrote: > acpi_tb_delete_namespace_by_owner expects ACPI_MTX_INTERPRETER to be > taken. This fixes the following issue: > > ACPI Error: Mutex [0x0] is not acquired, cannot release (20141107/utmutex-322) > Call Trace: > [<ffffffff81b0bd28>] dump_stack+0x4f/0x7b > [<ffffffff81546bfc>] acpi_ut_release_mutex+0x47/0x67 > [<ffffffff81542cf1>] acpi_tb_delete_namespace_by_owner+0x57/0x8d > [<ffffffff81543ef1>] acpi_unload_table_id+0x3a/0x5e > > Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> I've queued up this one for 3.20. > --- > drivers/acpi/acpica/tbxface.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c > index 6482b0d..9520ae1 100644 > --- a/drivers/acpi/acpica/tbxface.c > +++ b/drivers/acpi/acpica/tbxface.c > @@ -281,6 +281,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) > > ACPI_FUNCTION_TRACE(acpi_unload_table_id); > > + status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER); > + if (ACPI_FAILURE(status)) { > + return_ACPI_STATUS(status); > + } > + > /* Find table in the global table list */ > for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) { > if (id != acpi_gbl_root_table_list.tables[i].owner_id) { > @@ -297,6 +302,8 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) > acpi_tb_set_table_loaded_flag(i, FALSE); > break; > } > + > + (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); > return_ACPI_STATUS(status); > } > >
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c index 6482b0d..9520ae1 100644 --- a/drivers/acpi/acpica/tbxface.c +++ b/drivers/acpi/acpica/tbxface.c @@ -281,6 +281,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) ACPI_FUNCTION_TRACE(acpi_unload_table_id); + status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + /* Find table in the global table list */ for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) { if (id != acpi_gbl_root_table_list.tables[i].owner_id) { @@ -297,6 +302,8 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) acpi_tb_set_table_loaded_flag(i, FALSE); break; } + + (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); return_ACPI_STATUS(status); }
acpi_tb_delete_namespace_by_owner expects ACPI_MTX_INTERPRETER to be taken. This fixes the following issue: ACPI Error: Mutex [0x0] is not acquired, cannot release (20141107/utmutex-322) Call Trace: [<ffffffff81b0bd28>] dump_stack+0x4f/0x7b [<ffffffff81546bfc>] acpi_ut_release_mutex+0x47/0x67 [<ffffffff81542cf1>] acpi_tb_delete_namespace_by_owner+0x57/0x8d [<ffffffff81543ef1>] acpi_unload_table_id+0x3a/0x5e Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> --- drivers/acpi/acpica/tbxface.c | 7 +++++++ 1 file changed, 7 insertions(+)