From patchwork Mon Jul 3 13:26:10 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: 9822705 X-Patchwork-Delegate: rjw@sisk.pl 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 E188C60246 for ; Mon, 3 Jul 2017 13:26:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE5A228401 for ; Mon, 3 Jul 2017 13:26:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1D6C2853F; Mon, 3 Jul 2017 13:26:17 +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 A618928401 for ; Mon, 3 Jul 2017 13:26:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754423AbdGCN0P (ORCPT ); Mon, 3 Jul 2017 09:26:15 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34722 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754089AbdGCN0O (ORCPT ); Mon, 3 Jul 2017 09:26:14 -0400 Received: by mail-pg0-f67.google.com with SMTP id j186so23184698pge.1; Mon, 03 Jul 2017 06:26:14 -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=isZPb512WMuMbCGM6ltc2+NHvM0Jc+ouGZWgHnx0j+U=; b=hTvcKp6VtZSaHM4HTEbH5RWT1U82G7AHEKeCfLLDNHn7ApnDD/dWdCay/OJF2YrK8e Z5LodkS10eYIbdUHUOm2JNgBucAf6J/KaCUHgnsoKNaiItBZXDu6JturllwLEenFPWyn 8KbSQUm1fCHEAayHq4wmPk24mmZ5XOXrL/mUk8byJtYEcyfCj6BNEJuDC7sufGJt3aX7 bhHsHZEXFeiDJLsnlAV5B4Wa64+MLDYeEB4XQxSVOBYi5mZFVMPNSMbdJIlMMVvNS4Ck Ui0i9UIcTBmfcQj28w1JzT4+LhPHxV3KGnLraTLyOauOTOhu0LKDt+ZxN78Da2U4m5lq tDQQ== 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=isZPb512WMuMbCGM6ltc2+NHvM0Jc+ouGZWgHnx0j+U=; b=JVJbW/kMJUGhc90yWHzrRKorN6OH3FEBaiVlRYp3ScXopBUH0yT9q3yQIjxKxFVEa6 Sf51iwWouq1LSmbPzcIn7TJ/0GYaZIgn90iHJszxtJ65Rqhb+K6q9PtA2e9bk9yzk/w4 6oklio3BMRQl81+8M3j7pIoU3Hc2JLQkRFo6pID2/okzKZMRNsPCUm7eQaydQK0r1aco qeXIkNaFPAti1kNpvPIOO6ImEcY5KfBxvD8snrPkU1ZS3iXd5uXcrdgE2uk+m+wZNu7t nCFindzoW/TkVdevGfg/q38AcPMl/+4XPfTCCqUz1O3Itpytucm/k0wCAp8s/Ldy0Fl1 ygOA== X-Gm-Message-State: AIVw111xj9yWCC6zpPJZVjQcueqJzB81rof1ijusttPMrs/Gy6zVfi6d NCXjWmpVQ/O/aRk2 X-Received: by 10.84.133.69 with SMTP id 63mr10525956plf.225.1499088373992; Mon, 03 Jul 2017 06:26:13 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id l63sm37328906pfc.132.2017.07.03.06.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jul 2017 06:26:13 -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 v4] acpi: indicate to platform when hot remove returns busy Date: Mon, 3 Jul 2017 21:26:10 +0800 Message-Id: <20170703132610.21719-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. v4: Use switch-case statements to simplify code. (Andy Shevchenko, Rafael J. Wysocki) 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" Reviewed-by: Andy Shevchenko --- drivers/acpi/scan.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index d531629..ce88175 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -404,10 +404,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,8 +419,20 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src) else goto out; } - if (!error) + switch (error) { + case 0: ost_code = ACPI_OST_SC_SUCCESS; + break; + case -EPERM: + ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED; + break; + case -EBUSY: + ost_code = ACPI_OST_SC_DEVICE_BUSY; + break; + default: + ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; + break; + } err_out: acpi_evaluate_ost(adev->handle, src, ost_code, NULL);