Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e21422de authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

MIPS: Fix CDMM to use native endian MMIO reads 



The MIPS Common Device Memory Map (CDMM) is internal to the core and has
native endianness. There is therefore no need to byte swap the accesses
on big endian targets, so convert the CDMM bus driver to use
__raw_readl() rather than readl().

Fixes: 8286ae03 ("MIPS: Add CDMM bus support")
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9904/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ba155e2d

drivers/bus/mips_cdmm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -453,7 +453,7 @@ void __iomem *mips_cdmm_early_probe(unsigned int dev_type) 




	/* Look for a specific device type */

	/* Look for a specific device type */

	for (; drb < bus->drbs; drb += size + 1) {

	for (; drb < bus->drbs; drb += size + 1) {

		acsr = readl(cdmm + drb * CDMM_DRB_SIZE);

		acsr = __raw_readl(cdmm + drb * CDMM_DRB_SIZE);

		type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;

		type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;

		if (type == dev_type)

		if (type == dev_type)

			return cdmm + drb * CDMM_DRB_SIZE;

			return cdmm + drb * CDMM_DRB_SIZE;
@@ -500,7 +500,7 @@ static void mips_cdmm_bus_discover(struct mips_cdmm_bus *bus) 
	bus->discovered = true;

	bus->discovered = true;

	pr_info("cdmm%u discovery (%u blocks)\n", cpu, bus->drbs);

	pr_info("cdmm%u discovery (%u blocks)\n", cpu, bus->drbs);

	for (; drb < bus->drbs; drb += size + 1) {

	for (; drb < bus->drbs; drb += size + 1) {

		acsr = readl(cdmm + drb * CDMM_DRB_SIZE);

		acsr = __raw_readl(cdmm + drb * CDMM_DRB_SIZE);

		type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;

		type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;

		size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT;

		size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT;

		rev  = (acsr & CDMM_ACSR_DEVREV)  >> CDMM_ACSR_DEVREV_SHIFT;

		rev  = (acsr & CDMM_ACSR_DEVREV)  >> CDMM_ACSR_DEVREV_SHIFT;