From patchwork Sat Oct 1 17:46:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9359337 X-Patchwork-Delegate: bhelgaas@google.com 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 5BA8260757 for ; Sat, 1 Oct 2016 17:46:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50B9A28D6B for ; Sat, 1 Oct 2016 17:46:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4542128D6D; Sat, 1 Oct 2016 17:46: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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 EC5EE28D6B for ; Sat, 1 Oct 2016 17:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751804AbcJARqe (ORCPT ); Sat, 1 Oct 2016 13:46:34 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:51501 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbcJARq0 (ORCPT ); Sat, 1 Oct 2016 13:46:26 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 74D8D61AF3; Sat, 1 Oct 2016 17:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475343985; bh=6Cw0swca7IZeF0hy7FKcsuNGNyX+UzcnAA/gRdj6dYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUzemQwdsw5/wNpkB6SYqMLCVas7ldSFYWGSAzwkkiuA6Hdbn/JXsQ/ygZ8IqTR8r yQ4l++J1oOFTKVBqpgR6Vp7NWDuflDANxKHCchQM6/f280tTfBLGOzsRhkB6aIhva8 B5dwvntA1Aim/+MXTfdEt1yxxJdwvkdxIKlYHZrI= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E0C3261AD6; Sat, 1 Oct 2016 17:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475343984; bh=6Cw0swca7IZeF0hy7FKcsuNGNyX+UzcnAA/gRdj6dYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=isO5Jm9HJXgweOLXy9uhwxbkOM2o6Y4gybGbs6dY0skPdk58ESOf3P57kfR3fn4ti GVlb6Xe5Hl3nuYUXmbJ2KpQHTanWb8mLPquD34g5QWjKyZygegMBhGCxnCDhCZHpN0 4b86tSkU/3Ds5m0W4ebOOgx9R/1KASCMP+5RoNw4= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org E0C3261AD6 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-acpi@vger.kernel.org, rjw@rjwysocki.net, bhelgaas@google.com, ravikanth.nalla@hpe.com, linux@rainbow-software.org, timur@codeaurora.org, cov@codeaurora.org, jcm@redhat.com, alex.williamson@redhat.com Cc: linux-pci@vger.kernel.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, wim@djo.tudelft.nl, Sinan Kaya , Len Brown , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ACPI, PCI IRQ: add PCI_USING penalty for ISA interrupts Date: Sat, 1 Oct 2016 13:46:15 -0400 Message-Id: <1475343976-20744-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475343976-20744-1-git-send-email-okaya@codeaurora.org> References: <1475343976-20744-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The change introduced in commit 103544d86976 ("ACPI,PCI,IRQ: reduce resource requirements") removed PCI_USING penalty from acpi_pci_link_allocate function as there is no longer a fixed size penalty array for both PCI and IRQ interrupts. We need to add the PCI_USING penalty for ISA interrupts too if the link is in use and matches our ISA IRQ number. Signed-off-by: Sinan Kaya Tested-by: Jonathan Liu --- drivers/acpi/pci_link.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index f3792f4..06c2a11 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -620,6 +620,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) acpi_device_bid(link->device)); return -ENODEV; } else { + if (link->irq.active < ACPI_MAX_IRQS) + acpi_irq_penalty[link->irq.active] += + PIRQ_PENALTY_PCI_USING; + printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n", acpi_device_name(link->device), acpi_device_bid(link->device), link->irq.active);