Commit 07f34a13 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'arm-smmu-updates' of... 

Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu

Arm SMMU updates for 5.16

- Minor optimisations to SMMUv3 command creation and submission

- Numerous new compatible string for Qualcomm SMMUv2 implementations
parents 5816b3e6 e37f1fe4

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ properties: 
      - description: Qcom SoCs implementing "arm,mmu-500"

        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+14 −7
Original line number Diff line number Diff line
@@ -409,10 +409,7 @@ static void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu, 
		dev_err(smmu->dev, "\t0x%016llx\n", (unsigned long long)cmd[i]);



	/* Convert the erroneous command into a CMD_SYNC */

	if (arm_smmu_cmdq_build_cmd(cmd, &cmd_sync)) {

		dev_err(smmu->dev, "failed to convert to CMD_SYNC\n");

		return;

	}

	arm_smmu_cmdq_build_cmd(cmd, &cmd_sync);



	queue_write(Q_ENT(q, cons), cmd, q->ent_dwords);

}
@@ -860,7 +857,7 @@ static int __arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu, 
{

	u64 cmd[CMDQ_ENT_DWORDS];



	if (arm_smmu_cmdq_build_cmd(cmd, ent)) {

	if (unlikely(arm_smmu_cmdq_build_cmd(cmd, ent))) {

		dev_warn(smmu->dev, "ignoring unknown CMDQ opcode 0x%x\n",

			 ent->opcode);

		return -EINVAL;
@@ -885,11 +882,20 @@ static void arm_smmu_cmdq_batch_add(struct arm_smmu_device *smmu, 
				    struct arm_smmu_cmdq_batch *cmds,

				    struct arm_smmu_cmdq_ent *cmd)

{

	int index;



	if (cmds->num == CMDQ_BATCH_ENTRIES) {

		arm_smmu_cmdq_issue_cmdlist(smmu, cmds->cmds, cmds->num, false);

		cmds->num = 0;

	}

	arm_smmu_cmdq_build_cmd(&cmds->cmds[cmds->num * CMDQ_ENT_DWORDS], cmd);



	index = cmds->num * CMDQ_ENT_DWORDS;

	if (unlikely(arm_smmu_cmdq_build_cmd(&cmds->cmds[index], cmd))) {

		dev_warn(smmu->dev, "ignoring unknown CMDQ opcode 0x%x\n",

			 cmd->opcode);

		return;

	}



	cmds->num++;

}
@@ -1764,10 +1770,11 @@ static int arm_smmu_atc_inv_master(struct arm_smmu_master *master) 
{

	int i;

	struct arm_smmu_cmdq_ent cmd;

	struct arm_smmu_cmdq_batch cmds = {};

	struct arm_smmu_cmdq_batch cmds;



	arm_smmu_atc_inv_to_cmd(0, 0, 0, &cmd);



	cmds.num = 0;

	for (i = 0; i < master->num_streams; i++) {

		cmd.atc.sid = master->streams[i].id;

		arm_smmu_cmdq_batch_add(master->smmu, &cmds, &cmd);

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = { 
	{ .compatible = "qcom,sc7180-mdss" },

	{ .compatible = "qcom,sc7180-mss-pil" },

	{ .compatible = "qcom,sc7280-mdss" },

	{ .compatible = "qcom,sc7280-mss-pil" },

	{ .compatible = "qcom,sc8180x-mdss" },

	{ .compatible = "qcom,sdm845-mdss" },

	{ .compatible = "qcom,sdm845-mss-pil" },
@@ -403,12 +404,14 @@ static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu, 


static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {

	{ .compatible = "qcom,msm8998-smmu-v2" },

	{ .compatible = "qcom,qcm2290-smmu-500" },

	{ .compatible = "qcom,sc7180-smmu-500" },

	{ .compatible = "qcom,sc7280-smmu-500" },

	{ .compatible = "qcom,sc8180x-smmu-500" },

	{ .compatible = "qcom,sdm630-smmu-v2" },

	{ .compatible = "qcom,sdm845-smmu-500" },

	{ .compatible = "qcom,sm6125-smmu-500" },

	{ .compatible = "qcom,sm6350-smmu-500" },

	{ .compatible = "qcom,sm8150-smmu-500" },

	{ .compatible = "qcom,sm8250-smmu-500" },

	{ .compatible = "qcom,sm8350-smmu-500" },