Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Wed, 25 Oct 2023 09:17:09 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Joerg Roedel <joro@8bytes.org>, Joerg Roedel <jroedel@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lu Baolu <baolu.lu@linux.intel.com>,
        Nicolin Chen <nicolinc@nvidia.com>, Yi Liu <yi.l.liu@intel.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231025121709.GC3952@nvidia.com>
References: <20231025154420.718e27af@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231025154420.718e27af@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FGbLLhDhZFzm000KB/m3X75FnoeAGFdpKPkfyXHVNlR1PCWCJ8jxk++ml8b2?=
 =?us-ascii?Q?6qc2Tv4caVzuPxcFJ5ACShKrzIvt6OR+h18SP3PS7xnw0sWCZPPj0TauqfsO?=
 =?us-ascii?Q?TmF0sywTI4YgHm4Vkmg2YV6niFbfiNoDBEPH61aSHZDOawnZkl90JsIaQiHg?=
 =?us-ascii?Q?uE9p0KAzz29rKIlz3G0zlmhkDifQ2Ypbc+I6TwJHx6610K/+nJ2nW6YNEKHd?=
 =?us-ascii?Q?GSA/bXjHP7zut6Y7VTHzULEmr1mT58zhpNhLa0RsLiyufhSob040WPaSTFhX?=
 =?us-ascii?Q?F62L9VSnlwQF9OI9rkJOCoTy7jbkTzS57cxvYLJXvItZA1DrwtbK71Nz8uSu?=
 =?us-ascii?Q?81k3xXWUTA6nOxHeeHiFKivu0AhvqDx8/xJTczdXbtzeoD3hZ+z1uYuGLWdS?=
 =?us-ascii?Q?m1F0srPXQNkXlTOuqeVq4CQ9ZVqFzzMqeIjUba2AibvSOZ5y5FoMioESR4YD?=
 =?us-ascii?Q?MLx4IW70aZ59mQTPVBXmEdt+QPtIztVKmsJ32c7qNHE9qvTP+WUSvP7RHN/B?=
 =?us-ascii?Q?iSC8O/hK3i3eb+zqUVWRpZPrnyGuzfUHI7fxK6CSBl7iXmmoUJoGspbrUAre?=
 =?us-ascii?Q?tmd3amVhpsu7J0CfIxgujTSEybCd7LGC7rEtPIoekIBLTezxDV6yvqoYEvo8?=
 =?us-ascii?Q?WgezDbD24XbaNhCd/xLioepOoeYzSyS7yMWxH6dFCokn671pUY1evKbQt9+U?=
 =?us-ascii?Q?V/29rOMlbLPvIB2txJD3WWiMg+opUiqWXhi30I6xC0TVSv00Xpi5smLgqSca?=
 =?us-ascii?Q?IKMmZGveAz+J838m8fjX93Lzjej3jYAKbnuUAwUDOfhQgzIPQ7ixlU4gAVcQ?=
 =?us-ascii?Q?Ckx0Maz9jCD9n/cD9W28twlcijp66UzDijPLRcs7WqV7qZHWgEOoRPmqNa2r?=
 =?us-ascii?Q?+setuU4KNnwKLrdUiEKzS3S1qBW1lYTTcIRR2jSWsQAY4ypfzyv9MXG8A4pJ?=
 =?us-ascii?Q?8v5xxzX8esc3c0XRvgl8qfWbN9V+sh8yYqg9vw8LbUXmTqKVt4lrJTndaAIn?=
 =?us-ascii?Q?PI5WlP5wsyImSQggv9vi6/QI3lzdpZ277YZGnzprtskCaT1/FuppJrobS4IP?=
 =?us-ascii?Q?N2Qvith1HtRrMtWR5zRRLdJNL7SNkABJmDneURQH2Gbp9b8aIbeP7VPZUK8S?=
 =?us-ascii?Q?F8M1ZY1V8EqJe3CPqJXKvKdKYmobkru5m4cCf99Ll+Lmr4rEk+bzdPfM9Fso?=
 =?us-ascii?Q?Md+miD5XQM1A7UduincgA8HpDB2iHFCSo7coqaRN4IYEiD9fqjg0skaer+hF?=
 =?us-ascii?Q?/eNTZAIukI6Z0odAA71rLBa1NVGXSSfBLZGLtcHURPlISkELnstdv5/O1Co1?=
 =?us-ascii?Q?zmsnRO6qRTRX9gnehp1GFxIk9p+a9IuvqODczvnae7SfuXsbPhfqWFzozcIu?=
 =?us-ascii?Q?HthcH0NZs4yHtSv0hLJh1ppdJxhz4fF0jFUBgmUDOIARcpopDFXnFRIwNXO3?=
 =?us-ascii?Q?io9N7mug15e9sLoOkIbU6SN/eb2ZV0LY7Ywha9Ctya6e0yj5APOPajaGNdXb?=
 =?us-ascii?Q?n2Z/G9709qlNOzAhPkn1ao9jUqW1OUp7E7HPGIrOzqyZSw1xogpuEGYuJAB/?=
 =?us-ascii?Q?qsihEpQfm4gdbwYPh5vQyHciD1hCDChKAw/xh5Of?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 401ef13b-46db-43e3-6b0c-08dbd5545088
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 12:17:10.9352
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: J5ko8gdKxvjJWUr0d75rS4WXqwe45muSp5M1vsGa4uukGIwVXE7Naxl1jppndt8G
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7616
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 25 Oct 2023 05:17:43 -0700 (PDT)

On Wed, Oct 25, 2023 at 03:44:20PM +1100, Stephen Rothwell wrote:
> diff --cc include/linux/iommu.h
> index b5b254e205c6,f347bf31761f..000000000000
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@@ -64,8 -66,10 +66,11 @@@ struct iommu_domain_geometry 
>   #define __IOMMU_DOMAIN_DMA_FQ	(1U << 3)  /* DMA-API uses flush queue    */
>   
>   #define __IOMMU_DOMAIN_SVA	(1U << 4)  /* Shared process address space */
>  +#define __IOMMU_DOMAIN_PLATFORM	(1U << 5)
>   
> + #define __IOMMU_DOMAIN_NESTED	(1U << 5)  /* User-managed address space nested
> + 					      on a stage-2 translation        */

One of these should be 6

I'm going to change my tree so __IOMMU_DOMAIN_NESTED is 6

Otherwise looks OK thanks

Jason