Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge qtmr_rg0/rg1 into just qtmr_region #105

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Merge qtmr_rg0/rg1 into just qtmr_region #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hw/hexagon/hexagon_dsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,
qdev_prop_set_bit(DEVICE(cpu), "start-powered-off", (i != 0));
qdev_prop_set_uint32(DEVICE(cpu), "l2vic-base-addr", m_cfg->l2vic_base);
qdev_prop_set_uint32(DEVICE(cpu), "config-table-addr", m_cfg->cfgbase);
qdev_prop_set_uint32(DEVICE(cpu), "qtimer-base-addr", m_cfg->qtmr_region);
qdev_prop_set_uint32(DEVICE(cpu), "hvx-contexts",
m_cfg->cfgtable.ext_contexts);
qdev_prop_set_uint32(DEVICE(cpu), "jtlb-entries",
Expand Down
3 changes: 1 addition & 2 deletions hw/hexagon/machine_cfg_sa8775_cdsp0.h.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ static hexagon_machine_config SA8775P_cdsp0 = {
.l2vic_base = 0x26300000 + 0x90000,
.l2vic_size = 0x00001000,
.csr_base = 0x26300000,
.qtmr_rg0 = 0x26300000 + 0xA1000,
.qtmr_rg1 = 0x26300000 + 0xA2000,
.qtmr_region = 0x26300000 + 0xA1000,
.cfgtable = {
.l2tcm_base = 0x00002400,
.reserved0 = 0x00000000,
Expand Down
3 changes: 1 addition & 2 deletions hw/hexagon/machine_cfg_v66g_1024.h.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ static hexagon_machine_config v66g_1024 = {
.l2vic_base = 0xfc910000,
.l2vic_size = 0x00001000,
.csr_base = 0xfc900000,
.qtmr_rg0 = 0xfc921000,
.qtmr_rg1 = 0xfc922000,
.qtmr_region = 0xfc921000,
.cfgtable = {
.l2tcm_base = 0x0000d800,
.reserved0 = 0x0000d400,
Expand Down
3 changes: 1 addition & 2 deletions hw/hexagon/machine_cfg_v68n_1024.h.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ static hexagon_machine_config v68n_1024 = {
.l2vic_base = 0xfc910000,
.l2vic_size = 0x00001000,
.csr_base = 0xfc900000,
.qtmr_rg0 = 0xfc921000,
.qtmr_rg1 = 0xfc922000,
.qtmr_region = 0xfc921000,
.cfgtable = {
.l2tcm_base = 0x0000d800,
.reserved0 = 0x00000000,
Expand Down
4 changes: 2 additions & 2 deletions hw/hexagon/virt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,7 @@ static void create_qtimer(HexagonVirtMachineState *vms,
sysbus_realize_and_unref(SYS_BUS_DEVICE(qtimer), errp);


sysbus_mmio_map(SYS_BUS_DEVICE(qtimer), 0, m_cfg->qtmr_rg1);
sysbus_mmio_map(SYS_BUS_DEVICE(qtimer), 1, m_cfg->qtmr_rg0);
sysbus_mmio_map(SYS_BUS_DEVICE(qtimer), 1, m_cfg->qtmr_region);
sysbus_connect_irq(SYS_BUS_DEVICE(qtimer), 0,
qdev_get_gpio_in(vms->l2vic, irqmap[VIRT_QTMR0]));
sysbus_connect_irq(SYS_BUS_DEVICE(qtimer), 1,
Expand Down Expand Up @@ -354,6 +353,7 @@ static void virt_init(MachineState *ms)
m_cfg->cfgtable.ext_contexts);
qdev_prop_set_uint32(DEVICE(cpu), "config-table-addr", m_cfg->cfgbase);
qdev_prop_set_uint32(DEVICE(cpu), "l2vic-base-addr", m_cfg->l2vic_base);
qdev_prop_set_uint32(DEVICE(cpu), "qtimer-base-addr", m_cfg->qtmr_region);
qdev_prop_set_uint32(DEVICE(cpu), "jtlb-entries",
m_cfg->cfgtable.jtlb_size_entries);

Expand Down
3 changes: 1 addition & 2 deletions include/hw/hexagon/hexagon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ typedef struct {
uint32_t l2vic_size;
/* QTimer csr base */
uint32_t csr_base;
uint32_t qtmr_rg0;
uint32_t qtmr_rg1;
uint32_t qtmr_region;
hexagon_config_table cfgtable;
} hexagon_machine_config;

Expand Down