mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
hw/ssi/pnv_spi: Make bus names distinct for each controllers of a socket
Create a spi buses with distinct names on each socket so that responders are attached to correct SPI controllers. Change the bus name to chipX.spi.<busnum> where X = 0..<num_sockets> QOM tree on a 2 socket machine: (qemu) info qom-tree /machine (powernv10-machine) /chip[0] (power10_v2.0-pnv-chip) /pib_spic[0] (pnv-spi) /chip0.spi.0 (SSI) /xscom-spi[0] (memory-region) /chip[1] (power10_v2.0-pnv-chip) /pib_spic[0] (pnv-spi) /chip1.spi.0 (SSI) /xscom-spi[0] (memory-region) Signed-off-by: Chalapathi V <chalapathi.v@linux.ibm.com> Message-ID: <20250303141328.23991-4-chalapathi.v@linux.ibm.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
f1f756f305
commit
7192d7b7fe
4 changed files with 8 additions and 4 deletions
|
@ -2252,6 +2252,8 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
|
|||
/* pib_spic[2] connected to 25csm04 which implements 1 byte transfer */
|
||||
object_property_set_int(OBJECT(&chip10->pib_spic[i]), "transfer_len",
|
||||
(i == 2) ? 1 : 4, &error_fatal);
|
||||
object_property_set_int(OBJECT(&chip10->pib_spic[i]), "chip-id",
|
||||
chip->chip_id, &error_fatal);
|
||||
if (!sysbus_realize(SYS_BUS_DEVICE(OBJECT
|
||||
(&chip10->pib_spic[i])), errp)) {
|
||||
return;
|
||||
|
|
|
@ -1147,14 +1147,15 @@ static const MemoryRegionOps pnv_spi_xscom_ops = {
|
|||
|
||||
static const Property pnv_spi_properties[] = {
|
||||
DEFINE_PROP_UINT32("spic_num", PnvSpi, spic_num, 0),
|
||||
DEFINE_PROP_UINT32("chip-id", PnvSpi, chip_id, 0),
|
||||
DEFINE_PROP_UINT8("transfer_len", PnvSpi, transfer_len, 4),
|
||||
};
|
||||
|
||||
static void pnv_spi_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
PnvSpi *s = PNV_SPI(dev);
|
||||
g_autofree char *name = g_strdup_printf(TYPE_PNV_SPI_BUS ".%d",
|
||||
s->spic_num);
|
||||
g_autofree char *name = g_strdup_printf("chip%d." TYPE_PNV_SPI_BUS ".%d",
|
||||
s->chip_id, s->spic_num);
|
||||
s->ssi_bus = ssi_create_bus(dev, name);
|
||||
s->cs_line = g_new0(qemu_irq, 1);
|
||||
qdev_init_gpio_out_named(DEVICE(s), s->cs_line, "cs", 1);
|
||||
|
|
|
@ -31,7 +31,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PnvSpi, PNV_SPI)
|
|||
#define PNV_SPI_REG_SIZE 8
|
||||
#define PNV_SPI_REGS 7
|
||||
|
||||
#define TYPE_PNV_SPI_BUS "pnv-spi-bus"
|
||||
#define TYPE_PNV_SPI_BUS "spi"
|
||||
typedef struct PnvSpi {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
|
@ -42,6 +42,7 @@ typedef struct PnvSpi {
|
|||
Fifo8 rx_fifo;
|
||||
/* SPI object number */
|
||||
uint32_t spic_num;
|
||||
uint32_t chip_id;
|
||||
uint8_t transfer_len;
|
||||
uint8_t responder_select;
|
||||
/* To verify if shift_n1 happens prior to shift_n2 */
|
||||
|
|
|
@ -92,7 +92,7 @@ static void test_spi_seeprom(const void *data)
|
|||
qts = qtest_initf("-machine powernv10 -smp 2,cores=2,"
|
||||
"threads=1 -accel tcg,thread=single -nographic "
|
||||
"-blockdev node-name=pib_spic2,driver=file,"
|
||||
"filename=%s -device 25csm04,bus=pnv-spi-bus.2,cs=0,"
|
||||
"filename=%s -device 25csm04,bus=chip0.spi.2,cs=0,"
|
||||
"drive=pib_spic2", tmp_path);
|
||||
spi_seeprom_transaction(qts, chip);
|
||||
qtest_quit(qts);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue