mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-27 12:02:04 -06:00
hw/misc/aspeed_hace: Move register size to instance class and dynamically allocate regs
Dynamically allocate the register array by removing the hardcoded ASPEED_HACE_NR_REGS macro. To support different register sizes across SoC variants, introduce a new "nr_regs" class attribute and replace the static "regs" array with dynamically allocated memory. Add a new "aspeed_hace_unrealize" function to properly free the allocated "regs" memory during device cleanup. Remove the bounds checking in the MMIO read/write handlers since the MemoryRegion size now matches the (register array size << 2). This commit updates the VMState fields accordingly. The VMState version was already bumped in a previous patch of this series, so no further version change is needed. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Link: https://lore.kernel.org/qemu-devel/20250515081008.583578-13-jamin_lin@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
7b4e588000
commit
89d2a9f3f7
2 changed files with 22 additions and 19 deletions
|
@ -386,13 +386,6 @@ static uint64_t aspeed_hace_read(void *opaque, hwaddr addr, unsigned int size)
|
||||||
|
|
||||||
addr >>= 2;
|
addr >>= 2;
|
||||||
|
|
||||||
if (addr >= ASPEED_HACE_NR_REGS) {
|
|
||||||
qemu_log_mask(LOG_GUEST_ERROR,
|
|
||||||
"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx "\n",
|
|
||||||
__func__, addr << 2);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return s->regs[addr];
|
return s->regs[addr];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -404,13 +397,6 @@ static void aspeed_hace_write(void *opaque, hwaddr addr, uint64_t data,
|
||||||
|
|
||||||
addr >>= 2;
|
addr >>= 2;
|
||||||
|
|
||||||
if (addr >= ASPEED_HACE_NR_REGS) {
|
|
||||||
qemu_log_mask(LOG_GUEST_ERROR,
|
|
||||||
"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx "\n",
|
|
||||||
__func__, addr << 2);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (addr) {
|
switch (addr) {
|
||||||
case R_STATUS:
|
case R_STATUS:
|
||||||
if (data & HASH_IRQ) {
|
if (data & HASH_IRQ) {
|
||||||
|
@ -507,13 +493,14 @@ static const MemoryRegionOps aspeed_hace_ops = {
|
||||||
static void aspeed_hace_reset(DeviceState *dev)
|
static void aspeed_hace_reset(DeviceState *dev)
|
||||||
{
|
{
|
||||||
struct AspeedHACEState *s = ASPEED_HACE(dev);
|
struct AspeedHACEState *s = ASPEED_HACE(dev);
|
||||||
|
AspeedHACEClass *ahc = ASPEED_HACE_GET_CLASS(s);
|
||||||
|
|
||||||
if (s->hash_ctx != NULL) {
|
if (s->hash_ctx != NULL) {
|
||||||
qcrypto_hash_free(s->hash_ctx);
|
qcrypto_hash_free(s->hash_ctx);
|
||||||
s->hash_ctx = NULL;
|
s->hash_ctx = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(s->regs, 0, sizeof(s->regs));
|
memset(s->regs, 0, ahc->nr_regs << 2);
|
||||||
s->total_req_len = 0;
|
s->total_req_len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -521,11 +508,13 @@ static void aspeed_hace_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
AspeedHACEState *s = ASPEED_HACE(dev);
|
AspeedHACEState *s = ASPEED_HACE(dev);
|
||||||
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||||
|
AspeedHACEClass *ahc = ASPEED_HACE_GET_CLASS(s);
|
||||||
|
|
||||||
sysbus_init_irq(sbd, &s->irq);
|
sysbus_init_irq(sbd, &s->irq);
|
||||||
|
|
||||||
|
s->regs = g_new(uint32_t, ahc->nr_regs);
|
||||||
memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_hace_ops, s,
|
memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_hace_ops, s,
|
||||||
TYPE_ASPEED_HACE, 0x1000);
|
TYPE_ASPEED_HACE, ahc->nr_regs << 2);
|
||||||
|
|
||||||
if (!s->dram_mr) {
|
if (!s->dram_mr) {
|
||||||
error_setg(errp, TYPE_ASPEED_HACE ": 'dram' link not set");
|
error_setg(errp, TYPE_ASPEED_HACE ": 'dram' link not set");
|
||||||
|
@ -548,17 +537,25 @@ static const VMStateDescription vmstate_aspeed_hace = {
|
||||||
.version_id = 2,
|
.version_id = 2,
|
||||||
.minimum_version_id = 2,
|
.minimum_version_id = 2,
|
||||||
.fields = (const VMStateField[]) {
|
.fields = (const VMStateField[]) {
|
||||||
VMSTATE_UINT32_ARRAY(regs, AspeedHACEState, ASPEED_HACE_NR_REGS),
|
|
||||||
VMSTATE_UINT32(total_req_len, AspeedHACEState),
|
VMSTATE_UINT32(total_req_len, AspeedHACEState),
|
||||||
VMSTATE_END_OF_LIST(),
|
VMSTATE_END_OF_LIST(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void aspeed_hace_unrealize(DeviceState *dev)
|
||||||
|
{
|
||||||
|
AspeedHACEState *s = ASPEED_HACE(dev);
|
||||||
|
|
||||||
|
g_free(s->regs);
|
||||||
|
s->regs = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
static void aspeed_hace_class_init(ObjectClass *klass, const void *data)
|
static void aspeed_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
dc->realize = aspeed_hace_realize;
|
dc->realize = aspeed_hace_realize;
|
||||||
|
dc->unrealize = aspeed_hace_unrealize;
|
||||||
device_class_set_legacy_reset(dc, aspeed_hace_reset);
|
device_class_set_legacy_reset(dc, aspeed_hace_reset);
|
||||||
device_class_set_props(dc, aspeed_hace_properties);
|
device_class_set_props(dc, aspeed_hace_properties);
|
||||||
dc->vmsd = &vmstate_aspeed_hace;
|
dc->vmsd = &vmstate_aspeed_hace;
|
||||||
|
@ -579,6 +576,7 @@ static void aspeed_ast2400_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
|
|
||||||
dc->desc = "AST2400 Hash and Crypto Engine";
|
dc->desc = "AST2400 Hash and Crypto Engine";
|
||||||
|
|
||||||
|
ahc->nr_regs = 0x64 >> 2;
|
||||||
ahc->src_mask = 0x0FFFFFFF;
|
ahc->src_mask = 0x0FFFFFFF;
|
||||||
ahc->dest_mask = 0x0FFFFFF8;
|
ahc->dest_mask = 0x0FFFFFF8;
|
||||||
ahc->key_mask = 0x0FFFFFC0;
|
ahc->key_mask = 0x0FFFFFC0;
|
||||||
|
@ -598,6 +596,7 @@ static void aspeed_ast2500_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
|
|
||||||
dc->desc = "AST2500 Hash and Crypto Engine";
|
dc->desc = "AST2500 Hash and Crypto Engine";
|
||||||
|
|
||||||
|
ahc->nr_regs = 0x64 >> 2;
|
||||||
ahc->src_mask = 0x3fffffff;
|
ahc->src_mask = 0x3fffffff;
|
||||||
ahc->dest_mask = 0x3ffffff8;
|
ahc->dest_mask = 0x3ffffff8;
|
||||||
ahc->key_mask = 0x3FFFFFC0;
|
ahc->key_mask = 0x3FFFFFC0;
|
||||||
|
@ -617,6 +616,7 @@ static void aspeed_ast2600_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
|
|
||||||
dc->desc = "AST2600 Hash and Crypto Engine";
|
dc->desc = "AST2600 Hash and Crypto Engine";
|
||||||
|
|
||||||
|
ahc->nr_regs = 0x64 >> 2;
|
||||||
ahc->src_mask = 0x7FFFFFFF;
|
ahc->src_mask = 0x7FFFFFFF;
|
||||||
ahc->dest_mask = 0x7FFFFFF8;
|
ahc->dest_mask = 0x7FFFFFF8;
|
||||||
ahc->key_mask = 0x7FFFFFF8;
|
ahc->key_mask = 0x7FFFFFF8;
|
||||||
|
@ -636,6 +636,7 @@ static void aspeed_ast1030_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
|
|
||||||
dc->desc = "AST1030 Hash and Crypto Engine";
|
dc->desc = "AST1030 Hash and Crypto Engine";
|
||||||
|
|
||||||
|
ahc->nr_regs = 0x64 >> 2;
|
||||||
ahc->src_mask = 0x7FFFFFFF;
|
ahc->src_mask = 0x7FFFFFFF;
|
||||||
ahc->dest_mask = 0x7FFFFFF8;
|
ahc->dest_mask = 0x7FFFFFF8;
|
||||||
ahc->key_mask = 0x7FFFFFF8;
|
ahc->key_mask = 0x7FFFFFF8;
|
||||||
|
@ -655,6 +656,7 @@ static void aspeed_ast2700_hace_class_init(ObjectClass *klass, const void *data)
|
||||||
|
|
||||||
dc->desc = "AST2700 Hash and Crypto Engine";
|
dc->desc = "AST2700 Hash and Crypto Engine";
|
||||||
|
|
||||||
|
ahc->nr_regs = 0x64 >> 2;
|
||||||
ahc->src_mask = 0x7FFFFFFF;
|
ahc->src_mask = 0x7FFFFFFF;
|
||||||
ahc->dest_mask = 0x7FFFFFF8;
|
ahc->dest_mask = 0x7FFFFFF8;
|
||||||
ahc->key_mask = 0x7FFFFFF8;
|
ahc->key_mask = 0x7FFFFFF8;
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
OBJECT_DECLARE_TYPE(AspeedHACEState, AspeedHACEClass, ASPEED_HACE)
|
OBJECT_DECLARE_TYPE(AspeedHACEState, AspeedHACEClass, ASPEED_HACE)
|
||||||
|
|
||||||
#define ASPEED_HACE_NR_REGS (0x64 >> 2)
|
|
||||||
#define ASPEED_HACE_MAX_SG 256 /* max number of entries */
|
#define ASPEED_HACE_MAX_SG 256 /* max number of entries */
|
||||||
|
|
||||||
struct AspeedHACEState {
|
struct AspeedHACEState {
|
||||||
|
@ -31,7 +30,7 @@ struct AspeedHACEState {
|
||||||
MemoryRegion iomem;
|
MemoryRegion iomem;
|
||||||
qemu_irq irq;
|
qemu_irq irq;
|
||||||
|
|
||||||
uint32_t regs[ASPEED_HACE_NR_REGS];
|
uint32_t *regs;
|
||||||
uint32_t total_req_len;
|
uint32_t total_req_len;
|
||||||
|
|
||||||
MemoryRegion *dram_mr;
|
MemoryRegion *dram_mr;
|
||||||
|
@ -44,10 +43,12 @@ struct AspeedHACEState {
|
||||||
struct AspeedHACEClass {
|
struct AspeedHACEClass {
|
||||||
SysBusDeviceClass parent_class;
|
SysBusDeviceClass parent_class;
|
||||||
|
|
||||||
|
const MemoryRegionOps *reg_ops;
|
||||||
uint32_t src_mask;
|
uint32_t src_mask;
|
||||||
uint32_t dest_mask;
|
uint32_t dest_mask;
|
||||||
uint32_t key_mask;
|
uint32_t key_mask;
|
||||||
uint32_t hash_mask;
|
uint32_t hash_mask;
|
||||||
|
uint64_t nr_regs;
|
||||||
bool raise_crypt_interrupt_workaround;
|
bool raise_crypt_interrupt_workaround;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue