From patchwork Wed Oct 19 22:21:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9385493 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 B9E1160487 for ; Wed, 19 Oct 2016 22:21:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC0B328B8F for ; Wed, 19 Oct 2016 22:21:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0CF129107; Wed, 19 Oct 2016 22:21:18 +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 4B1CB28B8F for ; Wed, 19 Oct 2016 22:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932165AbcJSWVR (ORCPT ); Wed, 19 Oct 2016 18:21:17 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:38348 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754818AbcJSWVN (ORCPT ); Wed, 19 Oct 2016 18:21:13 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id EBA7D61B1E; Wed, 19 Oct 2016 22:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476915672; bh=F9Fsd68b2cQDYzEySBO49s/yYvswi2PPxQ/hpLilmCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIoqgiPcNN+PDu9bzm0jREMs+ToO3BzZfm2C85ibHUkzsnRUVsV7KgSuZOHtVAfQX FSGjpCowvUHHHyXjIj8ofA1RqQDoUsrVAJYCJqsfUZ6z3JLZ2tRiKM+4Fqc9GrAcV1 037Q4MAHsN4ODQM4PtFTZIk3nRUEDlm8O4r1YnOk= 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 3E71361AF5; Wed, 19 Oct 2016 22:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476915672; bh=F9Fsd68b2cQDYzEySBO49s/yYvswi2PPxQ/hpLilmCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIoqgiPcNN+PDu9bzm0jREMs+ToO3BzZfm2C85ibHUkzsnRUVsV7KgSuZOHtVAfQX FSGjpCowvUHHHyXjIj8ofA1RqQDoUsrVAJYCJqsfUZ6z3JLZ2tRiKM+4Fqc9GrAcV1 037Q4MAHsN4ODQM4PtFTZIk3nRUEDlm8O4r1YnOk= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 3E71361AF5 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 V4 1/3] ACPI, PCI, IRQ: assign ISA IRQ directly during early boot stages Date: Wed, 19 Oct 2016 18:21:02 -0400 Message-Id: <1476915664-27231-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476915664-27231-1-git-send-email-okaya@codeaurora.org> References: <1476915664-27231-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 penalty determination of ISA IRQ goes through 4 paths. 1. assign PCI_USING during power up via acpi_irq_penalty_init. 2. update the penalty with acpi_penalize_isa_irq function based on the active parameter. 3. kernel command line penalty update via acpi_irq_penalty_update function. 4. increment the penalty as USING right after the IRQ is assign to PCI. acpi_penalize_isa_irq and acpi_irq_penalty_update functions get called before the ACPI subsystem is started. These API need to bypass the acpi_irq_get_penalty function. Signed-off-by: Sinan Kaya Acked-by: Bjorn Helgaas Tested-by: Jonathan Liu --- drivers/acpi/pci_link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index c983bf7..4f37938 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -849,7 +849,7 @@ static int __init acpi_irq_penalty_update(char *str, int used) continue; if (used) - new_penalty = acpi_irq_get_penalty(irq) + + new_penalty = acpi_isa_irq_penalty[irq] + PIRQ_PENALTY_ISA_USED; else new_penalty = 0; @@ -871,7 +871,7 @@ static int __init acpi_irq_penalty_update(char *str, int used) void acpi_penalize_isa_irq(int irq, int active) { if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty))) - acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) + + acpi_isa_irq_penalty[irq] = acpi_isa_irq_penalty[irq] + (active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING); }