Message ID | 20180921102155.22839-30-kishon@ti.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp629594ljw; Fri, 21 Sep 2018 03:25:12 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaJZy8Aj8o4grAwObkdQ1SyeTNYwo+YyUH9dos8kuvYfd2lgIC9P/ZJdGEseZgTL652vP9Z X-Received: by 2002:a17:902:b492:: with SMTP id y18-v6mr6362095plr.208.1537525511972; Fri, 21 Sep 2018 03:25:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537525511; cv=none; d=google.com; s=arc-20160816; b=ZTh1K2oCTQIfxCqC0QrLzbdhCOAT0ODmzOTqxSLXOYd3klNQsaQHCfsE9OkABVMZOE bj4eNgZGfME8oTByR+eAbPvhzC6KfWhj4JiQB2u8OfWOljfQrXZ5mS1RkOWWbqdOtRUe p3xs4Qj+/IWCpbV0aS4gcRyzqzQrNEMRhxkqjL7iTKriqqcWJEdV7W0XC4jEJ9glF0je eGqThJFzfrL+vKrv+AZSzeoEdJNjaJqBKQtLqqF+p/neWvAeg4SgTn3TOEP1SHFkncOT MxteLQllQbxVjIrKznf6fk26u6BZV5k8waUBWixDuE2EFVPnK7do1S1lF1aN6UtXyloF rHCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ctc4e/xsmLuyHnBieUhBknnPJYfDslzVYzZW978E0Bk=; b=aFOKR/pRJeFyjO6sCyVWp6mYgFSRuDB9k43ev7ATQPmfi+X5Huwk7d7ac6GTskP8ax kfPgBC1bvWFRGM8znwinc88QptMN6tyXeY3hGoz4WGDl11KjdSnFeFLO1nh9Pm+4xPKw yCL0FCRxdGhV1fflLd8FMxaWXnuS3mFS+KOp9GCypVBFFPtiZokgYrCWx7gWalFI/YL3 lo5siUiqSmfJw1eAiVYGL0j8BRf6nYZG3tgL7jtpQcEO6a55rAv9aneCDg8Uckl7UZad 8YrF7eQxQXd7F3kxFoJaXNKTqprIXV3YWa1XEGDU6MIDTaxaYED8xx/+V1X9S6Kz0r6P B9uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=GEPsVoNB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: <linux-kernel-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m23-v6si7702139pgn.603.2018.09.21.03.25.11; Fri, 21 Sep 2018 03:25:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=GEPsVoNB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390229AbeIUQNW (ORCPT <rfc822;igor.opaniuk@linaro.org> + 32 others); Fri, 21 Sep 2018 12:13:22 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:35190 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389686AbeIUQNK (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 21 Sep 2018 12:13:10 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8LAOY4o030647; Fri, 21 Sep 2018 05:24:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537525474; bh=ctc4e/xsmLuyHnBieUhBknnPJYfDslzVYzZW978E0Bk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=GEPsVoNBVcUrwbnUHpmEMrK5G24yzgk/vD+ITtdBmGSdxe7zq3S+ZwFW/L0gZ/TDM 8OgckNAWmf9x6HyaOc4Iy33uTWSSG8Vy6ZlGZ+DrZhuQ3hWm4AYdtESZbs0o6UOPPC xI+CglX9YwDd0ZGiyiKToCmrblPT6X4M7vwYlFDw= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8LAOYx1020364; Fri, 21 Sep 2018 05:24:34 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 21 Sep 2018 05:24:34 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Fri, 21 Sep 2018 05:24:34 -0500 Received: from a0393678ub.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8LAMEtX032280; Fri, 21 Sep 2018 05:24:30 -0500 From: Kishon Vijay Abraham I <kishon@ti.com> To: Jingoo Han <jingoohan1@gmail.com>, Joao Pinto <Joao.Pinto@synopsys.com>, Bjorn Helgaas <bhelgaas@google.com>, Rob Herring <robh+dt@kernel.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Murali Karicheri <m-karicheri2@ti.com>, Kishon Vijay Abraham I <kishon@ti.com>, <Gustavo.Pimentel@synopsys.com> CC: Mark Rutland <mark.rutland@arm.com>, Santosh Shilimkar <ssantosh@kernel.org>, Tero Kristo <t-kristo@ti.com>, Nishanth Menon <nm@ti.com>, <linux-pci@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Subject: [RFC PATCH 29/40] PCI: keystone: Prevent ARM32 specific code to be compiled for ARM64 Date: Fri, 21 Sep 2018 15:51:44 +0530 Message-ID: <20180921102155.22839-30-kishon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921102155.22839-1-kishon@ti.com> References: <20180921102155.22839-1-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org |
Series |
Cleanup pci-keystone.c and Add AM654 PCIe Support
|
expand
|
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index e8328039a017..91337e9c87a5 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -493,6 +493,7 @@ static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) return 0; } +#ifdef CONFIG_ARM /* * When a PCI device does not exist during config cycles, keystone host gets a * bus error instead of returning 0xffffffff. This handler always returns 0 @@ -512,6 +513,7 @@ static int ks_pcie_fault(unsigned long addr, unsigned int fsr, return 0; } +#endif static void ks_pcie_setup_mem_space(struct keystone_pcie *ks_pcie) { @@ -592,12 +594,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) if (ret < 0) return ret; +#ifdef CONFIG_ARM /* * PCIe access errors that result into OCP errors are caught by ARM as * "External aborts" */ hook_fault_code(17, ks_pcie_fault, SIGBUS, 0, "Asynchronous external abort"); +#endif ks_pcie_start_link(pci); return dw_pcie_wait_for_link(pci);
hook_fault_code is an ARM32 specific API for hooking into data abort. Since pci-keystone.c will be used for AM65X platforms which is an ARM64 platform, allow hook_fault_code to be compiled only for ARM32. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/pci/controller/dwc/pci-keystone.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1