| Message ID | 20240112102927.35406-5-deller@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/hppa qemu v8.2 regression fixes | expand |
On 1/12/24 21:29, deller@kernel.org wrote: > From: Helge Deller <deller@gmx.de> > > Fix the address translation for PDC space on PA2.0 if PSW.W=0. > Basically, for any address in the 32-bit PDC range from 0xf0000000 to > 0xf1000000 keep the lower 32-bits and just set the upper 32-bits to > 0xfffffff0. > > This mapping fixes the emulated power button in PDC space for 32- and > 64-bit machines and is how the physical C3700 machine seems to map > PDC. > > Figures H-10 and H-11 in the parisc2.0 spec [1] show that the 32-bit > region will be mapped somewhere into a higher and bigger 64-bit PDC > space. The start and end of this 64-bit space is defined by the > physical address bits. But the figures don't specifiy where exactly the > mapping will start inside that region. Tests on a real HP C3700 > regarding the address of the power button indicate, that the lower > 32-bits will stay the same though. > [1] https://parisc.wiki.kernel.org/images-parisc/7/73/Parisc2.0.pdf > > Signed-off-by: Helge Deller <deller@gmx.de> > Tested-by: Bruno Haible <bruno@clisp.org> > --- > target/hppa/mem_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c > index 08abd1a9f9..011b192406 100644 > --- a/target/hppa/mem_helper.c > +++ b/target/hppa/mem_helper.c > @@ -56,7 +56,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) > addr = (int32_t)addr; > } else { > /* PDC address space */ > - addr &= MAKE_64BIT_MASK(0, 24); > + addr = (uint32_t)addr; > addr |= -1ull << (TARGET_PHYS_ADDR_SPACE_BITS - 4); > } > return addr; Please adjust the code comment that immediately precedes this, not just within the commit message. r~
> Please adjust the code comment that immediately precedes this, not just > within the commit message. Like this: ? Fix the address translation for PDC space on PA2.0 if PSW.W=0. Basically, for any address in the 32-bit PDC range from 0xf0000000 to 0xf1000000 keep the lower 32-bits and just set the upper 32-bits to 0xfffffff0. This mapping fixes the emulated power button in PDC space for 32- and 64-bit machines and is how the physical C3700 machine seems to map PDC. Figures H-10 and H-11 in the parisc2.0 spec [1] show that the 32-bit region will be mapped somewhere into a higher and bigger 64-bit PDC space. The start and end of this 64-bit space is defined by the physical address bits. But the figures don't specifiy where exactly the mapping will start inside that region. Tests on a real HP C3700 regarding the address of the power button indicate, that the lower 32-bits will stay the same though. [1] https://parisc.wiki.kernel.org/images-parisc/7/73/Parisc2.0.pdf Signed-off-by: Helge Deller <deller@gmx.de> Tested-by: Bruno Haible <bruno@clisp.org> diff --git a/roms/seabios-hppa b/roms/seabios-hppa index 4c6ecda618..e4eac85880 160000 --- a/roms/seabios-hppa +++ b/roms/seabios-hppa @@ -1 +1 @@ -Subproject commit 4c6ecda618f2066707f50c53f31419244fd7f77a +Subproject commit e4eac85880e8677f96d8b9e94de9f2eec9c0751f diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 08abd1a9f9..4c28c58ee9 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -55,8 +55,14 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) /* I/O address space */ addr = (int32_t)addr; } else { - /* PDC address space */ - addr &= MAKE_64BIT_MASK(0, 24); + /* + * PDC address space: + * Figures H-10 and H-11 of the parisc2.0 spec do not specify + * where to map into the 64-bit PDC address space. + * We map with an offset which equals the 32-bit address, which + * is what can be seen on physical machines too. + */ + addr = (uint32_t)addr; addr |= -1ull << (TARGET_PHYS_ADDR_SPACE_BITS - 4); } return addr;
On 1/13/24 09:23, Helge Deller wrote: >> Please adjust the code comment that immediately precedes this, not just >> within the commit message. > > Like this: ? Yes, thanks. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > + /* > + * PDC address space: > + * Figures H-10 and H-11 of the parisc2.0 spec do not specify > + * where to map into the 64-bit PDC address space. > + * We map with an offset which equals the 32-bit address, which > + * is what can be seen on physical machines too. > + */ > + addr = (uint32_t)addr; r~
diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 08abd1a9f9..011b192406 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -56,7 +56,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) addr = (int32_t)addr; } else { /* PDC address space */ - addr &= MAKE_64BIT_MASK(0, 24); + addr = (uint32_t)addr; addr |= -1ull << (TARGET_PHYS_ADDR_SPACE_BITS - 4); } return addr;