From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A756BC433EF for ; Mon, 10 Jan 2022 01:50:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237988AbiAJBud (ORCPT ); Sun, 9 Jan 2022 20:50:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237985AbiAJBu3 (ORCPT ); Sun, 9 Jan 2022 20:50:29 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A392BC06173F for ; Sun, 9 Jan 2022 17:50:28 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6B11BB8111F for ; Mon, 10 Jan 2022 01:50:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9517EC36AF4; Mon, 10 Jan 2022 01:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641779426; bh=WwwztMYPBfFsKPyVwryWqLcipuz5ybC+HCXaS8W85SI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fsQ+YgNoDwEpSD30cHIQrcJtyUvQqlfdNGpV25P8+4XrSZTfdZ/+XydTlQgrktHEk 3VNZZ8V4MwCKQYwgViJRcbgao6Drn9VMRWf2pbnOc3htZn9EODsLLKcOTSz163T5+M ahBro/mG8So5mc7UJKamm3uhfb727oyej8Z3gx+JR7zEEkhkDLO6zvmrjL2toQNcgC BfEtg9IErwSrl9JAbfLoV9YVyaYl0mbe2JxWoXtyhju8mDfbin/vDgzHL3r9ga9CIV dHy6X7SvIc/V0SjWWI7Ld4Y4J7mCL4krCD+Ck/6Nb6K5jyhgtFd6XWDQyz2xksd9Yb teGNq9ftsJGbg== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Marc Zyngier , Lorenzo Pieralisi , Bjorn Helgaas Cc: pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH v2 01/23] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros with PCI_INTERRUPT_* Date: Mon, 10 Jan 2022 02:49:56 +0100 Message-Id: <20220110015018.26359-2-kabel@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220110015018.26359-1-kabel@kernel.org> References: <20220110015018.26359-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Pali Rohár Header file linux/pci.h defines enum pci_interrupt_pin with corresponding PCI_INTERRUPT_* values. Signed-off-by: Pali Rohár Signed-off-by: Marek Behún --- drivers/pci/controller/pci-aardvark.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index ec0df426863d..62baddd2ca95 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -39,10 +39,6 @@ #define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN BIT(6) #define PCIE_CORE_ERR_CAPCTL_ECRC_CHCK BIT(7) #define PCIE_CORE_ERR_CAPCTL_ECRC_CHCK_RCV BIT(8) -#define PCIE_CORE_INT_A_ASSERT_ENABLE 1 -#define PCIE_CORE_INT_B_ASSERT_ENABLE 2 -#define PCIE_CORE_INT_C_ASSERT_ENABLE 3 -#define PCIE_CORE_INT_D_ASSERT_ENABLE 4 /* PIO registers base address and register offsets */ #define PIO_BASE_ADDR 0x4000 #define PIO_CTRL (PIO_BASE_ADDR + 0x0) @@ -968,7 +964,7 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) bridge->conf.pref_mem_limit = cpu_to_le16(PCI_PREF_RANGE_TYPE_64); /* Support interrupt A for MSI feature */ - bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE; + bridge->conf.intpin = PCI_INTERRUPT_INTA; /* Aardvark HW provides PCIe Capability structure in version 2 */ bridge->pcie_conf.cap = cpu_to_le16(2); -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A474C433F5 for ; Mon, 10 Jan 2022 01:52:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rcxfgafnTGvxTHj+POR9p4x0oEwEeVqdFayrRvg2sBI=; b=fuetB0lBCTlEWW MOSaSOGPdWyNhxGQFyzFFMpbfJ6vBgCkD2ANijiBD55a1ZyYwCzETBkJxxmMLRWly5B3Z/ZIFxXz9 mPPMK1PPcFgYT645KTHNPMNL80Yek7Oh82c9fgHGLy5CGvXvMVtqTwclBGTtM/5kv6Uzj8oH/ujQk tfC8ziyCix2TVTzitb90TwVkuACALYlr9f9qHQP9mdBxplLi8f6vsHuKvO3DL/e/proccbcagfaGu oKv6ETf+mDLLIZPWP9DDfixUbC8+Pd7/Q4s6AhI6V6Tj5qC1zl66Fxyw8bfDmE4kNlr/YujiFXbuT 6+2/94BF0aEfcm2wy98Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6jpY-008ldu-1L; Mon, 10 Jan 2022 01:50:40 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6jpL-008lZ6-Jv for linux-arm-kernel@lists.infradead.org; Mon, 10 Jan 2022 01:50:28 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED4CC60EC8; Mon, 10 Jan 2022 01:50:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9517EC36AF4; Mon, 10 Jan 2022 01:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641779426; bh=WwwztMYPBfFsKPyVwryWqLcipuz5ybC+HCXaS8W85SI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fsQ+YgNoDwEpSD30cHIQrcJtyUvQqlfdNGpV25P8+4XrSZTfdZ/+XydTlQgrktHEk 3VNZZ8V4MwCKQYwgViJRcbgao6Drn9VMRWf2pbnOc3htZn9EODsLLKcOTSz163T5+M ahBro/mG8So5mc7UJKamm3uhfb727oyej8Z3gx+JR7zEEkhkDLO6zvmrjL2toQNcgC BfEtg9IErwSrl9JAbfLoV9YVyaYl0mbe2JxWoXtyhju8mDfbin/vDgzHL3r9ga9CIV dHy6X7SvIc/V0SjWWI7Ld4Y4J7mCL4krCD+Ck/6Nb6K5jyhgtFd6XWDQyz2xksd9Yb teGNq9ftsJGbg== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Marc Zyngier , Lorenzo Pieralisi , Bjorn Helgaas Cc: pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH v2 01/23] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros with PCI_INTERRUPT_* Date: Mon, 10 Jan 2022 02:49:56 +0100 Message-Id: <20220110015018.26359-2-kabel@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220110015018.26359-1-kabel@kernel.org> References: <20220110015018.26359-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220109_175027_721719_C665AA7C X-CRM114-Status: GOOD ( 12.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KCkhlYWRlciBmaWxlIGxpbnV4L3Bj aS5oIGRlZmluZXMgZW51bSBwY2lfaW50ZXJydXB0X3BpbiB3aXRoIGNvcnJlc3BvbmRpbmcKUENJ X0lOVEVSUlVQVF8qIHZhbHVlcy4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtl cm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IE1hcmVrIEJlaMO6biA8a2FiZWxAa2VybmVsLm9yZz4K LS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jIHwgNiArLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jIGIvZHJpdmVycy9wY2kvY29u dHJvbGxlci9wY2ktYWFyZHZhcmsuYwppbmRleCBlYzBkZjQyNjg2M2QuLjYyYmFkZGQyY2E5NSAx MDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktYWFyZHZhcmsuYworKysgYi9k cml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jCkBAIC0zOSwxMCArMzksNiBAQAog I2RlZmluZSAgICAgUENJRV9DT1JFX0VSUl9DQVBDVExfRUNSQ19DSEtfVFhfRU4JCQlCSVQoNikK ICNkZWZpbmUgICAgIFBDSUVfQ09SRV9FUlJfQ0FQQ1RMX0VDUkNfQ0hDSwkJCUJJVCg3KQogI2Rl ZmluZSAgICAgUENJRV9DT1JFX0VSUl9DQVBDVExfRUNSQ19DSENLX1JDVgkJCUJJVCg4KQotI2Rl ZmluZSAgICAgUENJRV9DT1JFX0lOVF9BX0FTU0VSVF9FTkFCTEUJCQkxCi0jZGVmaW5lICAgICBQ Q0lFX0NPUkVfSU5UX0JfQVNTRVJUX0VOQUJMRQkJCTIKLSNkZWZpbmUgICAgIFBDSUVfQ09SRV9J TlRfQ19BU1NFUlRfRU5BQkxFCQkJMwotI2RlZmluZSAgICAgUENJRV9DT1JFX0lOVF9EX0FTU0VS VF9FTkFCTEUJCQk0CiAvKiBQSU8gcmVnaXN0ZXJzIGJhc2UgYWRkcmVzcyBhbmQgcmVnaXN0ZXIg b2Zmc2V0cyAqLwogI2RlZmluZSBQSU9fQkFTRV9BRERSCQkJCTB4NDAwMAogI2RlZmluZSBQSU9f Q1RSTAkJCQkoUElPX0JBU0VfQUREUiArIDB4MCkKQEAgLTk2OCw3ICs5NjQsNyBAQCBzdGF0aWMg aW50IGFkdmtfc3dfcGNpX2JyaWRnZV9pbml0KHN0cnVjdCBhZHZrX3BjaWUgKnBjaWUpCiAJYnJp ZGdlLT5jb25mLnByZWZfbWVtX2xpbWl0ID0gY3B1X3RvX2xlMTYoUENJX1BSRUZfUkFOR0VfVFlQ RV82NCk7CiAKIAkvKiBTdXBwb3J0IGludGVycnVwdCBBIGZvciBNU0kgZmVhdHVyZSAqLwotCWJy aWRnZS0+Y29uZi5pbnRwaW4gPSBQQ0lFX0NPUkVfSU5UX0FfQVNTRVJUX0VOQUJMRTsKKwlicmlk Z2UtPmNvbmYuaW50cGluID0gUENJX0lOVEVSUlVQVF9JTlRBOwogCiAJLyogQWFyZHZhcmsgSFcg cHJvdmlkZXMgUENJZSBDYXBhYmlsaXR5IHN0cnVjdHVyZSBpbiB2ZXJzaW9uIDIgKi8KIAlicmlk Z2UtPnBjaWVfY29uZi5jYXAgPSBjcHVfdG9fbGUxNigyKTsKLS0gCjIuMzQuMQoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK