From nobody Sat Oct 25 08:57:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520286075932338.64914114722285; Mon, 5 Mar 2018 13:41:15 -0800 (PST) Received: from localhost ([::1]:51727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxr8-00065Z-U0 for importer@patchew.org; Mon, 05 Mar 2018 16:41:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxWb-0004Vk-BQ for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:20:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esxWa-0001g4-7l for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:20:01 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:36328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1esxWZ-0001fW-Uj; Mon, 05 Mar 2018 16:20:00 -0500 Received: by mail-wr0-x242.google.com with SMTP id v111so18788517wrb.3; Mon, 05 Mar 2018 13:19:59 -0800 (PST) Received: from x1.local (ABayonne-654-1-79-224.w86-222.abo.wanadoo.fr. [86.222.222.224]) by smtp.gmail.com with ESMTPSA id g96sm12904808wrd.73.2018.03.05.13.19.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 13:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+zYkSBPkxyE471bKM0LQ2S9m8Lb9giIeXCDaIKVgIpM=; b=BDehQ/8494yabFULID+OBFx3DchpdE21WyXTSyjG1uIp+VZG5jnzXu0Qwtt65U1EA6 2std5kKiHGk8MQQbtq74QkRPmPMd1qYqn7FwRTclytcMjE9uXlg6Q6reBBE32jS99EUa XnOX8pREw68YU8Hr7n/v8pkwaPhzPvnrwYHQZMChWKvPIlVpTLUzwKCwZMnIRPduTmTM 3Cnm2Qc2TSGSYwvjW5wtiIapuOBBSnHL7JAr+RTsR3iXu/p9QkxI9TK7M+EP7F8IVsYj AV5xLz4pCsr4JY5EcERJXKliFLfJC1Ny4rnT+Gk881cNebBdkkGMxqVYmvsltL35y2nO R5EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+zYkSBPkxyE471bKM0LQ2S9m8Lb9giIeXCDaIKVgIpM=; b=Q0ha5s+iC8QlQPKO1OtUV1eXPQbyDpPX1PH+8uVMX8C/yBeliV9e8y0SxssfYyJZTj ogT8bz5u2SrzG2Bul9YWCVGNjOjePw2VlWqk/XUbu4c93Sbt2fUusUIgnaVVV0SJnF2o eTI2GLdfjJeYqskApAvOGQBQQwoZm5T91WRGmexm38V/zKudFU1Jc2NcaxAl8qP6MdYk HU+gB3mdqwqP6aAjBNnJBQ+dNoDhSbG06utUgR/9/8Wr4x8bFZC/aMIH/IGyPb3eseqK nf3nr147ZJRkd9nVyZyvZGZIcgb9tRqgxgHT5pJLoo8jzXTd57ZYKlGdE49EPJPlNa89 InNg== X-Gm-Message-State: AElRT7GhT6TZz5Ni9iLyGhBt7k5ib1ZavOfVdmZJbQXXs/Yr2kSJ0zxD jKI9xN+RAGPcpvKc+88Y/K0= X-Google-Smtp-Source: AG47ELszxV/zcpua0V/MkEsJQngXIsviXkvm4eXiyEyHBp4FoMjxArNekL+n+7ZEm0FfpjoDe+kD2A== X-Received: by 10.223.136.164 with SMTP id f33mr377462wrf.77.1520284798933; Mon, 05 Mar 2018 13:19:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Aurelien Jarno , Mark Cave-Ayland , Alexey Kardashevskiy , Thomas Huth Date: Mon, 5 Mar 2018 18:19:19 -0300 Message-Id: <20180305211928.466-14-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180305211928.466-1-f4bug@amsat.org> References: <20180305211928.466-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [RFC PATCH v2 13/22] hw/isa/superio: Factor out the IDE code from pc87312.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:PReP" , Guan Xuetao , Yongbok Kim , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/superio.h | 2 ++ hw/isa/isa-superio.c | 22 ++++++++++++++++++++++ hw/isa/pc87312.c | 36 ++++++++++++++++++++---------------- hw/isa/trace-events | 2 +- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h index 2fc33bf3d3..3dd5448f8c 100644 --- a/include/hw/isa/superio.h +++ b/include/hw/isa/superio.h @@ -31,6 +31,7 @@ typedef struct ISASuperIODevice { ISADevice *serial[MAX_SERIAL_PORTS]; ISADevice *floppy; ISADevice *kbc; + ISADevice *ide; } ISASuperIODevice; =20 typedef struct ISASuperIOFuncs { @@ -50,6 +51,7 @@ typedef struct ISASuperIOClass { ISASuperIOFuncs parallel; ISASuperIOFuncs serial; ISASuperIOFuncs floppy; + ISASuperIOFuncs ide; } ISASuperIOClass; =20 #endif /* HW_ISA_SUPERIO_H */ diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 6a24ac0259..88d254a602 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -142,6 +142,28 @@ static void isa_superio_realize(DeviceState *dev, Erro= r **errp) =20 /* Keyboard, mouse */ sio->kbc =3D isa_create_simple(bus, TYPE_I8042); + + /* IDE */ + if (k->ide.count && (!k->ide.is_enabled || k->ide.is_enabled(sio, 0)))= { + isa =3D isa_create(bus, "isa-ide"); + d =3D DEVICE(isa); + if (k->ide.get_iobase) { + qdev_prop_set_uint32(d, "iobase", k->ide.get_iobase(sio, 0)); + } + if (k->ide.get_iobase) { + qdev_prop_set_uint32(d, "iobase2", k->ide.get_iobase(sio, 1)); + } + if (k->ide.get_irq) { + qdev_prop_set_uint32(d, "irq", k->ide.get_irq(sio, 0)); + } + qdev_init_nofail(d); + sio->ide =3D isa; + trace_superio_create_ide(0, + k->ide.get_iobase ? + k->ide.get_iobase(sio, 0) : -1, + k->ide.get_irq ? + k->ide.get_irq(sio, 0) : -1); + } } =20 static void isa_superio_class_init(ObjectClass *oc, void *data) diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index a1845a91c3..5cf64505fe 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -150,16 +150,28 @@ static unsigned int get_fdc_irq(ISASuperIODevice *sio= , uint8_t index) =20 /* IDE controller */ =20 -static inline bool is_ide_enabled(PC87312State *s) +static bool is_ide_enabled(ISASuperIODevice *sio, uint8_t index) { + PC87312State *s =3D PC87312(sio); + return s->regs[REG_FER] & FER_IDE_EN; } =20 -static inline uint16_t get_ide_iobase(PC87312State *s) +static uint16_t get_ide_iobase(ISASuperIODevice *sio, uint8_t index) { + PC87312State *s =3D PC87312(sio); + + if (index =3D=3D 1) { + return get_ide_iobase(sio, 0) + 0x206; + } return (s->regs[REG_FER] & FER_IDE_ADDR) ? 0x170 : 0x1f0; } =20 +static unsigned int get_ide_irq(ISASuperIODevice *sio, uint8_t index) +{ + assert(index =3D=3D 0); + return 14; +} =20 static void reconfigure_devices(PC87312State *s) { @@ -277,14 +289,11 @@ static void pc87312_reset(DeviceState *d) static void pc87312_realize(DeviceState *dev, Error **errp) { PC87312State *s; - DeviceState *d; ISADevice *isa; - ISABus *bus; Error *local_err =3D NULL; =20 s =3D PC87312(dev); isa =3D ISA_DEVICE(dev); - bus =3D isa_bus_from_device(isa); isa_register_ioport(isa, &s->io, s->iobase); pc87312_hard_reset(s); =20 @@ -293,17 +302,6 @@ static void pc87312_realize(DeviceState *dev, Error **= errp) error_propagate(errp, local_err); return; } - - if (is_ide_enabled(s)) { - isa =3D isa_create(bus, "isa-ide"); - d =3D DEVICE(isa); - qdev_prop_set_uint32(d, "iobase", get_ide_iobase(s)); - qdev_prop_set_uint32(d, "iobase2", get_ide_iobase(s) + 0x206); - qdev_prop_set_uint32(d, "irq", 14); - qdev_init_nofail(d); - s->ide.dev =3D isa; - trace_pc87312_info_ide(get_ide_iobase(s)); - } } =20 static void pc87312_initfn(Object *obj) @@ -361,6 +359,12 @@ static void pc87312_class_init(ObjectClass *klass, voi= d *data) .get_iobase =3D get_fdc_iobase, .get_irq =3D get_fdc_irq, }; + sc->ide =3D (ISASuperIOFuncs){ + .count =3D 1, + .is_enabled =3D is_ide_enabled, + .get_iobase =3D get_ide_iobase, + .get_irq =3D get_ide_irq, + }; } =20 static const TypeInfo pc87312_type_info =3D { diff --git a/hw/isa/trace-events b/hw/isa/trace-events index 8d9900882f..80ac6175d6 100644 --- a/hw/isa/trace-events +++ b/hw/isa/trace-events @@ -4,8 +4,8 @@ superio_create_parallel(int id, uint16_t base, unsigned int irq) "id=3D%d,= base 0x%03x, irq %u" superio_create_serial(int id, uint16_t base, unsigned int irq) "id=3D%d, b= ase 0x%03x, irq %u" superio_create_floppy(int id, uint16_t base, unsigned int irq) "id=3D%d, b= ase 0x%03x, irq %u" +superio_create_ide(int id, uint16_t base, unsigned int irq) "id=3D%d, base= 0x%03x, irq %u" =20 # hw/isa/pc87312.c pc87312_io_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D0x%x" pc87312_io_write(uint32_t addr, uint32_t val) "write addr=3D0x%x val=3D0x%= x" -pc87312_info_ide(uint32_t base) "base 0x%x" --=20 2.16.2