From patchwork Fri Jul 1 16:03:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Gondois X-Patchwork-Id: 1651299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4LZKkV0qP6z9s09 for ; Sat, 2 Jul 2022 02:03:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230000AbiGAQDm (ORCPT ); Fri, 1 Jul 2022 12:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230452AbiGAQDi (ORCPT ); Fri, 1 Jul 2022 12:03:38 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 194FD1EC6A; Fri, 1 Jul 2022 09:03:37 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2A6A0113E; Fri, 1 Jul 2022 09:03:37 -0700 (PDT) Received: from pierre123.arm.com (unknown [10.57.40.143]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E2EEE3F66F; Fri, 1 Jul 2022 09:03:34 -0700 (PDT) From: Pierre Gondois To: linux-eng@arm.com Cc: Pierre Gondois , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] ACPI/PCI: Make _SRS optional for link device Date: Fri, 1 Jul 2022 18:03:07 +0200 Message-Id: <20220701160309.2842180-1-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Pierre Gondois In ACPI 6.4, s6.2.13 "_PRT (PCI Routing Table)", PCI legacy interrupts can be described though a link device (first model). From s6.2.16 "_SRS (Set Resource Settings)": "This optional control method [...]" Make it optional to have a _SRS method for link devices. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215560 Signed-off-by: Pierre Gondois --- drivers/acpi/pci_link.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 58647051c948..129e3e7e80ee 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -288,6 +288,13 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) if (!irq) return -EINVAL; + if (!acpi_has_method(handle, METHOD_NAME__SRS)) { + if (link->irq.active == irq) + return 0; + acpi_handle_err(handle, "Unable to set IRQ %d: No _SRS.\n", irq); + return -ENODEV; + } + resource = kzalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL); if (!resource) return -ENOMEM; From patchwork Fri Jul 1 16:03:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Gondois X-Patchwork-Id: 1651300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4LZKkW2Hp7z9s09 for ; Sat, 2 Jul 2022 02:03:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbiGAQDo (ORCPT ); Fri, 1 Jul 2022 12:03:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231442AbiGAQDk (ORCPT ); Fri, 1 Jul 2022 12:03:40 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 88C241F2DF; Fri, 1 Jul 2022 09:03:39 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 98867143D; Fri, 1 Jul 2022 09:03:39 -0700 (PDT) Received: from pierre123.arm.com (unknown [10.57.40.143]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 61C8F3F66F; Fri, 1 Jul 2022 09:03:37 -0700 (PDT) From: Pierre Gondois To: linux-eng@arm.com Cc: Pierre Gondois , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] ACPI/PCI: Make _PRS optional for link device Date: Fri, 1 Jul 2022 18:03:08 +0200 Message-Id: <20220701160309.2842180-2-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220701160309.2842180-1-pierre.gondois@arm.com> References: <20220701160309.2842180-1-pierre.gondois@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Pierre Gondois In ACPI 6.4, s6.2.13 "_PRT (PCI Routing Table)", PCI legacy interrupts can be described though a link device (first model). From s6.2.12 "_PRS (Possible Resource Settings)": "This optional object evaluates [...]" It is currently checked that the interrupt advertised in _CRS is one of the interrupts available in _PRS. Make this check conditional to the presence of _PRS. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215560 Signed-off-by: Pierre Gondois --- drivers/acpi/pci_link.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 129e3e7e80ee..b5a41866f135 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -532,19 +532,10 @@ int __init acpi_irq_penalty_init(void) static int acpi_irq_balance = -1; /* 0: static, 1: balance */ -static int acpi_pci_link_allocate(struct acpi_pci_link *link) +static int select_from_possible(struct acpi_pci_link *link) { - acpi_handle handle = link->device->handle; - int irq; int i; - if (link->irq.initialized) { - if (link->refcnt == 0) - /* This means the link is disabled but initialized */ - acpi_pci_link_set(link, link->irq.active); - return 0; - } - /* * search for active IRQ in list of possible IRQs. */ @@ -557,8 +548,9 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) */ if (i == link->irq.possible_count) { if (acpi_strict) - acpi_handle_warn(handle, "_CRS %d not found in _PRS\n", - link->irq.active); + acpi_handle_warn(link->device->handle, + "_CRS %d not found in _PRS\n", + link->irq.active); link->irq.active = 0; } @@ -566,9 +558,28 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) * if active found, use it; else pick entry from end of possible list. */ if (link->irq.active) - irq = link->irq.active; + return link->irq.active; + else + return link->irq.possible[link->irq.possible_count - 1]; +} + +static int acpi_pci_link_allocate(struct acpi_pci_link *link) +{ + acpi_handle handle = link->device->handle; + int irq; + int i; + + if (link->irq.initialized) { + if (link->refcnt == 0) + /* This means the link is disabled but initialized */ + acpi_pci_link_set(link, link->irq.active); + return 0; + } + + if (link->irq.possible_count) + irq = select_from_possible(link); else - irq = link->irq.possible[link->irq.possible_count - 1]; + irq = link->irq.active; if (acpi_irq_balance || !link->irq.active) { /*