mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
MIPS patches 2015-08-13
Changes: * mips32r5-generic CPU updated and renamed to P5600 * improvements in LWL/LDL, logging and fulong2e -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJVzMGTAAoJEFIRjjwLKdprClUH/2col9J1MIoYm+8Ac8Q5hBd5 Bpg1HvWql8ecx29z9bhDNkitXATaMkwho05aEl0xkYzjhKMvjs2ayTuko35ryOY6 KRSONpndvfJLDCaxdrQcvKG9DXmhSPIy2TZLv0Jpl0dfhPXm0LPxv3WQ/s8YZJa7 e2bGmUNLyloySMEmq7T55U4FCB/eyzzLBreCR4miOxU+KBKSAQyZBB9dcCj52sCM qA8OtaQZdKXUYvqwd+mRpCUjvqhrfFmMSV/A0VclXHCxb9lX63HY1c7X6bHzNyoP YWwCJLadQsYMUl4ajF+phUrWu6mjRgpcpQKSYiX8+u2gdcbVY6TeyzjYfsczLf8= =Owqn -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150813' into staging MIPS patches 2015-08-13 Changes: * mips32r5-generic CPU updated and renamed to P5600 * improvements in LWL/LDL, logging and fulong2e # gpg: Signature made Thu 13 Aug 2015 17:10:59 BST using RSA key ID 0B29DA6B # gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8DD3 2F98 5495 9D66 35D4 4FC0 5211 8E3C 0B29 DA6B * remotes/lalrae/tags/mips-20150813: target-mips: Use CPU_LOG_INT for logging related to interrupts hw/pci-host/bonito: Avoid buffer overrun for bad LDMA/COP accesses target-mips: simplify LWL/LDL mask generation target-mips: update mips32r5-generic into P5600 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
be1f13ac9d
6 changed files with 65 additions and 53 deletions
|
@ -355,6 +355,10 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr addr,
|
|||
uint32_t val;
|
||||
PCIBonitoState *s = opaque;
|
||||
|
||||
if (addr >= sizeof(s->bonldma)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
val = ((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)];
|
||||
|
||||
return val;
|
||||
|
@ -365,6 +369,10 @@ static void bonito_ldma_writel(void *opaque, hwaddr addr,
|
|||
{
|
||||
PCIBonitoState *s = opaque;
|
||||
|
||||
if (addr >= sizeof(s->bonldma)) {
|
||||
return;
|
||||
}
|
||||
|
||||
((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)] = val & 0xffffffff;
|
||||
}
|
||||
|
||||
|
@ -384,6 +392,10 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr addr,
|
|||
uint32_t val;
|
||||
PCIBonitoState *s = opaque;
|
||||
|
||||
if (addr >= sizeof(s->boncop)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
val = ((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)];
|
||||
|
||||
return val;
|
||||
|
@ -394,6 +406,10 @@ static void bonito_cop_writel(void *opaque, hwaddr addr,
|
|||
{
|
||||
PCIBonitoState *s = opaque;
|
||||
|
||||
if (addr >= sizeof(s->boncop)) {
|
||||
return;
|
||||
}
|
||||
|
||||
((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)] = val & 0xffffffff;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue