On Wed, May 26, 2021 at 6:57 PM Joel Stan= ley <joel@jms.id.au> wrote:
=

On Wed, 14 Apr 2021 at 00:06, Willy Tu <wltu@google.com> wrote:
>
> Hi Joel,
>
> thanks for the response.
>
> Sorry, I did not update the patch to include the branch name. I'll= be more careful next time.
>
> This change should be in `v2019.04-aspeed-openbmc` and the other patch= in https://lore.kernel.org= /openbmc/20210413161238.2816187-1-wltu@google.com/ should be in `v2016.= 07-aspeed-openbmc`.

Okay.

> I have not tested this change, but have tested=C2=A0 https://lore.kernel.org/openbmc/202104131612= 38.2816187-1-wltu@google.com/ that I based off of (Which I have tested = with my setup). Will that be an issue?

What branch are you using for your system?

I strongly encourage you to use the 2019.04 branch if at all possible.

Some review below.

The system that I wa= s using was based on v2016.07-aspeed-openbmc . It is an old system and we d= on't plan on migrating the u-boot version for it. We don't have any= system that is using aspeed other than this one.

=C2=A0

> On Tue, Apr 13, 2021 at 4:32 PM Joel Stanley <joel@jms.id.au> wrote:
>>
>> Hi Willy,
>>
>> On Tue, 13 Apr 2021 at 16:11, Willy Tu <wltu@google.com> wrote:
>> >
>> > Add option to enable register for SGPIO in SCU.
>> >
>> > Included new function register values for ast2400
>> > SCU and enable the SGPIO function in board init.
>>
>> Which branch would you like this patch applied to?
>>
>> >
>> > Signed-off-by: Willy Tu <wltu@google.com>
>> > ---
>> >=C2=A0 arch/arm/include/asm/arch-aspeed/scu_ast2400.h |=C2=A0 = 4 ++++
>> >=C2=A0 arch/arm/mach-aspeed/ast2400/Kconfig=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 4 ++++
>> >=C2=A0 arch/arm/mach-aspeed/ast2400/board_common.c=C2=A0 =C2= =A0 | 15 +++++++++++++++
>> >=C2=A0 3 files changed, 23 insertions(+)
>> >
>> > diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2400.h b= /arch/arm/include/asm/arch-aspeed/scu_ast2400.h
>> > index 9c5d96ae84..17eaaf3e9d 100644
>> > --- a/arch/arm/include/asm/arch-aspeed/scu_ast2400.h
>> > +++ b/arch/arm/include/asm/arch-aspeed/scu_ast2400.h
>> > @@ -75,6 +75,10 @@
>> >=C2=A0 #define SCU_PIN_FUN_SCL2=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(1 << 14)
>> >=C2=A0 #define SCU_PIN_FUN_SDA1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(1 << 13)
>> >=C2=A0 #define SCU_PIN_FUN_SDA2=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(1 << 15)
>> > +#define SCU_PIN_FUN_SGPMCK=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0(0x1 << 8)
>> > +#define SCU_PIN_FUN_SGPMLD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0(0x1 << 9)
>> > +#define SCU_PIN_FUN_SGPMO=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 (0x1 << 10)
>> > +#define SCU_PIN_FUN_SGPMI=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 (0x1 << 11)
>> >
>> >=C2=A0 #define SCU_D2PLL_EXT1_OFF=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(1 << 0)
>> >=C2=A0 #define SCU_D2PLL_EXT1_BYPASS=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 (1 << 1)
>> > diff --git a/arch/arm/mach-aspeed/ast2400/Kconfig b/arch/arm/= mach-aspeed/ast2400/Kconfig
>> > index f76276860c..c4e88b5140 100644
>> > --- a/arch/arm/mach-aspeed/ast2400/Kconfig
>> > +++ b/arch/arm/mach-aspeed/ast2400/Kconfig
>> > @@ -17,6 +17,10 @@ config TARGET_EVB_AST2400
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A020 pin JTAG, pinouts = for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs.
>> >=C2=A0 endchoice
>> >
>> > +config ENABLE_SGPIO
>> > +=C2=A0 =C2=A0 tristate "Enable SGPIO in SCU"
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0default n

Note that this is the default default in kconfig, you only need to
specify a default if you want some other behaviour.

>> > @@ -14,6 +14,21 @@ __weak int board_init(void)
>> >=C2=A0 {
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gd->bd->bi_boot_params= =3D CONFIG_SYS_SDRAM_BASE + 0x100;
>> >
>> > +#ifdef CONFIG_ENABLE_SGPIO
>> > +#define SCU_BASE 0x1e6e2000
>> > +#define SCU_FUN_PIN_CTRL2 0x84 /* Multi-function Pin Control= #2*/
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Unlock SCU */
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0writel(SCU_UNLOCK_VALUE, SCU_BASE= );
>> > +
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Enable SGPIO Master */
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0u32 reg =3D readl(SCU_BASE + SCU_= FUN_PIN_CTRL2);
>> > +
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0reg |=3D (SCU_PIN_FUN_SGPMI=C2=A0= |
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMO=C2=A0 |
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMLD |
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMCK);
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0writel(reg, SCU_BASE + SCU_FUN_PI= N_CTRL2);
>> > +#endif

Here's what I saw when attempting to compile test your patch:

In file included from ../arch/arm/mach-aspeed/ast2400/board_common.c:6:
../arch/arm/mach-aspeed/ast2400/board_common.c: In function =E2=80=98board_= init=E2=80=99:
../arch/arm/mach-aspeed/ast2400/board_common.c:21:16: error:
=E2=80=98SCU_UNLOCK_VALUE=E2=80=99 undeclared (first use in this function)<= br> =C2=A0 =C2=A021 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0writel(SCU_UNLOCK_VALUE,= SCU_BASE);
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ^~~~~~~~~~~~~~~~
../arch/arm/include/asm/io.h:117:38: note: in definition of macro =E2=80=98= writel=E2=80=99
=C2=A0 117 | #define writel(v,c)=C2=A0 =C2=A0 =C2=A0({ u32 __v =3D v; __iow= mb();
__arch_putl(__v,c); __v; })
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 ^
../arch/arm/mach-aspeed/ast2400/board_common.c:21:16: note: each
undeclared identifier is reported only once for each function it
appears in
=C2=A0 =C2=A021 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0writel(SCU_UNLOCK_VALUE,= SCU_BASE);
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ^~~~~~~~~~~~~~~~
../arch/arm/include/asm/io.h:117:38: note: in definition of macro =E2=80=98= writel=E2=80=99
=C2=A0 117 | #define writel(v,c)=C2=A0 =C2=A0 =C2=A0({ u32 __v =3D v; __iow= mb();
__arch_putl(__v,c); __v; })
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 ^
../arch/arm/mach-aspeed/ast2400/board_common.c:26:17: error:
=E2=80=98SCU_PIN_FUN_SGPMI=E2=80=99 undeclared (first use in this function)=
=C2=A0 =C2=A026 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reg |=3D (SCU_PIN_FUN_SG= PMI=C2=A0 |
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0^~~~~~~~~~~~~~~~~
../arch/arm/mach-aspeed/ast2400/board_common.c:27:25: error:
=E2=80=98SCU_PIN_FUN_SGPMO=E2=80=99 undeclared (first use in this function)=
=C2=A0 =C2=A027 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMO=C2=A0 |
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^~~~~~~~~~~~~~~~~
../arch/arm/mach-aspeed/ast2400/board_common.c:28:25: error:
=E2=80=98SCU_PIN_FUN_SGPMLD=E2=80=99 undeclared (first use in this function= )
=C2=A0 =C2=A028 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMLD |
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^~~~~~~~~~~~~~~~~~
../arch/arm/mach-aspeed/ast2400/board_common.c:29:25: error:
=E2=80=98SCU_PIN_FUN_SGPMCK=E2=80=99 undeclared (first use in this function= )
=C2=A0 =C2=A029 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SCU_PIN_FUN_SGPMCK);
=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^~~~~~~~~~~~~~~~~~

>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
>> >=C2=A0 }
>> >
>> > --
>> > 2.31.1.295.g9ea45b61b8-goog
>> >

Thanks for the feedback. = I'll address the issue and apply a new patch.

= Willy Tu