From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B227D605DA for ; Fri, 22 Mar 2024 17:52:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711129946; cv=none; b=HQJj3eyJYeXFt+KwjRbYwtnvzBAGzMwqBvuHRzi4ZoBGT5LqBqhVU9Y0osNokFGEiyOYguo9oYcqoHFSt/6kM3n+gBpen7Vz9fVkWcsO3bQY19MNSkZSjlKRTommi0VJal+dZwFf4XfkcXvBdpwCkOeCWGwbNAh6BwbfZd2mrxU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711129946; c=relaxed/simple; bh=2dco4Cp7gHDSJYMxBQIxVotRD/Rta+qI5bnqZqq5OTc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LbEzBdeh0/op+fmHsW/g/vEfOCg1cXWv+PJ4/q/PxR2uONqt6dm+yKYc/WqrgnCabRh+bdTjpyTLMGiptT+JchAKxue8L6t23mbYk1IafK2vTjTvNbQtJmcur4usflmYuaP+A5GaLwuwldLcyi+gsku7tepFkQKM4yJZyAS5kiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Y1wLomNB; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Y1wLomNB" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4146f72e2dfso6895e9.1 for ; Fri, 22 Mar 2024 10:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711129942; x=1711734742; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=R9oMrg7TwImkd0pYqNwG2LgH+fmS6/ZJ6R8JYrsRy8A=; b=Y1wLomNBdOH+nla0WPgpa8/v0pNoJ67DzQSjECl7ZlTIALJlJUgwf4ZZvFGhwMbWcT pHJ50zN/jhE0DE4EnOarJ/NwSufspXR5EfV3RsLcbl5TUQ7N7rw1BIVo+FrTT3YE8m5W sd0MinowFLKLCSh/DXe1lHA4IXdm7/aHOwiDV9VTQgWYB5S511Y4j4+Fw1Oo3E9OPJzQ 6qFdhxl5pMGrEdrGgtfU0fN1bwD/XRKfpnDkiA2uYEVYAZEglTdxlVEYhD5ZxyQjzzvN lkeUuhv8vovZUzTlAvAowHqcT0itWnXkH5F8UVD1N/mQyC7Hs1DA84aD26suXThReOkg MZfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711129942; x=1711734742; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=R9oMrg7TwImkd0pYqNwG2LgH+fmS6/ZJ6R8JYrsRy8A=; b=Man+TW9mCjZucyrb6FDwibbUPp5zkxAfwYljYEIPSVjHyAWof25B57T6zjLWZvrteO kmTdMkcKYHV86351GCR70kO4AM5TAPXkfOgw595lZSuJKlYGwQZpVqTI+sryGOdFavIU ii/u8XmdtaUorIOTyorgHHMdkL0lAO+eJcdyQegWdMK3IGcJ+7QhwEDQ3EFdA82GI2Cd JKA+TM0uvGn2vBNZaU1MD7na+trTI2dRDubzhYWHMvTTplnYe0tCRULJ/ZmCai6lM4FR jz8VQfLyNTu8dcUZHPNo3fZ4Y/9LKqzUz6i/fjdzs8Xg4owFgqwasiKVAWYVbv9OkZ1T e8RQ== X-Forwarded-Encrypted: i=1; AJvYcCVdrDSwYK/rPGQvaZljdgejvneex+v0Pr7j6B5+sF1ct9q+dais/vNAMb8oMy/dfBbxiZxDSpPqsPT3ARIwuNK9vRpYyk/IdQ== X-Gm-Message-State: AOJu0Yxw9fUmAb3UcmXELr6/FXAff8TPiJ21Lnq1bb2OTaRZAvlPGdSc 7W/V8i2mztpibOw8LXKJ7Gq5jshYyLTe5sb3zgfUMLGQzOkYQ8PJc6ybdSsyHA== X-Google-Smtp-Source: AGHT+IHjj0LOYPDRfLbOApiA9FqEKKJaqaDdBH5Vx421Ez+M6eX4Mh4lnvz3MgI9eUzeo+z4tILx6g== X-Received: by 2002:a05:600c:4f47:b0:414:6467:3471 with SMTP id m7-20020a05600c4f4700b0041464673471mr501995wmq.1.1711129941796; Fri, 22 Mar 2024 10:52:21 -0700 (PDT) Received: from google.com (216.131.76.34.bc.googleusercontent.com. [34.76.131.216]) by smtp.gmail.com with ESMTPSA id t21-20020a05600c451500b004146e58cc35sm141612wmo.46.2024.03.22.10.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 10:52:21 -0700 (PDT) Date: Fri, 22 Mar 2024 17:52:17 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Eric Auger , Jean-Philippe Brucker , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameerali Kolothum Thodi Subject: Re: [PATCH v5 03/27] iommu/arm-smmu-v3: Add a type for the CD entry Message-ID: References: <0-v5-9a37e0c884ce+31e3-smmuv3_newapi_p2_jgg@nvidia.com> <3-v5-9a37e0c884ce+31e3-smmuv3_newapi_p2_jgg@nvidia.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3-v5-9a37e0c884ce+31e3-smmuv3_newapi_p2_jgg@nvidia.com> On Mon, Mar 04, 2024 at 07:43:51PM -0400, Jason Gunthorpe wrote: > Instead of passing a naked __le16 * around to represent a CD table entry > wrap it in a "struct arm_smmu_cd" with an array of the correct size. This > makes it much clearer which functions will comprise the "CD API". > > Tested-by: Nicolin Chen > Signed-off-by: Jason Gunthorpe > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 20 +++++++++++--------- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 7 ++++++- > 2 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 9e9233331c4636..c60b067c1f553e 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1219,7 +1219,8 @@ static void arm_smmu_write_cd_l1_desc(__le64 *dst, > WRITE_ONCE(*dst, cpu_to_le64(val)); > } > > -static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, u32 ssid) > +static struct arm_smmu_cd *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, > + u32 ssid) > { > __le64 *l1ptr; > unsigned int idx; > @@ -1228,7 +1229,8 @@ static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, u32 ssid) > struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table; > > if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_LINEAR) > - return cd_table->cdtab + ssid * CTXDESC_CD_DWORDS; > + return (struct arm_smmu_cd *)(cd_table->cdtab + > + ssid * CTXDESC_CD_DWORDS); > > idx = ssid >> CTXDESC_SPLIT; > l1_desc = &cd_table->l1_desc[idx]; > @@ -1242,7 +1244,7 @@ static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, u32 ssid) > arm_smmu_sync_cd(master, ssid, false); > } > idx = ssid & (CTXDESC_L2_ENTRIES - 1); > - return l1_desc->l2ptr + idx * CTXDESC_CD_DWORDS; > + return &l1_desc->l2ptr[idx]; > } > > int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > @@ -1261,7 +1263,7 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > */ > u64 val; > bool cd_live; > - __le64 *cdptr; > + struct arm_smmu_cd *cdptr; > struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table; > struct arm_smmu_device *smmu = master->smmu; > > @@ -1272,7 +1274,7 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > if (!cdptr) > return -ENOMEM; > > - val = le64_to_cpu(cdptr[0]); > + val = le64_to_cpu(cdptr->data[0]); > cd_live = !!(val & CTXDESC_CD_0_V); > > if (!cd) { /* (5) */ > @@ -1289,9 +1291,9 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > * this substream's traffic > */ > } else { /* (1) and (2) */ > - cdptr[1] = cpu_to_le64(cd->ttbr & CTXDESC_CD_1_TTB0_MASK); > - cdptr[2] = 0; > - cdptr[3] = cpu_to_le64(cd->mair); > + cdptr->data[1] = cpu_to_le64(cd->ttbr & CTXDESC_CD_1_TTB0_MASK); > + cdptr->data[2] = 0; > + cdptr->data[3] = cpu_to_le64(cd->mair); > > /* > * STE may be live, and the SMMU might read dwords of this CD in any > @@ -1323,7 +1325,7 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > * field within an aligned 64-bit span of a structure can be altered > * without first making the structure invalid. > */ > - WRITE_ONCE(cdptr[0], cpu_to_le64(val)); > + WRITE_ONCE(cdptr->data[0], cpu_to_le64(val)); > arm_smmu_sync_cd(master, ssid, true); > return 0; > } > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > index 23baf117e7e4b5..7078ed569fd4d3 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > @@ -282,6 +282,11 @@ struct arm_smmu_ste { > #define CTXDESC_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 12) > > #define CTXDESC_CD_DWORDS 8 > + > +struct arm_smmu_cd { > + __le64 data[CTXDESC_CD_DWORDS]; > +}; > + > #define CTXDESC_CD_0_TCR_T0SZ GENMASK_ULL(5, 0) > #define CTXDESC_CD_0_TCR_TG0 GENMASK_ULL(7, 6) > #define CTXDESC_CD_0_TCR_IRGN0 GENMASK_ULL(9, 8) > @@ -591,7 +596,7 @@ struct arm_smmu_ctx_desc { > }; > > struct arm_smmu_l1_ctx_desc { > - __le64 *l2ptr; > + struct arm_smmu_cd *l2ptr; > dma_addr_t l2ptr_dma; > }; > > -- > 2.43.2 > Reviewed-by: Mostafa Saleh Thanks, Mostafa