From patchwork Fri Jul 7 06:25:23 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: 9829619 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 7987B602BD for ; Fri, 7 Jul 2017 06:25:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69D9D285E5 for ; Fri, 7 Jul 2017 06:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D8EA285F9; Fri, 7 Jul 2017 06:25:36 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 BC5D5285E5 for ; Fri, 7 Jul 2017 06:25:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750950AbdGGGZe (ORCPT ); Fri, 7 Jul 2017 02:25:34 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35496 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbdGGGZd (ORCPT ); Fri, 7 Jul 2017 02:25:33 -0400 Received: by mail-it0-f66.google.com with SMTP id v193so3969015itc.2; Thu, 06 Jul 2017 23:25:33 -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=xtM/YOyBdU5oCL79Y1vUUJezEZKFIeAMEJg8zwFi2W4=; b=fqBTDrKUqknMc2+dRyonY4wXg8QOUcwbUN7wT28shVc9ZIXBXceHTUYR6ifvwaRG6t T9Uc/7Ln23EwcVRHOWRnnJ5CS+GbhdWFYjJKdkF06oYPEga3K6ApIP0FyHsQ7aSwVWnh WWG8ZWmSAmai0tCtOaRyjwg+g8t7bM8vjPRnEqjrzN9XQGLonFlFcu6EvpVh3Hn3DLU+ tZOu6WK6fOu1pCrR3K0JtFPryLJ521NKhc3ADmDLKYd2i8CuM5/NQu/yz765WWjGQk2n JC8uKgIfgbo65A9ljhQ7GDBD9kn+G8pIQ/PEo7tXiOQKKZyv3eua6cHMKe2VgPmZZead UW+Q== 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=xtM/YOyBdU5oCL79Y1vUUJezEZKFIeAMEJg8zwFi2W4=; b=hD7NnE5n16qIVD2VjtRtX11MkM7msPwyhIRpfK2CKOA+CqhAJ6z/a+8rheOBQgRJA4 sSEI2Bl6w6gXZl2baQ8SkpstjRKiIrGZ87zGMUl1h82KJ38udRABFUIwNhhC8rQQrbCN kx1T6kgC7Mfp14cuZmJ92enw/mk/aMpqN7N/ThwWlEoxj1BcEIHyXTUcw28RKP6NeFh+ 3c6DXafUXo9LjdmqTmfSUIoOtkQnbDZCtwwo5PNH/DbM+N3JWeaOZwopbQDRN+LLrV2g thHNKqJwh/tobBev3BDeANgflsNq94DUZvrBGvNmKEqz+x+KD13+swof3kbPg1fNlDsm UvvQ== X-Gm-Message-State: AIVw112Pr7reUyhuSo85Zd2rFXYNzrgCUMHWSSv4YgmoEyuS62BY37tt BOoDQQtqXk+nRQ== X-Received: by 10.36.47.5 with SMTP id j5mr1289145itj.125.1499408732555; Thu, 06 Jul 2017 23:25:32 -0700 (PDT) Received: from linux-l9pv.suse ([45.122.156.254]) by smtp.gmail.com with ESMTPSA id 84sm1286833iog.39.2017.07.06.23.25.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 23:25:32 -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 , Michal Hocko Subject: [RFC PATCH v4] acpi: indicate to platform when hot remove returns busy Date: Fri, 7 Jul 2017 14:25:23 +0800 Message-Id: <20170707062523.29735-1-jlee@suse.com> X-Mailer: git-send-email 2.12.3 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: Michal Hocko Reviewed-by: Andy Shevchenko Signed-off-by: "Lee, Chun-Yi" --- 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);