From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbdEAVbC (ORCPT ); Mon, 1 May 2017 17:31:02 -0400 Received: from mail-co1nam03on0046.outbound.protection.outlook.com ([104.47.40.46]:62137 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750892AbdEAVaf (ORCPT ); Mon, 1 May 2017 17:30:35 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: Roy Pledge To: , , , , CC: , , Claudiu Manoil Subject: [PATCH v3 09/11] soc/fsl/qbman: different register offsets on ARM Date: Mon, 1 May 2017 17:30:11 -0400 Message-ID: <1493674213-963-10-git-send-email-roy.pledge@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493674213-963-1-git-send-email-roy.pledge@nxp.com> References: <1493674213-963-1-git-send-email-roy.pledge@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131381478258943401;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(39400400002)(39380400002)(39410400002)(39850400002)(39860400002)(39840400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(81156014)(8936002)(81166006)(106466001)(33646002)(50226002)(105606002)(85426001)(8656002)(8676002)(38730400002)(2950100002)(6666003)(36756003)(356003)(47776003)(5003940100001)(54906002)(3450700001)(50466002)(76176999)(48376002)(5660300001)(498600001)(189998001)(50986999)(2906002)(43066003)(53936002)(4326008)(86362001)(77096006)(2201001)(104016004)(305945005)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0301MB0904;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD005;1:CBa5901b3yxS21Xwro3vtLgg/oRZmszEZFVSd2N4xkkNyc7Sib2tkl3BfIKLjDprxPACZYP4sBK4i3skrco/fI2S34PRP9LWcNHo88BBloHur3KazDNk8GeX8y2w4U307KRbhUHzpEiez8g6mSPPiqOXmsHUAVYWyQLLfNJcQb/N1e3pKPKMUkBv/oFiAtVk3C/uegsUD84TmpykSyMCylk9GSg7TFOEqh5z88BJs2O5NL81PoFT5lNEfxyilKzq7VU306WQ8xzssDbOkXcSppnBTcP4McX+1DU0O6DhI7jmhmJ/llIhrKTpEHAHA+dPuovZ7L8QrYZC2TFLnWipekhYppKiVfKjP4IiJ5YPn/PUW2d0AERmFraHifAwboA4AXS7sqmgUbIrgLiIocsHiv3tbhmVLyGaaNu2GTxRALqMthKAhTsGQLibD+mQwnVvjk/y2CgnHChvpn6na9Lktv9iXOUX7QZ1IlJlMifMX/zY/xAs3rgYE+gjhHyT8eDcP3F6tZmscAfYvTXTqN4l6A8fLWKKqeHCchQPKyqifMOpzINfrIGwDgCGfZBJZeUhWNUfRgpyHqlJKgTXIwZJe9TZ4Pja6+V28bkSS/AovsObHnEZB6ohjGNAXzfqYtW4vdDJGSt2TAZBHoh7ZMHtjhDK++8Xny3izLW3gQSW2MqwqJbwgPq32899KTJMAG3A/gAYX7oJViRbj6wIC9DacWyc6nFbBagiIBv/7jS03zKSxTZAqCllGgkFJCOHYALP MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 016c30b1-d11e-47f9-4448-08d490d94825 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:BY1PR0301MB0904; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB0904;3:wGcRkVEBBrUohE7UH9++CHkMRKD/xm10CnmCXXL2sisvrPEOKkH8FA/ApibB8NR4AuYDC90VhgTukUY3UdpvLA4hthF33E1XBCEw9ZUdzzbtMZyMI+1qv7M0Q322z+/cQEv3iVbcDdGpb9fY7b/eViFSQGqMiqbKJyv0zL3uZAtO5Dno4kffLrZq2FwdzigRmMaKxGslW38h748MC/sL+2wStjQhOrbDm0GgfE6xzf87jMzSJ2mOxWZZWt/BFtXwozM5jLRjPBZAVEqhIo/osthBpzInSlgzJjUA94QreO7eO+8BdTQe7Tn4WOcLPUDp9MFv2WIvw10pohSwh4pSrP7+OS2Bo1gvcNSEGpgNyG0j+k9Zh3+4YIVCmnC0dgutpZC/MNKElSKmA9LXfMGS9qNtFGyI/J7p4A7MKSGEtHAAc8weSnjC0aJRXr2b6CvC;25:/3AS0LXkpe2kJUA1tCDxYxe9VpokflYWh82NNnlb8ULgGiDxKg/Dkj+sXyFWqKXh4hTm4//nu2iU6gB1t+JxoP7519KEsRTzMQtjk/JmG37WkDA3En0lzhxJrcG5HqsMZ88Tu3mo3aAihd8N+dzxt4QggbiCSWz7snca1ykNn7GhRtqakHzoxnpGveAywrMk+fSbMhxgztdqVpA1VihQ7rOBS8GnY8Tamcj9+VPrPjnTE+znD8VdjmR/M/RVi9eJzAuUag3CTYKYaLZdxamBubMbsfAIApEJm1KxsKo6R1d5OFgHgNOhmJ4tQM6J00zOKz87H8AGHr86Ey0+PFf9s46XM8uJIauDRvZ1EZT2XgOKpYsehYkShBA3e+yps2eRwzA6EU9xsanNDIXB7zO/9OA9E3L2EWCNVAxIBQIBkSlJI0vosCqlK989zU8BRcjh49fQRcevnJefYCoFx10mIA== X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB0904;31:dvEnlJqL732uJzKw4Vjrvp5irk5a5NkNM5lVcrwCytcS4i+5R1qlsrCdRQfvhZidX5GF5bNYU3NGLg+BrLXbebeK/0qJXs/Noi1aWDFBIuennLqEWfEMweMoRtYI2msp4LiD82HhjTg9rA1JEAv8S3BW/OaATO9FKJafO497j5I6xbtz6ExQPhv6MAoCXwZ6OBlGdL8opybjb+moUAI7VxFasU9wlUcR/aI3e+9zIqSWL/Zr8VdPq1H8sjiE7NMoUKU7pLzEnrmTyz216p+EcmoX5WMNGIAsQiQ+uW7ulaQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13023025)(13024025)(13018025)(13015025)(13017025)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(20161123565025)(20161123561025)(20161123556025);SRVR:BY1PR0301MB0904;BCL:0;PCL:0;RULEID:(400006);SRVR:BY1PR0301MB0904; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB0904;4:RNdQzpouXA4eeitOxofpQ8gW9FMYoqY+3vpMv6XVvGk7/HcvsM+j9TsgUoobPYLRxSoVwyXRmF3czlZN1+X+1B/BhdWU8pbvYJlrJEiUISKqztWoYcjdW7YTw+DokMD5P9ohMjdjdAlL71sxmce4dVfbg8Rb02qSTPp5SfCX3v0ANshL6OcxW16OjaWLS2LS74R+tvYw3aAYhGqUquZNqwdY/YljFCztkye5UUvIyjjuSfTh+7psPNxshoBPkEOKRUPevpjzTD5Jep3XnOS4NHiY0GYAjfzqjVPqwmoIpNEakaq5gkSNk++pLVGEWJdhD5q28016CncoyAPJ1wKDcq2iKWUy/KHBWn3o6Tz2dTr4PjpzNid1fO/GAaP7dwT6Xq6bMAsx+1EJGOxNFLOfOmYMORsCE9SXhIb9wrMi9DFGs81WUE8uDwgDtjAIwaAiA/wB4Z2sRKGfL/AavFfdu9YQRNomeStdWhPy4++0NILwMFvGHn+j29gxE6JngyBmA3naEuS86DOQdtA6z48SE44yxstJI+ZUeDJxtx4xOQaZWfmXfJcPzzxcYVJR9c2zobuhlNoVqkTrVCezEp5FbCQ7QbJG+xTVxVFUilkR+WsdM9QCjLjG9bI1Hs6QaOR6LtIQU4CTq5hfhnwDiQp72FT2vyPFgzIsKr9Rs0N7nXrpEyOT90jdia+p+Ul9GuUBZRlMKcHCSFprWSKLLzXTWGPzX4aO/abSZdGgzMP7Doobp9gAT8fWPEoSb1HKfLj3ZiaoHYaN3zslywCBSgu7Tq9WREa/xBGHBDwzUCxfCPwCr6ZPf1xgMpxgPUTd2i3RQDNfH6dtM9drhmPJVnCrrR7YQNG3eNPCECXDrR6oZpfI83OUnxIxb6SJJQ90PhzR0/PaL3Dt7Xz1FQQALlcL6YFQy27GZ1RzeW+FzB08Gdg= X-Forefront-PRVS: 02945962BD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB0904;23:bUy1C1zxitCwXqQYC4MSWFLIRAxWMLo27aHxlEQ?= =?us-ascii?Q?eMtFhfNrqnbYhz+uvTpi7rb5aSBP9ZolaPEAm38BiHKazQsFOwyKQ79do1Hy?= =?us-ascii?Q?Q1jM4GzP6tDPlE2GxjQKH3/kz1shdPvDhPrjomlSdM2VPm9TWvVnU89NI7nw?= =?us-ascii?Q?CuxBE4qfbuQZ0GdG/pOQQaYNNippliWY6NxQ/EZSkbQxmL2utcs/8DI5R5tk?= =?us-ascii?Q?y16DfqLNNGM/I8jMVQxHS7lcBdFCFIEF36dPjYaB9bvuHOrQxPnlXyZVDeW6?= =?us-ascii?Q?kLafiIFPStotRQGRdktur27d5qtF5QqcBqJr+LXsSyRi0nYXt7cYL2eewG6k?= =?us-ascii?Q?sf8eAy3E2MdE1pyOrGuhkodRCtZ4Fpc/iunbSmlUCf9ugSnpHzAnWxM6q6nD?= =?us-ascii?Q?fvVfqLV3iq/vFGPpOGBuR1VuvYNYL/PLk6UlaGFah0IEDwdt4VzIhVsA586B?= =?us-ascii?Q?xpgaIjAQ1nR3tzCMYyaLUOx9xITF4XGj8BC2jh8pHWhKezRW++oe6oJZAgoE?= =?us-ascii?Q?cGlJaTSelHNLT5zu38OdUz6EJI9vKAn3YQjsEJZzrxf8RfEsB99p1VkP4EME?= =?us-ascii?Q?FaJhgjODlXN5wFN1qYFwlhbsaMpUAqMCaLzNv8+1hFsIRHRAnfguq5OuML+p?= =?us-ascii?Q?qAUgJJ36uEeXXnT4WPg/rLs80wY6sCfrVbO7Z7xyo3G1oyDD5B70NOOuHIbz?= =?us-ascii?Q?iaH4wUaYxvK6Y7fCLACPTByyheAUCRkZlGZIs1Ip5wmJLeLs86nypokd318g?= =?us-ascii?Q?XBijTL2wDfYuOMyBep64gEh/OwKLdHQMjjmuIxF9r09+TSV3S2NmLvRVHMQR?= =?us-ascii?Q?9y53kmcsAQdt81bZxZNRP1HrnwmsoI1EiNeH6DuI2zcg8M4SuwUqcW1Ua0E5?= =?us-ascii?Q?Id1BDmdJPjKI5MdAQZddyRrzB7lloSWxztV0N0AfhcSgZOUlJcgLW9JF3S56?= =?us-ascii?Q?BEpn/D4/KtKM3ML5tGUlQyfPUFXrf2njzVwauaJg0+UktJAtC6yYwD/AKzvZ?= =?us-ascii?Q?yR/1wopegkAy1iiiwDdCpGtHrvk72ZNmsmSY5Fo6AANyJYD6hIznyRfyq0VJ?= =?us-ascii?Q?0EhuBKxm1X1AMWoX/8MJbu6UZ6SZ+JVpsPCZ8WbL/pJVhfZE2zBSpqroBLtI?= =?us-ascii?Q?ESPdLLWLyn2sWPNFVwE3MdSrmxV2lG8+RhDmvR7k+HI+/Da3mft9+OadRTcb?= =?us-ascii?Q?tGd7YQcDtIYoV5+MxQi9wFSNTMHtDtNdn9C77sG36GZN2RZ8t3ISUXFYmdTz?= =?us-ascii?Q?wFKIyZ0YHRwyQmii8YwzHg/3KBZOsbfvS1aZmbMhhY2FhuqifVfLvvlPVqOB?= =?us-ascii?Q?OwQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB0904;6:saSSr4Jrl8CbmSPe77MUTGalQxJudwPSCPnos2Up7td+lnKbz0ggEBSPECszOPvaX8+NokgYR1sXAc8Gil6tszhSqNoQkpWe59jBurli6aEGaHCXJI8nfWVd38gd/iobkwSmNL40sU+SbpRT9PjF6KZPwiI07SxWQPlghDJPaDvriNRF2GSs2qLjwmDuQ9yFz4ia+86JWTrA+gUM2jNLNbtBHqzE8kCFv8jw1ZxMNxRxCzg4ykjUf8Js/DplwfsA/98fgBjmre8AuDHdKrxIhV49Ttkja4TamEg2wkfnqBjWG36pN2oedpqp+u1hzVIReWAO7gJRN/6HRhJCdUhygr8z8J1uwlDSkEkWNRO0rq2H9NQ62GTPUri765z7vOJmpIVarW6TN2yuPfUOK7ZjK7uVH+1+po1wfa2Xu4hm+qOuUBAnXQ+vdkqqykBmWERHCdswHMEnzhVai2XcI6im9gg4SKN8L+whRM84ZTynTfkto9NHCbWfDJlf4oPHs3MltBOZqWoVS0zbUUxsWk/3Fg==;5:ZubuuV4NJnjTDFxLodln3+yn80e1fKDMMr8A15BVAPiaM/OwptMvWY+zRu3TcflbBWYoTccLqLxu5Pa4db5vgdd4ZmQSgYX+4kI51+rHNvazwYzHufHVVuk218N6AjLHExk10J31dhgM30VPcsS06sBkakVli78MYWuaq90PhCAQcNDVZpRAhB7AGa9dkf2p;24:lMK5HoQ33SlPVcyLqI6pVnFS5fOqpVvt2N6eyjlkHZw3e/nkTo5AXvr599YXAX2jUKSSPfT9UELxXubkQaSgbzul5ALmGerzPw4R6o5e/yc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB0904;7:Y7kdmLwkEDAR37fau+8CYGnVpcYZVbKP38Svah3GgljrGIE8y46MLZi3Te2SnQ/lVVg0XIpLj/qRbnw49LnxmB/Nt6ebAVOrU92g4+4gqvNnu/zoGYpr7f+X5Hi/9bINA9hd7xAcKg3CZyxMEc4EH6yaNwhWVTgROdYX6cxzAxEEy6jFQ+kTUmYz9H8yn5t7Y+C5m3Gu0IHE3hUGpvFeXMtnPPa4J/5TTzUM32KNHJ1iVl1uGDWEIRrIZcPfZYqu2HdJpQw08+8oOqpbt0wEytSdOidZ+2Er4qmXkNNF3LW2bhjKf5iourMKROA73gA0ud5ofW7/0YPhSElyGafpxg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2017 21:30:25.6447 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB0904 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Madalin Bucur Signed-off-by: Madalin Bucur Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/bman.c | 22 ++++++++++++++++++++++ drivers/soc/fsl/qbman/qman.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c index 3acded1..1fa9099 100644 --- a/drivers/soc/fsl/qbman/bman.c +++ b/drivers/soc/fsl/qbman/bman.c @@ -35,6 +35,27 @@ /* Portal register assists */ +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) +/* Cache-inhibited register offsets */ +#define BM_REG_RCR_PI_CINH 0x3000 +#define BM_REG_RCR_CI_CINH 0x3100 +#define BM_REG_RCR_ITR 0x3200 +#define BM_REG_CFG 0x3300 +#define BM_REG_SCN(n) (0x3400 + ((n) << 6)) +#define BM_REG_ISR 0x3e00 +#define BM_REG_IER 0x3e40 +#define BM_REG_ISDR 0x3e80 +#define BM_REG_IIR 0x3ec0 + +/* Cache-enabled register offsets */ +#define BM_CL_CR 0x0000 +#define BM_CL_RR0 0x0100 +#define BM_CL_RR1 0x0140 +#define BM_CL_RCR 0x1000 +#define BM_CL_RCR_PI_CENA 0x3000 +#define BM_CL_RCR_CI_CENA 0x3100 + +#else /* Cache-inhibited register offsets */ #define BM_REG_RCR_PI_CINH 0x0000 #define BM_REG_RCR_CI_CINH 0x0004 @@ -53,6 +74,7 @@ #define BM_CL_RCR 0x1000 #define BM_CL_RCR_PI_CENA 0x3000 #define BM_CL_RCR_CI_CENA 0x3100 +#endif /* * Portal modes. diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 3f60289..121bbb7 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -41,6 +41,43 @@ /* Portal register assists */ +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) +/* Cache-inhibited register offsets */ +#define QM_REG_EQCR_PI_CINH 0x3000 +#define QM_REG_EQCR_CI_CINH 0x3040 +#define QM_REG_EQCR_ITR 0x3080 +#define QM_REG_DQRR_PI_CINH 0x3100 +#define QM_REG_DQRR_CI_CINH 0x3140 +#define QM_REG_DQRR_ITR 0x3180 +#define QM_REG_DQRR_DCAP 0x31C0 +#define QM_REG_DQRR_SDQCR 0x3200 +#define QM_REG_DQRR_VDQCR 0x3240 +#define QM_REG_DQRR_PDQCR 0x3280 +#define QM_REG_MR_PI_CINH 0x3300 +#define QM_REG_MR_CI_CINH 0x3340 +#define QM_REG_MR_ITR 0x3380 +#define QM_REG_CFG 0x3500 +#define QM_REG_ISR 0x3600 +#define QM_REG_IER 0x3640 +#define QM_REG_ISDR 0x3680 +#define QM_REG_IIR 0x36C0 +#define QM_REG_ITPR 0x3740 + +/* Cache-enabled register offsets */ +#define QM_CL_EQCR 0x0000 +#define QM_CL_DQRR 0x1000 +#define QM_CL_MR 0x2000 +#define QM_CL_EQCR_PI_CENA 0x3000 +#define QM_CL_EQCR_CI_CENA 0x3040 +#define QM_CL_DQRR_PI_CENA 0x3100 +#define QM_CL_DQRR_CI_CENA 0x3140 +#define QM_CL_MR_PI_CENA 0x3300 +#define QM_CL_MR_CI_CENA 0x3340 +#define QM_CL_CR 0x3800 +#define QM_CL_RR0 0x3900 +#define QM_CL_RR1 0x3940 + +#else /* Cache-inhibited register offsets */ #define QM_REG_EQCR_PI_CINH 0x0000 #define QM_REG_EQCR_CI_CINH 0x0004 @@ -75,6 +112,7 @@ #define QM_CL_CR 0x3800 #define QM_CL_RR0 0x3900 #define QM_CL_RR1 0x3940 +#endif /* * BTW, the drivers (and h/w programming model) already obtain the required -- 2.7.4