From patchwork Tue Nov 6 13:20:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 10670375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2931213A4 for ; Tue, 6 Nov 2018 13:23:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1536C2A3D9 for ; Tue, 6 Nov 2018 13:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 071C82A40D; Tue, 6 Nov 2018 13:23:41 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEFAC2A3D9 for ; Tue, 6 Nov 2018 13:23:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5nx2bAfN8OaXcDykKS9BCch4OWAmRgOSUvY7kmzXIwA=; b=tYo9kTQ2VNpaDf ttFAjb03y4Ovs2YhCaARRLWWBIc6ST6vtZJsQk9pM7nee6FZp37KS+ZZuUoyosZO/anD6p8ZyfZzw ICjQV0obNc1y5ABCkkvpVFPKlN/FAYhzy3SHsM+0gWfbw2+jRZwaBa7xRz17hpwfAbeApnY9Q22Rr eh+2U7gIY/t/sFthtLIpRBSh6xP4v14MEvkdSl44gAtPQtC6kDixsJd4Amqc4bmi138jOPM3CwlkY xWEc3hu3AQ3hwKTvzHUD7ugS4ALOlwLfP7lGfTuLCzcKJem7PGlIiLsXCJpVjq8pXyobzaX2e0Z4K nQkxBe6rvd5/yPwEj5Xw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gK1KF-0004rN-QC; Tue, 06 Nov 2018 13:23:23 +0000 Received: from mail-he1eur01on061c.outbound.protection.outlook.com ([2a01:111:f400:fe1e::61c] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gK1HT-0000r5-9v for linux-arm-kernel@lists.infradead.org; Tue, 06 Nov 2018 13:20:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vLCzTSVXqk69mjV2G0uMjdSuJB0D7mj0QkDfLtG61lc=; b=nx7neKGs2mMSe4Uym3gizNi4EEC9paTqqDbAMph9jLd6JUhxesErw2seBa7Cvw6jM3JL8hoP1njqtkA+EKg97VeCyFuvvslnE9RIP0uweL9u+3PRbrBegyWMRSoV9x507NCyh8lNKbe44n+LyonwoLYjfMJXDmasf0s4xVRcj4c= Received: from DB5PR04MB1221.eurprd04.prod.outlook.com (10.162.155.27) by DB5PR04MB1414.eurprd04.prod.outlook.com (10.162.221.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Tue, 6 Nov 2018 13:20:17 +0000 Received: from DB5PR04MB1221.eurprd04.prod.outlook.com ([fe80::6c36:f4cb:26c2:e8cb]) by DB5PR04MB1221.eurprd04.prod.outlook.com ([fe80::6c36:f4cb:26c2:e8cb%2]) with mapi id 15.20.1273.035; Tue, 6 Nov 2018 13:20:17 +0000 From: "Z.q. Hou" To: "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "bhelgaas@google.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "l.subrahmanya@mobiveil.co.in" , "shawnguo@kernel.org" , Leo Li , "lorenzo.pieralisi@arm.com" Subject: [PATCH 11/23] PCI: mobiveil: only fixup the Class Code field Thread-Topic: [PATCH 11/23] PCI: mobiveil: only fixup the Class Code field Thread-Index: AQHUddN1NZze+4D3a0WmVRogFB+YMw== Date: Tue, 6 Nov 2018 13:20:16 +0000 Message-ID: <20181106131807.29951-12-Zhiqiang.Hou@nxp.com> References: <20181106131807.29951-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20181106131807.29951-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0008.apcprd03.prod.outlook.com (2603:1096:203:2e::20) To DB5PR04MB1221.eurprd04.prod.outlook.com (2a01:111:e400:51c2::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5PR04MB1414; 6:M7txVNWWM/xN+eQBg3HFXyYnHcV3le7ItrSVU4pgZrDDeSL5x4qCo9ANJUqsPzAAv+v31q5OcSHjmw0JUVtzjdyB0nLofc+bYzDd65z3bIXlAnOFiXkyG94filzcBJQ1tVG5vmja9FNkciHV8E5XKLq55ScaDaFaeK2yvoEnBBq/EG7g88Mb3gVeqp0XTKFyWiJwU1ohJ9/uHlQmCvGgFOUknXkvhSFDn8srBjjk62kdJddvPz5uUMWGbFEhfIGTsfbTl81oCedVSnbpfocHEE5ozWyq9SSSlDk2VIPj0E7eXcUmxbCih1l1kf/q+Hkp+rFGFfe7VMEYZh72PdA55YllWHSpcQHuJ1C3t4aW1nsyh5MwsO7ooRqcNrTwHg1m4Rbb1UIPrPaIPKdAkTrRLV2SWBYfeU20CsJl/ODbHNcQAs9i0knlWeZvCt9GwU4FHhb4N9MIt6VyBwdzbZxzpg==; 5:DGTZyReU+cZAnoZ9cUR734rNtYRr7753my6xe/C5qQhTWb6SkuZ561vJrK/AwCK8fP6s4WydJovEaNQNidJsG0c/zukomzCTdn7i8QJOIArXpIhxrw+ADofSx4YTEmxUxKz+OKh37UKrgHcnkR3x0q+qr1B1j9PIELr7UGUkANc=; 7:VCMmf2c9wG3mVqk3t36eVMgmaYw5a1EKJ++hUnElrq1DiSoAyyRNCZC1X4CVIUlxt4pLSBNDr9xIdFgoH/d5lGr0GoVntnyueQo5k4+ugV1be/p3sLlPsyL4MaPw+/rZRDOYD06RFMtCK/NHtmNaVg== x-ms-office365-filtering-correlation-id: 80a4a48f-863a-423a-2beb-08d643ea9798 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1414; x-ms-traffictypediagnostic: DB5PR04MB1414: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB5PR04MB1414; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1414; x-forefront-prvs: 0848C1A6AA x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(376002)(346002)(136003)(189003)(199004)(97736004)(66066001)(8936002)(81156014)(81166006)(7416002)(8676002)(5660300001)(71200400001)(71190400001)(478600001)(6486002)(6116002)(2900100001)(1076002)(53936002)(6436002)(6512007)(305945005)(4326008)(25786009)(7736002)(105586002)(106356001)(68736007)(2906002)(3846002)(256004)(26005)(486006)(2501003)(14454004)(99286004)(52116002)(76176011)(36756003)(110136005)(386003)(6506007)(102836004)(54906003)(86362001)(186003)(446003)(11346002)(316002)(2616005)(476003)(2201001)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1414; H:DB5PR04MB1221.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: CNsQ/t8Sk6vuQS0PzBsvjhB77nUE1qe76sEwgzeuQO7iiNnUaTN6vPh7D5VnPmjp+2sYjvIZejUcJBPN+Z4WegnRn1x7XSVAu83oqMv/voNvYhWpw1v1PnC96nUmpp4yiG0YQfEhk0x5VtmCsqR7NWQyhHnEORffGngNVOGbMyuEAxqFqDoNWSmSMxTnmkiBzBkICmz6tR1j+BFLDXjAvli28hxgyp/m6vCdz7pQ3173G8C5KArB5YqHN/fOMuUR9hCpHpp+OVPHQ+gLkmAYt5bA9o8Bg2PLZLkWGFZlIH+/1sUsf0EvjE86NBYMv3fFf43A/iaPq4v9ggxyAGMdn+wutYDhBfW/Tzb5qEQNz1Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80a4a48f-863a-423a-2beb-08d643ea9798 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2018 13:20:16.9909 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1414 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181106_052031_385595_9C4373EF X-CRM114-Status: GOOD ( 14.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "M.h. Lian" , "Z.q. Hou" , Xiaowei Bao , Mingkai Hu Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hou Zhiqiang Fixup the Class Code to PCI bridge, do not change the Revision ID. And move the fixup to *_host_init function. Signed-off-by: Hou Zhiqiang --- drivers/pci/controller/pcie-mobiveil.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c index 884c9f95374d..8e3630359597 100644 --- a/drivers/pci/controller/pcie-mobiveil.c +++ b/drivers/pci/controller/pcie-mobiveil.c @@ -652,6 +652,12 @@ static int mobiveil_host_init(struct mobiveil_pcie *pcie) type, resource_size(win->res)); } + /* fixup for PCIe class register */ + value = csr_readl(pcie, PAB_INTP_AXI_PIO_CLASS); + value &= 0xff; + value |= (PCI_CLASS_BRIDGE_PCI << 16); + csr_writel(pcie, value, PAB_INTP_AXI_PIO_CLASS); + /* setup MSI hardware registers */ mobiveil_pcie_enable_msi(pcie); @@ -895,9 +901,6 @@ static int mobiveil_pcie_probe(struct platform_device *pdev) goto error; } - /* fixup for PCIe class register */ - csr_writel(pcie, 0x060402ab, PAB_INTP_AXI_PIO_CLASS); - /* initialize the IRQ domains */ ret = mobiveil_pcie_init_irq_domain(pcie); if (ret) {