Skip to content

Commit f8cfe02

Browse files
Andre-ARMdlezcano
authored andcommitted
soc: sunxi: sram: export register 0 for THS on H616
The Allwinner H616 SoC contains a mysterious bit at register offset 0x0 in the SRAM control block. If bit 16 is set (the reset value), the temperature readings of the THS are way off, leading to reports about 200C, at normal ambient temperatures. Clearing this bits brings the reported values down to the expected values. The BSP code clears this bit in firmware (U-Boot), and has an explicit comment about this, but offers no real explanation. Experiments in U-Boot show that register 0x0 has no effect on the SRAM C visibility: all tested bit settings still allow full read and write access by the CPU to the whole of SRAM C. Only bit 24 of the register at offset 0x4 makes all of SRAM C inaccessible by the CPU. So modelling the THS switch functionality as an SRAM region would not reflect reality. Since we should not rely on firmware settings, allow other code (the THS driver) to access this register, by exporting it through the already existing regmap. This mimics what we already do for the LDO control and the EMAC register. To avoid concurrent accesses to the same register at the same time, by the SRAM switch code and the regmap code, use the same lock to protect the access. The regmap subsystem allows to use an existing lock, so we just need to hook in there. Signed-off-by: Andre Przywara <[email protected]> Reviewed-by: Jernej Skrabec <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent dd01475 commit f8cfe02

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

drivers/soc/sunxi/sunxi_sram.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ EXPORT_SYMBOL(sunxi_sram_release);
287287
struct sunxi_sramc_variant {
288288
int num_emac_clocks;
289289
bool has_ldo_ctrl;
290+
bool has_ths_offset;
290291
};
291292

292293
static const struct sunxi_sramc_variant sun4i_a10_sramc_variant = {
@@ -308,8 +309,10 @@ static const struct sunxi_sramc_variant sun50i_a64_sramc_variant = {
308309

309310
static const struct sunxi_sramc_variant sun50i_h616_sramc_variant = {
310311
.num_emac_clocks = 2,
312+
.has_ths_offset = true,
311313
};
312314

315+
#define SUNXI_SRAM_THS_OFFSET_REG 0x0
313316
#define SUNXI_SRAM_EMAC_CLOCK_REG 0x30
314317
#define SUNXI_SYS_LDO_CTRL_REG 0x150
315318

@@ -318,6 +321,8 @@ static bool sunxi_sram_regmap_accessible_reg(struct device *dev,
318321
{
319322
const struct sunxi_sramc_variant *variant = dev_get_drvdata(dev);
320323

324+
if (reg == SUNXI_SRAM_THS_OFFSET_REG && variant->has_ths_offset)
325+
return true;
321326
if (reg >= SUNXI_SRAM_EMAC_CLOCK_REG &&
322327
reg < SUNXI_SRAM_EMAC_CLOCK_REG + variant->num_emac_clocks * 4)
323328
return true;
@@ -327,6 +332,20 @@ static bool sunxi_sram_regmap_accessible_reg(struct device *dev,
327332
return false;
328333
}
329334

335+
static void sunxi_sram_lock(void *_lock)
336+
{
337+
spinlock_t *lock = _lock;
338+
339+
spin_lock(lock);
340+
}
341+
342+
static void sunxi_sram_unlock(void *_lock)
343+
{
344+
spinlock_t *lock = _lock;
345+
346+
spin_unlock(lock);
347+
}
348+
330349
static struct regmap_config sunxi_sram_regmap_config = {
331350
.reg_bits = 32,
332351
.val_bits = 32,
@@ -336,6 +355,9 @@ static struct regmap_config sunxi_sram_regmap_config = {
336355
/* other devices have no business accessing other registers */
337356
.readable_reg = sunxi_sram_regmap_accessible_reg,
338357
.writeable_reg = sunxi_sram_regmap_accessible_reg,
358+
.lock = sunxi_sram_lock,
359+
.unlock = sunxi_sram_unlock,
360+
.lock_arg = &sram_lock,
339361
};
340362

341363
static int __init sunxi_sram_probe(struct platform_device *pdev)

0 commit comments

Comments
 (0)