diff mbox

[1/3] arm: hisi: add ARCH_MULTI_V5 support

Message ID 20161017120705.3726-2-wenpan@hisilicon.com (mailing list archive)
State New, archived
Headers show

Commit Message

Pan Wen Oct. 17, 2016, 12:07 p.m. UTC
Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.

Signed-off-by: Pan Wen <wenpan@hisilicon.com>
---
 arch/arm/mach-hisi/Kconfig | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Arnd Bergmann Oct. 17, 2016, 1:48 p.m. UTC | #1
On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
> 
> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
> 

Looks ok. I've added Marty Plummer to Cc, he was recently proposing
patches for Hi3520, which I think is closely related to this one.
Please try to work together so the patches don't conflict. It should
be fairly straightforward since you are basically doing the same
change here.

	Arnd
Pan Wen Nov. 16, 2016, 8:56 a.m. UTC | #2
Hi Martyo<
Does this confict with your patcho< If noto<I hope this could be merged first.  Besides could you tell me the link to your related patch?

Thanks,
Pan

On 2016/10/17 21:48, Arnd Bergmann wrote:
> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>
>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>
> 
> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
> patches for Hi3520, which I think is closely related to this one.
> Please try to work together so the patches don't conflict. It should
> be fairly straightforward since you are basically doing the same
> change here.
> 
> 	Arnd
> 
> .
>
Wei Xu Nov. 16, 2016, 9:31 a.m. UTC | #3
Hi Pan,

On 2016/11/16 8:56, wenpan wrote:
> Hi Marty,
> Does this confict with your patch? If not,I hope this could be merged first.  Besides could you tell me the link to your related patch?

This is the link: https://patchwork.kernel.org/patch/9334743/

BR,
Wei

> 
> Thanks,
> Pan
> 
> On 2016/10/17 21:48, Arnd Bergmann wrote:
>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>
>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>
>>
>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>> patches for Hi3520, which I think is closely related to this one.
>> Please try to work together so the patches don't conflict. It should
>> be fairly straightforward since you are basically doing the same
>> change here.
>>
>> 	Arnd
>>
>> .
>>
> 
> 
> .
>
Jiancheng Xue Nov. 17, 2016, 3:03 a.m. UTC | #4
Hi Wei,

On 2016/11/16 17:31, Wei Xu wrote:
> Hi Pan,
> 
> On 2016/11/16 8:56, wenpan wrote:
>> Hi Marty,
>> Does this confict with your patch? If not,I hope this could be merged first.  Besides could you tell me the link to your related patch?
> 
> This is the link: https://patchwork.kernel.org/patch/9334743/
> 

Thank you for offering this.If I want to give some comments on Marty's patch,
what should I do?

For Marty's patch, I think there's no need to add specific config item ARCH_HIxxxx
for every chipset. Some existing chipsets depend on ARCH_HISI directly like Hi3519
and Hi3798CV200. If some options like ARM_GIC is removed from ARCH_HISI, this kind
of chipsets will must choose other place to select it. I suggest we should keep selecting
ARM_GIC under ARCH_HISI as Pan's patch do.

The code may be like this:

config ARCH_HISI
 	bool "Hisilicon SoC Support"
-	depends on ARCH_MULTI_V7
+	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7
 	select ARM_AMBA
-	select ARM_GIC
+	select ARM_GIC if ARCH_MULTI_V7
+	select ARM_VIC if ARCH_MULTI_V5 || depends on ARCH_MULTI_V6
 	select ARM_TIMER_SP804
 	select POWER_RESET
 	select POWER_RESET_HISI
 	select POWER_SUPPLY

What's your opinion?

Best Regards,
Jiancheng

>> On 2016/10/17 21:48, Arnd Bergmann wrote:
>>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>>
>>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>>
>>>
>>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>>> patches for Hi3520, which I think is closely related to this one.
>>> Please try to work together so the patches don't conflict. It should
>>> be fairly straightforward since you are basically doing the same
>>> change here.
>>>
Jiancheng Xue Nov. 18, 2016, 6:42 a.m. UTC | #5
Hi Marty,

On 2016/11/17 11:03, Jiancheng Xue wrote:
> Hi Wei,
> 
> On 2016/11/16 17:31, Wei Xu wrote:
>> Hi Pan,
>>
>> On 2016/11/16 8:56, wenpan wrote:
>>> Hi Marty,
>>> Does this confict with your patch? If not,I hope this could be merged first.  Besides could you tell me the link to your related patch?
>>
>> This is the link: https://patchwork.kernel.org/patch/9334743/
>>

Could you give your comments on this patch?
If you have any objections to it, please let us know.

> 
> Thank you for offering this.If I want to give some comments on Marty's patch,
> what should I do?
> 
> For Marty's patch, I think there's no need to add specific config item ARCH_HIxxxx
> for every chipset. Some existing chipsets depend on ARCH_HISI directly like Hi3519
> and Hi3798CV200. If some options like ARM_GIC is removed from ARCH_HISI, this kind
> of chipsets will must choose other place to select it. I suggest we should keep selecting
> ARM_GIC under ARCH_HISI as Pan's patch do.
> 
> The code may be like this:
> 
> config ARCH_HISI
>  	bool "Hisilicon SoC Support"
> -	depends on ARCH_MULTI_V7
> +	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7
>  	select ARM_AMBA
> -	select ARM_GIC
> +	select ARM_GIC if ARCH_MULTI_V7
> +	select ARM_VIC if ARCH_MULTI_V5 || depends on ARCH_MULTI_V6
>  	select ARM_TIMER_SP804
>  	select POWER_RESET
>  	select POWER_RESET_HISI
>  	select POWER_SUPPLY
> 

What's your opinion about this?

Best Regards,
Jiancheng

>>> On 2016/10/17 21:48, Arnd Bergmann wrote:
>>>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>>>
>>>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>>>
>>>>
>>>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>>>> patches for Hi3520, which I think is closely related to this one.
>>>> Please try to work together so the patches don't conflict. It should
>>>> be fairly straightforward since you are basically doing the same
>>>> change here.
>>>>
> 
> 
> 
> .
>
Jiancheng Xue Dec. 5, 2016, 2:03 a.m. UTC | #6
Hi Arnd,

On 2016/10/17 21:48, Arnd Bergmann wrote:
> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>
>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>
> 
> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
> patches for Hi3520, which I think is closely related to this one.
> Please try to work together so the patches don't conflict. It should
> be fairly straightforward since you are basically doing the same
> change here.
> 
Marty hasn't give any replies about this thread until now. I reviewed
the patch for Hi3520. And I think this patch won't conflict with Hi3520.
Could you help us to ack this patch?

Thanks,
Jiancheng
Marty Plummer Dec. 9, 2016, 3:07 p.m. UTC | #7
On 12/04/2016 08:03 PM, Jiancheng Xue wrote:
> Hi Arnd,
> 
> On 2016/10/17 21:48, Arnd Bergmann wrote:
>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>
>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>
>>
>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>> patches for Hi3520, which I think is closely related to this one.
>> Please try to work together so the patches don't conflict. It should
>> be fairly straightforward since you are basically doing the same
>> change here.
>>
> Marty hasn't give any replies about this thread until now. I reviewed
> the patch for Hi3520. And I think this patch won't conflict with Hi3520.
> Could you help us to ack this patch?
> 
> Thanks,
> Jiancheng
> 
> 
Hello all

Sorry for my lack of activity, I've just been very busy lately with real
world considerations (well, real world but related to this; I have
another board based on hi3521a I've been tinkering with, trying to get
the manuf. to release gpl source via the sfconfservancy). I've not given
up on the project, however, since devices like this really need updates
in light of the recent botnets targeting devices of this sort as
manpower.
Jiancheng Xue Dec. 12, 2016, 7:11 a.m. UTC | #8
On 2016/12/9 23:07, Marty Plummer wrote:
> On 12/04/2016 08:03 PM, Jiancheng Xue wrote:
>> Hi Arnd,
>>
>> On 2016/10/17 21:48, Arnd Bergmann wrote:
>>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>>
>>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>>
>>>
>>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>>> patches for Hi3520, which I think is closely related to this one.
>>> Please try to work together so the patches don't conflict. It should
>>> be fairly straightforward since you are basically doing the same
>>> change here.
>>>
>> Marty hasn't give any replies about this thread until now. I reviewed
>> the patch for Hi3520. And I think this patch won't conflict with Hi3520.
>> Could you help us to ack this patch?
>>
>> Thanks,
>> Jiancheng
>>
>>
> Hello all
> 
> Sorry for my lack of activity, I've just been very busy lately with real
> world considerations (well, real world but related to this; I have
> another board based on hi3521a I've been tinkering with, trying to get
> the manuf. to release gpl source via the sfconfservancy). I've not given
> up on the project, however, since devices like this really need updates
> in light of the recent botnets targeting devices of this sort as
> manpower.

Do you have any objections to this patch?  If not, I hope this patch can
be merged in 4.10.  Thank you.

Regards,
Jiancheng
Jiancheng Xue Jan. 20, 2017, 1:47 a.m. UTC | #9
On 2016/12/15 4:06, Marty Plummer wrote:
> On 12/12/2016 01:11 AM, Jiancheng Xue wrote:
>>
>>
>> On 2016/12/9 23:07, Marty Plummer wrote:
>>> On 12/04/2016 08:03 PM, Jiancheng Xue wrote:
>>>> Hi Arnd,
>>>>
>>>> On 2016/10/17 21:48, Arnd Bergmann wrote:
>>>>> On Monday, October 17, 2016 8:07:03 PM CEST Pan Wen wrote:
>>>>>> Add support for some HiSilicon SoCs which depend on ARCH_MULTI_V5.
>>>>>>
>>>>>> Signed-off-by: Pan Wen <wenpan@hisilicon.com>
>>>>>>
>>>>>
>>>>> Looks ok. I've added Marty Plummer to Cc, he was recently proposing
>>>>> patches for Hi3520, which I think is closely related to this one.
>>>>> Please try to work together so the patches don't conflict. It should
>>>>> be fairly straightforward since you are basically doing the same
>>>>> change here.
>>>>>
>>>> Marty hasn't give any replies about this thread until now. I reviewed
>>>> the patch for Hi3520. And I think this patch won't conflict with Hi3520.
>>>> Could you help us to ack this patch?
>>>>
>>>> Thanks,
>>>> Jiancheng
>>>>
>>>>
>>> Hello all
>>>
>>> Sorry for my lack of activity, I've just been very busy lately with real
>>> world considerations (well, real world but related to this; I have
>>> another board based on hi3521a I've been tinkering with, trying to get
>>> the manuf. to release gpl source via the sfconfservancy). I've not given
>>> up on the project, however, since devices like this really need updates
>>> in light of the recent botnets targeting devices of this sort as
>>> manpower.
>>
>> Do you have any objections to this patch?  If not, I hope this patch can
>> be merged in 4.10.  Thank you.
>>
>> Regards,
>> Jiancheng
>>
>>
>>
> I have no objections. It looks like it might make my job a bit easier in
> the end. I need to go ahead and rebase my patches anyways and fix up
> earlier concerns raised about them, so go right ahead.
> 
Hi Arnd,

Could this patch be accepted?  Any further comments will be appreciated.

Regards,
Jiancheng
Arnd Bergmann Jan. 27, 2017, 4:44 p.m. UTC | #10
On Fri, Jan 20, 2017 at 2:47 AM, Jiancheng Xue
<xuejiancheng@hisilicon.com> wrote:
> On 2016/12/15 4:06, Marty Plummer wrote:

>>>
>> I have no objections. It looks like it might make my job a bit easier in
>> the end. I need to go ahead and rebase my patches anyways and fix up
>> earlier concerns raised about them, so go right ahead.
>>
> Hi Arnd,
>
> Could this patch be accepted?  Any further comments will be appreciated.

Sorry this is going so slowly. The patch is fine, please work with Wei Xu to
have it merged into 4.11. My only concern was whether it conflicted with Marty's
work, but since he has no objections and has not posted a new version of
his patches in a while, there is no problem.

    Arnd
diff mbox

Patch

diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index a3b091a..03d8379 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -1,12 +1,14 @@ 
 config ARCH_HISI
 	bool "Hisilicon SoC Support"
-	depends on ARCH_MULTI_V7
 	select ARM_AMBA
-	select ARM_GIC
+	select ARM_GIC if ARCH_MULTI_V7
+	select ARM_VIC if ARCH_MULTI_V5
 	select ARM_TIMER_SP804
 	select POWER_RESET
 	select POWER_RESET_HISI
 	select POWER_SUPPLY
+	select PINCTRL
+	select PINCTRL_SINGLE
 
 if ARCH_HISI
 
@@ -18,8 +20,6 @@  config ARCH_HI3xxx
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL
-	select PINCTRL_SINGLE
 	help
 	  Support for Hisilicon Hi36xx SoC family
 
@@ -48,8 +48,6 @@  config ARCH_HIX5HD2
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL
-	select PINCTRL_SINGLE
 	help
 	  Support for Hisilicon HIX5HD2 SoC family
 endmenu