From patchwork Fri Jun 9 10:54:51 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: 9778051 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 ACD2760393 for ; Fri, 9 Jun 2017 10:55:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E6A32848F for ; Fri, 9 Jun 2017 10:55:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92618284D5; Fri, 9 Jun 2017 10:55:11 +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 A54232848F for ; Fri, 9 Jun 2017 10:55:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751752AbdFIKzJ (ORCPT ); Fri, 9 Jun 2017 06:55:09 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:35434 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707AbdFIKzI (ORCPT ); Fri, 9 Jun 2017 06:55:08 -0400 Received: by mail-io0-f193.google.com with SMTP id f79so5344083ioi.2; Fri, 09 Jun 2017 03:55:08 -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=mNKwiIcK6RbUbj3Wv5LRnXMV8BeNk1kZMxRDCqwjKLg=; b=EllN0L9eYb89+cYLDyBkQtaw7aMWn9bUTFrenE8zoI6fbnXzBvJKFRjR5ISsKpA2Nb WnU8ym3bmi1v8qQUASCQ03yixQpzOgnyyX3v3e7T+AS5RVmYyDS1epjG/nUxXDGTOJZ2 X/qAGrOFu50d+mDJNMAYa+A1udJ2DRMyksg4iI7Kq+2eJvK3Vr4jzZfIsaBanuZGmltR Ts50/lK0sZvS8VmMMdKqGjujo1Qc7c9yOzO7nYFfzacwVJxc36o1MS0aaZ9RkUVODq/Z BgKkqyC2jsfnvH3gLMCNNM8Bzvpu/735J4eN/mIj2ssS1MV537/E5R0r/VGJncH3qkkC zVUw== 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=mNKwiIcK6RbUbj3Wv5LRnXMV8BeNk1kZMxRDCqwjKLg=; b=tK3paFsynuiQuuOtG0BZyg+zaQlgP8qCfYfaiKBVy9Ea9SLYG8of2YPAWwZoaUJ41T Xv0Ja80zDBmsn83neRz1jPq+Znx8QRf3iBn+Aogd8gV8knC0HROkIkLGsbQm9mbHgi8o 7RRPosu9YYDhFnKdpp0CuV8qe815Tt2LE9lMCBFQbUgTOdbb0FxUnDJK8vpkHEEDAT9u bYKCbl61yajcDYy4QiJ/vxw+MYhwtza2jJz4NridrkMz9JiCjun4To5SiB8cAyduHD9C VK4hylOYUGm/b1yGSgjf/MXheIKiHw0ruaOaFK+YPyXLDLJUc6kK3xGCbU4qbCiGOEIq nLEQ== X-Gm-Message-State: AODbwcA70ulm8IUnS+Wy6KYYoFzLU+Cq3uyuLAoiD+Xc9QzC0OpQiRLe CKkh/StMK3v5gQ== X-Received: by 10.107.162.10 with SMTP id l10mr3718412ioe.90.1497005707471; Fri, 09 Jun 2017 03:55:07 -0700 (PDT) Received: from linux-l9pv.suse ([45.122.156.254]) by smtp.gmail.com with ESMTPSA id w129sm277358iow.20.2017.06.09.03.55.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Jun 2017 03:55:06 -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 Subject: [PATCH v2] acpi: indicate to platform when hot remove returns busy Date: Fri, 9 Jun 2017 18:54:51 +0800 Message-Id: <20170609105451.461-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. v2: Do not overwrite ost code in acpi_generic_hotplug_event(). Move the "error code to ost code" logic to a help function. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Andy Shevchenko 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 2433569..e407eed 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -394,6 +394,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; + else 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; @@ -414,10 +428,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); @@ -433,9 +443,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);