diff mbox series

[59/97] target/xtensa: drop num_[core_]regs from dc232b/dc233c configs

Message ID 20190401210011.16009-60-mdroth@linux.vnet.ibm.com (mailing list archive)
State New, archived
Headers show
Series Patch Round-up for stable 3.0.1, freeze on 2019-04-08 | expand

Commit Message

Michael Roth April 1, 2019, 8:59 p.m. UTC 
From: Max Filippov <jcmvbkbc@gmail.com>

Now that xtensa_count_regs does the right thing, remove manual
initialization of these fields from the affected configurations and let
xtensa_finalize_config initialize them. Add XTREG_END to terminate
register lists.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
(cherry picked from commit 7da9111e77b9cdb3a927dcd47642b7ffff9de636)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 target/xtensa/core-dc232b.c                | 2 --
 target/xtensa/core-dc232b/gdb-config.inc.c | 1 +
 target/xtensa/core-dc233c.c                | 2 --
 target/xtensa/core-dc233c/gdb-config.inc.c | 1 +
 4 files changed, 2 insertions(+), 4 deletions(-)

Comments

Max Filippov April 1, 2019, 9:19 p.m. UTC | #1 
Hi Michael,

On Mon, Apr 1, 2019 at 2:04 PM Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> From: Max Filippov <jcmvbkbc@gmail.com>
>
> Now that xtensa_count_regs does the right thing, remove manual
> initialization of these fields from the affected configurations and let
> xtensa_finalize_config initialize them. Add XTREG_END to terminate
> register lists.
>
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> (cherry picked from commit 7da9111e77b9cdb3a927dcd47642b7ffff9de636)
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

I'm curious why this change was picked for stable, it wasn't marked for it.
I'm pretty sure it's not going to work without the corresponding change
in the xtensa_count_regs, which is pretty big.
Michael Roth April 1, 2019, 11:28 p.m. UTC | #2 
Quoting Max Filippov (2019-04-01 16:19:59)
> Hi Michael,
> 
> On Mon, Apr 1, 2019 at 2:04 PM Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> > From: Max Filippov <jcmvbkbc@gmail.com>
> >
> > Now that xtensa_count_regs does the right thing, remove manual
> > initialization of these fields from the affected configurations and let
> > xtensa_finalize_config initialize them. Add XTREG_END to terminate
> > register lists.
> >
> > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> > (cherry picked from commit 7da9111e77b9cdb3a927dcd47642b7ffff9de636)
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> 
> I'm curious why this change was picked for stable, it wasn't marked for it.
> I'm pretty sure it's not going to work without the corresponding change
> in the xtensa_count_regs, which is pretty big.

Looks like an earlier patch was tagged for stable:

  https://patchwork.kernel.org/patch/10666423/

Since patches are often referred to qemu-stable via actual email Cc: and
often don't get tagged in the commit I don't rely too much on the
"Cc: qemu-stable@nongnu.org" tags in the commit messages currently.

I should probably take note next time a tag is explicitly removed from the
final commit though, but the safest way to avoid this if a patch ends up
getting Cc'd to qemu-stable at some point is to reply to the patch on why
it should be kept out, since I'll usually see those.

I'll make sure to back the patch out, thanks for checking!

> 
> -- 
> Thanks.
> -- Max
>
Max Filippov April 1, 2019, 11:42 p.m. UTC | #3 
On Mon, Apr 1, 2019 at 4:28 PM Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> > I'm curious why this change was picked for stable, it wasn't marked for it.
> Looks like an earlier patch was tagged for stable:
...
> Since patches are often referred to qemu-stable via actual email Cc: and
> often don't get tagged in the commit I don't rely too much on the
> "Cc: qemu-stable@nongnu.org" tags in the commit messages currently.

Oh, I see.

> I should probably take note next time a tag is explicitly removed from the
> final commit though, but the safest way to avoid this if a patch ends up
> getting Cc'd to qemu-stable at some point is to reply to the patch on why
> it should be kept out, since I'll usually see those.

Ok, will do it next time.
diff mbox series

Patch

diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index 7131337840..7851bcb636 100644
--- a/target/xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
@@ -40,8 +40,6 @@ 
 static XtensaConfig dc232b __attribute__((unused)) = {
     .name = "dc232b",
     .gdb_regmap = {
-        .num_regs = 120,
-        .num_core_regs = 52,
         .reg = {
 #include "core-dc232b/gdb-config.inc.c"
         }
diff --git a/target/xtensa/core-dc232b/gdb-config.inc.c b/target/xtensa/core-dc232b/gdb-config.inc.c
index 13aba5edec..d87168628b 100644
--- a/target/xtensa/core-dc232b/gdb-config.inc.c
+++ b/target/xtensa/core-dc232b/gdb-config.inc.c
@@ -259,3 +259,4 @@ 
           0, 0, 0, 0, 0, 0)
   XTREG(119, 476, 32, 4, 4, 0x000f, 0x0006, -2, 8, 0x0100, a15,
           0, 0, 0, 0, 0, 0)
+  XTREG_END
diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c
index d701e3f5de..8853bfd4d0 100644
--- a/target/xtensa/core-dc233c.c
+++ b/target/xtensa/core-dc233c.c
@@ -40,8 +40,6 @@ 
 static XtensaConfig dc233c __attribute__((unused)) = {
     .name = "dc233c",
     .gdb_regmap = {
-        .num_regs = 121,
-        .num_core_regs = 52,
         .reg = {
 #include "core-dc233c/gdb-config.inc.c"
         }
diff --git a/target/xtensa/core-dc233c/gdb-config.inc.c b/target/xtensa/core-dc233c/gdb-config.inc.c
index b632341b28..7e8963227f 100644
--- a/target/xtensa/core-dc233c/gdb-config.inc.c
+++ b/target/xtensa/core-dc233c/gdb-config.inc.c
@@ -143,3 +143,4 @@  XTREG(117, 468, 32, 4, 4, 0x000c, 0x0006, -2, 8, 0x0100, a12,         0, 0, 0, 0
 XTREG(118, 472, 32, 4, 4, 0x000d, 0x0006, -2, 8, 0x0100, a13,         0, 0, 0, 0, 0, 0)
 XTREG(119, 476, 32, 4, 4, 0x000e, 0x0006, -2, 8, 0x0100, a14,         0, 0, 0, 0, 0, 0)
 XTREG(120, 480, 32, 4, 4, 0x000f, 0x0006, -2, 8, 0x0100, a15,         0, 0, 0, 0, 0, 0)
+XTREG_END