| Message ID | 20210531201641.2804-1-abrodkin@synopsys.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARC: Rename nSIM HS to HAPS HS | expand |
Looks good to me. What branches were you targetting for the change ? Bruce In message: [linux-yocto] [PATCH] ARC: Rename nSIM HS to HAPS HS on 31/05/2021 Alexey Brodkin via lists.yoctoproject.org wrote: > In v5.5 kernel we merged "nsim_hs" config into "haps_hs", see [1], > and from then on we use the same one "haps_hs" for everything simulated: > nSIM/QEMU/FPGA. > > Of important notes: > * We switched from legacy ARC UART to a standard DW UART > > * QEMU port for ARC is under review upstream, see [2]. > But even today with WIP version from our GitHub fork [3] its possible > to run this image for "hapshs" machine as simple as: > ----------------------------->8------------------------------ > $ qemu-system-arc -cpu archs -M virt -nographic -no-reboot -monitor none \ > -kernel build/tmp-glibc/deploy/images/hapshs/vmlinux-initramfs-hapshs.bin > ----------------------------->8------------------------------ > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1681baa713aa138d3f0f77f05c3de1cd6416c7d6 > [2] https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg00458.html > [3] https://github.com/foss-for-synopsys-dwc-arc-processors/qemu > > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> > --- > .../nsimhs-standard.scc => hapshs/hapshs-standard.scc} | 4 ++-- > bsp/hapshs/hapshs.cfg | 12 ++++++++++++ > bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} | 2 +- > bsp/nsimhs/nsimhs.cfg | 10 ---------- > 4 files changed, 15 insertions(+), 13 deletions(-) > rename bsp/{nsimhs/nsimhs-standard.scc => hapshs/hapshs-standard.scc} (72%) > create mode 100644 bsp/hapshs/hapshs.cfg > rename bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} (54%) > delete mode 100644 bsp/nsimhs/nsimhs.cfg > > diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc > similarity index 72% > rename from bsp/nsimhs/nsimhs-standard.scc > rename to bsp/hapshs/hapshs-standard.scc > index 3201ca52..1842b00c 100644 > --- a/bsp/nsimhs/nsimhs-standard.scc > +++ b/bsp/hapshs/hapshs-standard.scc > @@ -1,8 +1,8 @@ > # SPDX-License-Identifier: MIT > -define KMACHINE nsimhs > +define KMACHINE hapshs > define KTYPE standard > define KARCH arc > > include ktypes/standard/standard.scc > > -include nsimhs.scc > +include hapshs.scc > diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg > new file mode 100644 > index 00000000..adcc0531 > --- /dev/null > +++ b/bsp/hapshs/hapshs.cfg > @@ -0,0 +1,12 @@ > +# SPDX-License-Identifier: MIT > +# ARCv2 ISA > +CONFIG_ISA_ARCV2=y > + > +# Serial port > +CONFIG_SERIAL_8250=y > +CONFIG_SERIAL_8250_CONSOLE=y > +CONFIG_SERIAL_8250_DW=y > +CONFIG_SERIAL_OF_PLATFORM=y > + > +# Built-in .dtb > +CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" > diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc > similarity index 54% > rename from bsp/nsimhs/nsimhs.scc > rename to bsp/hapshs/hapshs.scc > index 3c1613a6..ea2b8b6c 100644 > --- a/bsp/nsimhs/nsimhs.scc > +++ b/bsp/hapshs/hapshs.scc > @@ -1,2 +1,2 @@ > # SPDX-License-Identifier: MIT > -kconf hardware nsimhs.cfg > +kconf hardware hapshs.cfg > diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg > deleted file mode 100644 > index 34580a39..00000000 > --- a/bsp/nsimhs/nsimhs.cfg > +++ /dev/null > @@ -1,10 +0,0 @@ > -# SPDX-License-Identifier: MIT > -# ARCv2 ISA > -CONFIG_ISA_ARCV2=y > - > -# Legacy ARC UART > -CONFIG_SERIAL_ARC=y > -CONFIG_SERIAL_ARC_CONSOLE=y > - > -# Built-in .dtb > -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" > -- > 2.16.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#9926): https://lists.yoctoproject.org/g/linux-yocto/message/9926 > Mute This Topic: https://lists.yoctoproject.org/mt/83218216/1050810 > Group Owner: linux-yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [bruce.ashfield@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Fri, Jun 11, 2021 at 12:15 PM Alexey Brodkin via lists.yoctoproject.org <abrodkin=synopsys.com@lists.yoctoproject.org> wrote: > > Hi Bruce, > > Looks like you were trying to fix-up an author of https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/commit/?h=yocto-5.10&id=b12e322c9f3144e3b18c8723790dc027476b3c70 but mistakenly did it for the next one https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/commit/?h=yocto-5.10&id=422f8a09a856800f027bbae98dbab24cf3ae0f25. > The author as it comes in on your patches is rejected by the yocto git servers, so yes, it had to be fixed up. I used your email address, and yes, it looks like I got the wrong commit on one of them. Congrats on the free commit! :D Bruce > I'm fine with current state of things, but just to let you know ;) > > -Alexey > ________________________________ > From: Alexey Brodkin <abrodkin@synopsys.com> > Sent: Thursday, June 3, 2021 12:12 AM > To: Bruce Ashfield <bruce.ashfield@gmail.com> > Cc: linux-yocto@lists.yoctoproject.org <linux-yocto@lists.yoctoproject.org>; linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org> > Subject: Re: [linux-yocto] [PATCH] ARC: Rename nSIM HS to HAPS HS > > Hi Bruce, > > Please pardon my lack of good knowledge here as I don't deal with OE/Yocto very often. > So what are the options we have here? > > Given dependency on the Linux kernel v5.5 where that change ("nsim_hs_defconfig" -> "haps_hs_defconfig") was done I'd say whatever active branches of version above 5.5 exist would be good to get it. > > Looking at https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/ I'd think these are: 5.10, 5.13 & "master" branches. > > -Alexey > ________________________________ > From: Bruce Ashfield <bruce.ashfield@gmail.com> > Sent: Thursday, June 3, 2021 12:01 AM > To: Alexey Brodkin <abrodkin@synopsys.com> > Cc: linux-yocto@lists.yoctoproject.org <linux-yocto@lists.yoctoproject.org>; linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org>; Alexey Brodkin <abrodkin@synopsys.com> > Subject: Re: [linux-yocto] [PATCH] ARC: Rename nSIM HS to HAPS HS > > Looks good to me. > > What branches were you targetting for the change ? > > Bruce > > In message: [linux-yocto] [PATCH] ARC: Rename nSIM HS to HAPS HS > on 31/05/2021 Alexey Brodkin via lists.yoctoproject.org wrote: > > > In v5.5 kernel we merged "nsim_hs" config into "haps_hs", see [1], > > and from then on we use the same one "haps_hs" for everything simulated: > > nSIM/QEMU/FPGA. > > > > Of important notes: > > * We switched from legacy ARC UART to a standard DW UART > > > > * QEMU port for ARC is under review upstream, see [2]. > > But even today with WIP version from our GitHub fork [3] its possible > > to run this image for "hapshs" machine as simple as: > > ----------------------------->8------------------------------ > > $ qemu-system-arc -cpu archs -M virt -nographic -no-reboot -monitor none \ > > -kernel build/tmp-glibc/deploy/images/hapshs/vmlinux-initramfs-hapshs.bin > > ----------------------------->8------------------------------ > > > > [1] https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1681baa713aa138d3f0f77f05c3de1cd6416c7d6__;!!A4F2R9G_pg!Kky99r2sqXZzDoCmjJ78MNNtcrXGIN8a8ILbgukM-lZ6eweRt8pm63oo9HR2lohj$ > > [2] https://urldefense.com/v3/__https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg00458.html__;!!A4F2R9G_pg!Kky99r2sqXZzDoCmjJ78MNNtcrXGIN8a8ILbgukM-lZ6eweRt8pm63oo9GmSrEmD$ > > [3] https://urldefense.com/v3/__https://github.com/foss-for-synopsys-dwc-arc-processors/qemu__;!!A4F2R9G_pg!Kky99r2sqXZzDoCmjJ78MNNtcrXGIN8a8ILbgukM-lZ6eweRt8pm63oo9N20qLr4$ > > > > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> > > --- > > .../nsimhs-standard.scc => hapshs/hapshs-standard.scc} | 4 ++-- > > bsp/hapshs/hapshs.cfg | 12 ++++++++++++ > > bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} | 2 +- > > bsp/nsimhs/nsimhs.cfg | 10 ---------- > > 4 files changed, 15 insertions(+), 13 deletions(-) > > rename bsp/{nsimhs/nsimhs-standard.scc => hapshs/hapshs-standard.scc} (72%) > > create mode 100644 bsp/hapshs/hapshs.cfg > > rename bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} (54%) > > delete mode 100644 bsp/nsimhs/nsimhs.cfg > > > > diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc > > similarity index 72% > > rename from bsp/nsimhs/nsimhs-standard.scc > > rename to bsp/hapshs/hapshs-standard.scc > > index 3201ca52..1842b00c 100644 > > --- a/bsp/nsimhs/nsimhs-standard.scc > > +++ b/bsp/hapshs/hapshs-standard.scc > > @@ -1,8 +1,8 @@ > > # SPDX-License-Identifier: MIT > > -define KMACHINE nsimhs > > +define KMACHINE hapshs > > define KTYPE standard > > define KARCH arc > > > > include ktypes/standard/standard.scc > > > > -include nsimhs.scc > > +include hapshs.scc > > diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg > > new file mode 100644 > > index 00000000..adcc0531 > > --- /dev/null > > +++ b/bsp/hapshs/hapshs.cfg > > @@ -0,0 +1,12 @@ > > +# SPDX-License-Identifier: MIT > > +# ARCv2 ISA > > +CONFIG_ISA_ARCV2=y > > + > > +# Serial port > > +CONFIG_SERIAL_8250=y > > +CONFIG_SERIAL_8250_CONSOLE=y > > +CONFIG_SERIAL_8250_DW=y > > +CONFIG_SERIAL_OF_PLATFORM=y > > + > > +# Built-in .dtb > > +CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" > > diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc > > similarity index 54% > > rename from bsp/nsimhs/nsimhs.scc > > rename to bsp/hapshs/hapshs.scc > > index 3c1613a6..ea2b8b6c 100644 > > --- a/bsp/nsimhs/nsimhs.scc > > +++ b/bsp/hapshs/hapshs.scc > > @@ -1,2 +1,2 @@ > > # SPDX-License-Identifier: MIT > > -kconf hardware nsimhs.cfg > > +kconf hardware hapshs.cfg > > diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg > > deleted file mode 100644 > > index 34580a39..00000000 > > --- a/bsp/nsimhs/nsimhs.cfg > > +++ /dev/null > > @@ -1,10 +0,0 @@ > > -# SPDX-License-Identifier: MIT > > -# ARCv2 ISA > > -CONFIG_ISA_ARCV2=y > > - > > -# Legacy ARC UART > > -CONFIG_SERIAL_ARC=y > > -CONFIG_SERIAL_ARC_CONSOLE=y > > - > > -# Built-in .dtb > > -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" > > -- > > 2.16.2 > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#9958): https://lists.yoctoproject.org/g/linux-yocto/message/9958 > Mute This Topic: https://lists.yoctoproject.org/mt/83218216/1050810 > Group Owner: linux-yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [bruce.ashfield@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hi Bruce, > The author as it comes in on your patches is rejected by the yocto git > servers, so yes, it had to be fixed up. Do you know what needs to be done to get that fixed? I hope to keep sending patches from time to time (and was about to send yet another one just now), so would be good to make things simpler and exclude that manual fix-up step. -Alexey
On Fri, Jun 11, 2021 at 1:00 PM Alexey Brodkin <Alexey.Brodkin@synopsys.com> wrote: > > Hi Bruce, > > > The author as it comes in on your patches is rejected by the yocto git > > servers, so yes, it had to be fixed up. > > Do you know what needs to be done to get that fixed? > I hope to keep sending patches from time to time > (and was about to send yet another one just now), > so would be good to make things simpler and exclude > that manual fix-up step. Did you send the patch via git-send email ? And what smtp relay did you use (if that's the case). The patch had a "via lists.yoctoproject.org" in the author, and that is what caused the server's pre-commit hook to reject it. Bruce > > -Alexey
> > > The author as it comes in on your patches is rejected by the yocto git > > > servers, so yes, it had to be fixed up. > > > > Do you know what needs to be done to get that fixed? > > I hope to keep sending patches from time to time > > (and was about to send yet another one just now), > > so would be good to make things simpler and exclude > > that manual fix-up step. > > Did you send the patch via git-send email ? And what smtp relay did > you use (if that's the case). I did sent it with "git send-email" as I always do. That was exactly my command: -------------------->8------------------- git send-email --to linux-yocto@lists.yoctoproject.org --cc linux-snps-arc@lists.infradead.org HEAD~1 -------------------->8------------------- I used our corporate SMPT server, again as I always used to do. > The patch had a "via lists.yoctoproject.org" in the author, and that > is what caused the server's pre-commit hook to reject it. I think what might be wrong - on my first attempt to send it, it was discarded by the mailing list as I didn't have my email alias properly set in the mailing list settings. The thing is my internal and SoB email is "abrodkin@synopsys.com", while our email servers nicely convert that "shorter and supposedly ugly form" into more beautiful "alexey.brodkin@synopsys.com" once email leaves company's premises. So I added the latter email as an alias and on the second attempt it was accepted by the mailing list. Let's see. I'm going to post another patch now and hopefully it will work as it should. If of any interest, I may add you as a Cc for it (it's for OE/gcc). -Alexey
diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc similarity index 72% rename from bsp/nsimhs/nsimhs-standard.scc rename to bsp/hapshs/hapshs-standard.scc index 3201ca52..1842b00c 100644 --- a/bsp/nsimhs/nsimhs-standard.scc +++ b/bsp/hapshs/hapshs-standard.scc @@ -1,8 +1,8 @@ # SPDX-License-Identifier: MIT -define KMACHINE nsimhs +define KMACHINE hapshs define KTYPE standard define KARCH arc include ktypes/standard/standard.scc -include nsimhs.scc +include hapshs.scc diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg new file mode 100644 index 00000000..adcc0531 --- /dev/null +++ b/bsp/hapshs/hapshs.cfg @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# ARCv2 ISA +CONFIG_ISA_ARCV2=y + +# Serial port +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y + +# Built-in .dtb +CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc similarity index 54% rename from bsp/nsimhs/nsimhs.scc rename to bsp/hapshs/hapshs.scc index 3c1613a6..ea2b8b6c 100644 --- a/bsp/nsimhs/nsimhs.scc +++ b/bsp/hapshs/hapshs.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -kconf hardware nsimhs.cfg +kconf hardware hapshs.cfg diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg deleted file mode 100644 index 34580a39..00000000 --- a/bsp/nsimhs/nsimhs.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: MIT -# ARCv2 ISA -CONFIG_ISA_ARCV2=y - -# Legacy ARC UART -CONFIG_SERIAL_ARC=y -CONFIG_SERIAL_ARC_CONSOLE=y - -# Built-in .dtb -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs"
In v5.5 kernel we merged "nsim_hs" config into "haps_hs", see [1], and from then on we use the same one "haps_hs" for everything simulated: nSIM/QEMU/FPGA. Of important notes: * We switched from legacy ARC UART to a standard DW UART * QEMU port for ARC is under review upstream, see [2]. But even today with WIP version from our GitHub fork [3] its possible to run this image for "hapshs" machine as simple as: ----------------------------->8------------------------------ $ qemu-system-arc -cpu archs -M virt -nographic -no-reboot -monitor none \ -kernel build/tmp-glibc/deploy/images/hapshs/vmlinux-initramfs-hapshs.bin ----------------------------->8------------------------------ [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1681baa713aa138d3f0f77f05c3de1cd6416c7d6 [2] https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg00458.html [3] https://github.com/foss-for-synopsys-dwc-arc-processors/qemu Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> --- .../nsimhs-standard.scc => hapshs/hapshs-standard.scc} | 4 ++-- bsp/hapshs/hapshs.cfg | 12 ++++++++++++ bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} | 2 +- bsp/nsimhs/nsimhs.cfg | 10 ---------- 4 files changed, 15 insertions(+), 13 deletions(-) rename bsp/{nsimhs/nsimhs-standard.scc => hapshs/hapshs-standard.scc} (72%) create mode 100644 bsp/hapshs/hapshs.cfg rename bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} (54%) delete mode 100644 bsp/nsimhs/nsimhs.cfg