From patchwork Sat Jun 3 17:20:36 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: 9764419 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 91B9360363 for ; Sat, 3 Jun 2017 17:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C75F2846D for ; Sat, 3 Jun 2017 17:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D8BD28477; Sat, 3 Jun 2017 17:20:48 +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 99A4A2846D for ; Sat, 3 Jun 2017 17:20:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750991AbdFCRUq (ORCPT ); Sat, 3 Jun 2017 13:20:46 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32855 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbdFCRUp (ORCPT ); Sat, 3 Jun 2017 13:20:45 -0400 Received: by mail-pf0-f196.google.com with SMTP id f27so16027864pfe.0; Sat, 03 Jun 2017 10:20:45 -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=8cDGbR6uugk4QWyYV4MPFCVMkS3KMK3h+cYcLjImQf0=; b=GCVpEWSLNAKaGmfnvMNCl/HIvN2dt7CuGk3bhRvTnQRfuHAq2i+bWgDnOkiKEPLIUl x3VvQSRkSoKuBmYkuWrTixKK3XRmzb7hrVo/SvnRjgGdL492SWoCYgBgq16tYN0UAaG6 4iuBqbSn5qyDj3Ro09F1/t/kA7dDgfBcf51vayoUbzb977x6bKqLkEmVwNvceBL1eH1h 6tH63zokiTsCsLZZvvrhM23Nprg3OKOSU+EjgKxJ4xYY3SLrHzPwZ9nHw6hvsjzKxuXn zmHfZaRtl3isZ9EZxRaqSAyOOYJ3VESczZkUAYVMlMheuVr0z9EQ/CoCFNuRneREAimE CO2Q== 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=8cDGbR6uugk4QWyYV4MPFCVMkS3KMK3h+cYcLjImQf0=; b=nsTbR+VddCci16Af1xq9UCr7pjblvspra2N5wKXwXWt3G2ptN13c7rIE/PhXCiekxn XUYBOiB9FgnWx0cONfZBkLsBBQtIp9utRPWKzuoVBCfc5btirNxNsZqbplPn8Cw+O16i VMtRpmNZsyJXg4r3XGHVzJj7AJzptotf4stqVMg6723IYkPdgcxGArAsz1apAlvtVTh9 yl3nQ+PJfv5wqY1ytEARQRJ8CmFN+uIy6JzdlqEWf36K6tA9B8QOfyw04QdAcU87ysJq SrZ8ov7QSF1RbZalpM/B3XW5DmcMZV4ug2b/6LwRjgdOinPufb11uvuiPhstnKY2WJPA 82fw== X-Gm-Message-State: AODbwcB1Hy/D0/oUnM4Hi9EPAafU37hEX1vGdQvy9hTBiyPFlUeRBuCD jEzPbXRQ71pKonP+ X-Received: by 10.99.119.6 with SMTP id s6mr1538650pgc.215.1496510445103; Sat, 03 Jun 2017 10:20:45 -0700 (PDT) Received: from linux-uc2j.site ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id 187sm43192627pgc.46.2017.06.03.10.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Jun 2017 10:20:44 -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 Subject: [RFC PATCH] acpi: indicate to platform when hot remove returns busy Date: Sun, 4 Jun 2017 01:20:36 +0800 Message-Id: <20170603172036.7645-1-jlee@suse.com> X-Mailer: git-send-email 2.10.2 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 unknow 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. Cc: "Rafael J. Wysocki" Cc: Len Brown Signed-off-by: "Lee, Chun-Yi" --- drivers/acpi/scan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 2433569..d4aae9f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -374,8 +374,11 @@ static int acpi_scan_bus_check(struct acpi_device *adev) return 0; } -static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type) +static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type, + u32 *ost_code) { + int error = -EINVAL; + switch (type) { case ACPI_NOTIFY_BUS_CHECK: return acpi_scan_bus_check(adev); @@ -389,9 +392,11 @@ static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type) } acpi_evaluate_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL); - return acpi_scan_hot_remove(adev); + error = acpi_scan_hot_remove(adev); + if (error == -EBUSY && ost_code) + *ost_code = ACPI_OST_SC_DEVICE_BUSY; } - return -EINVAL; + return error; } void acpi_device_hotplug(struct acpi_device *adev, u32 src) @@ -413,7 +418,7 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src) if (adev->flags.is_dock_station) { error = dock_notify(adev, src); } else if (adev->flags.hotplug_notify) { - error = acpi_generic_hotplug_event(adev, src); + error = acpi_generic_hotplug_event(adev, src, &ost_code); if (error == -EPERM) { ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED; goto err_out;