From patchwork Tue Jun 13 11:18:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 9783671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C4B460325 for ; Tue, 13 Jun 2017 11:18:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F01562853A for ; Tue, 13 Jun 2017 11:18:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E21C228673; Tue, 13 Jun 2017 11:18:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 576FE2853A for ; Tue, 13 Jun 2017 11:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083AbdFMLSt (ORCPT ); Tue, 13 Jun 2017 07:18:49 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33470 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752081AbdFMLSs (ORCPT ); Tue, 13 Jun 2017 07:18:48 -0400 Received: by mail-pg0-f68.google.com with SMTP id a70so18148423pge.0; Tue, 13 Jun 2017 04:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DRk5BaTJP2Milrh78EdD/vL0mhjTZpgqL6BKPFHJEPk=; b=f0xRtNo+VLjtuky946QOYHo3iJH3cIamkYd+I8PTuEb2HSNEgy+AtGUf/eAnKNkkkD OuV3htLZUfFQ9/p2+4jM/iYBwtl06V3NN9CZMYMz86EKv1MqF+N0cZDHhern53uOyA2q 0T4WMdNOJjQWo8EiXkEcDQjxkabg+Og/e+2We7+Sws0xFjNvnYW1n2MoV5FYB9JQ4CYh W3T4UJi6JSa+5ir+jvrLF4oe5ieFkXHlxLAXTakbeI5j4dFNGpOYruTZKlHXAvOJGUhO mZunh8M5nrckm2f6tafYwcgQWpwBBx3ViDMe4JREozW4baOJS0G1EfZR85JlLSgcguz+ xEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DRk5BaTJP2Milrh78EdD/vL0mhjTZpgqL6BKPFHJEPk=; b=UxaqH4/xQbSKXrzd0Ft4mC+urwuaXshGAa2vIQ/Z984K6FTYritWqa+O1vg+PsURTa zHzxDrSxFEXucFMbXae7OyYffdzSXtP8BweOR0AkEg5teZlhHI72maUc+nbl60Gm/GXV fIV4wnjLFsTjxi96V9yxOzfvYyigpYVUv+mpsLRiMrzd+dKSC6630pw+HWX0MDxlV/TK zoyS43LFvO6V74uK7HxF3cPE8R0nxjjssQ6qytcsC9EfnaPn08/aAV9PPAXFRuDRpiuU LMTJywbKaUPyXJ3Y9RyxmcPV9yEVOjXENnA8nPUm85DOG+PWcNfV8LMPOYNWp+HG18UB 2toA== X-Gm-Message-State: AODbwcBmTaqJAJEFLSOsEHTfcoIDKGydbBSYnMsmm8Mlj9GZ2KU+0aLJ PZLh7qwS9l++Mg== X-Received: by 10.84.179.65 with SMTP id a59mr60159204plc.82.1497352727614; Tue, 13 Jun 2017 04:18:47 -0700 (PDT) Received: from linux-l9pv.suse ([45.122.156.254]) by smtp.gmail.com with ESMTPSA id 15sm24119071pfj.59.2017.06.13.04.18.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 04:18:47 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: "Rafael J . Wysocki" Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , Len Brown , Andy Shevchenko , Michal Hocko Subject: [RFC PATCH v3] acpi: indicate to platform when hot remove returns busy Date: Tue, 13 Jun 2017 19:18:37 +0800 Message-Id: <20170613111837.14170-1-jlee@suse.com> X-Mailer: git-send-email 2.12.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In hotplug logic, it always indicates non-specific failure to platform through _OST when handing acpi hot-remove event failed. Then platform terminates the hot-remove process but it can not identify the reason. Base on current hot-remove code, there have two situations that it returns busy: - OSPM try to offline an individual device, but the device offline function returns busy. - When the ejection event is applied to an "not offlined yet" container. OSPM send kobject change event to userspace and returns busy. Both of them will returns -EBUSY to acpi device hotplug function then hotplug function indicates non-specific failure to platform just like any other error, e.g. -ENODEV or -EIO. The benefit to platform for identifying the OS busy state is that platform can be applied different approach to handle the busy but not just terminate the hot-remove process by unknown reason. For example, platform can wait for a while then triggers hot-remove again. This RFC patch adds one more parameter to the handler function of acpi generic hotplug event to give the function a chance to propose the return code of _OST. In this case, it sets ost return code to ACPI_OST_SC_DEVICE_BUSY when the acpi hot remove function returns -EBUSY. v3: Removed redundant 'else' in acpi_ost_status_code(). (Andy Shevchenko) v2: Do not overwrite ost code in acpi_generic_hotplug_event(). Move the "error code to ost code" logic to a help function. (Andy Shevchenko) Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Andy Shevchenko Cc: Michal Hocko Signed-off-by: "Lee, Chun-Yi" --- drivers/acpi/scan.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 3a10d7573477..41f5065190c7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -384,6 +384,20 @@ static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type) return -EINVAL; } +static int acpi_ost_status_code(u32 src, int error) +{ + switch (src) { + case ACPI_NOTIFY_EJECT_REQUEST: + case ACPI_OST_EC_OSPM_EJECT: + if (error == -EPERM) + return ACPI_OST_SC_EJECT_NOT_SUPPORTED; + if (error == -EBUSY) + return ACPI_OST_SC_DEVICE_BUSY; + break; + } + return error ? ACPI_OST_SC_NON_SPECIFIC_FAILURE : ACPI_OST_SC_SUCCESS; +} + void acpi_device_hotplug(struct acpi_device *adev, u32 src) { u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; @@ -404,10 +418,6 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src) error = dock_notify(adev, src); } else if (adev->flags.hotplug_notify) { error = acpi_generic_hotplug_event(adev, src); - if (error == -EPERM) { - ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED; - goto err_out; - } } else { int (*notify)(struct acpi_device *, u32); @@ -423,9 +433,8 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src) else goto out; } - if (!error) - ost_code = ACPI_OST_SC_SUCCESS; + ost_code = acpi_ost_status_code(src, error); err_out: acpi_evaluate_ost(adev->handle, src, ost_code, NULL);