gpio: zynq: Fix for bug in zynq_gpio_restore_context API (36f2e720) · Commits · 戴 / test

This patch writes the inverse value of Interrupt Mask Status register into the Interrupt Enable register in zynq_gpio_restore_context API to fix the bug. Fixes: ("gpio: zynq: Add support for suspend resume") Signed-off-by:

Swapna Manupati <swapna.manupati@xilinx.com> Signed-off-by:

Michal Simek <michal.simek@xilinx.com> Signed-off-by:

Srinivas Neeli <srinivas.neeli@xilinx.com> Link: https://lore.kernel.org/r/1577362338-28744-2-git-send-email-srinivas.neeli@xilinx.com Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/gpio/gpio-zynq.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -684,6 +684,8 @@ static void zynq_gpio_restore_context(struct zynq_gpio *gpio)
		unsigned int bank_num;

		for (bank_num = 0; bank_num < gpio->p_data->max_bank; bank_num++) {
		writel_relaxed(ZYNQ_GPIO_IXR_DISABLE_ALL, gpio->base_addr +
		ZYNQ_GPIO_INTDIS_OFFSET(bank_num));
		writel_relaxed(gpio->context.datalsw[bank_num],
		gpio->base_addr +
		ZYNQ_GPIO_DATA_LSW_OFFSET(bank_num));
		@@ -693,9 +695,6 @@ static void zynq_gpio_restore_context(struct zynq_gpio *gpio)
		writel_relaxed(gpio->context.dirm[bank_num],
		gpio->base_addr +
		ZYNQ_GPIO_DIRM_OFFSET(bank_num));
		writel_relaxed(gpio->context.int_en[bank_num],
		gpio->base_addr +
		ZYNQ_GPIO_INTEN_OFFSET(bank_num));
		writel_relaxed(gpio->context.int_type[bank_num],
		gpio->base_addr +
		ZYNQ_GPIO_INTTYPE_OFFSET(bank_num));
		@@ -705,6 +704,9 @@ static void zynq_gpio_restore_context(struct zynq_gpio *gpio)
		writel_relaxed(gpio->context.int_any[bank_num],
		gpio->base_addr +
		ZYNQ_GPIO_INTANY_OFFSET(bank_num));
		writel_relaxed(~(gpio->context.int_en[bank_num]),
		gpio->base_addr +
		ZYNQ_GPIO_INTEN_OFFSET(bank_num));
		}
		}

Admin message