From mboxrd@z Thu Jan 1 00:00:00 1970 From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) Date: Mon, 25 Sep 2017 15:19:52 +0100 Subject: [PATCH] iommu/arm-smmu-v3: Correct COHACC override message In-Reply-To: References: Message-ID: <20170925141952.GA12270@red-moon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Sep 25, 2017 at 02:55:40PM +0100, Robin Murphy wrote: > Slightly confusingly, when reporting a mismatch of the ID register > value, we still refer to the IORT COHACC override flag as the > "dma-coherent property" if we booted with ACPI. Update the message > to be firmware-agnostic in line with SMMUv2. > > Reported-by: Will Deacon > Signed-off-by: Robin Murphy > --- > drivers/iommu/arm-smmu-v3.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Apologies - missed while reshuffling the probe path to enable ACPI probing: Acked-by: Lorenzo Pieralisi > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 47f52b1ab838..4c63b3cf4eba 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -2523,7 +2523,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) > * register, but warn on mismatch. > */ > if (!!(reg & IDR0_COHACC) != coherent) > - dev_warn(smmu->dev, "IDR0.COHACC overridden by dma-coherent property (%s)\n", > + dev_warn(smmu->dev, "IDR0.COHACC overridden by FW configuration (%s)\n", > coherent ? "true" : "false"); > > switch (reg & IDR0_STALL_MODEL_MASK << IDR0_STALL_MODEL_SHIFT) { > -- > 2.13.4.dirty > > _______________________________________________ > iommu mailing list > iommu at lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu