From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751393AbdEJFbe (ORCPT ); Wed, 10 May 2017 01:31:34 -0400 Received: from mail-cys01nam02on0071.outbound.protection.outlook.com ([104.47.37.71]:6991 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750780AbdEJFbc (ORCPT ); Wed, 10 May 2017 01:31:32 -0400 Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=cavium.com; Date: Wed, 10 May 2017 11:01:05 +0530 From: Linu Cherian To: Robin Murphy Cc: Geetha sowjanya , will.deacon@arm.com, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org, sudeep.holla@arm.com, iommu@lists.linux-foundation.org, jcm@redhat.com, linux-kernel@vger.kernel.org, robert.richter@cavium.com, catalin.marinas@arm.com, sgoutham@cavium.com, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, geethasowjanya.akula@gmail.com, Charles.Garcia-Tobin@arm.com, Geetha Sowjanya Subject: Re: [v4 3/4] iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2 erratum #74 Message-ID: <20170510053105.GA7576@virtx40> References: <1494330314-30179-1-git-send-email-gakula@caviumnetworks.com> <1494330314-30179-4-git-send-email-gakula@caviumnetworks.com> <20170509134856.GA1090@virtx40> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170509134856.GA1090@virtx40> User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BN6PR16CA0004.namprd16.prod.outlook.com (10.172.212.142) To CY1PR07MB2522.namprd07.prod.outlook.com (10.167.16.13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d1aa9a1-3191-4488-8f92-08d49765cbae X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:CY1PR07MB2522; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2522;3:5Ho+lDtF0d+4X940lf/YOhQbUDjIhozwnoORKrppqXGj5m21m1U7j52hwfzSi6mVNLXcthBQ9TMbaS5o8W/0cQarxeHORC7xM4A9NeIf7YRGN4UU6n8jLj4RldV4vnZlAsYqS9WeczWeRx8kS3DS5uz0LmR32wXuR2FSipdggouuXdWSVeGs3niTCHwMvS11KuvMWjh7AU/3UYMNZcs0SH0tP6lKNKgrtTzIpbxIm6U8TLwblWAAGqOjYtYqSF/IulU1JKRryU//YzGxQYfj//rmiLh/d1ijerWfpByEsZ55bXvIlDI688l+WGXXRMjt4/gbi31xnfUHb4KYUCSNeA==;25:QP7v+kT6qNao9uHpvayhI6XJ7MvDtLGLpbAJW8im1ZuysyOTuQxhOR4WuOIpMSWJpAdqoH5L16dI8fvm/wEhqjNLSay9hRjjE2RE3/B1ut+G8o0eKswBfdNT7oyEULMlbx2Kz7V3c5yGYU61RCFqb60zQwVd4mVKRNpvnZOzzGZoLtUWgWIH92nae853jVL9fzcAVj0Rl0QzlktoEJSyHJFuzKEj0BOYLc0+K/79jdsN6O+39aF+isF1JYQbjkeCZtarfLfji30ykBm/nadFslYMuRFQBiTUm55wBcXIjzhK9EngqekPueYKKBlicl3WZMy/750Zw90ThFsPQXB2BrUFzF1KBGUrGO/NY8ud4AvhYmP1tM1AcI1m+S62FMjJjr5gm52OAMQRmR3m5QWafXbakac1pnahb+/h6Zw0faCv4lENl2ZHcRTXlCzyeE6bqdSWQOpO0LMtRVdqbst/JRujf/CH68Zg4YQzioypfOA= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2522;31:lhzE5FMIqxZNpvTRcl/TZcOYt/G9yTB2lOBqxtdUW6GRQZhuCefJOe0MyntK0FQOdG5XsZbCxu6v6QJ8JBCIDY/8FGi5mh1EgxVgmLYTWj7fT6MNbWnsW7Xf1/+rCuoiFWvazhIrRRqpOgsM7mgF9mSyDNbvY7GyJt5G8xmI1RdGvpKb0Qc1drlMaahB/8KXGclmukPYMmJcimkZTrIiUFwRSLQ4HLKKRr3SeQfzy7w=;20:515lUum5J6l3s0WC993taunURs38wZdvG7N1DpblSvOZThCzkECnktwHfRucNHg1yP5oAzdIaKgqTSxogbe26v7WliKh8FvrJzYT6KbJZzZyJd+RSLBEyWRDpN+YAUbWSBfoiDz6aQfSHqsicgKR9D2CMRLC17yjfkeqe6qhb3mTMoGQc/A9kQlZD7ap0kB8Er82Zz4Iar74yQ0u21QiaKUuwTGWFUacZHopV+iPmJHC4xkE1oiWJ43v5Z9TrJfNNJCy/MrNaaioR6P0hnT9UaVZfpXXkHOHttINb03St0ljTEhtWUZZk7wxnMOMrkhwDS4sPnfc6ywmlutHwczPVU3oeFdBX1/jVkX0EemCji95JejBiQk1HVyoefuk9eJS4+QfGmDP2FqGJlpiwwzNpr7+a6na5iCMsF7jnVdIImDAc1buBSaSnS9F6B+HXeEwwUAj0mLgv9QE4sb4c6Cljhr2P6IfpgL5DyLHPDiySJITEpt5nzwuZQH5nAl0uzcf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148);SRVR:CY1PR07MB2522;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2522; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2522;4:NzFFkp0sTnx+SxkXd+q4oD8HJA65PiYJgOg4lQDWVjiHQ33NCZZ9R683xKVvXNgzQEaGMGQeeFqJZtOJLxd0EIOIAv5XZnejbSDD1XSpxFzYBMrGVHr9ynFte9OVrVoIDa2NOIJPgJ8UATCEVJtu1YsAL5AHJU04VoRi9qb0sS+Ee9r9O3bakAJg0+MudLQfokthR5z8YrudSxOie/6TzBEHjT+SY252jlgctqqSYiaGWSgM9PvHEQtiPqjTZCeZmSZBkorilWcVjICJZnUdsss2FqKCO86sUSvmKgKRSrtP9zgOBmcvbOshekNwWgmDBsI7vtlZnq0o+MDk+kCMX5mxMqfhaYQ6moTqqVG1kvUpduiGdAD1jdMfCLdY4sUW0QfhOJfHHRQqXLQzhjrIxvPHWi/X8ZVFPh2puGJzGn8+iTrQVhDpbYxjgTr0OCxhJQLU6qv4DNh8pbcs0utPu92kf00YK63bxwf6X/ryKdiBJBoPgOXEMFOUTmv0DsO5Zfi23K+dNBnzfqGqFjt2sPvTzqLv0gQ/iSBBUl4VC8UrNVnF6NGGluL45Ek3v9HH/WlUtiJFQeBbD722Tu1otvs+imcwBOEyAqXLe1afnCLr5qa0oySx65t3Egf8gO18Af357RGmJtkzSa9DzzzqDrZma8jztWqywH68T1ThWOSxx5+5Uy0TyHY6ka+vhoQKoN/IeKzICN9/cgXJvH7Z8oBdKnFOYD0IdHgFBzyrd464YrzKTybXj5RYjKHf+B91Tz1iq+V1k6BoxG2j//zdAv50xsVngh7JegfiWEJZHs0= X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(39840400002)(39850400002)(39400400002)(39450400003)(39410400002)(24454002)(1076002)(3846002)(23726003)(83506001)(305945005)(7736002)(6116002)(66066001)(86362001)(4326008)(47776003)(81166006)(72206003)(2906002)(8676002)(33656002)(42186005)(9686003)(33716001)(38730400002)(110136004)(6246003)(230783001)(107886003)(478600001)(93886004)(54356999)(189998001)(5660300001)(76176999)(53546009)(53936002)(50986999)(122856001)(50466002)(7416002)(54906002)(2950100002)(4001350100001)(6916009)(18370500001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB2522;H:localhost;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR07MB2522;23:cF9JDNXQR5BXQrBobE7Eed6CbPhGv4ZrbMjbeLejQ?= =?us-ascii?Q?5cWn/SwJYv41cy2ymg22UV6Tx2Bg1BdUC5jigAPA+JgQxPZ7df4522c3jMWE?= =?us-ascii?Q?P76jmdrr8pF5Bmxa8mF+TzaufzG0oWP5bpyXeh2/BxEofM7UQgu4gItpwx/w?= =?us-ascii?Q?hQhJ1MZ611AaB5slCQeneBXIMmie+lQTpely1EtwIBCtUIQIq1xJGlSM+Z04?= =?us-ascii?Q?+7QvK6xbSSOBHLK5VD1NaohU5rdnPff0cjP2S7SCdo6LcuYslY2l55M2zX/l?= =?us-ascii?Q?0c4+bGZoJRHOrRPWywLQSoESXVsa8DASDI2lD9NTS4lpECZmc3b4Ygw1H+ss?= =?us-ascii?Q?y5f5Px8oVy6+AP67nlm3KRLcfkQjdhqWDV6Sdt9KjUS1Py/BCkeLCySn84lM?= =?us-ascii?Q?2XB5roBkByEFGT9b+/l5TObG6cZMcxujBazWUHb/ICgTTomHrSNYnH2nY4Dw?= =?us-ascii?Q?ZKDzTrlwZb379o5GhKA8mr9pq14wl7y+NnrHZt3OouP0ZNTLbuhypwrtFp82?= =?us-ascii?Q?3Oj5EqKa7fI7E3D2ZBRzjKafDIrjiS+ULZlhqRoFEmEvlrK2chfotHcZfC5U?= =?us-ascii?Q?3BvlfwrwC4lnDMIdmQHw5kaawGU5xjItBAuPUsNGk4FDkjYuRxdP8JmP1U6e?= =?us-ascii?Q?jnIzwRpounMWx5XUrV2PWRtM5wb8W3GRH8CNbbX83eQsx5qIVqaPOp2CLpEy?= =?us-ascii?Q?FriMsYQORlzW/+rKwSw2Uy85iUWbw4UM7f04R0DBLEpy7Ygk7jB7pq6qmqnN?= =?us-ascii?Q?R76QEuY5OfhZDmHgTeAJTUIw5zRc3IZPjFEWWkel6mXUftZUuamYXwmHBEGx?= =?us-ascii?Q?bvBxZoxHNgS0wpbcgdBIjBQKZ/GCZtHRuG7jv7/rOvpC2G9Xvaja0s8rafGR?= =?us-ascii?Q?D6TU+zxwfCyS3oD641m/HKSOoj2OaaYAGm8wnroTvMV7flZN+NjHqDwWDdVA?= =?us-ascii?Q?4cSp4JpEaaV+jjt79sFxnapMltt1yPX/j7ZWvhTKcGP9w1mB++0rzGFce5F0?= =?us-ascii?Q?l87qXA46FquXqUdvqRdIIw7YawbzyOfWB5k52LKm0eha/56C/W8yox8RMYCz?= =?us-ascii?Q?WubfWMQ49nhlTQf9RRK9CpZjjlU22q6BVQuvgP4CGNcEsmBa2zxn4K5KKpyX?= =?us-ascii?Q?0uhJEkccxDjxLeUhnNflsQYfjScRYLNLsFhpfd1eubLKPB7UMdTL3AVQrvpq?= =?us-ascii?Q?nagxe3b4SroEE9toFpEbVsWIinqeRwvj0P2PABZihSgfVkYCnJlrGw7pHn5Y?= =?us-ascii?Q?A5NZBLz3a+yPo7lmVU=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2522;6:HjrcWnr9Qsy922ogMgO0g0aw17CsQmLt8SSQkRxBso80md6dlGSF3ba+2AwbKp95ft2JQumUmtzHfaJycSwpSSJ80AkYVJd/9XjKeSIhA6L1GjCs8+lJ6THEAKa0EOFWmc7XYjwU88vtlGFmQvVQ0M1TGwGlZOGwRV3oZ4+hSbWBUQf5EQCxCDKs5loLw0exbD7kRUtuWW6dsa15Xcu5nW3FMrD4AAA8RbulncmH1bVY1rK4EDpvL7Pwn3pfgAp4rwKRe9SOMd4h6vpaGK7SV6OdmP2yOEJQ5pMln7i1G6djKRnlL4dSyXVLCHSqFAE9I+JGrtBEwAwwQqVgJ/5GxI2PMb1T+pEHwkVBegri/CNNoza4xuurHHabG4wCmjQaHyLwH5ulel1+UwvM08zTcDpkOaT19yNvpuZfuGEW84/6Nqt20f61lDfDYvrh595x2Mb95a9sS7Z14rzy1YP5BwJ0tlhD3L/+7JIyYUseNFrEdjLthR3G8IlTv4Nohcxgg6azceaWnRl7ujRFFvW3gQ==;5:sQzS2bV7O06wetngt/XBfOIuimPOaUvx9yE35jTdw/pJBYkm2ztXpYne4nTPQ29ti78vGPmX3+SzEj5onuaDgWrSi6n1WDCw/iRkPaFymc6D9cvOKxKwRFlUsSC/7A8T0hmB8eAUwbn959MG3GniBg==;24:ZJwAp2RqNy9lmpkcjqjJ86O6FP+2hkjxylbrpcZMd373tuSHg6gOU0UH6fDDU9DAnx5/U7HpdhxLI6IOTrFj+JNxlNWHTZgMY4syDyYrmJo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2522;7:d6xQOnlJWSfNT23MEsp8dhgOHpiZ+LvaPuSST6daXSCyFzhxC7y7P48DwTD9XyNGMhaEJSMzImWImE7PS0ERafTVt5peLOAnGg53sgkOFeHubp4Cg4zS+ECz3PNDltLGy5afpFZYfxBI4re2KSDUsZpne8f2NQYn06E+3FvTmz6aB1eL9s5EeK8L4bFcC2ThW7xWwHK8Wsh9hhNs/xXh1FKI8DUKrkK/TgjnTa7ji4bdBMyzvZvl9vJZ7631Myte4RGi0ekmw3Rayk2II9wbVOfbmaZZoZWeMj/F28Ffmqg6wte90nzoCP99nDcmG3w7VVhLiNjIOgeuUCb+9yZhkg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 05:31:17.2820 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2522 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Tue May 09, 2017 at 02:02:58PM +0100, Robin Murphy wrote: > > On 09/05/17 12:45, Geetha sowjanya wrote: > > > From: Linu Cherian > > > > > > Cavium ThunderX2 SMMU implementation doesn't support page 1 register space > > > and PAGE0_REGS_ONLY option is enabled as an errata workaround. > > > This option when turned on, replaces all page 1 offsets used for > > > EVTQ_PROD/CONS, PRIQ_PROD/CONS register access with page 0 offsets. > > > > > > SMMU resource size checks are now based on SMMU option PAGE0_REGS_ONLY, > > > since resource size can be either 64k/128k. > > > For this, arm_smmu_device_dt_probe/acpi_probe has been moved before > > > platform_get_resource call, so that SMMU options are set beforehand. > > > > > > Signed-off-by: Linu Cherian > > > Signed-off-by: Geetha Sowjanya > > > --- > > > Documentation/arm64/silicon-errata.txt | 1 + > > > .../devicetree/bindings/iommu/arm,smmu-v3.txt | 6 ++ > > > drivers/iommu/arm-smmu-v3.c | 80 ++++++++++++++++------ > > > 3 files changed, 66 insertions(+), 21 deletions(-) > > > > > > diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt > > > index 10f2ddd..4693a32 100644 > > > --- a/Documentation/arm64/silicon-errata.txt > > > +++ b/Documentation/arm64/silicon-errata.txt > > > @@ -62,6 +62,7 @@ stable kernels. > > > | Cavium | ThunderX GICv3 | #23154 | CAVIUM_ERRATUM_23154 | > > > | Cavium | ThunderX Core | #27456 | CAVIUM_ERRATUM_27456 | > > > | Cavium | ThunderX SMMUv2 | #27704 | N/A | > > > +| Cavium | ThunderX2 SMMUv3| #74 | N/A | > > > | | | | | > > > | Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 | > > > | | | | | > > > diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt b/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt > > > index be57550..e6da62b 100644 > > > --- a/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt > > > +++ b/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt > > > @@ -49,6 +49,12 @@ the PCIe specification. > > > - hisilicon,broken-prefetch-cmd > > > : Avoid sending CMD_PREFETCH_* commands to the SMMU. > > > > > > +- cavium-cn99xx,broken-page1-regspace > > > + : Replaces all page 1 offsets used for EVTQ_PROD/CONS, > > > + PRIQ_PROD/CONS register access with page 0 offsets. > > > + Set for Caviun ThunderX2 silicon that doesn't support > > > + SMMU page1 register space. > > > + > > > ** Example > > > > > > smmu@2b400000 { > > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > > > index 380969a..1e986a0 100644 > > > --- a/drivers/iommu/arm-smmu-v3.c > > > +++ b/drivers/iommu/arm-smmu-v3.c > > > @@ -176,15 +176,15 @@ > > > #define ARM_SMMU_CMDQ_CONS 0x9c > > > > > > #define ARM_SMMU_EVTQ_BASE 0xa0 > > > -#define ARM_SMMU_EVTQ_PROD 0x100a8 > > > -#define ARM_SMMU_EVTQ_CONS 0x100ac > > > +#define ARM_SMMU_EVTQ_PROD(smmu) (page1_offset_adjust(0x100a8, smmu)) > > > +#define ARM_SMMU_EVTQ_CONS(smmu) (page1_offset_adjust(0x100ac, smmu)) > > > > Sorry, perhaps I should have communicated the rest of the idea more > > explicitly - you now don't need to change these definitions... > > > > Fine. > > > > > #define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 > > > #define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 > > > #define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc > > > > > > #define ARM_SMMU_PRIQ_BASE 0xc0 > > > -#define ARM_SMMU_PRIQ_PROD 0x100c8 > > > -#define ARM_SMMU_PRIQ_CONS 0x100cc > > > +#define ARM_SMMU_PRIQ_PROD(smmu) (page1_offset_adjust(0x100c8, smmu)) > > > +#define ARM_SMMU_PRIQ_CONS(smmu) (page1_offset_adjust(0x100cc, smmu)) > > > #define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 > > > #define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 > > > #define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc > > > @@ -412,6 +412,9 @@ > > > #define MSI_IOVA_BASE 0x8000000 > > > #define MSI_IOVA_LENGTH 0x100000 > > > > > > +#define ARM_SMMU_PAGE0_REGS_ONLY(smmu) \ > > > + ((smmu)->options & ARM_SMMU_OPT_PAGE0_REGS_ONLY) > > > + > > > static bool disable_bypass; > > > module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO); > > > MODULE_PARM_DESC(disable_bypass, > > > @@ -597,6 +600,7 @@ struct arm_smmu_device { > > > u32 features; > > > > > > #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) > > > +#define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1) > > > u32 options; > > > > > > struct arm_smmu_cmdq cmdq; > > > @@ -663,9 +667,19 @@ struct arm_smmu_option_prop { > > > > > > static struct arm_smmu_option_prop arm_smmu_options[] = { > > > { ARM_SMMU_OPT_SKIP_PREFETCH, "hisilicon,broken-prefetch-cmd" }, > > > + { ARM_SMMU_OPT_PAGE0_REGS_ONLY, "cavium-cn99xx,broken-page1-regspace"}, > > > { 0, NULL}, > > > }; > > > > > > +static inline unsigned long page1_offset_adjust( > > > + unsigned long off, struct arm_smmu_device *smmu) > > > +{ > > > + if (off > SZ_64K && ARM_SMMU_PAGE0_REGS_ONLY(smmu)) > > > + return (off - SZ_64K); > > > + > > > + return off; > > > +} > > > + > > > static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom) > > > { > > > return container_of(dom, struct arm_smmu_domain, domain); > > > @@ -1986,8 +2000,10 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) > > > return ret; > > > > > > /* evtq */ > > > - ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, ARM_SMMU_EVTQ_PROD, > > > - ARM_SMMU_EVTQ_CONS, EVTQ_ENT_DWORDS); > > > + ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, > > > + ARM_SMMU_EVTQ_PROD(smmu), > > > + ARM_SMMU_EVTQ_CONS(smmu), > > > + EVTQ_ENT_DWORDS); > > > > ...or these callsites; you can just use page1_offset_adjust() directly > > within arm_smmu_init_one_queue(), i.e. > > > > > > > q->prod_reg = smmu->base + page1_offset_adjust(prod_off, smmu); > > q->cons_reg = smmu->base + page1_offset_adjust(cons_off, smmu); > > > > because it won't affect page 0 offsets either way. > > > > > if (ret) > > > return ret; > > > > > > @@ -1995,8 +2011,10 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) > > > if (!(smmu->features & ARM_SMMU_FEAT_PRI)) > > > return 0; > > > > > > - return arm_smmu_init_one_queue(smmu, &smmu->priq.q, ARM_SMMU_PRIQ_PROD, > > > - ARM_SMMU_PRIQ_CONS, PRIQ_ENT_DWORDS); > > > + return arm_smmu_init_one_queue(smmu, &smmu->priq.q, > > > + ARM_SMMU_PRIQ_PROD(smmu), > > > + ARM_SMMU_PRIQ_CONS(smmu), > > > + PRIQ_ENT_DWORDS); > > > } > > > > > > static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) > > > @@ -2363,8 +2381,10 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) > > > > > > /* Event queue */ > > > writeq_relaxed(smmu->evtq.q.q_base, smmu->base + ARM_SMMU_EVTQ_BASE); > > > - writel_relaxed(smmu->evtq.q.prod, smmu->base + ARM_SMMU_EVTQ_PROD); > > > - writel_relaxed(smmu->evtq.q.cons, smmu->base + ARM_SMMU_EVTQ_CONS); > > > + writel_relaxed(smmu->evtq.q.prod, smmu->base + > > > + ARM_SMMU_EVTQ_PROD(smmu)); > > > > And correspondingly just use page1_offset_adjust(ARM_SMMU_EVTQ_*, smmu) > > explicitly for these writes. > > > > In fact, if all the potential callsites are immediately converting the > > offset into an address, then it may be worth just factoring that into > > the helper as well, something like: > > > > static inline void __iomem *arm_smmu_page1_fixup(unsigned long offset, > > struct arm_smmu_device *smmu) > > { > > if (offset > SZ_64K && ARM_SMMU_PAGE0_REGS_ONLY(smmu)) > > offset -= SZ_64K; > > > > return smmu->base + offset; > > } > > > > What do you reckon? > > > > Just had a opinion that, replacing all page1 offset macros(ARM_SMMU_EVTQ/PRIQ_PROD/CONS) with > page1_offset_adjust(ARM_SMMU_EVTQ/PRIQ_PROD/CONS, smmu) will make the changes > more uniform. In that case, we wont need, offset > SZ_64K check as > well. > > Hope the intention is not to change the offset definitions. > > Will post v5 series with the approach you suggested (using arm_smmu_page1_fixup). Also realize that this will result in less number of changes as well. Thanks. -- Linu cherian