[PATCH 0/2] Change the the config option of mbigen driver.

[PATCH 0/2] Change the the config option of mbigen driver.

[MaJun]

From: Ma Jun <majun258@huawei.com>

In current driver, the config of mbigen driver is a configurable option and
have nothing to do with CONFIG_ARCH_HISI.

As a module of Hisilicon SOC, the config of mbigen driver should be selected
by CONFIG_ARCH_HISI on Hisilicon platform, but not a configurable option.

This patch set is applied to fix this problem.

Ma Jun (2):
  ARM64: Enable mbigen interrupt controller on Hisilicon platform
  irqchip/mbigen:Change the config option of mbigen driver to non-configurable

 arch/arm64/Kconfig.platforms |    1 +
 drivers/irqchip/Kconfig      |   14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

[PATCH 0/2] Change the the config option of mbigen driver.

[MaJun]

From: Ma Jun <majun258@huawei.com>

In current driver, the config of mbigen driver is a configurable option and
have nothing to do with CONFIG_ARCH_HISI.

As a module of Hisilicon SOC, the config of mbigen driver should be selected
by CONFIG_ARCH_HISI on Hisilicon platform, but not a configurable option.

This patch set is applied to fix this problem.

Ma Jun (2):
  ARM64: Enable mbigen interrupt controller on Hisilicon platform
  irqchip/mbigen:Change the config option of mbigen driver to non-configurable

 arch/arm64/Kconfig.platforms |    1 +
 drivers/irqchip/Kconfig      |   14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

[PATCH 1/2]ARM64: Enable mbigen interrupt controller on Hisilicon platform

[MaJun]

From: Ma Jun <majun258@huawei.com>

As a interrupt controller used on some of hisilicon SOCs(660,1610 etc.),
mbigen driver should be enabled when CONFIG_ARCH_HISI is enabled.
Signed-off-by: Ma Jun <majun258@huawei.com>
---
 arch/arm64/Kconfig.platforms |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 21074f6..fdfd526 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -37,6 +37,7 @@ config ARCH_LAYERSCAPE
 
 config ARCH_HISI
 	bool "Hisilicon SoC Family"
+	select HISILICON_IRQ_MBIGEN
 	help
 	  This enables support for Hisilicon ARMv8 SoC family
 
-- 
1.7.1

[PATCH 1/2]ARM64: Enable mbigen interrupt controller on Hisilicon platform

[MaJun]

From: Ma Jun <majun258@huawei.com>

As a interrupt controller used on some of hisilicon SOCs(660,1610 etc.),
mbigen driver should be enabled when CONFIG_ARCH_HISI is enabled.
Signed-off-by: Ma Jun <majun258@huawei.com>
---
 arch/arm64/Kconfig.platforms |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 21074f6..fdfd526 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -37,6 +37,7 @@ config ARCH_LAYERSCAPE
 
 config ARCH_HISI
 	bool "Hisilicon SoC Family"
+	select HISILICON_IRQ_MBIGEN
 	help
 	  This enables support for Hisilicon ARMv8 SoC family
 
-- 
1.7.1

[PATCH 2/2] irqchip/mbigen:Change the config option of mbigen driver to non-configurable

[MaJun]

From: Ma Jun <majun258@huawei.com>

This config is selected by CONFIG_ARCH_HISI, So we change
this config to non-configurable.

I also adjust the mbigen config position try to sort the configs
in alphabetical order.

Signed-off-by: Ma Jun <majun258@huawei.com>
---
 drivers/irqchip/Kconfig |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7e8c441..3e12479 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -32,14 +32,6 @@ config ARM_GIC_V3_ITS
 	bool
 	select PCI_MSI_IRQ_DOMAIN
 
-config HISILICON_IRQ_MBIGEN
-	bool "Support mbigen interrupt controller"
-	default n
-	depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
-	help
-	 Enable the mbigen interrupt controller used on
-	 Hisilicon platform.
-
 config ARM_NVIC
 	bool
 	select IRQ_DOMAIN
@@ -114,6 +106,12 @@ config DW_APB_ICTL
 	select GENERIC_IRQ_CHIP
 	select IRQ_DOMAIN
 
+config HISILICON_IRQ_MBIGEN
+	bool
+	select ARM_GIC_V3
+	select ARM_GIC_V3_ITS
+	select GENERIC_MSI_IRQ_DOMAIN
+
 config IMGPDC_IRQ
 	bool
 	select GENERIC_IRQ_CHIP
-- 
1.7.1

[PATCH 2/2] irqchip/mbigen:Change the config option of mbigen driver to non-configurable

[MaJun]

From: Ma Jun <majun258@huawei.com>

This config is selected by CONFIG_ARCH_HISI, So we change
this config to non-configurable.

I also adjust the mbigen config position try to sort the configs
in alphabetical order.

Signed-off-by: Ma Jun <majun258@huawei.com>
---
 drivers/irqchip/Kconfig |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7e8c441..3e12479 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -32,14 +32,6 @@ config ARM_GIC_V3_ITS
 	bool
 	select PCI_MSI_IRQ_DOMAIN
 
-config HISILICON_IRQ_MBIGEN
-	bool "Support mbigen interrupt controller"
-	default n
-	depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
-	help
-	 Enable the mbigen interrupt controller used on
-	 Hisilicon platform.
-
 config ARM_NVIC
 	bool
 	select IRQ_DOMAIN
@@ -114,6 +106,12 @@ config DW_APB_ICTL
 	select GENERIC_IRQ_CHIP
 	select IRQ_DOMAIN
 
+config HISILICON_IRQ_MBIGEN
+	bool
+	select ARM_GIC_V3
+	select ARM_GIC_V3_ITS
+	select GENERIC_MSI_IRQ_DOMAIN
+
 config IMGPDC_IRQ
 	bool
 	select GENERIC_IRQ_CHIP
-- 
1.7.1

[tip:irq/urgent] ARM64: Kconfig: Select mbigen interrupt controller on Hisilicon platform

[tip-bot for MaJun]

Commit-ID:  dd17a3c40d46adea7215cad3f8fa0afb7c616290
Gitweb:     http://git.kernel.org/tip/dd17a3c40d46adea7215cad3f8fa0afb7c616290
Author:     MaJun <majun258@huawei.com>
AuthorDate: Wed, 23 Mar 2016 17:06:32 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 23 Mar 2016 12:02:29 +0100

ARM64: Kconfig: Select mbigen interrupt controller on Hisilicon platform

As a interrupt controller used on some of hisilicon SOCs(660,1610 etc.),
mbigen driver should be enabled when CONFIG_ARCH_HISI is enabled.

Signed-off-by: Ma Jun <majun258@huawei.com>
Cc: mark.rutland@arm.com
Cc: jason@lakedaemon.net
Cc: marc.zyngier@arm.com
Cc: Catalin.Marinas@arm.com
Cc: guohanjun@huawei.com
Cc: Will.Deacon@arm.com
Cc: huxinwei@huawei.com
Cc: lizefan@huawei.com
Cc: dingtianhong@huawei.com
Cc: zhaojunhua@hisilicon.com
Cc: liguozhu@hisilicon.com
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1458723993-21044-2-git-send-email-majun258@huawei.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/arm64/Kconfig.platforms | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 21074f6..fdfd526 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -37,6 +37,7 @@ config ARCH_LAYERSCAPE
 
 config ARCH_HISI
 	bool "Hisilicon SoC Family"
+	select HISILICON_IRQ_MBIGEN
 	help
 	  This enables support for Hisilicon ARMv8 SoC family
 

[tip:irq/urgent] irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option

[tip-bot for MaJun]

Commit-ID:  9a7c4abd41c0d553f4fb9845bdd4328155426ac7
Gitweb:     http://git.kernel.org/tip/9a7c4abd41c0d553f4fb9845bdd4328155426ac7
Author:     MaJun <majun258@huawei.com>
AuthorDate: Wed, 23 Mar 2016 17:06:33 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 23 Mar 2016 12:02:29 +0100

irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option

This config is selected by CONFIG_ARCH_HISI, so there is no point to have it
user configurable.

While at it move the config option to the proper place in the alphabetically
sorted option list.

Requested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ma Jun <majun258@huawei.com>
Cc: mark.rutland@arm.com
Cc: jason@lakedaemon.net
Cc: marc.zyngier@arm.com
Cc: Catalin.Marinas@arm.com
Cc: guohanjun@huawei.com
Cc: Will.Deacon@arm.com
Cc: huxinwei@huawei.com
Cc: lizefan@huawei.com
Cc: dingtianhong@huawei.com
Cc: zhaojunhua@hisilicon.com
Cc: liguozhu@hisilicon.com
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1458723993-21044-3-git-send-email-majun258@huawei.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 drivers/irqchip/Kconfig | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7e8c441..3e12479 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -32,14 +32,6 @@ config ARM_GIC_V3_ITS
 	bool
 	select PCI_MSI_IRQ_DOMAIN
 
-config HISILICON_IRQ_MBIGEN
-	bool "Support mbigen interrupt controller"
-	default n
-	depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
-	help
-	 Enable the mbigen interrupt controller used on
-	 Hisilicon platform.
-
 config ARM_NVIC
 	bool
 	select IRQ_DOMAIN
@@ -114,6 +106,12 @@ config DW_APB_ICTL
 	select GENERIC_IRQ_CHIP
 	select IRQ_DOMAIN
 
+config HISILICON_IRQ_MBIGEN
+	bool
+	select ARM_GIC_V3
+	select ARM_GIC_V3_ITS
+	select GENERIC_MSI_IRQ_DOMAIN
+
 config IMGPDC_IRQ
 	bool
 	select GENERIC_IRQ_CHIP

Re: [PATCH 0/2] Change the the config option of mbigen driver.

[Arnd Bergmann]

On Wednesday 23 March 2016 17:06:31 MaJun wrote:
> From: Ma Jun <majun258@huawei.com>
> 
> In current driver, the config of mbigen driver is a configurable option and
> have nothing to do with CONFIG_ARCH_HISI.
> 
> As a module of Hisilicon SOC, the config of mbigen driver should be selected
> by CONFIG_ARCH_HISI on Hisilicon platform, but not a configurable option.
> 
> This patch set is applied to fix this problem.
> 
> 

I don't understand this one. I thought mbigen is specific to just one
of Hisilicon's SoC families, while ARCH_HISI is more generic and can
also be set for the other ones.

Maybe just add 'default ARCH_HISI' and 'depends on ARCH_HISI || COMPILE_TEST'
to the option? We should certainly keep building this driver for
compile-test on all architectures.

	Arnd

[PATCH 0/2] Change the the config option of mbigen driver.

[Arnd Bergmann]

On Wednesday 23 March 2016 17:06:31 MaJun wrote:
> From: Ma Jun <majun258@huawei.com>
> 
> In current driver, the config of mbigen driver is a configurable option and
> have nothing to do with CONFIG_ARCH_HISI.
> 
> As a module of Hisilicon SOC, the config of mbigen driver should be selected
> by CONFIG_ARCH_HISI on Hisilicon platform, but not a configurable option.
> 
> This patch set is applied to fix this problem.
> 
> 

I don't understand this one. I thought mbigen is specific to just one
of Hisilicon's SoC families, while ARCH_HISI is more generic and can
also be set for the other ones.

Maybe just add 'default ARCH_HISI' and 'depends on ARCH_HISI || COMPILE_TEST'
to the option? We should certainly keep building this driver for
compile-test on all architectures.

	Arnd