From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBFF6C433FF for ; Mon, 29 Jul 2019 20:50:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0E2A21655 for ; Mon, 29 Jul 2019 20:50:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="g8Xe3U6r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387975AbfG2Uup (ORCPT ); Mon, 29 Jul 2019 16:50:45 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35377 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387557AbfG2Uup (ORCPT ); Mon, 29 Jul 2019 16:50:45 -0400 Received: by mail-pg1-f193.google.com with SMTP id s1so22537860pgr.2 for ; Mon, 29 Jul 2019 13:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X7NRnVGXrnkZVd1ruHSDb2QmanWeOsJggEzv5XoJGLk=; b=g8Xe3U6r1WMKS9LpTAo8v7PyLN4NImhzdcIDuTFJxjhqOMMqVGDOJjqGbC75u9jGrJ 9rsfp0fNe+B9+Hbw+xEHeY2lF+yRVDjVlZsBN1gUShyUBLJukIfvAsmnbEfn0tVfS53J OAT0K+ESCnlT0PVCnpsbnTZ7Gr+WLrfaxnnnQ= 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:mime-version :content-transfer-encoding; bh=X7NRnVGXrnkZVd1ruHSDb2QmanWeOsJggEzv5XoJGLk=; b=T+bGq4BWERctd1llFzyNuFaO2je+1azibq+BZno8W+OwQpIQnCkkTWjtkhTcAwYC4t f9aynmaYXyBBa5SXu1F3mYBRlMDJX2P48xlIsDpD3FH5uXrIwpJ0EbbgSoub2ePXY18x W573phnisSV40ssXi5+LWeoy8csqVgWzBNg7TjoMywqLH7+Kc+6zSuZiOASI/FrQ96+Z x4/rQP7KG4EM0aH5Z9KMP/j04vowGuCIBdiScQzTaCujGYanFiCcHua+OQrmN9ZGJSwT g512pJXryIBwzf9VR9G17oDuwRGgdyjPUsP2wcBAQ22d8SuE9CGRBS+JaIs4mGSZwf+g 0xng== X-Gm-Message-State: APjAAAW+JuXsFQUJAq0JtNGoduP/1PnVuwWTmoETTiWUmH8nME12EYtg BpPnW42DQXoLOqI1x/yRD5fa0Q== X-Google-Smtp-Source: APXvYqxP+VotuzvhmIqzWu9T/9V4wCTVnjtv++12+Cq7MoRt8by6kh1T/3tOa+KoGk5BEbIp77zndA== X-Received: by 2002:aa7:9146:: with SMTP id 6mr37179555pfi.67.1564433444420; Mon, 29 Jul 2019 13:50:44 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id l44sm55364485pje.29.2019.07.29.13.50.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 13:50:43 -0700 (PDT) From: Brian Norris To: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" , , andriy.shevchenko@linux.intel.com, Salvatore Bellizzi , andy.shevchenko@gmail.com, Dmitry Torokhov , egranata@chromium.org, egranata@google.com, Enric Balletbo i Serra , Gwendal Grignou , linux-acpi@vger.kernel.org, Benson Leung , Brian Norris , stable@vger.kernel.org Subject: [PATCH] driver core: platform: return -ENXIO for missing GpioInt Date: Mon, 29 Jul 2019 13:49:54 -0700 Message-Id: <20190729204954.25510-1-briannorris@chromium.org> X-Mailer: git-send-email 2.22.0.709.g102302147b-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Commit daaef255dc96 ("driver: platform: Support parsing GpioInt 0 in platform_get_irq()") broke the Embedded Controller driver on most LPC Chromebooks (i.e., most x86 Chromebooks), because cros_ec_lpc expects platform_get_irq() to return -ENXIO for non-existent IRQs. Unfortunately, acpi_dev_gpio_irq_get() doesn't follow this convention and returns -ENOENT instead. So we get this error from cros_ec_lpc: couldn't retrieve IRQ number (-2) I see a variety of drivers that treat -ENXIO specially, so rather than fix all of them, let's fix up the API to restore its previous behavior. I reported this on v2 of this patch: https://lore.kernel.org/lkml/20190220180538.GA42642@google.com/ but apparently the patch had already been merged before v3 got sent out: https://lore.kernel.org/lkml/20190221193429.161300-1-egranata@chromium.org/ and the result is that the bug landed and remains unfixed. I differ from the v3 patch by: * allowing for ret==0, even though acpi_dev_gpio_irq_get() specifically documents (and enforces) that 0 is not a valid return value (noted on the v3 review) * adding a small comment Reported-by: Brian Norris Reported-by: Salvatore Bellizzi Cc: Enrico Granata Cc: Fixes: daaef255dc96 ("driver: platform: Support parsing GpioInt 0 in platform_get_irq()") Signed-off-by: Brian Norris --- Side note: it might have helped alleviate some of this pain if there were email notifications to the mailing list when a patch gets applied. I didn't realize (and I'm not sure if Enrico did) that v2 was already merged by the time I noted its mistakes. If I had known, I would have suggested a follow-up patch, not a v3. I know some maintainers' "tip bots" do this, but not all apparently. drivers/base/platform.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 506a0175a5a7..ec974ba9c0c4 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -157,8 +157,13 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) * the device will only expose one IRQ, and this fallback * allows a common code path across either kind of resource. */ - if (num == 0 && has_acpi_companion(&dev->dev)) - return acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num); + if (num == 0 && has_acpi_companion(&dev->dev)) { + int ret = acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num); + + /* Our callers expect -ENXIO for missing IRQs. */ + if (ret >= 0 || ret == -EPROBE_DEFER) + return ret; + } return -ENXIO; #endif -- 2.22.0.709.g102302147b-goog