The ath79_device_reset_* are causing BUG when those are used on the QCA955x SoCs. The patch adds the required code to avoid that. Cc: Rodriguez, Luis <rodrigue@qca.qualcomm.com> Cc: Giori, Kathy <kgiori@qca.qualcomm.com> Cc: QCA Linux Team <qca-linux-team@qca.qualcomm.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/4948/ Signed-off-by: John Crispin <blogic@openwrt.org>
		
			
				
	
	
		
			113 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			113 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  Atheros AR71XX/AR724X/AR913X common routines
 | 
						|
 *
 | 
						|
 *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
 | 
						|
 *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
 | 
						|
 *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
 | 
						|
 *
 | 
						|
 *  Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
 | 
						|
 *
 | 
						|
 *  This program is free software; you can redistribute it and/or modify it
 | 
						|
 *  under the terms of the GNU General Public License version 2 as published
 | 
						|
 *  by the Free Software Foundation.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/types.h>
 | 
						|
#include <linux/spinlock.h>
 | 
						|
 | 
						|
#include <asm/mach-ath79/ath79.h>
 | 
						|
#include <asm/mach-ath79/ar71xx_regs.h>
 | 
						|
#include "common.h"
 | 
						|
 | 
						|
static DEFINE_SPINLOCK(ath79_device_reset_lock);
 | 
						|
 | 
						|
u32 ath79_cpu_freq;
 | 
						|
EXPORT_SYMBOL_GPL(ath79_cpu_freq);
 | 
						|
 | 
						|
u32 ath79_ahb_freq;
 | 
						|
EXPORT_SYMBOL_GPL(ath79_ahb_freq);
 | 
						|
 | 
						|
u32 ath79_ddr_freq;
 | 
						|
EXPORT_SYMBOL_GPL(ath79_ddr_freq);
 | 
						|
 | 
						|
enum ath79_soc_type ath79_soc;
 | 
						|
unsigned int ath79_soc_rev;
 | 
						|
 | 
						|
void __iomem *ath79_pll_base;
 | 
						|
void __iomem *ath79_reset_base;
 | 
						|
EXPORT_SYMBOL_GPL(ath79_reset_base);
 | 
						|
void __iomem *ath79_ddr_base;
 | 
						|
 | 
						|
void ath79_ddr_wb_flush(u32 reg)
 | 
						|
{
 | 
						|
	void __iomem *flush_reg = ath79_ddr_base + reg;
 | 
						|
 | 
						|
	/* Flush the DDR write buffer. */
 | 
						|
	__raw_writel(0x1, flush_reg);
 | 
						|
	while (__raw_readl(flush_reg) & 0x1)
 | 
						|
		;
 | 
						|
 | 
						|
	/* It must be run twice. */
 | 
						|
	__raw_writel(0x1, flush_reg);
 | 
						|
	while (__raw_readl(flush_reg) & 0x1)
 | 
						|
		;
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(ath79_ddr_wb_flush);
 | 
						|
 | 
						|
void ath79_device_reset_set(u32 mask)
 | 
						|
{
 | 
						|
	unsigned long flags;
 | 
						|
	u32 reg;
 | 
						|
	u32 t;
 | 
						|
 | 
						|
	if (soc_is_ar71xx())
 | 
						|
		reg = AR71XX_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar724x())
 | 
						|
		reg = AR724X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar913x())
 | 
						|
		reg = AR913X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar933x())
 | 
						|
		reg = AR933X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar934x())
 | 
						|
		reg = AR934X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_qca955x())
 | 
						|
		reg = QCA955X_RESET_REG_RESET_MODULE;
 | 
						|
	else
 | 
						|
		BUG();
 | 
						|
 | 
						|
	spin_lock_irqsave(&ath79_device_reset_lock, flags);
 | 
						|
	t = ath79_reset_rr(reg);
 | 
						|
	ath79_reset_wr(reg, t | mask);
 | 
						|
	spin_unlock_irqrestore(&ath79_device_reset_lock, flags);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(ath79_device_reset_set);
 | 
						|
 | 
						|
void ath79_device_reset_clear(u32 mask)
 | 
						|
{
 | 
						|
	unsigned long flags;
 | 
						|
	u32 reg;
 | 
						|
	u32 t;
 | 
						|
 | 
						|
	if (soc_is_ar71xx())
 | 
						|
		reg = AR71XX_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar724x())
 | 
						|
		reg = AR724X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar913x())
 | 
						|
		reg = AR913X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar933x())
 | 
						|
		reg = AR933X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_ar934x())
 | 
						|
		reg = AR934X_RESET_REG_RESET_MODULE;
 | 
						|
	else if (soc_is_qca955x())
 | 
						|
		reg = QCA955X_RESET_REG_RESET_MODULE;
 | 
						|
	else
 | 
						|
		BUG();
 | 
						|
 | 
						|
	spin_lock_irqsave(&ath79_device_reset_lock, flags);
 | 
						|
	t = ath79_reset_rr(reg);
 | 
						|
	ath79_reset_wr(reg, t & ~mask);
 | 
						|
	spin_unlock_irqrestore(&ath79_device_reset_lock, flags);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(ath79_device_reset_clear);
 |