Commit df049d1f authored Nov 28, 2019 by Rasmus Villemoes Committed by Li Yang Dec 09, 2019

soc: fsl: qe: qe.c: guard use of pvr_version_is() with CONFIG_PPC32



Commit e5c5c8d2 (soc/fsl/qe: only apply QE_General4 workaround on
affected SoCs) introduced use of pvr_version_is(), saying

    The QE_General4 workaround is only valid for the MPC832x and MPC836x
    SoCs. The other SoCs that embed a QUICC engine are not affected by this
    hardware bug and thus can use the computed divisors (this was
    successfully tested on the T1040).

I'm reading the above as saying that the errata does not apply to the
ARM-based SOCs with QUICC engine. In any case, use of pvr_version_is()
must be guarded by CONFIG_PPC32 before we can remove the PPC32
dependency from CONFIG_QUICC_ENGINE, so introduce qe_general4_errata()
to keep the necessary #ifdeffery localized to a trivial helper.

Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>

parent 58099685

drivers/soc/fsl/qe/qe.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -197,6 +197,14 @@ EXPORT_SYMBOL(qe_get_brg_clk);
		#define PVR_VER_836x 0x8083
		#define PVR_VER_832x 0x8084

		static bool qe_general4_errata(void)
		{
		#ifdef CONFIG_PPC32
		return pvr_version_is(PVR_VER_836x) \|\| pvr_version_is(PVR_VER_832x);
		#endif
		return false;
		}

		/* Program the BRG to the given sampling rate and multiplier
		*
		* @brg: the BRG, QE_BRG1 - QE_BRG16
		@@ -223,7 +231,7 @@ int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier)
		/* Errata QE_General4, which affects some MPC832x and MPC836x SOCs, says
		that the BRG divisor must be even if you're not using divide-by-16
		mode. */
		if (pvr_version_is(PVR_VER_836x) \|\| pvr_version_is(PVR_VER_832x))
		if (qe_general4_errata())
		if (!div16 && (divisor & 1) && (divisor > 3))
		divisor++;

Admin message