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

Commit 1c74d5c0 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

memory: tegra: Apply interrupts mask per SoC 



Currently we are enabling handling of interrupts specific to Tegra124+
which happen to overlap with previous generations. Let's specify
interrupts mask per SoC generation for consistency and in a preparation
of squashing of Tegra20 driver into the common one that will enable
handling of GART faults which may be undesirable by newer generations.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent db4a9c19

drivers/memory/tegra/mc.c

+3 −18
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ 
#include "mc.h"



#define MC_INTSTATUS 0x000

#define  MC_INT_DECERR_MTS (1 << 16)

#define  MC_INT_SECERR_SEC (1 << 13)

#define  MC_INT_DECERR_VPR (1 << 12)

#define  MC_INT_INVALID_APB_ASID_UPDATE (1 << 11)

#define  MC_INT_INVALID_SMMU_PAGE (1 << 10)

#define  MC_INT_ARBITRATION_EMEM (1 << 9)

#define  MC_INT_SECURITY_VIOLATION (1 << 8)

#define  MC_INT_DECERR_EMEM (1 << 6)



#define MC_INTMASK 0x004
@@ -248,13 +240,11 @@ static const char *const error_names[8] = { 
static irqreturn_t tegra_mc_irq(int irq, void *data)

{

	struct tegra_mc *mc = data;

	unsigned long status, mask;

	unsigned long status;

	unsigned int bit;



	/* mask all interrupts to avoid flooding */

	mask = mc_readl(mc, MC_INTMASK);

	status = mc_readl(mc, MC_INTSTATUS) & mask;



	status = mc_readl(mc, MC_INTSTATUS) & mc->soc->intmask;

	if (!status)

		return IRQ_NONE;
@@ -349,7 +339,6 @@ static int tegra_mc_probe(struct platform_device *pdev) 
	const struct of_device_id *match;

	struct resource *res;

	struct tegra_mc *mc;

	u32 value;

	int err;



	match = of_match_node(tegra_mc_of_match, pdev->dev.of_node);
@@ -409,11 +398,7 @@ static int tegra_mc_probe(struct platform_device *pdev) 


	WARN(!mc->soc->client_id_mask, "Missing client ID mask for this SoC\n");



	value = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |

		MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |

		MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM;



	mc_writel(mc, value, MC_INTMASK);

	mc_writel(mc, mc->soc->intmask, MC_INTMASK);



	err = devm_request_irq(&pdev->dev, mc->irq, tegra_mc_irq, IRQF_SHARED,

			       dev_name(&pdev->dev), mc);

drivers/memory/tegra/mc.h

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,15 @@ 


#include <soc/tegra/mc.h>



#define MC_INT_DECERR_MTS (1 << 16)

#define MC_INT_SECERR_SEC (1 << 13)

#define MC_INT_DECERR_VPR (1 << 12)

#define MC_INT_INVALID_APB_ASID_UPDATE (1 << 11)

#define MC_INT_INVALID_SMMU_PAGE (1 << 10)

#define MC_INT_ARBITRATION_EMEM (1 << 9)

#define MC_INT_SECURITY_VIOLATION (1 << 8)

#define MC_INT_DECERR_EMEM (1 << 6)



static inline u32 mc_readl(struct tegra_mc *mc, unsigned long offset)

{

	return readl(mc->regs + offset);

drivers/memory/tegra/tegra114.c

+2 −0
Original line number Diff line number Diff line
@@ -945,4 +945,6 @@ const struct tegra_mc_soc tegra114_mc_soc = { 
	.atom_size = 32,

	.client_id_mask = 0x7f,

	.smmu = &tegra114_smmu_soc,

	.intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION |

		   MC_INT_DECERR_EMEM,

};

drivers/memory/tegra/tegra124.c

+6 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,9 @@ const struct tegra_mc_soc tegra124_mc_soc = { 
	.smmu = &tegra124_smmu_soc,

	.emem_regs = tegra124_mc_emem_regs,

	.num_emem_regs = ARRAY_SIZE(tegra124_mc_emem_regs),

	.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |

		   MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |

		   MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,

};

#endif /* CONFIG_ARCH_TEGRA_124_SOC */
@@ -1059,5 +1062,8 @@ const struct tegra_mc_soc tegra132_mc_soc = { 
	.atom_size = 32,

	.client_id_mask = 0x7f,

	.smmu = &tegra132_smmu_soc,

	.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |

		   MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |

		   MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,

};

#endif /* CONFIG_ARCH_TEGRA_132_SOC */

drivers/memory/tegra/tegra210.c

+3 −0
Original line number Diff line number Diff line
@@ -1092,4 +1092,7 @@ const struct tegra_mc_soc tegra210_mc_soc = { 
	.atom_size = 64,

	.client_id_mask = 0xff,

	.smmu = &tegra210_smmu_soc,

	.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |

		   MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |

		   MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,

};