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 X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3413C282CE for ; Fri, 12 Apr 2019 08:35:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A75B12084D for ; Fri, 12 Apr 2019 08:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="NuqG/CGr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727354AbfDLIf0 (ORCPT ); Fri, 12 Apr 2019 04:35:26 -0400 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:59521 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725973AbfDLIf0 (ORCPT ); Fri, 12 Apr 2019 04:35:26 -0400 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=tihGF5jurDcVNgTrzVPkP6FnaGR6og8OayLAp3RWDJ4=; b=NuqG/CGrs6qHyZdxqJ45BT6h82zvXeyEmXuWj8LPojhlEJr7T50OK+ClQARKE5Ex03PK578W4/EXVBEMtxFP0wnYPIHkjjdkibviK51zMbX1ybYjJa1bDVLlm8c3tzf4JNlJVx0h/dlAOXzKNfbtwMRlynBoXqJKIT1lPVPVNmA= Received: from AM6PR04MB5781.eurprd04.prod.outlook.com (20.179.3.19) by AM6PR04MB5926.eurprd04.prod.outlook.com (20.179.3.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.14; Fri, 12 Apr 2019 08:35:18 +0000 Received: from AM6PR04MB5781.eurprd04.prod.outlook.com ([fe80::f9db:ed86:614e:460]) by AM6PR04MB5781.eurprd04.prod.outlook.com ([fe80::f9db:ed86:614e:460%4]) with mapi id 15.20.1792.009; Fri, 12 Apr 2019 08:35:18 +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" , "catalin.marinas@arm.com" , "will.deacon@arm.com" CC: Mingkai Hu , "M.h. Lian" , Xiaowei Bao , "Z.q. Hou" Subject: [PATCHv5 01/20] PCI: mobiveil: Unify register accessors Thread-Topic: [PATCHv5 01/20] PCI: mobiveil: Unify register accessors Thread-Index: AQHU8Qqo0Gg7x0A600WGswFC0azSXA== Date: Fri, 12 Apr 2019 08:35:17 +0000 Message-ID: <20190412083635.33626-2-Zhiqiang.Hou@nxp.com> References: <20190412083635.33626-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190412083635.33626-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: HK2PR06CA0011.apcprd06.prod.outlook.com (2603:1096:202:2e::23) To AM6PR04MB5781.eurprd04.prod.outlook.com (2603:10a6:20b:ad::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6504bd16-5ecb-4110-ead7-08d6bf21ca21 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020);SRVR:AM6PR04MB5926; x-ms-traffictypediagnostic: AM6PR04MB5926: x-microsoft-antispam-prvs: x-forefront-prvs: 0005B05917 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(136003)(366004)(396003)(39860400002)(189003)(199004)(54534003)(478600001)(36756003)(305945005)(52116002)(6486002)(110136005)(186003)(7416002)(3846002)(7736002)(6436002)(50226002)(54906003)(316002)(6512007)(6116002)(25786009)(1076003)(26005)(86362001)(105586002)(8676002)(81166006)(386003)(106356001)(14454004)(2501003)(6506007)(81156014)(76176011)(5660300002)(102836004)(256004)(53936002)(71200400001)(71190400001)(2906002)(68736007)(476003)(66066001)(99286004)(2616005)(97736004)(4326008)(486006)(446003)(11346002)(8936002)(2201001)(14444005)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR04MB5926;H:AM6PR04MB5781.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: C/2teK21dTiB3plgh4J12QbicPMumCfrMoT+TZgchfERogqoQaUyohIRyMIyPt8I8+960JbvKdIUPQS8Wr/95y6y+vXeEeEKVHcUGs8RS4BvpcX6jFRMRlW1CtUCMETvxIBaYO2rKGH7n4zrXCp+7dw8dX8sNf4fHHyoIoXsmPERV+nxjFXuF/OkuVEIhT+TW918Ck0FEA43sQJBc4ijuuPNPSWgU5nDGJIeir+D+SYwm77RrYPldjmbIC0ym0+e7eQCUwGhcJgfFV3jWM/gK99odnUM1Aquk1FKRSikv/xdiojnA7R6XuM6obK3zEVJ2oP6Cr2qoT0yUfhYzzMorH1yilRHCeE3llKFWBbSrR2lK30bayZ/2imvXN8WazawzP7cHlVZbVVdbTwQaAtO/UkmdJdSH2EN3MrDW41X90U= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6504bd16-5ecb-4110-ead7-08d6bf21ca21 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2019 08:35:17.6358 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5926 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org RnJvbTogSG91IFpoaXFpYW5nIDxaaGlxaWFuZy5Ib3VAbnhwLmNvbT4NCg0KSXQncyBjb25mdXNl ZCB0aGF0IFIvVyBzb21lIHJlZ2lzdGVycyBieSBjc3JfcmVhZGwoKS9jc3Jfd3JpdGVsKCksDQp3 aGlsZSBvdGhlcnMgYnkgcmVhZF9wYWdlZF9yZWdpc3RlcigpL3dyaXRlX3BhZ2VkX3JlZ2lzdGVy KCkuDQpBY3R1YWxseSB0aGUgbG93ZXIgM0tCIG9mIDRLQiBQQ0llIGNvbmZpZ3VyZSBzcGFjZSBj YW4gYmUgYWNjZXNzZWQNCmRpcmVjdGx5IGFuZCBoaWdoZXIgMUtCIGlzIHBhZ2luZyBhcmVhLiBT byB0aGlzIHBhdGNoIHVuaWZpZXMgdGhlDQpyZWdpc3RlciBhY2Nlc3NvcnMgdG8gY3NyX3JlYWRs KCkgYW5kIGNzcl93cml0ZWwoKSBieSBjb21wYXJpbmcNCnRoZSByZWdpc3RlciBvZmZzZXQgd2l0 aCBwYWdlIGFjY2VzcyBib3VuZGFyeSAzS0IgaW4gdGhlIGFjY2Vzc29yDQppbnRlcm5hbC4NCg0K U2lnbmVkLW9mZi1ieTogSG91IFpoaXFpYW5nIDxaaGlxaWFuZy5Ib3VAbnhwLmNvbT4NClJldmll d2VkLWJ5OiBNaW5naHVhbiBMaWFuIDxNaW5naHVhbi5MaWFuQG54cC5jb20+DQpSZXZpZXdlZC1i eTogU3VicmFobWFueWEgTGluZ2FwcGEgPGwuc3VicmFobWFueWFAbW9iaXZlaWwuY28uaW4+DQot LS0NClY1Og0KIC0gQ29ycmVjdGVkIGFuZCByZXRvdWNoZWQgdGhlIHN1YmplY3QgYW5kIGNoYW5n ZWxvZy4NCg0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1tb2JpdmVpbC5jIHwgMTc5ICsr KysrKysrKysrKysrKysrLS0tLS0tLS0NCiAxIGZpbGUgY2hhbmdlZCwgMTI0IGluc2VydGlvbnMo KyksIDU1IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJvbGxl ci9wY2llLW1vYml2ZWlsLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaWUtbW9iaXZlaWwu Yw0KaW5kZXggNzcwNTJhMDcxMmQwLi5kNTVjN2U3ODBjNmUgMTAwNjQ0DQotLS0gYS9kcml2ZXJz L3BjaS9jb250cm9sbGVyL3BjaWUtbW9iaXZlaWwuYw0KKysrIGIvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2llLW1vYml2ZWlsLmMNCkBAIC00Nyw3ICs0Nyw2IEBADQogI2RlZmluZSAgUEFHRV9T RUxfU0hJRlQJMTMNCiAjZGVmaW5lICBQQUdFX1NFTF9NQVNLCQkweDNmDQogI2RlZmluZSAgUEFH RV9MT19NQVNLCQkweDNmZg0KLSNkZWZpbmUgIFBBR0VfU0VMX0VOCQkweGMwMA0KICNkZWZpbmUg IFBBR0VfU0VMX09GRlNFVF9TSElGVAkxMA0KIA0KICNkZWZpbmUgUEFCX0FYSV9QSU9fQ1RSTAkw eDA4NDANCkBAIC0xMTcsNiArMTE2LDEyIEBADQogI2RlZmluZSBMSU5LX1dBSVRfTUlOCTkwMDAw DQogI2RlZmluZSBMSU5LX1dBSVRfTUFYCTEwMDAwMA0KIA0KKyNkZWZpbmUgUEFHRURfQUREUl9C TkRSWQkJCTB4YzAwDQorI2RlZmluZSBPRkZTRVRfVE9fUEFHRV9BRERSKG9mZikJCVwNCisJKChv ZmYgJiBQQUdFX0xPX01BU0spIHwgUEFHRURfQUREUl9CTkRSWSkNCisjZGVmaW5lIE9GRlNFVF9U T19QQUdFX0lEWChvZmYpCQkJXA0KKwkoKG9mZiA+PiBQQUdFX1NFTF9PRkZTRVRfU0hJRlQpICYg UEFHRV9TRUxfTUFTSykNCisNCiBzdHJ1Y3QgbW9iaXZlaWxfbXNpIHsJCQkvKiBNU0kgaW5mb3Jt YXRpb24gKi8NCiAJc3RydWN0IG11dGV4IGxvY2s7CQkvKiBwcm90ZWN0IGJpdG1hcCB2YXJpYWJs ZSAqLw0KIAlzdHJ1Y3QgaXJxX2RvbWFpbiAqbXNpX2RvbWFpbjsNCkBAIC0xNDUsMTUgKzE1MCwx MTkgQEAgc3RydWN0IG1vYml2ZWlsX3BjaWUgew0KIAlzdHJ1Y3QgbW9iaXZlaWxfbXNpIG1zaTsN CiB9Ow0KIA0KLXN0YXRpYyBpbmxpbmUgdm9pZCBjc3Jfd3JpdGVsKHN0cnVjdCBtb2JpdmVpbF9w Y2llICpwY2llLCBjb25zdCB1MzIgdmFsdWUsDQotCQljb25zdCB1MzIgcmVnKQ0KKy8qDQorICog bW9iaXZlaWxfcGNpZV9zZWxfcGFnZSAtIHJvdXRpbmUgdG8gYWNjZXNzIHBhZ2VkIHJlZ2lzdGVy DQorICoNCisgKiBSZWdpc3RlcnMgd2hvc2UgYWRkcmVzcyBncmVhdGVyIHRoYW4gUEFHRURfQURE Ul9CTkRSWSAoMHhjMDApIGFyZSBwYWdlZCwNCisgKiBmb3IgdGhpcyBzY2hlbWUgdG8gd29yayBl eHRyYWN0ZWQgaGlnaGVyIDYgYml0cyBvZiB0aGUgb2Zmc2V0IHdpbGwgYmUNCisgKiB3cml0dGVu IHRvIHBnX3NlbCBmaWVsZCBvZiBQQUJfQ1RSTCByZWdpc3RlciBhbmQgcmVzdCBvZiB0aGUgbG93 ZXIgMTANCisgKiBiaXRzIGVuYWJsZWQgd2l0aCBQQUdFRF9BRERSX0JORFJZIGFyZSB1c2VkIGFz IG9mZnNldCBvZiB0aGUgcmVnaXN0ZXIuDQorICovDQorc3RhdGljIHZvaWQgbW9iaXZlaWxfcGNp ZV9zZWxfcGFnZShzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTggcGdfaWR4KQ0KIHsNCi0J d3JpdGVsX3JlbGF4ZWQodmFsdWUsIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIHJlZyk7DQor CXUzMiB2YWw7DQorDQorCXZhbCA9IHJlYWRsKHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIFBB Ql9DVFJMKTsNCisJdmFsICY9IH4oUEFHRV9TRUxfTUFTSyA8PCBQQUdFX1NFTF9TSElGVCk7DQor CXZhbCB8PSAocGdfaWR4ICYgUEFHRV9TRUxfTUFTSykgPDwgUEFHRV9TRUxfU0hJRlQ7DQorDQor CXdyaXRlbCh2YWwsIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIFBBQl9DVFJMKTsNCiB9DQog DQotc3RhdGljIGlubGluZSB1MzIgY3NyX3JlYWRsKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2ll LCBjb25zdCB1MzIgcmVnKQ0KK3N0YXRpYyB2b2lkICptb2JpdmVpbF9wY2llX2NvbXBfYWRkcihz dHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIG9mZikNCiB7DQotCXJldHVybiByZWFkbF9y ZWxheGVkKHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIHJlZyk7DQorCWlmIChvZmYgPCBQQUdF RF9BRERSX0JORFJZKSB7DQorCQkvKiBGb3IgZGlyZWN0bHkgYWNjZXNzZWQgcmVnaXN0ZXJzLCBj bGVhciB0aGUgcGdfc2VsIGZpZWxkICovDQorCQltb2JpdmVpbF9wY2llX3NlbF9wYWdlKHBjaWUs IDApOw0KKwkJcmV0dXJuIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIG9mZjsNCisJfQ0KKw0K Kwltb2JpdmVpbF9wY2llX3NlbF9wYWdlKHBjaWUsIE9GRlNFVF9UT19QQUdFX0lEWChvZmYpKTsN CisJcmV0dXJuIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIE9GRlNFVF9UT19QQUdFX0FERFIo b2ZmKTsNCit9DQorDQorc3RhdGljIGludCBtb2JpdmVpbF9wY2llX3JlYWQodm9pZCBfX2lvbWVt ICphZGRyLCBpbnQgc2l6ZSwgdTMyICp2YWwpDQorew0KKwlpZiAoKHVpbnRwdHJfdClhZGRyICYg KHNpemUgLSAxKSkgew0KKwkJKnZhbCA9IDA7DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVHSVNU RVJfTlVNQkVSOw0KKwl9DQorDQorCXN3aXRjaCAoc2l6ZSkgew0KKwljYXNlIDQ6DQorCQkqdmFs ID0gcmVhZGwoYWRkcik7DQorCQlicmVhazsNCisJY2FzZSAyOg0KKwkJKnZhbCA9IHJlYWR3KGFk ZHIpOw0KKwkJYnJlYWs7DQorCWNhc2UgMToNCisJCSp2YWwgPSByZWFkYihhZGRyKTsNCisJCWJy ZWFrOw0KKwlkZWZhdWx0Og0KKwkJKnZhbCA9IDA7DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVH SVNURVJfTlVNQkVSOw0KKwl9DQorDQorCXJldHVybiBQQ0lCSU9TX1NVQ0NFU1NGVUw7DQorfQ0K Kw0KK3N0YXRpYyBpbnQgbW9iaXZlaWxfcGNpZV93cml0ZSh2b2lkIF9faW9tZW0gKmFkZHIsIGlu dCBzaXplLCB1MzIgdmFsKQ0KK3sNCisJaWYgKCh1aW50cHRyX3QpYWRkciAmIChzaXplIC0gMSkp DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVHSVNURVJfTlVNQkVSOw0KKw0KKwlzd2l0Y2ggKHNp emUpIHsNCisJY2FzZSA0Og0KKwkJd3JpdGVsKHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJY2Fz ZSAyOg0KKwkJd3JpdGV3KHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJY2FzZSAxOg0KKwkJd3Jp dGViKHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJZGVmYXVsdDoNCisJCXJldHVybiBQQ0lCSU9T X0JBRF9SRUdJU1RFUl9OVU1CRVI7DQorCX0NCisNCisJcmV0dXJuIFBDSUJJT1NfU1VDQ0VTU0ZV TDsNCit9DQorDQorc3RhdGljIHUzMiBjc3JfcmVhZChzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNp ZSwgdTMyIG9mZiwgc2l6ZV90IHNpemUpDQorew0KKwl2b2lkICphZGRyOw0KKwl1MzIgdmFsOw0K KwlpbnQgcmV0Ow0KKw0KKwlhZGRyID0gbW9iaXZlaWxfcGNpZV9jb21wX2FkZHIocGNpZSwgb2Zm KTsNCisNCisJcmV0ID0gbW9iaXZlaWxfcGNpZV9yZWFkKGFkZHIsIHNpemUsICZ2YWwpOw0KKwlp ZiAocmV0KQ0KKwkJZGV2X2VycigmcGNpZS0+cGRldi0+ZGV2LCAicmVhZCBDU1IgYWRkcmVzcyBm YWlsZWRcbiIpOw0KKw0KKwlyZXR1cm4gdmFsOw0KK30NCisNCitzdGF0aWMgdm9pZCBjc3Jfd3Jp dGUoc3RydWN0IG1vYml2ZWlsX3BjaWUgKnBjaWUsIHUzMiB2YWwsIHUzMiBvZmYsIHNpemVfdCBz aXplKQ0KK3sNCisJdm9pZCAqYWRkcjsNCisJaW50IHJldDsNCisNCisJYWRkciA9IG1vYml2ZWls X3BjaWVfY29tcF9hZGRyKHBjaWUsIG9mZik7DQorDQorCXJldCA9IG1vYml2ZWlsX3BjaWVfd3Jp dGUoYWRkciwgc2l6ZSwgdmFsKTsNCisJaWYgKHJldCkNCisJCWRldl9lcnIoJnBjaWUtPnBkZXYt PmRldiwgIndyaXRlIENTUiBhZGRyZXNzIGZhaWxlZFxuIik7DQorfQ0KKw0KK3N0YXRpYyB1MzIg Y3NyX3JlYWRsKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llLCB1MzIgb2ZmKQ0KK3sNCisJcmV0 dXJuIGNzcl9yZWFkKHBjaWUsIG9mZiwgMHg0KTsNCit9DQorDQorc3RhdGljIHZvaWQgY3NyX3dy aXRlbChzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIHZhbCwgdTMyIG9mZikNCit7DQor CWNzcl93cml0ZShwY2llLCB2YWwsIG9mZiwgMHg0KTsNCiB9DQogDQogc3RhdGljIGJvb2wgbW9i aXZlaWxfcGNpZV9saW5rX3VwKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llKQ0KQEAgLTM0Miw0 NSArNDUxLDYgQEAgc3RhdGljIGludCBtb2JpdmVpbF9wY2llX3BhcnNlX2R0KHN0cnVjdCBtb2Jp dmVpbF9wY2llICpwY2llKQ0KIAlyZXR1cm4gMDsNCiB9DQogDQotLyoNCi0gKiBzZWxlY3RfcGFn ZWRfcmVnaXN0ZXIgLSByb3V0aW5lIHRvIGFjY2VzcyBwYWdlZCByZWdpc3RlciBvZiByb290IGNv bXBsZXgNCi0gKg0KLSAqIHJlZ2lzdGVycyBvZiBSQyBhcmUgcGFnZWQsIGZvciB0aGlzIHNjaGVt ZSB0byB3b3JrDQotICogZXh0cmFjdGVkIGhpZ2hlciA2IGJpdHMgb2YgdGhlIG9mZnNldCB3aWxs IGJlIHdyaXR0ZW4gdG8gcGdfc2VsDQotICogZmllbGQgb2YgUEFCX0NUUkwgcmVnaXN0ZXIgYW5k IHJlc3Qgb2YgdGhlIGxvd2VyIDEwIGJpdHMgZW5hYmxlZCB3aXRoDQotICogUEFHRV9TRUxfRU4g YXJlIHVzZWQgYXMgb2Zmc2V0IG9mIHRoZSByZWdpc3Rlci4NCi0gKi8NCi1zdGF0aWMgdm9pZCBz ZWxlY3RfcGFnZWRfcmVnaXN0ZXIoc3RydWN0IG1vYml2ZWlsX3BjaWUgKnBjaWUsIHUzMiBvZmZz ZXQpDQotew0KLQlpbnQgcGFiX2N0cmxfZHcsIHBnX3NlbDsNCi0NCi0JLyogY2xlYXIgcGdfc2Vs IGZpZWxkICovDQotCXBhYl9jdHJsX2R3ID0gY3NyX3JlYWRsKHBjaWUsIFBBQl9DVFJMKTsNCi0J cGFiX2N0cmxfZHcgPSAocGFiX2N0cmxfZHcgJiB+KFBBR0VfU0VMX01BU0sgPDwgUEFHRV9TRUxf U0hJRlQpKTsNCi0NCi0JLyogc2V0IHBnX3NlbCBmaWVsZCAqLw0KLQlwZ19zZWwgPSAob2Zmc2V0 ID4+IFBBR0VfU0VMX09GRlNFVF9TSElGVCkgJiBQQUdFX1NFTF9NQVNLOw0KLQlwYWJfY3RybF9k dyB8PSAoKHBnX3NlbCA8PCBQQUdFX1NFTF9TSElGVCkpOw0KLQljc3Jfd3JpdGVsKHBjaWUsIHBh Yl9jdHJsX2R3LCBQQUJfQ1RSTCk7DQotfQ0KLQ0KLXN0YXRpYyB2b2lkIHdyaXRlX3BhZ2VkX3Jl Z2lzdGVyKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llLA0KLQkJdTMyIHZhbCwgdTMyIG9mZnNl dCkNCi17DQotCXUzMiBvZmYgPSAob2Zmc2V0ICYgUEFHRV9MT19NQVNLKSB8IFBBR0VfU0VMX0VO Ow0KLQ0KLQlzZWxlY3RfcGFnZWRfcmVnaXN0ZXIocGNpZSwgb2Zmc2V0KTsNCi0JY3NyX3dyaXRl bChwY2llLCB2YWwsIG9mZik7DQotfQ0KLQ0KLXN0YXRpYyB1MzIgcmVhZF9wYWdlZF9yZWdpc3Rl cihzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIG9mZnNldCkNCi17DQotCXUzMiBvZmYg PSAob2Zmc2V0ICYgUEFHRV9MT19NQVNLKSB8IFBBR0VfU0VMX0VOOw0KLQ0KLQlzZWxlY3RfcGFn ZWRfcmVnaXN0ZXIocGNpZSwgb2Zmc2V0KTsNCi0JcmV0dXJuIGNzcl9yZWFkbChwY2llLCBvZmYp Ow0KLX0NCi0NCiBzdGF0aWMgdm9pZCBwcm9ncmFtX2liX3dpbmRvd3Moc3RydWN0IG1vYml2ZWls X3BjaWUgKnBjaWUsIGludCB3aW5fbnVtLA0KIAkJaW50IHBjaV9hZGRyLCB1MzIgdHlwZSwgdTY0 IHNpemUpDQogew0KQEAgLTM5NywxOSArNDY3LDE5IEBAIHN0YXRpYyB2b2lkIHByb2dyYW1faWJf d2luZG93cyhzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgaW50IHdpbl9udW0sDQogCXBpb19j dHJsX3ZhbCA9IGNzcl9yZWFkbChwY2llLCBQQUJfUEVYX1BJT19DVFJMKTsNCiAJY3NyX3dyaXRl bChwY2llLA0KIAkJcGlvX2N0cmxfdmFsIHwgKDEgPDwgUElPX0VOQUJMRV9TSElGVCksIFBBQl9Q RVhfUElPX0NUUkwpOw0KLQlhbWFwX2N0cmxfZHcgPSByZWFkX3BhZ2VkX3JlZ2lzdGVyKHBjaWUs IFBBQl9QRVhfQU1BUF9DVFJMKHdpbl9udW0pKTsNCisJYW1hcF9jdHJsX2R3ID0gY3NyX3JlYWRs KHBjaWUsIFBBQl9QRVhfQU1BUF9DVFJMKHdpbl9udW0pKTsNCiAJYW1hcF9jdHJsX2R3ID0gKGFt YXBfY3RybF9kdyB8ICh0eXBlIDw8IEFNQVBfQ1RSTF9UWVBFX1NISUZUKSk7DQogCWFtYXBfY3Ry bF9kdyA9IChhbWFwX2N0cmxfZHcgfCAoMSA8PCBBTUFQX0NUUkxfRU5fU0hJRlQpKTsNCiANCi0J d3JpdGVfcGFnZWRfcmVnaXN0ZXIocGNpZSwgYW1hcF9jdHJsX2R3IHwgbG93ZXJfMzJfYml0cyhz aXplNjQpLA0KLQkJCQlQQUJfUEVYX0FNQVBfQ1RSTCh3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwo cGNpZSwgYW1hcF9jdHJsX2R3IHwgbG93ZXJfMzJfYml0cyhzaXplNjQpLA0KKwkJICAgUEFCX1BF WF9BTUFQX0NUUkwod2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdpc3RlcihwY2llLCB1 cHBlcl8zMl9iaXRzKHNpemU2NCksDQotCQkJCVBBQl9FWFRfUEVYX0FNQVBfU0laRU4od2luX251 bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIHVwcGVyXzMyX2JpdHMoc2l6ZTY0KSwNCisJCSAgIFBB Ql9FWFRfUEVYX0FNQVBfU0laRU4od2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdpc3Rl cihwY2llLCBwY2lfYWRkciwgUEFCX1BFWF9BTUFQX0FYSV9XSU4od2luX251bSkpOw0KLQl3cml0 ZV9wYWdlZF9yZWdpc3RlcihwY2llLCBwY2lfYWRkciwgUEFCX1BFWF9BTUFQX1BFWF9XSU5fTCh3 aW5fbnVtKSk7DQotCXdyaXRlX3BhZ2VkX3JlZ2lzdGVyKHBjaWUsIDAsIFBBQl9QRVhfQU1BUF9Q RVhfV0lOX0god2luX251bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIHBjaV9hZGRyLCBQQUJfUEVY X0FNQVBfQVhJX1dJTih3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwocGNpZSwgcGNpX2FkZHIsIFBB Ql9QRVhfQU1BUF9QRVhfV0lOX0wod2luX251bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIDAsIFBB Ql9QRVhfQU1BUF9QRVhfV0lOX0god2luX251bSkpOw0KIH0NCiANCiAvKg0KQEAgLTQzNyw4ICs1 MDcsNyBAQCBzdGF0aWMgdm9pZCBwcm9ncmFtX29iX3dpbmRvd3Moc3RydWN0IG1vYml2ZWlsX3Bj aWUgKnBjaWUsIGludCB3aW5fbnVtLA0KIAljc3Jfd3JpdGVsKHBjaWUsIDEgPDwgV0lOX0VOQUJM RV9TSElGVCB8IHR5cGUgPDwgV0lOX1RZUEVfU0hJRlQgfA0KIAkJCWxvd2VyXzMyX2JpdHMoc2l6 ZTY0KSwgUEFCX0FYSV9BTUFQX0NUUkwod2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdp c3RlcihwY2llLCB1cHBlcl8zMl9iaXRzKHNpemU2NCksDQotCQkJCVBBQl9FWFRfQVhJX0FNQVBf U0laRSh3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwocGNpZSwgdXBwZXJfMzJfYml0cyhzaXplNjQp LCBQQUJfRVhUX0FYSV9BTUFQX1NJWkUod2luX251bSkpOw0KIA0KIAkvKg0KIAkgKiBwcm9ncmFt IEFYSSB3aW5kb3cgYmFzZSB3aXRoIGFwcHJvcHJpYXRlIHZhbHVlIGluDQotLSANCjIuMTcuMQ0K DQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Z.q. Hou" Subject: [PATCHv5 01/20] PCI: mobiveil: Unify register accessors Date: Fri, 12 Apr 2019 08:35:17 +0000 Message-ID: <20190412083635.33626-2-Zhiqiang.Hou@nxp.com> References: <20190412083635.33626-1-Zhiqiang.Hou@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190412083635.33626-1-Zhiqiang.Hou@nxp.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org 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" , "catalin.marinas@arm.com" , "will.deacon@arm.com" Cc: Mingkai Hu , "M.h. Lian" , Xiaowei Bao , "Z.q. Hou" List-Id: devicetree@vger.kernel.org RnJvbTogSG91IFpoaXFpYW5nIDxaaGlxaWFuZy5Ib3VAbnhwLmNvbT4NCg0KSXQncyBjb25mdXNl ZCB0aGF0IFIvVyBzb21lIHJlZ2lzdGVycyBieSBjc3JfcmVhZGwoKS9jc3Jfd3JpdGVsKCksDQp3 aGlsZSBvdGhlcnMgYnkgcmVhZF9wYWdlZF9yZWdpc3RlcigpL3dyaXRlX3BhZ2VkX3JlZ2lzdGVy KCkuDQpBY3R1YWxseSB0aGUgbG93ZXIgM0tCIG9mIDRLQiBQQ0llIGNvbmZpZ3VyZSBzcGFjZSBj YW4gYmUgYWNjZXNzZWQNCmRpcmVjdGx5IGFuZCBoaWdoZXIgMUtCIGlzIHBhZ2luZyBhcmVhLiBT byB0aGlzIHBhdGNoIHVuaWZpZXMgdGhlDQpyZWdpc3RlciBhY2Nlc3NvcnMgdG8gY3NyX3JlYWRs KCkgYW5kIGNzcl93cml0ZWwoKSBieSBjb21wYXJpbmcNCnRoZSByZWdpc3RlciBvZmZzZXQgd2l0 aCBwYWdlIGFjY2VzcyBib3VuZGFyeSAzS0IgaW4gdGhlIGFjY2Vzc29yDQppbnRlcm5hbC4NCg0K U2lnbmVkLW9mZi1ieTogSG91IFpoaXFpYW5nIDxaaGlxaWFuZy5Ib3VAbnhwLmNvbT4NClJldmll d2VkLWJ5OiBNaW5naHVhbiBMaWFuIDxNaW5naHVhbi5MaWFuQG54cC5jb20+DQpSZXZpZXdlZC1i eTogU3VicmFobWFueWEgTGluZ2FwcGEgPGwuc3VicmFobWFueWFAbW9iaXZlaWwuY28uaW4+DQot LS0NClY1Og0KIC0gQ29ycmVjdGVkIGFuZCByZXRvdWNoZWQgdGhlIHN1YmplY3QgYW5kIGNoYW5n ZWxvZy4NCg0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1tb2JpdmVpbC5jIHwgMTc5ICsr KysrKysrKysrKysrKysrLS0tLS0tLS0NCiAxIGZpbGUgY2hhbmdlZCwgMTI0IGluc2VydGlvbnMo KyksIDU1IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJvbGxl ci9wY2llLW1vYml2ZWlsLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaWUtbW9iaXZlaWwu Yw0KaW5kZXggNzcwNTJhMDcxMmQwLi5kNTVjN2U3ODBjNmUgMTAwNjQ0DQotLS0gYS9kcml2ZXJz L3BjaS9jb250cm9sbGVyL3BjaWUtbW9iaXZlaWwuYw0KKysrIGIvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2llLW1vYml2ZWlsLmMNCkBAIC00Nyw3ICs0Nyw2IEBADQogI2RlZmluZSAgUEFHRV9T RUxfU0hJRlQJMTMNCiAjZGVmaW5lICBQQUdFX1NFTF9NQVNLCQkweDNmDQogI2RlZmluZSAgUEFH RV9MT19NQVNLCQkweDNmZg0KLSNkZWZpbmUgIFBBR0VfU0VMX0VOCQkweGMwMA0KICNkZWZpbmUg IFBBR0VfU0VMX09GRlNFVF9TSElGVAkxMA0KIA0KICNkZWZpbmUgUEFCX0FYSV9QSU9fQ1RSTAkw eDA4NDANCkBAIC0xMTcsNiArMTE2LDEyIEBADQogI2RlZmluZSBMSU5LX1dBSVRfTUlOCTkwMDAw DQogI2RlZmluZSBMSU5LX1dBSVRfTUFYCTEwMDAwMA0KIA0KKyNkZWZpbmUgUEFHRURfQUREUl9C TkRSWQkJCTB4YzAwDQorI2RlZmluZSBPRkZTRVRfVE9fUEFHRV9BRERSKG9mZikJCVwNCisJKChv ZmYgJiBQQUdFX0xPX01BU0spIHwgUEFHRURfQUREUl9CTkRSWSkNCisjZGVmaW5lIE9GRlNFVF9U T19QQUdFX0lEWChvZmYpCQkJXA0KKwkoKG9mZiA+PiBQQUdFX1NFTF9PRkZTRVRfU0hJRlQpICYg UEFHRV9TRUxfTUFTSykNCisNCiBzdHJ1Y3QgbW9iaXZlaWxfbXNpIHsJCQkvKiBNU0kgaW5mb3Jt YXRpb24gKi8NCiAJc3RydWN0IG11dGV4IGxvY2s7CQkvKiBwcm90ZWN0IGJpdG1hcCB2YXJpYWJs ZSAqLw0KIAlzdHJ1Y3QgaXJxX2RvbWFpbiAqbXNpX2RvbWFpbjsNCkBAIC0xNDUsMTUgKzE1MCwx MTkgQEAgc3RydWN0IG1vYml2ZWlsX3BjaWUgew0KIAlzdHJ1Y3QgbW9iaXZlaWxfbXNpIG1zaTsN CiB9Ow0KIA0KLXN0YXRpYyBpbmxpbmUgdm9pZCBjc3Jfd3JpdGVsKHN0cnVjdCBtb2JpdmVpbF9w Y2llICpwY2llLCBjb25zdCB1MzIgdmFsdWUsDQotCQljb25zdCB1MzIgcmVnKQ0KKy8qDQorICog bW9iaXZlaWxfcGNpZV9zZWxfcGFnZSAtIHJvdXRpbmUgdG8gYWNjZXNzIHBhZ2VkIHJlZ2lzdGVy DQorICoNCisgKiBSZWdpc3RlcnMgd2hvc2UgYWRkcmVzcyBncmVhdGVyIHRoYW4gUEFHRURfQURE Ul9CTkRSWSAoMHhjMDApIGFyZSBwYWdlZCwNCisgKiBmb3IgdGhpcyBzY2hlbWUgdG8gd29yayBl eHRyYWN0ZWQgaGlnaGVyIDYgYml0cyBvZiB0aGUgb2Zmc2V0IHdpbGwgYmUNCisgKiB3cml0dGVu IHRvIHBnX3NlbCBmaWVsZCBvZiBQQUJfQ1RSTCByZWdpc3RlciBhbmQgcmVzdCBvZiB0aGUgbG93 ZXIgMTANCisgKiBiaXRzIGVuYWJsZWQgd2l0aCBQQUdFRF9BRERSX0JORFJZIGFyZSB1c2VkIGFz IG9mZnNldCBvZiB0aGUgcmVnaXN0ZXIuDQorICovDQorc3RhdGljIHZvaWQgbW9iaXZlaWxfcGNp ZV9zZWxfcGFnZShzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTggcGdfaWR4KQ0KIHsNCi0J d3JpdGVsX3JlbGF4ZWQodmFsdWUsIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIHJlZyk7DQor CXUzMiB2YWw7DQorDQorCXZhbCA9IHJlYWRsKHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIFBB Ql9DVFJMKTsNCisJdmFsICY9IH4oUEFHRV9TRUxfTUFTSyA8PCBQQUdFX1NFTF9TSElGVCk7DQor CXZhbCB8PSAocGdfaWR4ICYgUEFHRV9TRUxfTUFTSykgPDwgUEFHRV9TRUxfU0hJRlQ7DQorDQor CXdyaXRlbCh2YWwsIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIFBBQl9DVFJMKTsNCiB9DQog DQotc3RhdGljIGlubGluZSB1MzIgY3NyX3JlYWRsKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2ll LCBjb25zdCB1MzIgcmVnKQ0KK3N0YXRpYyB2b2lkICptb2JpdmVpbF9wY2llX2NvbXBfYWRkcihz dHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIG9mZikNCiB7DQotCXJldHVybiByZWFkbF9y ZWxheGVkKHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIHJlZyk7DQorCWlmIChvZmYgPCBQQUdF RF9BRERSX0JORFJZKSB7DQorCQkvKiBGb3IgZGlyZWN0bHkgYWNjZXNzZWQgcmVnaXN0ZXJzLCBj bGVhciB0aGUgcGdfc2VsIGZpZWxkICovDQorCQltb2JpdmVpbF9wY2llX3NlbF9wYWdlKHBjaWUs IDApOw0KKwkJcmV0dXJuIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIG9mZjsNCisJfQ0KKw0K Kwltb2JpdmVpbF9wY2llX3NlbF9wYWdlKHBjaWUsIE9GRlNFVF9UT19QQUdFX0lEWChvZmYpKTsN CisJcmV0dXJuIHBjaWUtPmNzcl9heGlfc2xhdmVfYmFzZSArIE9GRlNFVF9UT19QQUdFX0FERFIo b2ZmKTsNCit9DQorDQorc3RhdGljIGludCBtb2JpdmVpbF9wY2llX3JlYWQodm9pZCBfX2lvbWVt ICphZGRyLCBpbnQgc2l6ZSwgdTMyICp2YWwpDQorew0KKwlpZiAoKHVpbnRwdHJfdClhZGRyICYg KHNpemUgLSAxKSkgew0KKwkJKnZhbCA9IDA7DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVHSVNU RVJfTlVNQkVSOw0KKwl9DQorDQorCXN3aXRjaCAoc2l6ZSkgew0KKwljYXNlIDQ6DQorCQkqdmFs ID0gcmVhZGwoYWRkcik7DQorCQlicmVhazsNCisJY2FzZSAyOg0KKwkJKnZhbCA9IHJlYWR3KGFk ZHIpOw0KKwkJYnJlYWs7DQorCWNhc2UgMToNCisJCSp2YWwgPSByZWFkYihhZGRyKTsNCisJCWJy ZWFrOw0KKwlkZWZhdWx0Og0KKwkJKnZhbCA9IDA7DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVH SVNURVJfTlVNQkVSOw0KKwl9DQorDQorCXJldHVybiBQQ0lCSU9TX1NVQ0NFU1NGVUw7DQorfQ0K Kw0KK3N0YXRpYyBpbnQgbW9iaXZlaWxfcGNpZV93cml0ZSh2b2lkIF9faW9tZW0gKmFkZHIsIGlu dCBzaXplLCB1MzIgdmFsKQ0KK3sNCisJaWYgKCh1aW50cHRyX3QpYWRkciAmIChzaXplIC0gMSkp DQorCQlyZXR1cm4gUENJQklPU19CQURfUkVHSVNURVJfTlVNQkVSOw0KKw0KKwlzd2l0Y2ggKHNp emUpIHsNCisJY2FzZSA0Og0KKwkJd3JpdGVsKHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJY2Fz ZSAyOg0KKwkJd3JpdGV3KHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJY2FzZSAxOg0KKwkJd3Jp dGViKHZhbCwgYWRkcik7DQorCQlicmVhazsNCisJZGVmYXVsdDoNCisJCXJldHVybiBQQ0lCSU9T X0JBRF9SRUdJU1RFUl9OVU1CRVI7DQorCX0NCisNCisJcmV0dXJuIFBDSUJJT1NfU1VDQ0VTU0ZV TDsNCit9DQorDQorc3RhdGljIHUzMiBjc3JfcmVhZChzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNp ZSwgdTMyIG9mZiwgc2l6ZV90IHNpemUpDQorew0KKwl2b2lkICphZGRyOw0KKwl1MzIgdmFsOw0K KwlpbnQgcmV0Ow0KKw0KKwlhZGRyID0gbW9iaXZlaWxfcGNpZV9jb21wX2FkZHIocGNpZSwgb2Zm KTsNCisNCisJcmV0ID0gbW9iaXZlaWxfcGNpZV9yZWFkKGFkZHIsIHNpemUsICZ2YWwpOw0KKwlp ZiAocmV0KQ0KKwkJZGV2X2VycigmcGNpZS0+cGRldi0+ZGV2LCAicmVhZCBDU1IgYWRkcmVzcyBm YWlsZWRcbiIpOw0KKw0KKwlyZXR1cm4gdmFsOw0KK30NCisNCitzdGF0aWMgdm9pZCBjc3Jfd3Jp dGUoc3RydWN0IG1vYml2ZWlsX3BjaWUgKnBjaWUsIHUzMiB2YWwsIHUzMiBvZmYsIHNpemVfdCBz aXplKQ0KK3sNCisJdm9pZCAqYWRkcjsNCisJaW50IHJldDsNCisNCisJYWRkciA9IG1vYml2ZWls X3BjaWVfY29tcF9hZGRyKHBjaWUsIG9mZik7DQorDQorCXJldCA9IG1vYml2ZWlsX3BjaWVfd3Jp dGUoYWRkciwgc2l6ZSwgdmFsKTsNCisJaWYgKHJldCkNCisJCWRldl9lcnIoJnBjaWUtPnBkZXYt PmRldiwgIndyaXRlIENTUiBhZGRyZXNzIGZhaWxlZFxuIik7DQorfQ0KKw0KK3N0YXRpYyB1MzIg Y3NyX3JlYWRsKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llLCB1MzIgb2ZmKQ0KK3sNCisJcmV0 dXJuIGNzcl9yZWFkKHBjaWUsIG9mZiwgMHg0KTsNCit9DQorDQorc3RhdGljIHZvaWQgY3NyX3dy aXRlbChzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIHZhbCwgdTMyIG9mZikNCit7DQor CWNzcl93cml0ZShwY2llLCB2YWwsIG9mZiwgMHg0KTsNCiB9DQogDQogc3RhdGljIGJvb2wgbW9i aXZlaWxfcGNpZV9saW5rX3VwKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llKQ0KQEAgLTM0Miw0 NSArNDUxLDYgQEAgc3RhdGljIGludCBtb2JpdmVpbF9wY2llX3BhcnNlX2R0KHN0cnVjdCBtb2Jp dmVpbF9wY2llICpwY2llKQ0KIAlyZXR1cm4gMDsNCiB9DQogDQotLyoNCi0gKiBzZWxlY3RfcGFn ZWRfcmVnaXN0ZXIgLSByb3V0aW5lIHRvIGFjY2VzcyBwYWdlZCByZWdpc3RlciBvZiByb290IGNv bXBsZXgNCi0gKg0KLSAqIHJlZ2lzdGVycyBvZiBSQyBhcmUgcGFnZWQsIGZvciB0aGlzIHNjaGVt ZSB0byB3b3JrDQotICogZXh0cmFjdGVkIGhpZ2hlciA2IGJpdHMgb2YgdGhlIG9mZnNldCB3aWxs IGJlIHdyaXR0ZW4gdG8gcGdfc2VsDQotICogZmllbGQgb2YgUEFCX0NUUkwgcmVnaXN0ZXIgYW5k IHJlc3Qgb2YgdGhlIGxvd2VyIDEwIGJpdHMgZW5hYmxlZCB3aXRoDQotICogUEFHRV9TRUxfRU4g YXJlIHVzZWQgYXMgb2Zmc2V0IG9mIHRoZSByZWdpc3Rlci4NCi0gKi8NCi1zdGF0aWMgdm9pZCBz ZWxlY3RfcGFnZWRfcmVnaXN0ZXIoc3RydWN0IG1vYml2ZWlsX3BjaWUgKnBjaWUsIHUzMiBvZmZz ZXQpDQotew0KLQlpbnQgcGFiX2N0cmxfZHcsIHBnX3NlbDsNCi0NCi0JLyogY2xlYXIgcGdfc2Vs IGZpZWxkICovDQotCXBhYl9jdHJsX2R3ID0gY3NyX3JlYWRsKHBjaWUsIFBBQl9DVFJMKTsNCi0J cGFiX2N0cmxfZHcgPSAocGFiX2N0cmxfZHcgJiB+KFBBR0VfU0VMX01BU0sgPDwgUEFHRV9TRUxf U0hJRlQpKTsNCi0NCi0JLyogc2V0IHBnX3NlbCBmaWVsZCAqLw0KLQlwZ19zZWwgPSAob2Zmc2V0 ID4+IFBBR0VfU0VMX09GRlNFVF9TSElGVCkgJiBQQUdFX1NFTF9NQVNLOw0KLQlwYWJfY3RybF9k dyB8PSAoKHBnX3NlbCA8PCBQQUdFX1NFTF9TSElGVCkpOw0KLQljc3Jfd3JpdGVsKHBjaWUsIHBh Yl9jdHJsX2R3LCBQQUJfQ1RSTCk7DQotfQ0KLQ0KLXN0YXRpYyB2b2lkIHdyaXRlX3BhZ2VkX3Jl Z2lzdGVyKHN0cnVjdCBtb2JpdmVpbF9wY2llICpwY2llLA0KLQkJdTMyIHZhbCwgdTMyIG9mZnNl dCkNCi17DQotCXUzMiBvZmYgPSAob2Zmc2V0ICYgUEFHRV9MT19NQVNLKSB8IFBBR0VfU0VMX0VO Ow0KLQ0KLQlzZWxlY3RfcGFnZWRfcmVnaXN0ZXIocGNpZSwgb2Zmc2V0KTsNCi0JY3NyX3dyaXRl bChwY2llLCB2YWwsIG9mZik7DQotfQ0KLQ0KLXN0YXRpYyB1MzIgcmVhZF9wYWdlZF9yZWdpc3Rl cihzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgdTMyIG9mZnNldCkNCi17DQotCXUzMiBvZmYg PSAob2Zmc2V0ICYgUEFHRV9MT19NQVNLKSB8IFBBR0VfU0VMX0VOOw0KLQ0KLQlzZWxlY3RfcGFn ZWRfcmVnaXN0ZXIocGNpZSwgb2Zmc2V0KTsNCi0JcmV0dXJuIGNzcl9yZWFkbChwY2llLCBvZmYp Ow0KLX0NCi0NCiBzdGF0aWMgdm9pZCBwcm9ncmFtX2liX3dpbmRvd3Moc3RydWN0IG1vYml2ZWls X3BjaWUgKnBjaWUsIGludCB3aW5fbnVtLA0KIAkJaW50IHBjaV9hZGRyLCB1MzIgdHlwZSwgdTY0 IHNpemUpDQogew0KQEAgLTM5NywxOSArNDY3LDE5IEBAIHN0YXRpYyB2b2lkIHByb2dyYW1faWJf d2luZG93cyhzdHJ1Y3QgbW9iaXZlaWxfcGNpZSAqcGNpZSwgaW50IHdpbl9udW0sDQogCXBpb19j dHJsX3ZhbCA9IGNzcl9yZWFkbChwY2llLCBQQUJfUEVYX1BJT19DVFJMKTsNCiAJY3NyX3dyaXRl bChwY2llLA0KIAkJcGlvX2N0cmxfdmFsIHwgKDEgPDwgUElPX0VOQUJMRV9TSElGVCksIFBBQl9Q RVhfUElPX0NUUkwpOw0KLQlhbWFwX2N0cmxfZHcgPSByZWFkX3BhZ2VkX3JlZ2lzdGVyKHBjaWUs IFBBQl9QRVhfQU1BUF9DVFJMKHdpbl9udW0pKTsNCisJYW1hcF9jdHJsX2R3ID0gY3NyX3JlYWRs KHBjaWUsIFBBQl9QRVhfQU1BUF9DVFJMKHdpbl9udW0pKTsNCiAJYW1hcF9jdHJsX2R3ID0gKGFt YXBfY3RybF9kdyB8ICh0eXBlIDw8IEFNQVBfQ1RSTF9UWVBFX1NISUZUKSk7DQogCWFtYXBfY3Ry bF9kdyA9IChhbWFwX2N0cmxfZHcgfCAoMSA8PCBBTUFQX0NUUkxfRU5fU0hJRlQpKTsNCiANCi0J d3JpdGVfcGFnZWRfcmVnaXN0ZXIocGNpZSwgYW1hcF9jdHJsX2R3IHwgbG93ZXJfMzJfYml0cyhz aXplNjQpLA0KLQkJCQlQQUJfUEVYX0FNQVBfQ1RSTCh3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwo cGNpZSwgYW1hcF9jdHJsX2R3IHwgbG93ZXJfMzJfYml0cyhzaXplNjQpLA0KKwkJICAgUEFCX1BF WF9BTUFQX0NUUkwod2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdpc3RlcihwY2llLCB1 cHBlcl8zMl9iaXRzKHNpemU2NCksDQotCQkJCVBBQl9FWFRfUEVYX0FNQVBfU0laRU4od2luX251 bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIHVwcGVyXzMyX2JpdHMoc2l6ZTY0KSwNCisJCSAgIFBB Ql9FWFRfUEVYX0FNQVBfU0laRU4od2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdpc3Rl cihwY2llLCBwY2lfYWRkciwgUEFCX1BFWF9BTUFQX0FYSV9XSU4od2luX251bSkpOw0KLQl3cml0 ZV9wYWdlZF9yZWdpc3RlcihwY2llLCBwY2lfYWRkciwgUEFCX1BFWF9BTUFQX1BFWF9XSU5fTCh3 aW5fbnVtKSk7DQotCXdyaXRlX3BhZ2VkX3JlZ2lzdGVyKHBjaWUsIDAsIFBBQl9QRVhfQU1BUF9Q RVhfV0lOX0god2luX251bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIHBjaV9hZGRyLCBQQUJfUEVY X0FNQVBfQVhJX1dJTih3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwocGNpZSwgcGNpX2FkZHIsIFBB Ql9QRVhfQU1BUF9QRVhfV0lOX0wod2luX251bSkpOw0KKwljc3Jfd3JpdGVsKHBjaWUsIDAsIFBB Ql9QRVhfQU1BUF9QRVhfV0lOX0god2luX251bSkpOw0KIH0NCiANCiAvKg0KQEAgLTQzNyw4ICs1 MDcsNyBAQCBzdGF0aWMgdm9pZCBwcm9ncmFtX29iX3dpbmRvd3Moc3RydWN0IG1vYml2ZWlsX3Bj aWUgKnBjaWUsIGludCB3aW5fbnVtLA0KIAljc3Jfd3JpdGVsKHBjaWUsIDEgPDwgV0lOX0VOQUJM RV9TSElGVCB8IHR5cGUgPDwgV0lOX1RZUEVfU0hJRlQgfA0KIAkJCWxvd2VyXzMyX2JpdHMoc2l6 ZTY0KSwgUEFCX0FYSV9BTUFQX0NUUkwod2luX251bSkpOw0KIA0KLQl3cml0ZV9wYWdlZF9yZWdp c3RlcihwY2llLCB1cHBlcl8zMl9iaXRzKHNpemU2NCksDQotCQkJCVBBQl9FWFRfQVhJX0FNQVBf U0laRSh3aW5fbnVtKSk7DQorCWNzcl93cml0ZWwocGNpZSwgdXBwZXJfMzJfYml0cyhzaXplNjQp LCBQQUJfRVhUX0FYSV9BTUFQX1NJWkUod2luX251bSkpOw0KIA0KIAkvKg0KIAkgKiBwcm9ncmFt IEFYSSB3aW5kb3cgYmFzZSB3aXRoIGFwcHJvcHJpYXRlIHZhbHVlIGluDQotLSANCjIuMTcuMQ0K DQo= 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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E81BC10F0E for ; Fri, 12 Apr 2019 08:35:33 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3E3A02171F for ; Fri, 12 Apr 2019 08:35:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sHW0MOT3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="NuqG/CGr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E3A02171F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=e2BjBBPFKpfz5CUTeTrgZIbICMJwcX/27JGV+sP04+k=; b=sHW0MOT3tXnVWY C/H19pQzKJVEN+422U2yqeJPAGiGXrrSdHvPbZPaHsBzqjxotXck6GcOmbbAU4M109cYmTD0izUzZ hU/+1K8feAeRJOJnuGZjoRwEtvL9vNsLcQp+5PX6sGCPZ8nMRk6Vslknb/MEjheRbIrKB6yxD1wKJ RhtS++Fe3BUL5FOSDy7jvYJeP8aNVQ8ZCBoPAmi6l3oy2rs++WLE3VBbtT1XIV5gJISIZ7j/VbYJD IwAjTmNaLuL/OsI1FN28HqmTE7Pn5JmerwPuo0cKFZGmbFQxOVRFVPckTzrN7ohBWbF0Qr22i72BQ adzNTTjBQtzTRuepmDtg==; 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 1hErei-0004ub-Fu; Fri, 12 Apr 2019 08:35:28 +0000 Received: from mail-eopbgr30056.outbound.protection.outlook.com ([40.107.3.56] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hErea-0004is-JD for linux-arm-kernel@lists.infradead.org; Fri, 12 Apr 2019 08:35:25 +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=tihGF5jurDcVNgTrzVPkP6FnaGR6og8OayLAp3RWDJ4=; b=NuqG/CGrs6qHyZdxqJ45BT6h82zvXeyEmXuWj8LPojhlEJr7T50OK+ClQARKE5Ex03PK578W4/EXVBEMtxFP0wnYPIHkjjdkibviK51zMbX1ybYjJa1bDVLlm8c3tzf4JNlJVx0h/dlAOXzKNfbtwMRlynBoXqJKIT1lPVPVNmA= Received: from AM6PR04MB5781.eurprd04.prod.outlook.com (20.179.3.19) by AM6PR04MB5926.eurprd04.prod.outlook.com (20.179.3.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.14; Fri, 12 Apr 2019 08:35:18 +0000 Received: from AM6PR04MB5781.eurprd04.prod.outlook.com ([fe80::f9db:ed86:614e:460]) by AM6PR04MB5781.eurprd04.prod.outlook.com ([fe80::f9db:ed86:614e:460%4]) with mapi id 15.20.1792.009; Fri, 12 Apr 2019 08:35:18 +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" , "catalin.marinas@arm.com" , "will.deacon@arm.com" Subject: [PATCHv5 01/20] PCI: mobiveil: Unify register accessors Thread-Topic: [PATCHv5 01/20] PCI: mobiveil: Unify register accessors Thread-Index: AQHU8Qqo0Gg7x0A600WGswFC0azSXA== Date: Fri, 12 Apr 2019 08:35:17 +0000 Message-ID: <20190412083635.33626-2-Zhiqiang.Hou@nxp.com> References: <20190412083635.33626-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190412083635.33626-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: HK2PR06CA0011.apcprd06.prod.outlook.com (2603:1096:202:2e::23) To AM6PR04MB5781.eurprd04.prod.outlook.com (2603:10a6:20b:ad::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6504bd16-5ecb-4110-ead7-08d6bf21ca21 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM6PR04MB5926; x-ms-traffictypediagnostic: AM6PR04MB5926: x-microsoft-antispam-prvs: x-forefront-prvs: 0005B05917 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(366004)(396003)(39860400002)(189003)(199004)(54534003)(478600001)(36756003)(305945005)(52116002)(6486002)(110136005)(186003)(7416002)(3846002)(7736002)(6436002)(50226002)(54906003)(316002)(6512007)(6116002)(25786009)(1076003)(26005)(86362001)(105586002)(8676002)(81166006)(386003)(106356001)(14454004)(2501003)(6506007)(81156014)(76176011)(5660300002)(102836004)(256004)(53936002)(71200400001)(71190400001)(2906002)(68736007)(476003)(66066001)(99286004)(2616005)(97736004)(4326008)(486006)(446003)(11346002)(8936002)(2201001)(14444005)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB5926; H:AM6PR04MB5781.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: C/2teK21dTiB3plgh4J12QbicPMumCfrMoT+TZgchfERogqoQaUyohIRyMIyPt8I8+960JbvKdIUPQS8Wr/95y6y+vXeEeEKVHcUGs8RS4BvpcX6jFRMRlW1CtUCMETvxIBaYO2rKGH7n4zrXCp+7dw8dX8sNf4fHHyoIoXsmPERV+nxjFXuF/OkuVEIhT+TW918Ck0FEA43sQJBc4ijuuPNPSWgU5nDGJIeir+D+SYwm77RrYPldjmbIC0ym0+e7eQCUwGhcJgfFV3jWM/gK99odnUM1Aquk1FKRSikv/xdiojnA7R6XuM6obK3zEVJ2oP6Cr2qoT0yUfhYzzMorH1yilRHCeE3llKFWBbSrR2lK30bayZ/2imvXN8WazawzP7cHlVZbVVdbTwQaAtO/UkmdJdSH2EN3MrDW41X90U= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6504bd16-5ecb-4110-ead7-08d6bf21ca21 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2019 08:35:17.6358 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5926 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190412_013521_011337_A1A18071 X-CRM114-Status: GOOD ( 16.15 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hou Zhiqiang It's confused that R/W some registers by csr_readl()/csr_writel(), while others by read_paged_register()/write_paged_register(). Actually the lower 3KB of 4KB PCIe configure space can be accessed directly and higher 1KB is paging area. So this patch unifies the register accessors to csr_readl() and csr_writel() by comparing the register offset with page access boundary 3KB in the accessor internal. Signed-off-by: Hou Zhiqiang Reviewed-by: Minghuan Lian Reviewed-by: Subrahmanya Lingappa --- V5: - Corrected and retouched the subject and changelog. drivers/pci/controller/pcie-mobiveil.c | 179 +++++++++++++++++-------- 1 file changed, 124 insertions(+), 55 deletions(-) diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c index 77052a0712d0..d55c7e780c6e 100644 --- a/drivers/pci/controller/pcie-mobiveil.c +++ b/drivers/pci/controller/pcie-mobiveil.c @@ -47,7 +47,6 @@ #define PAGE_SEL_SHIFT 13 #define PAGE_SEL_MASK 0x3f #define PAGE_LO_MASK 0x3ff -#define PAGE_SEL_EN 0xc00 #define PAGE_SEL_OFFSET_SHIFT 10 #define PAB_AXI_PIO_CTRL 0x0840 @@ -117,6 +116,12 @@ #define LINK_WAIT_MIN 90000 #define LINK_WAIT_MAX 100000 +#define PAGED_ADDR_BNDRY 0xc00 +#define OFFSET_TO_PAGE_ADDR(off) \ + ((off & PAGE_LO_MASK) | PAGED_ADDR_BNDRY) +#define OFFSET_TO_PAGE_IDX(off) \ + ((off >> PAGE_SEL_OFFSET_SHIFT) & PAGE_SEL_MASK) + struct mobiveil_msi { /* MSI information */ struct mutex lock; /* protect bitmap variable */ struct irq_domain *msi_domain; @@ -145,15 +150,119 @@ struct mobiveil_pcie { struct mobiveil_msi msi; }; -static inline void csr_writel(struct mobiveil_pcie *pcie, const u32 value, - const u32 reg) +/* + * mobiveil_pcie_sel_page - routine to access paged register + * + * Registers whose address greater than PAGED_ADDR_BNDRY (0xc00) are paged, + * for this scheme to work extracted higher 6 bits of the offset will be + * written to pg_sel field of PAB_CTRL register and rest of the lower 10 + * bits enabled with PAGED_ADDR_BNDRY are used as offset of the register. + */ +static void mobiveil_pcie_sel_page(struct mobiveil_pcie *pcie, u8 pg_idx) { - writel_relaxed(value, pcie->csr_axi_slave_base + reg); + u32 val; + + val = readl(pcie->csr_axi_slave_base + PAB_CTRL); + val &= ~(PAGE_SEL_MASK << PAGE_SEL_SHIFT); + val |= (pg_idx & PAGE_SEL_MASK) << PAGE_SEL_SHIFT; + + writel(val, pcie->csr_axi_slave_base + PAB_CTRL); } -static inline u32 csr_readl(struct mobiveil_pcie *pcie, const u32 reg) +static void *mobiveil_pcie_comp_addr(struct mobiveil_pcie *pcie, u32 off) { - return readl_relaxed(pcie->csr_axi_slave_base + reg); + if (off < PAGED_ADDR_BNDRY) { + /* For directly accessed registers, clear the pg_sel field */ + mobiveil_pcie_sel_page(pcie, 0); + return pcie->csr_axi_slave_base + off; + } + + mobiveil_pcie_sel_page(pcie, OFFSET_TO_PAGE_IDX(off)); + return pcie->csr_axi_slave_base + OFFSET_TO_PAGE_ADDR(off); +} + +static int mobiveil_pcie_read(void __iomem *addr, int size, u32 *val) +{ + if ((uintptr_t)addr & (size - 1)) { + *val = 0; + return PCIBIOS_BAD_REGISTER_NUMBER; + } + + switch (size) { + case 4: + *val = readl(addr); + break; + case 2: + *val = readw(addr); + break; + case 1: + *val = readb(addr); + break; + default: + *val = 0; + return PCIBIOS_BAD_REGISTER_NUMBER; + } + + return PCIBIOS_SUCCESSFUL; +} + +static int mobiveil_pcie_write(void __iomem *addr, int size, u32 val) +{ + if ((uintptr_t)addr & (size - 1)) + return PCIBIOS_BAD_REGISTER_NUMBER; + + switch (size) { + case 4: + writel(val, addr); + break; + case 2: + writew(val, addr); + break; + case 1: + writeb(val, addr); + break; + default: + return PCIBIOS_BAD_REGISTER_NUMBER; + } + + return PCIBIOS_SUCCESSFUL; +} + +static u32 csr_read(struct mobiveil_pcie *pcie, u32 off, size_t size) +{ + void *addr; + u32 val; + int ret; + + addr = mobiveil_pcie_comp_addr(pcie, off); + + ret = mobiveil_pcie_read(addr, size, &val); + if (ret) + dev_err(&pcie->pdev->dev, "read CSR address failed\n"); + + return val; +} + +static void csr_write(struct mobiveil_pcie *pcie, u32 val, u32 off, size_t size) +{ + void *addr; + int ret; + + addr = mobiveil_pcie_comp_addr(pcie, off); + + ret = mobiveil_pcie_write(addr, size, val); + if (ret) + dev_err(&pcie->pdev->dev, "write CSR address failed\n"); +} + +static u32 csr_readl(struct mobiveil_pcie *pcie, u32 off) +{ + return csr_read(pcie, off, 0x4); +} + +static void csr_writel(struct mobiveil_pcie *pcie, u32 val, u32 off) +{ + csr_write(pcie, val, off, 0x4); } static bool mobiveil_pcie_link_up(struct mobiveil_pcie *pcie) @@ -342,45 +451,6 @@ static int mobiveil_pcie_parse_dt(struct mobiveil_pcie *pcie) return 0; } -/* - * select_paged_register - routine to access paged register of root complex - * - * registers of RC are paged, for this scheme to work - * extracted higher 6 bits of the offset will be written to pg_sel - * field of PAB_CTRL register and rest of the lower 10 bits enabled with - * PAGE_SEL_EN are used as offset of the register. - */ -static void select_paged_register(struct mobiveil_pcie *pcie, u32 offset) -{ - int pab_ctrl_dw, pg_sel; - - /* clear pg_sel field */ - pab_ctrl_dw = csr_readl(pcie, PAB_CTRL); - pab_ctrl_dw = (pab_ctrl_dw & ~(PAGE_SEL_MASK << PAGE_SEL_SHIFT)); - - /* set pg_sel field */ - pg_sel = (offset >> PAGE_SEL_OFFSET_SHIFT) & PAGE_SEL_MASK; - pab_ctrl_dw |= ((pg_sel << PAGE_SEL_SHIFT)); - csr_writel(pcie, pab_ctrl_dw, PAB_CTRL); -} - -static void write_paged_register(struct mobiveil_pcie *pcie, - u32 val, u32 offset) -{ - u32 off = (offset & PAGE_LO_MASK) | PAGE_SEL_EN; - - select_paged_register(pcie, offset); - csr_writel(pcie, val, off); -} - -static u32 read_paged_register(struct mobiveil_pcie *pcie, u32 offset) -{ - u32 off = (offset & PAGE_LO_MASK) | PAGE_SEL_EN; - - select_paged_register(pcie, offset); - return csr_readl(pcie, off); -} - static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num, int pci_addr, u32 type, u64 size) { @@ -397,19 +467,19 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num, pio_ctrl_val = csr_readl(pcie, PAB_PEX_PIO_CTRL); csr_writel(pcie, pio_ctrl_val | (1 << PIO_ENABLE_SHIFT), PAB_PEX_PIO_CTRL); - amap_ctrl_dw = read_paged_register(pcie, PAB_PEX_AMAP_CTRL(win_num)); + amap_ctrl_dw = csr_readl(pcie, PAB_PEX_AMAP_CTRL(win_num)); amap_ctrl_dw = (amap_ctrl_dw | (type << AMAP_CTRL_TYPE_SHIFT)); amap_ctrl_dw = (amap_ctrl_dw | (1 << AMAP_CTRL_EN_SHIFT)); - write_paged_register(pcie, amap_ctrl_dw | lower_32_bits(size64), - PAB_PEX_AMAP_CTRL(win_num)); + csr_writel(pcie, amap_ctrl_dw | lower_32_bits(size64), + PAB_PEX_AMAP_CTRL(win_num)); - write_paged_register(pcie, upper_32_bits(size64), - PAB_EXT_PEX_AMAP_SIZEN(win_num)); + csr_writel(pcie, upper_32_bits(size64), + PAB_EXT_PEX_AMAP_SIZEN(win_num)); - write_paged_register(pcie, pci_addr, PAB_PEX_AMAP_AXI_WIN(win_num)); - write_paged_register(pcie, pci_addr, PAB_PEX_AMAP_PEX_WIN_L(win_num)); - write_paged_register(pcie, 0, PAB_PEX_AMAP_PEX_WIN_H(win_num)); + csr_writel(pcie, pci_addr, PAB_PEX_AMAP_AXI_WIN(win_num)); + csr_writel(pcie, pci_addr, PAB_PEX_AMAP_PEX_WIN_L(win_num)); + csr_writel(pcie, 0, PAB_PEX_AMAP_PEX_WIN_H(win_num)); } /* @@ -437,8 +507,7 @@ static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num, csr_writel(pcie, 1 << WIN_ENABLE_SHIFT | type << WIN_TYPE_SHIFT | lower_32_bits(size64), PAB_AXI_AMAP_CTRL(win_num)); - write_paged_register(pcie, upper_32_bits(size64), - PAB_EXT_AXI_AMAP_SIZE(win_num)); + csr_writel(pcie, upper_32_bits(size64), PAB_EXT_AXI_AMAP_SIZE(win_num)); /* * program AXI window base with appropriate value in -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel