| Message ID | 20221030094258.486428-6-iskren.chernev@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for sm6115,4250 and OnePlus Nord N100 | expand |
On 30/10/2022 11:42, Iskren Chernev wrote: > From: Adam Skladowski <a39.skl@gmail.com> > > Add the Qualcomm SM6115 platform to the list of compatible, > this target uses MMU500 for both APSS and GPU. > > Signed-off-by: Adam Skladowski <a39.skl@gmail.com> > Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com> This needs to rebased on linux-next (or 6.2-rc1 once it's out). > --- > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > index b2708de25ea3..526fec79b4fe 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > @@ -432,6 +432,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { > { .compatible = "qcom,sc8280xp-smmu-500" }, > { .compatible = "qcom,sdm630-smmu-v2" }, > { .compatible = "qcom,sdm845-smmu-500" }, > + { .compatible = "qcom,sm6115-smmu-500" }, > { .compatible = "qcom,sm6125-smmu-500" }, > { .compatible = "qcom,sm6350-smmu-500" }, > { .compatible = "qcom,sm6375-smmu-500" },
On 15/12/2022 17:10, Dmitry Baryshkov wrote: > On 30/10/2022 11:42, Iskren Chernev wrote: >> From: Adam Skladowski <a39.skl@gmail.com> >> >> Add the Qualcomm SM6115 platform to the list of compatible, >> this target uses MMU500 for both APSS and GPU. >> >> Signed-off-by: Adam Skladowski <a39.skl@gmail.com> >> Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com> > > This needs to rebased on linux-next (or 6.2-rc1 once it's out). To add on top of that. linux-next has the following comment: /* * Do not add any more qcom,SOC-smmu-500 entries to this list, unless they need * special handling and can not be covered by the qcom,smmu-500 entry. */ So, hopefully you can skip this patch completely by depending on the generic "qcom,smmu-500" compatible.
> So, hopefully you can skip this patch completely by depending on the > generic "qcom,smmu-500" compatible. To be clear -- I still need the qcom,SOC-smmu-500 compatible in DT and bindings, but not in the driver (i.e driver will pick generic)? Then this can indeed be dropped (but it is merged in linux-next ATM, 6.2-rc1 based next won't have it, I guess?).
Hi, On Mon, 19 Dec 2022 at 12:01, Iskren Chernev <iskren.chernev@gmail.com> wrote: > > > So, hopefully you can skip this patch completely by depending on the > > generic "qcom,smmu-500" compatible. > > To be clear -- I still need the qcom,SOC-smmu-500 compatible in DT and > bindings, but not in the driver (i.e driver will pick generic)? > > Then this can indeed be dropped (but it is merged in linux-next ATM, > 6.2-rc1 based next won't have it, I guess?). The thread got bumped in my email client, so I replied with my review as if these patches were brand new. However I failed to notice that the patches were already accepted by Will Deacon. And that my rework happened already on top of your patches. So, you don't have to do anything, the IOMMU part will be a part of 6.3. Please excuse me for the noise.
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index b2708de25ea3..526fec79b4fe 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -432,6 +432,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { { .compatible = "qcom,sc8280xp-smmu-500" }, { .compatible = "qcom,sdm630-smmu-v2" }, { .compatible = "qcom,sdm845-smmu-500" }, + { .compatible = "qcom,sm6115-smmu-500" }, { .compatible = "qcom,sm6125-smmu-500" }, { .compatible = "qcom,sm6350-smmu-500" }, { .compatible = "qcom,sm6375-smmu-500" },