From patchwork Thu Nov 5 08:00:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 317888 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=BAYES_00,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 autolearn=unavailable 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 B95CEC4741F for ; Thu, 5 Nov 2020 08:00:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5BFBE21D7F for ; Thu, 5 Nov 2020 08:00:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VlFn8fkc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729851AbgKEIAZ (ORCPT ); Thu, 5 Nov 2020 03:00:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24540 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729779AbgKEIAZ (ORCPT ); Thu, 5 Nov 2020 03:00:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604563224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ppIkeNqrQXwJdt2qFiq6mkdhN5t6W9eweFCWsL70/gw=; b=VlFn8fkcFKznPdCeXgJcW7dlVOtTgZtS82UTbbi4JzbDKN42tEMOpIIr6cnaU7h2VpmVwo 9SvZ+GBYjzL3wAnAoSEvHeGPoDK+A6sXPH6DvDxC5RkqNqx/7TISWH0a/jewvMo19TGjrb tJXtyuTaT+p/gJIUPAuGRWyOzHqSA5I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-536-BYT2nQZDMJ2OwZmL9xbmrQ-1; Thu, 05 Nov 2020 03:00:20 -0500 X-MC-Unique: BYT2nQZDMJ2OwZmL9xbmrQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2989364149; Thu, 5 Nov 2020 08:00:19 +0000 (UTC) Received: from x1.localdomain.com (ovpn-113-73.ams2.redhat.com [10.36.113.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1C2F5DA79; Thu, 5 Nov 2020 08:00:17 +0000 (UTC) From: Hans de Goede To: Mark Gross , Wolfram Sang Cc: Hans de Goede , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [RFC 1/4] i2c: core: Allow i2c_board_info to specify that the core should not try to find an IRQ Date: Thu, 5 Nov 2020 09:00:11 +0100 Message-Id: <20201105080014.45410-2-hdegoede@redhat.com> In-Reply-To: <20201105080014.45410-1-hdegoede@redhat.com> References: <20201105080014.45410-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org When I2C devices are enumerated/instantiated through ACPI tables then a single ACPI device may describe multiple separate I2C connected ICs. This is handled by the drivers/platform/x86/i2c-multi-instantiate.c code which contains a table which maps the ACPI-device-id to the information necessary to instantiate the i2c-clients (type and IRQ routing for each described IC). In some cases the i2c-driver may need access to the ACPI-fwnode as that may contain ACPI-methods supplying e.g. orientation-matrix info for accelerometers. Currently setting i2c_board_info.fwnode to point to the ACPI-fwnode will cause the i2c-core to call i2c_acpi_get_irq() for any i2c-clients for which i2c-multi-instantiate.c has not passed an IRQ in i2c_board_info.irq, messing up the IRQ routing done by i2c-multi-instantiate.c. Make i2c_device_probe() accept a client->init_irq value < 0 to skip the i2c-core IRQ handling, while still setting client->irq to 0 after checking for this, since most i2c-drivers expect client->irq == 0 for clients without an IRQ. This allows i2c-multi-instantiate.c to set i2c_board_info.irq = -ENOENT for clients without an IRQ and pass the ACPI-fwnode without issues. Signed-off-by: Hans de Goede --- drivers/i2c/i2c-core-base.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 573b5da145d1..1887e2267031 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -467,11 +467,10 @@ static int i2c_device_probe(struct device *dev) goto put_sync_adapter; } - if (irq < 0) - irq = 0; - client->irq = irq; } + if (client->irq < 0) + client->irq = 0; driver = to_i2c_driver(dev->driver); From patchwork Thu Nov 5 08:00:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 317887 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=BAYES_00,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 autolearn=unavailable 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 5D00DC00A89 for ; Thu, 5 Nov 2020 08:00:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05D112071A for ; Thu, 5 Nov 2020 08:00:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NXyWz2R4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729938AbgKEIA2 (ORCPT ); Thu, 5 Nov 2020 03:00:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31076 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729867AbgKEIA2 (ORCPT ); Thu, 5 Nov 2020 03:00:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604563227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QexiIGh65OkVEakRusDkQrbb7GvquS9RxDdYOuUFhO0=; b=NXyWz2R4StlCyg4hifdMFieH7vTIlCHJvh290YJAWuq75TUFwddPzsHmUwZKcL0EDN6hZu qCSdZtml+SqK8+x6fI1u7U8old3gjIh2Rja9BeVqcqKyWOTP3+ZZCW1SNURKf8Pt9rrnZY 6+5yGlP98fLwsVbmBtalM3ONS5qJMRo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-C9DdjN0dPPGYzPhvx0ALig-1; Thu, 05 Nov 2020 03:00:25 -0500 X-MC-Unique: C9DdjN0dPPGYzPhvx0ALig-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67F9D64158; Thu, 5 Nov 2020 08:00:24 +0000 (UTC) Received: from x1.localdomain.com (ovpn-113-73.ams2.redhat.com [10.36.113.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id E91C65D98F; Thu, 5 Nov 2020 08:00:22 +0000 (UTC) From: Hans de Goede To: Mark Gross , Wolfram Sang Cc: Hans de Goede , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [RFC 4/4] platform/x86: i2c-multi-instantiate: Add IRQ_RESOURCE_GPIO_OPTIONAL IRQ type Date: Thu, 5 Nov 2020 09:00:14 +0100 Message-Id: <20201105080014.45410-5-hdegoede@redhat.com> In-Reply-To: <20201105080014.45410-1-hdegoede@redhat.com> References: <20201105080014.45410-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Most I2C-drivers treat IRQs as optional and in some cases ACPI devices managed by i2c-multi-instantiate.c may have a GpioInt resource specified on some systems, while it is not there on others. Add a new IRQ_RESOURCE_GPIO_OPTIONAL IRQ type, which still tries to get a GpioInt IRQ, but does not consider it a fatal error when this fails. Signed-off-by: Hans de Goede --- drivers/platform/x86/i2c-multi-instantiate.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c index cbccfcbed44c..55c6d6e8d576 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/i2c-multi-instantiate.c @@ -15,10 +15,11 @@ #include #include -#define IRQ_RESOURCE_TYPE GENMASK(1, 0) -#define IRQ_RESOURCE_NONE 0 -#define IRQ_RESOURCE_GPIO 1 -#define IRQ_RESOURCE_APIC 2 +#define IRQ_RESOURCE_TYPE GENMASK(1, 0) +#define IRQ_RESOURCE_NONE 0 +#define IRQ_RESOURCE_GPIO 1 +#define IRQ_RESOURCE_GPIO_OPTIONAL 2 +#define IRQ_RESOURCE_APIC 3 struct i2c_inst_data { const char *type; @@ -64,6 +65,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) struct i2c_board_info board_info = {}; struct device *dev = &pdev->dev; struct acpi_device *adev; + bool irq_optional; char name[32]; int i, ret; @@ -94,10 +96,14 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) inst_data[i].type, i); board_info.dev_name = name; board_info.fwnode = dev->fwnode; + irq_optional = false; switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) { + case IRQ_RESOURCE_GPIO_OPTIONAL: + irq_optional = true; + fallthrough; case IRQ_RESOURCE_GPIO: ret = acpi_dev_gpio_irq_get(adev, inst_data[i].irq_idx); - if (ret < 0) { + if (ret < 0 && (!irq_optional || ret != -ENOENT)) { dev_err(dev, "Error requesting irq at index %d: %d\n", inst_data[i].irq_idx, ret); goto error;