Commit 575bec53 authored by Christophe Leroy's avatar Christophe Leroy Committed by Mark Brown
Browse files

spi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1 



On CPM2, the SPI parameter RAM is dynamically allocated in the
dualport RAM whereas in CPM1, it is statically allocated to a default
address with capability to relocate it somewhere else via the use of
CPM micropatch. The address of the parameter RAM is given by the boot
loader and expected to be mapped via devm_ioremap_resource()

In the current implementation, in function fsl_spi_cpm_get_pram()
there is a confusion between the SPI_BASE register and the base of the
SPI parameter RAM. Fortunatly, it is working properly with MPC866 and
MPC885 because they do set SPI_BASE, but on MPC860 and other old
MPC8xx that doesn't set SPI_BASE, pram_ofs is not properly set.
Also, the parameter RAM is not properly mapped with
devm_ioremap_resource() as it should but still gets accessible by
chance through the full RAM which is mapped from somewhere else.

This patch applies to the SPI driver the same principle as for the
CPM UART: when the CPM is of type CPM1, we simply do an
devm_ioremap_resource() of the area provided via the device tree.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838

drivers/spi/spi-fsl-cpm.c

+18 −17
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/of_address.h>

#include <linux/spi/spi.h>

#include <linux/types.h>

#include <linux/platform_device.h>



#include "spi-fsl-cpm.h"

#include "spi-fsl-lib.h"
@@ -269,17 +270,6 @@ static unsigned long fsl_spi_cpm_get_pram(struct mpc8xxx_spi *mspi) 
	if (mspi->flags & SPI_CPM2) {

		pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);

		out_be16(spi_base, pram_ofs);

	} else {

		struct spi_pram __iomem *pram = spi_base;

		u16 rpbase = in_be16(&pram->rpbase);



		/* Microcode relocation patch applied? */

		if (rpbase) {

			pram_ofs = rpbase;

		} else {

			pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);

			out_be16(spi_base, pram_ofs);

		}

	}



	iounmap(spi_base);
@@ -292,7 +282,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
	struct device_node *np = dev->of_node;

	const u32 *iprop;

	int size;

	unsigned long pram_ofs;

	unsigned long bds_ofs;



	if (!(mspi->flags & SPI_CPM_MODE))
@@ -319,8 +308,21 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
		}

	}



	pram_ofs = fsl_spi_cpm_get_pram(mspi);

	if (IS_ERR_VALUE(pram_ofs)) {

	if (mspi->flags & SPI_CPM1) {

		struct resource *res;



		res = platform_get_resource(to_platform_device(dev),

					    IORESOURCE_MEM, 1);

		mspi->pram = devm_ioremap_resource(dev, res);

	} else {

		unsigned long pram_ofs = fsl_spi_cpm_get_pram(mspi);



		if (IS_ERR_VALUE(pram_ofs))

			mspi->pram = NULL;

		else

			mspi->pram = cpm_muram_addr(pram_ofs);

	}

	if (mspi->pram == NULL) {

		dev_err(dev, "can't allocate spi parameter ram\n");

		goto err_pram;

	}
@@ -346,8 +348,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
		goto err_dummy_rx;

	}



	mspi->pram = cpm_muram_addr(pram_ofs);



	mspi->tx_bd = cpm_muram_addr(bds_ofs);

	mspi->rx_bd = cpm_muram_addr(bds_ofs + sizeof(*mspi->tx_bd));
@@ -375,7 +375,8 @@ err_dummy_rx: 
err_dummy_tx:

	cpm_muram_free(bds_ofs);

err_bds:

	cpm_muram_free(pram_ofs);

	if (!(mspi->flags & SPI_CPM1))

		cpm_muram_free(cpm_muram_offset(mspi->pram));

err_pram:

	fsl_spi_free_dummy_rx();

	return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE