Blackfin arch: Comply with revised Anomaly Workarounds for BF533 05000311 and BF561 05000323 (2b39331a) · Commits · e / devices / android_kernel_fairphone_FP4

arch/blackfin/kernel/bfin_gpio.c

+107 −70

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,36 @@
	#include <asm/portmux.h>		#include <asm/portmux.h>
	#include <linux/irq.h>		#include <linux/irq.h>

			#if ANOMALY_05000311 \|\| ANOMALY_05000323
			enum {
			AWA_data = SYSCR,
			AWA_data_clear = SYSCR,
			AWA_data_set = SYSCR,
			AWA_toggle = SYSCR,
			AWA_maska = UART_SCR,
			AWA_maska_clear = UART_SCR,
			AWA_maska_set = UART_SCR,
			AWA_maska_toggle = UART_SCR,
			AWA_maskb = UART_GCTL,
			AWA_maskb_clear = UART_GCTL,
			AWA_maskb_set = UART_GCTL,
			AWA_maskb_toggle = UART_GCTL,
			AWA_dir = SPORT1_STAT,
			AWA_polar = SPORT1_STAT,
			AWA_edge = SPORT1_STAT,
			AWA_both = SPORT1_STAT,
			#if ANOMALY_05000311
			AWA_inen = TIMER_ENABLE,
			#elif ANOMALY_05000323
			AWA_inen = DMA1_1_CONFIG,
			#endif
			};
			/* Anomaly Workaround */
			#define AWA_DUMMY_READ(name) bfin_read16(AWA_ ## name)
			#else
			#define AWA_DUMMY_READ(...) do { } while (0)
			#endif

	#ifdef BF533_FAMILY		#ifdef BF533_FAMILY
	static struct gpio_port_t *gpio_bankb[gpio_bank(MAX_BLACKFIN_GPIOS)] = {		static struct gpio_port_t *gpio_bankb[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
	(struct gpio_port_t *) FIO_FLAG_D,		(struct gpio_port_t *) FIO_FLAG_D,
	@@ -332,10 +362,13 @@ inline u16 get_portmux(unsigned short portno)
	static void default_gpio(unsigned short gpio)		static void default_gpio(unsigned short gpio)
	{		{
	unsigned short bank, bitmask;		unsigned short bank, bitmask;
			unsigned long flags;

	bank = gpio_bank(gpio);		bank = gpio_bank(gpio);
	bitmask = gpio_bit(gpio);		bitmask = gpio_bit(gpio);

			local_irq_save(flags);

	gpio_bankb[bank]->maska_clear = bitmask;		gpio_bankb[bank]->maska_clear = bitmask;
	gpio_bankb[bank]->maskb_clear = bitmask;		gpio_bankb[bank]->maskb_clear = bitmask;
	SSYNC();		SSYNC();
	@@ -344,6 +377,9 @@ static void default_gpio(unsigned short gpio)
	gpio_bankb[bank]->polar &= ~bitmask;		gpio_bankb[bank]->polar &= ~bitmask;
	gpio_bankb[bank]->both &= ~bitmask;		gpio_bankb[bank]->both &= ~bitmask;
	gpio_bankb[bank]->edge &= ~bitmask;		gpio_bankb[bank]->edge &= ~bitmask;
			AWA_DUMMY_READ(edge);
			local_irq_restore(flags);

	}		}
	#else		#else
	# define default_gpio(...) do { } while (0)		# define default_gpio(...) do { } while (0)
	@@ -396,6 +432,7 @@ void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
	gpio_bankb[gpio_bank(gpio)]->name \|= gpio_bit(gpio); \		gpio_bankb[gpio_bank(gpio)]->name \|= gpio_bit(gpio); \
	else \		else \
	gpio_bankb[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \		gpio_bankb[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \
			AWA_DUMMY_READ(name); \
	local_irq_restore(flags); \		local_irq_restore(flags); \
	} \		} \
	EXPORT_SYMBOL(set_gpio_ ## name);		EXPORT_SYMBOL(set_gpio_ ## name);
	@@ -407,6 +444,22 @@ SET_GPIO(edge)
	SET_GPIO(both)		SET_GPIO(both)


			#if ANOMALY_05000311 \|\| ANOMALY_05000323
			#define SET_GPIO_SC(name) \
			void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
			{ \
			unsigned long flags; \
			BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
			local_irq_save(flags); \
			if (arg) \
			gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
			else \
			gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
			AWA_DUMMY_READ(name); \
			local_irq_restore(flags); \
			} \
			EXPORT_SYMBOL(set_gpio_ ## name);
			#else
	#define SET_GPIO_SC(name) \		#define SET_GPIO_SC(name) \
	void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \		void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
	{ \		{ \
	@@ -417,37 +470,20 @@ void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
	gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \		gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
	} \		} \
	EXPORT_SYMBOL(set_gpio_ ## name);		EXPORT_SYMBOL(set_gpio_ ## name);
			#endif

	SET_GPIO_SC(maska)		SET_GPIO_SC(maska)
	SET_GPIO_SC(maskb)		SET_GPIO_SC(maskb)

	#if ANOMALY_05000311
	void set_gpio_data(unsigned short gpio, unsigned short arg)
	{
	unsigned long flags;
	BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
	local_irq_save(flags);
	if (arg)
	gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
	else
	gpio_bankb[gpio_bank(gpio)]->data_clear = gpio_bit(gpio);
	bfin_read_CHIPID();
	local_irq_restore(flags);
	}
	EXPORT_SYMBOL(set_gpio_data);
	#else
	SET_GPIO_SC(data)		SET_GPIO_SC(data)
	#endif

			#if ANOMALY_05000311 \|\| ANOMALY_05000323
	#if ANOMALY_05000311
	void set_gpio_toggle(unsigned short gpio)		void set_gpio_toggle(unsigned short gpio)
	{		{
	unsigned long flags;		unsigned long flags;
	BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));		BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
	local_irq_save(flags);		local_irq_save(flags);
	gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);		gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
	bfin_read_CHIPID();		AWA_DUMMY_READ(toggle);
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}
	#else		#else
	@@ -462,13 +498,27 @@ EXPORT_SYMBOL(set_gpio_toggle);

	/Set current PORT date (16-bit word)/		/Set current PORT date (16-bit word)/

			#if ANOMALY_05000311 \|\| ANOMALY_05000323
			#define SET_GPIO_P(name) \
			void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \
			{ \
			unsigned long flags; \
			local_irq_save(flags); \
			gpio_bankb[gpio_bank(gpio)]->name = arg; \
			AWA_DUMMY_READ(name); \
			local_irq_restore(flags); \
			} \
			EXPORT_SYMBOL(set_gpiop_ ## name);
			#else
	#define SET_GPIO_P(name) \		#define SET_GPIO_P(name) \
	void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \		void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \
	{ \		{ \
	gpio_bankb[gpio_bank(gpio)]->name = arg; \		gpio_bankb[gpio_bank(gpio)]->name = arg; \
	} \		} \
	EXPORT_SYMBOL(set_gpiop_ ## name);		EXPORT_SYMBOL(set_gpiop_ ## name);
			#endif

			SET_GPIO_P(data)
	SET_GPIO_P(dir)		SET_GPIO_P(dir)
	SET_GPIO_P(inen)		SET_GPIO_P(inen)
	SET_GPIO_P(polar)		SET_GPIO_P(polar)
	@@ -478,31 +528,30 @@ SET_GPIO_P(maska)
	SET_GPIO_P(maskb)		SET_GPIO_P(maskb)


	#if ANOMALY_05000311
	void set_gpiop_data(unsigned short gpio, unsigned short arg)
	{
	unsigned long flags;
	local_irq_save(flags);
	gpio_bankb[gpio_bank(gpio)]->data = arg;
	bfin_read_CHIPID();
	local_irq_restore(flags);
	}
	EXPORT_SYMBOL(set_gpiop_data);
	#else
	SET_GPIO_P(data)
	#endif



	/* Get a specific bit */		/* Get a specific bit */
			#if ANOMALY_05000311 \|\| ANOMALY_05000323
			#define GET_GPIO(name) \
			unsigned short get_gpio_ ## name(unsigned short gpio) \
			{ \
			unsigned long flags; \
			unsigned short ret; \
			local_irq_save(flags); \
			ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \
			AWA_DUMMY_READ(name); \
			local_irq_restore(flags); \
			return ret; \
			} \
			EXPORT_SYMBOL(get_gpio_ ## name);
			#else
	#define GET_GPIO(name) \		#define GET_GPIO(name) \
	unsigned short get_gpio_ ## name(unsigned short gpio) \		unsigned short get_gpio_ ## name(unsigned short gpio) \
	{ \		{ \
	return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \		return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \
	} \		} \
	EXPORT_SYMBOL(get_gpio_ ## name);		EXPORT_SYMBOL(get_gpio_ ## name);
			#endif

			GET_GPIO(data)
	GET_GPIO(dir)		GET_GPIO(dir)
	GET_GPIO(inen)		GET_GPIO(inen)
	GET_GPIO(polar)		GET_GPIO(polar)
	@@ -511,33 +560,31 @@ GET_GPIO(both)
	GET_GPIO(maska)		GET_GPIO(maska)
	GET_GPIO(maskb)		GET_GPIO(maskb)


	#if ANOMALY_05000311
	unsigned short get_gpio_data(unsigned short gpio)
	{
	unsigned long flags;
	unsigned short ret;
	BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
	local_irq_save(flags);
	ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->data >> gpio_sub_n(gpio));
	bfin_read_CHIPID();
	local_irq_restore(flags);
	return ret;
	}
	EXPORT_SYMBOL(get_gpio_data);
	#else
	GET_GPIO(data)
	#endif

	/Get current PORT date (16-bit word)/		/Get current PORT date (16-bit word)/

			#if ANOMALY_05000311 \|\| ANOMALY_05000323
			#define GET_GPIO_P(name) \
			unsigned short get_gpiop_ ## name(unsigned short gpio) \
			{ \
			unsigned long flags; \
			unsigned short ret; \
			local_irq_save(flags); \
			ret = (gpio_bankb[gpio_bank(gpio)]->name); \
			AWA_DUMMY_READ(name); \
			local_irq_restore(flags); \
			return ret; \
			} \
			EXPORT_SYMBOL(get_gpiop_ ## name);
			#else
	#define GET_GPIO_P(name) \		#define GET_GPIO_P(name) \
	unsigned short get_gpiop_ ## name(unsigned short gpio) \		unsigned short get_gpiop_ ## name(unsigned short gpio) \
	{ \		{ \
	return (gpio_bankb[gpio_bank(gpio)]->name);\		return (gpio_bankb[gpio_bank(gpio)]->name);\
	} \		} \
	EXPORT_SYMBOL(get_gpiop_ ## name);		EXPORT_SYMBOL(get_gpiop_ ## name);
			#endif

			GET_GPIO_P(data)
	GET_GPIO_P(dir)		GET_GPIO_P(dir)
	GET_GPIO_P(inen)		GET_GPIO_P(inen)
	GET_GPIO_P(polar)		GET_GPIO_P(polar)
	@@ -546,21 +593,6 @@ GET_GPIO_P(both)
	GET_GPIO_P(maska)		GET_GPIO_P(maska)
	GET_GPIO_P(maskb)		GET_GPIO_P(maskb)

	#if ANOMALY_05000311
	unsigned short get_gpiop_data(unsigned short gpio)
	{
	unsigned long flags;
	unsigned short ret;
	local_irq_save(flags);
	ret = gpio_bankb[gpio_bank(gpio)]->data;
	bfin_read_CHIPID();
	local_irq_restore(flags);
	return ret;
	}
	EXPORT_SYMBOL(get_gpiop_data);
	#else
	GET_GPIO_P(data)
	#endif

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	/***********************************************************		/***********************************************************
	@@ -684,6 +716,8 @@ u32 gpio_pm_setup(void)
	}		}
	}		}

			AWA_DUMMY_READ(maskb_set);

	if (sic_iwr)		if (sic_iwr)
	return sic_iwr;		return sic_iwr;
	else		else
	@@ -715,6 +749,7 @@ void gpio_pm_restore(void)

	gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb;		gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb;
	}		}
			AWA_DUMMY_READ(maskb);
	}		}

	#endif		#endif
	@@ -1089,6 +1124,7 @@ void gpio_direction_input(unsigned short gpio)
	local_irq_save(flags);		local_irq_save(flags);
	gpio_bankb[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);		gpio_bankb[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
	gpio_bankb[gpio_bank(gpio)]->inen \|= gpio_bit(gpio);		gpio_bankb[gpio_bank(gpio)]->inen \|= gpio_bit(gpio);
			AWA_DUMMY_READ(inen);
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}
	EXPORT_SYMBOL(gpio_direction_input);		EXPORT_SYMBOL(gpio_direction_input);
	@@ -1102,6 +1138,7 @@ void gpio_direction_output(unsigned short gpio)
	local_irq_save(flags);		local_irq_save(flags);
	gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);		gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
	gpio_bankb[gpio_bank(gpio)]->dir \|= gpio_bit(gpio);		gpio_bankb[gpio_bank(gpio)]->dir \|= gpio_bit(gpio);
			AWA_DUMMY_READ(dir);
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}
	EXPORT_SYMBOL(gpio_direction_output);		EXPORT_SYMBOL(gpio_direction_output);

include/asm-blackfin/mach-bf527/anomaly.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,4 +36,6 @@
	/* Boot ROM Kernel Incorrectly Alters Reset Value of USB Register */		/* Boot ROM Kernel Incorrectly Alters Reset Value of USB Register */
	#define ANOMALY_05000347 (1)		#define ANOMALY_05000347 (1)

			/* Anomalies that don't exist on this proc */
			#define ANOMALY_05000323 (0)
	#endif		#endif

include/asm-blackfin/mach-bf533/anomaly.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -254,5 +254,6 @@

	/* Anomalies that don't exist on this proc */		/* Anomalies that don't exist on this proc */
	#define ANOMALY_05000266 (0)		#define ANOMALY_05000266 (0)
			#define ANOMALY_05000323 (0)

	#endif		#endif

include/asm-blackfin/mach-bf537/anomaly.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,5 +139,6 @@
	#define ANOMALY_05000230 (0)		#define ANOMALY_05000230 (0)
	#define ANOMALY_05000266 (0)		#define ANOMALY_05000266 (0)
	#define ANOMALY_05000311 (0)		#define ANOMALY_05000311 (0)
			#define ANOMALY_05000323 (0)

	#endif		#endif

include/asm-blackfin/mach-bf548/anomaly.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -80,5 +80,6 @@
	#define ANOMALY_05000266 (0)		#define ANOMALY_05000266 (0)
	#define ANOMALY_05000273 (0)		#define ANOMALY_05000273 (0)
	#define ANOMALY_05000311 (0)		#define ANOMALY_05000311 (0)
			#define ANOMALY_05000323 (0)

	#endif		#endif