From patchwork Tue Feb 13 15:49:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555280 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4E82C48260 for ; Tue, 13 Feb 2024 15:51:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv3d-0002en-S7; Tue, 13 Feb 2024 10:50:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3N-0002RN-Rn for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3D-0005Nm-Iz for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Egdkh5QoX3O/dzVIy8K+U7p2KokwdNAc13mHN8rwZY=; b=SyPsFRbRhWI4JTumQ8fLa2dyGLrEkOg9/xpJJSSFzJytLlnGJuKo/6XSVsWEC1WMuYet+1 lGAVMPsN92Vx4rqmPJB0dtZ9vpaMU/s0C1dj/1rGZWLYhheLcrB+CoM2O88ThkCqS1xpls 9x4OlpJP6puGtc/dgq0VRAKxNRwdw4I= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-270-jP8SABUqMWC85kS63xBIuA-1; Tue, 13 Feb 2024 10:50:25 -0500 X-MC-Unique: jP8SABUqMWC85kS63xBIuA-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7817253831cso606723785a.0 for ; Tue, 13 Feb 2024 07:50:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839421; x=1708444221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Egdkh5QoX3O/dzVIy8K+U7p2KokwdNAc13mHN8rwZY=; b=feN5tEPIzWMHymSbdbl/KL28bHxeRf0PHLUq4IBsniclzIa0X92bClxPmTGLOEVTMh QZghCutNy81u/6kkeSYp2kCli6NVNtaV4w0z79SHeWulZQton8Oc9rzVfPaRU1fOq8kB r1swcOmoZ70YuaCmu2fNyv1YzXwGqr3hboKdTaECfdbX4JBlFGsz33Z62R4IB/UVZ7co JQtO5UVTLP6ZmZc2hgSm2/R0H/ybdKSrJQuCAEYaL8+ibRulfV/8YQtYvQccLXwHObvq fc8e6VSSo12iB9nzoFHC8EAR3veJHGVDFW5GB/L0WDvBR9ZbIF2eDLXSQlp2qeDLNUGF Zo0g== X-Gm-Message-State: AOJu0YwK5C6oqgaG7+C8CAfEwJyTuOxmOEUn3OPNm2Aft/XpCuiJGM8n pTBOvS+1EMXabWocZk0wr7h5y2HsJ3Bo7he27AbMYygDRS71l6l0cElz7suO4ZgMI//U/lVZaTR G/4ncQCl3VtFwvSB5Dkn2sEu8JMEZFAG2RWfeU1BRDtX+tkwtNLeqU8BKEdDt/lkhtMwSResHme kMKW+/n06OmnlXiTKBnL7b9fAQ3fGZp3MjSQlw X-Received: by 2002:ae9:f718:0:b0:787:1652:b0a3 with SMTP id s24-20020ae9f718000000b007871652b0a3mr3615926qkg.5.1707839421640; Tue, 13 Feb 2024 07:50:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBkOjsNAmx88pwT6h6gGSotrMDsN0sF9nsh+Spo79sqZiHzqwcFQF81BKKBFx7Ayw1P32mXw== X-Received: by 2002:ae9:f718:0:b0:787:1652:b0a3 with SMTP id s24-20020ae9f718000000b007871652b0a3mr3615900qkg.5.1707839421205; Tue, 13 Feb 2024 07:50:21 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWECz1jLmLP9Gd8hR+1E6UmBQ9b7sucJjTMkYVuA7DLTykMQx1IrYlbwQZBQfXc1I2+eXt2QXL0oB+F7xfnGEqBRBVpd9WXCuPuhR9a5J48Lon9r9ejFWrMArjJRmRtS5wxj5tes1lKgNwYJAU1VHSjNgci Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id t8-20020a05620a004800b0078718e1f581sm829115qkt.68.2024.02.13.07.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:50:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu, Richard Henderson Subject: [PATCH v3 1/9] usb: inline device creation functions Date: Tue, 13 Feb 2024 16:49:56 +0100 Message-ID: <20240213155005.109954-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow boards to use the device creation functions even if USB itself is not available; of course the functions will fail inexorably, but this can be okay if the calls are conditional on the existence of some USB host controller device. This is for example the case for hw/mips/loongson3_virt.c. Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- include/hw/usb.h | 27 ++++++++++++++++++++++++--- hw/usb/bus.c | 23 ----------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/include/hw/usb.h b/include/hw/usb.h index 32c23a5ca2a..cfeead28403 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -30,6 +30,7 @@ #include "qemu/iov.h" #include "qemu/queue.h" #include "qom/object.h" +#include "qapi/error.h" /* Constants related to the USB / PCI interaction */ #define USB_SBRN 0x60 /* Serial Bus Release Number Register */ @@ -500,9 +501,6 @@ void usb_bus_release(USBBus *bus); USBBus *usb_bus_find(int busnr); void usb_legacy_register(const char *typename, const char *usbdevice_name, USBDevice *(*usbdevice_init)(void)); -USBDevice *usb_new(const char *name); -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp); -USBDevice *usb_create_simple(USBBus *bus, const char *name); USBDevice *usbdevice_create(const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask); @@ -582,4 +580,27 @@ void usb_pcap_init(FILE *fp); void usb_pcap_ctrl(USBPacket *p, bool setup); void usb_pcap_data(USBPacket *p, bool setup); +static inline USBDevice *usb_new(const char *name) +{ + return USB_DEVICE(qdev_new(name)); +} + +static inline USBDevice *usb_try_new(const char *name) +{ + return USB_DEVICE(qdev_try_new(name)); +} + +static inline bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) +{ + return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); +} + +static inline USBDevice *usb_create_simple(USBBus *bus, const char *name) +{ + USBDevice *dev = usb_new(name); + + usb_realize_and_unref(dev, bus, &error_abort); + return dev; +} + #endif diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 59c39945ddd..76fda41b7ec 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -329,29 +329,6 @@ void usb_legacy_register(const char *typename, const char *usbdevice_name, } } -USBDevice *usb_new(const char *name) -{ - return USB_DEVICE(qdev_new(name)); -} - -static USBDevice *usb_try_new(const char *name) -{ - return USB_DEVICE(qdev_try_new(name)); -} - -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) -{ - return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); -} - -USBDevice *usb_create_simple(USBBus *bus, const char *name) -{ - USBDevice *dev = usb_new(name); - - usb_realize_and_unref(dev, bus, &error_abort); - return dev; -} - static void usb_fill_port(USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask) { From patchwork Tue Feb 13 15:49:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4777DC48260 for ; Tue, 13 Feb 2024 15:51:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv3k-0002uB-QO; Tue, 13 Feb 2024 10:51:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3g-0002jO-Q8 for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3b-0005V7-O6 for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BbG1UcNnrJXHseB/1jw2t7pVf1ZGHlpH133WcB15Tq4=; b=Yc7AP2/YK/vBwlxI4lfVHk6kXWs33kpt4xMwvtACtNljKn34roYtSDa8oq/VDuVlK9QsSO WBGp/sCBHeDXFj2hOv7/5F3I7rd26SqeCiR/WnNEeIX6HwFDAkw35T2kL2J4Hh7UNdQsAy aTCG+zZGk49KV/QLJpEfjjW39W6b8KQ= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-WyfZAwalPZ6VgEcqCDPlaA-1; Tue, 13 Feb 2024 10:50:39 -0500 X-MC-Unique: WyfZAwalPZ6VgEcqCDPlaA-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-68c4f2aca5dso80529716d6.3 for ; Tue, 13 Feb 2024 07:50:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839437; x=1708444237; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BbG1UcNnrJXHseB/1jw2t7pVf1ZGHlpH133WcB15Tq4=; b=UYXvD/Q3wHsZCvdz01i7W4PCFHui/oQ7mUxY9bNydXaeNuhrr4A3z6xaKLwIIrQdQ9 a5o7fap6DtAWDhTdv/MMbWWuBm/4ioHow7XyhZdUjoUk2vA1FVqqh+9rhPD+ysRQXf14 7QT9w8xK9BSE87JIffKnnUTHHXqc6IEgkzEOGi6+14gGgfBaJaiJXo4t0O6ZqLriV0DP p9yiP2UVNhKc2onX7xCmPlgZVtUewUBcSRxtnMUJ38swX8T5BqcX0YQZY0fS+vYNxAvE p0gD3+DjIEx+zKEdL4+kUzLg2ZrOkTNlnLGTwOO+tET2irnH0ByfTjwNuWvFQvBXq52S v19w== X-Gm-Message-State: AOJu0Yz+1+jB3pa4hB/WhFQLl9SDdBlc5xP/XQrJYerU9Z0TjGUdi7Yh 91CFZPc6iZoL2sJzG+riDt3IzSoSKv0u2yCBqrDFtJjNTS3e3AFNB8az0fwTiyzlpNTQRizqESL 2fGW++3xmqnBm668616u5h0jAXOuWIEcEpMHK6TPDfq1s7p8FXmY8t+RNAIPloRNTqv/vx+KhjW k1B3+1d82MHmyYk1vd0QwGtQ9WFRggJZ6pl7Le X-Received: by 2002:a0c:f54d:0:b0:68c:8bee:a617 with SMTP id p13-20020a0cf54d000000b0068c8beea617mr9217066qvm.39.1707839437616; Tue, 13 Feb 2024 07:50:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IExqNDqol1z+aASmo8b3qMSL9/Ycr9wPupvHUTzeSKUmlx2T9HgV7QGf34J6kGGO2pITzwURw== X-Received: by 2002:a0c:f54d:0:b0:68c:8bee:a617 with SMTP id p13-20020a0cf54d000000b0068c8beea617mr9217049qvm.39.1707839437304; Tue, 13 Feb 2024 07:50:37 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXSSduA+98Mzjn18XeFAseyv/CK3WGQZpcStXqrp+DggPxqKojLLe7nSSjucA+R8MOvrQoPI6VaPg5CGm/Tj0HLkU7Wh/cTVo/LV7ke0MhE4lr7jc25mGGTvrbUjr3vK8LZw2Rl+P0HoZmPJMp7x1Flr9h7 Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id lx15-20020a0562145f0f00b0068ee9aeacefsm601825qvb.146.2024.02.13.07.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:50:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu, Richard Henderson Subject: [PATCH v3 2/9] isa: clean up Kconfig selections for ISA_SUPERIO Date: Tue, 13 Feb 2024 16:49:57 +0100 Message-ID: <20240213155005.109954-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org All users of ISA_SUPERIO include a floppy disk controller, serial port and parallel port via the automatic creation mechanism of isa-superio.c. Select the symbol and remove it from the dependents. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- hw/isa/Kconfig | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 040a18c0709..7884179d08b 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -17,7 +17,11 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD + select PARALLEL + select SERIAL_ISA select FDC_ISA + # Some users of ISA_SUPERIO do not use it + #select IDE_ISA config PC87312 bool @@ -26,9 +30,6 @@ config PC87312 select I8254 select I8257 select MC146818RTC - select SERIAL_ISA - select PARALLEL - select FDC_ISA select IDE_ISA config PIIX @@ -49,8 +50,6 @@ config VT82C686 select ISA_SUPERIO select ACPI select ACPI_SMBUS - select SERIAL_ISA - select FDC_ISA select USB_UHCI select APM select I8254 @@ -58,14 +57,10 @@ config VT82C686 select I8259 select IDE_VIA select MC146818RTC - select PARALLEL config SMC37C669 bool select ISA_SUPERIO - select SERIAL_ISA - select PARALLEL - select FDC_ISA config LPC_ICH9 bool From patchwork Tue Feb 13 15:49:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43ED0C4829A for ; Tue, 13 Feb 2024 15:51:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv3j-0002qg-Tj; Tue, 13 Feb 2024 10:50:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3e-0002hv-Ni for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:56 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3b-0005Vo-Nq for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:50:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mC2nbMoxIBuABmRhVbve0jC38/PoAQ5rTGQURWt/4Kk=; b=MhOyJOE4TrmhSNP9POB0F1avakD6WJiCZ0zAiwFop7BQuYIStIWbQif1gfHB+RStR80ctd mkycoo9BF7JiyVRtGej5fosN0IidJw/K9dqJItZ82aNxY6VEIzZxYKweyhRqWF8SYL1Ukp AZDBlk0eFQTcbXEU5eyff3BMAOGaW88= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-Ms1QCywhMXim4tu-K0sAqQ-1; Tue, 13 Feb 2024 10:50:46 -0500 X-MC-Unique: Ms1QCywhMXim4tu-K0sAqQ-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-785a91f4c28so532294385a.2 for ; Tue, 13 Feb 2024 07:50:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839443; x=1708444243; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mC2nbMoxIBuABmRhVbve0jC38/PoAQ5rTGQURWt/4Kk=; b=YmWKNXb7STmKiGh/yTVRxylY2uvqhGmcY/XYSqISTVV5MBq6GTwAH4cvjuFplzRnPJ QWF4Qt2E/jmtm1TvOJppMP9VZPAlw7PUufXGS5gESEmcYXcs++FDJCOKlp0/rgNSUr8J 24aPWb+uvtQTrQErU5BvrNqsGAd/BQoEByPMQcRc7l/GPrwVrNkYylGQi3x3TVZ6t/Hv CFbChc7H560wzNbyQzFEwnQamHDa3tgN8xxXiUGNNO9UDA/Gl/Tj4xxtAUdYqhnmyYvU Co3uIuzyNVS2mQrjRIP2jAOanQssaJZT2MyGw8uSmlizuzYm7k36gW8NHVDygs5C0wS5 1APA== X-Gm-Message-State: AOJu0YwqwcL0hsaA3ALOfxklOs4dj5NDoC0RQ45XNMIot3DNd22F+2As JWp2SY6zA/N2QTF/AfUqx73u4ZqBnZtbreXb0QCOFYkYSH2yNbzNX2MB/UWs9bH8RL1TRyL6flJ UsBUsvyoiLxqNMgQJGrsDRl7EZDKo2EoJMIcsjKROv0srVeW7TxuUBf6ZdtC5R2ECjCrp444JVm vRZTedIwvP5o6QgvH2oee4oBUg/yoN86lpnkKb X-Received: by 2002:a05:6214:4104:b0:68c:bcc4:f312 with SMTP id kc4-20020a056214410400b0068cbcc4f312mr14643052qvb.61.1707839443551; Tue, 13 Feb 2024 07:50:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHNYk404EhQ+ABXoqyXKpF1QNsktTDQ/gHnTLUL8uOzERQmiTOxJt/iybmwjgmsNccGoiF6XQ== X-Received: by 2002:a05:6214:4104:b0:68c:bcc4:f312 with SMTP id kc4-20020a056214410400b0068cbcc4f312mr14643026qvb.61.1707839443234; Tue, 13 Feb 2024 07:50:43 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVgAWEVNFtpPKkSk7WJnwQSwY0/5fKbfcC6rfmB66Z0UIOaV7a+XIlMdIesJPB/Vwq+G28rRBhsKt72kxHsVZvxZvA8l0E5m0pU3KxYLfVtHDEjQwIn Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id x9-20020ad440c9000000b0068ccba4896asm1366913qvp.47.2024.02.13.07.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:50:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 3/9] hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board Date: Tue, 13 Feb 2024 16:49:58 +0100 Message-ID: <20240213155005.109954-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow The board doesn't have a working ISA bus, only some I/O space. Selecting ISA_BUS and including hw/isa/isa.h is not necessary. Signed-off-by: Bernhard Beschow Message-ID: <20230109204124.102592-3-shentey@gmail.com> Signed-off-by: Paolo Bonzini --- hw/mips/mipssim.c | 7 +++++-- hw/mips/Kconfig | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index 16af31648e2..a12427b6c8a 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -31,7 +31,6 @@ #include "hw/clock.h" #include "hw/mips/mips.h" #include "hw/char/serial.h" -#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -206,7 +205,11 @@ mips_mipssim_init(MachineState *machine) cpu_mips_irq_init_cpu(cpu); cpu_mips_clock_init(cpu); - /* Register 64 KB of ISA IO space at 0x1fd00000. */ + /* + * Register 64 KB of ISA IO space at 0x1fd00000. But without interrupts + * (except for the hardcoded serial port interrupt) -device cannot work, + * so do not expose the ISA bus to the user. + */ memory_region_init_alias(isa, NULL, "isa_mmio", get_system_io(), 0, 0x00010000); memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa); diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ab61af209a0..afcfb2b8eca 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -6,8 +6,7 @@ config MALTA config MIPSSIM bool - select ISA_BUS - select SERIAL_ISA + select SERIAL select MIPSNET config JAZZ From patchwork Tue Feb 13 15:49:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 413B5C48260 for ; Tue, 13 Feb 2024 15:52:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv3l-0002x7-PF; Tue, 13 Feb 2024 10:51:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3k-0002uC-OX for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3i-0005X5-FM for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ddz/xp+FHATs0HtSax3jhPBsKh0ayriSqzKxrZz01xM=; b=cW/0lMNR9VjrZ6vLOdHrmvNHcRoXZhCuYHC2iGHTuRyKub5dFSnjheRD3S6CN39POyJKq+ hNCA4MqSr+1NRZ3InJwn55UPlooxYMPp8xFHdPgB2OSroR3sFUcxbDu8tk54ZRP/8FmtYl IFmL2gI76RPAEXQFpVLiJXXuLu9VbME= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-137-2Sd7wkKAMeyqTnIpqjcMaw-1; Tue, 13 Feb 2024 10:50:56 -0500 X-MC-Unique: 2Sd7wkKAMeyqTnIpqjcMaw-1 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2d0a7ab562eso27930701fa.0 for ; Tue, 13 Feb 2024 07:50:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839451; x=1708444251; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ddz/xp+FHATs0HtSax3jhPBsKh0ayriSqzKxrZz01xM=; b=penwIOCKnV71sv9Usqo1gjQWKkbqZzUXvWwIC/I4PHcNsvVNRW3N2C73TbiXpZqLzI rEfO2RQfLw+ov7qvHbarUSXkUluGs+4JGvZLdF+xn1RJwDt0TMQh75iqTgjpaKM74Ocp KKL1HME0ZSk5m9ZjB3WoCj/MnCBzVrIr5DI9LvwybIeS/aLx7J50diPwnCzuJUlzk02z 3TvApWVucQHiPSusjEt9TPaI5Gx5XgdIiHVGTwGSvsRJsTvQu50+J45rsgzgDW4q0TNQ uDYc4eTwBsg/RhZkNts43zMHsCIrbzoiHf1+52N2bT15TwQSjKEUC2LU9Xu6BKUdJXUO rsrg== X-Gm-Message-State: AOJu0YxbxRL98Ha4VHD5a+jrRP7I83yNBzMEQUAROwwZsr7gT8pojVFG Ho2xELSMbEAA1juDNx6/8NGZtCp1Rt1sanbblQ/DEefBQ5gmAXOmSjarFQTc8l59W0x2tSWRFgc CcfdffN4AHdj7XUwzdXPBfIpnlr+eSQw6ark7ZeEUQJCQ22RrNqtafiZWy/5tykvlR1kfB1JDZL 3W1Bnw7G+Sp6Fjb2jr897LXSU7xBCMVEyog/dR X-Received: by 2002:a2e:8e85:0:b0:2d0:77b1:de8a with SMTP id z5-20020a2e8e85000000b002d077b1de8amr975291ljk.0.1707839451502; Tue, 13 Feb 2024 07:50:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IGap8N//dGr9+/PoifOWtUTu8SAXuDZ92kB+eZhywRh7MxEz7RLOGXaq2Cmj5aSVwuITy4wZw== X-Received: by 2002:a2e:8e85:0:b0:2d0:77b1:de8a with SMTP id z5-20020a2e8e85000000b002d077b1de8amr975273ljk.0.1707839450976; Tue, 13 Feb 2024 07:50:50 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVFYJtbToZfL+lfLnx/3jhHAg3LpP3jo2EMfjfdaiAFPqsHt0cwLJgpDlNBVavYuyIavIHD+nlREk2D7VeQqypRZU93wwIKQC5hsGYfTwXsIkhOzXS/ Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id p7-20020a2e7407000000b002d06d48ddffsm544796ljc.70.2024.02.13.07.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:50:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 4/9] isa: fix ISA_SUPERIO dependencies Date: Tue, 13 Feb 2024 16:49:59 +0100 Message-ID: <20240213155005.109954-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org ISA_SUPERIO does not provide an ISA bus, so it should not select the symbol: instead it requires one. Among its users, VT82C686 is the only one that is a PCI-ISA bridge and does not already select ISA_BUS. Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow Signed-off-by: Paolo Bonzini --- hw/isa/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 7884179d08b..5df3c09cd51 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -15,7 +15,7 @@ config I82378 config ISA_SUPERIO bool - select ISA_BUS + depends on ISA_BUS select PCKBD select PARALLEL select SERIAL_ISA @@ -47,6 +47,7 @@ config PIIX config VT82C686 bool + select ISA_BUS select ISA_SUPERIO select ACPI select ACPI_SMBUS From patchwork Tue Feb 13 15:50:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87E67C48260 for ; Tue, 13 Feb 2024 15:51:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv3t-0003Cs-8c; Tue, 13 Feb 2024 10:51:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3r-00036D-AW for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3p-0005Y6-TK for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Eavu1uG4NtuHo7emg9gUb4sqremIQ+v3v3eAdA8Z7IY=; b=G3tabbd7p0MPFURhGsK2ypBYIZ+nzPowoG3qFnqdKWSlIChZdjkp/Z6SYSyeDy9ljJbSpA tYBpdf6/WSqZ5kIuEfrM2SGPeb34w9JTNzYn9eC2aKUE9qC4ViOpG1vVmgRz9Mo/bqxbDz X90U1doESVMUsw45tzFFX1vlLDm8djM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-8mqifFFlNxad4Kr-i8f2aA-1; Tue, 13 Feb 2024 10:51:03 -0500 X-MC-Unique: 8mqifFFlNxad4Kr-i8f2aA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a26f2da3c7bso236703966b.0 for ; Tue, 13 Feb 2024 07:51:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839460; x=1708444260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Eavu1uG4NtuHo7emg9gUb4sqremIQ+v3v3eAdA8Z7IY=; b=YutwIuYRLlApkZduAEGtzNM0lJ9FCOyfSGY6ZPV/K2tgqBGRm/GLimLEGTx13JNgUz fu/VbNR3By8R/urmYzC1NdhZfgykEVHmzGjNp3ctiI526LG2anUUcd2ulyGOiaLkYXRP i9Xfva8QJB81K1AQczW5Yic+/u2p633HSZ6HhG5NEwPs47Am29rCqEHKkEyL+Q38mgSE qNVlEF0WtRT1ncMvhcHNLtB4LVgyQ00YviraS7ro8QujlphoNPksMED4D9p13CrZogIQ iaizUSOOJ6tQRx1+3icGS9+D3AZTNE4bpkXmqu6cqQAJ4pdletKHb1GX8d8ratV/Yfvj XHXg== X-Gm-Message-State: AOJu0YxeTN/sqNDAocxO07fPZXEUHm7it10DjfSI2WcMSKcDdF2/pPf3 gR+w1O+m04OsI5fE1TPi2Y1K/XpkrHIpGOC5xTZNzkml4nGxRznltV4BSGzAiE/NwMLWKiX0Vkp skVJJWru65m0/lghvZ216ktVs+HeFdbinocDdfx5i2Q/sqtd2qLv60605a+HvK+VRPFMrKnEWYc L4QUZblZhD1es46c6/R6vfn7BBBIqt52wsCqrC X-Received: by 2002:a17:906:f1cb:b0:a3c:af7e:1660 with SMTP id gx11-20020a170906f1cb00b00a3caf7e1660mr3774306ejb.22.1707839459776; Tue, 13 Feb 2024 07:50:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IF21+/tB4MY0SeAlJaY4+dS6tUEeNd1XKqx1b24Zd4H9TBnCuZGK048x2V4e0FgIv6VuGvM2Q== X-Received: by 2002:a17:906:f1cb:b0:a3c:af7e:1660 with SMTP id gx11-20020a170906f1cb00b00a3caf7e1660mr3774289ejb.22.1707839459412; Tue, 13 Feb 2024 07:50:59 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW2sycnd3A6AsTvrCGK0SaRelCQ1dHZ7BNqYk+XgAFn9zomryny6k0/3pEk6KeoFi3jtGpo0++9dxuDl6sp1gwCuLlVO52yhSKpV8VSEh3fpR8OE9Ll Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id tz3-20020a170907c78300b00a3d243d0aa0sm165278ejc.31.2024.02.13.07.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:50:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 5/9] isa: specify instance_size in isa_superio_type_info Date: Tue, 13 Feb 2024 16:50:00 +0100 Message-ID: <20240213155005.109954-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Right now all subclasses of TYPE_ISA_SUPERIO have to specify an instance_size, because the ISASuperIODevice struct adds fields to ISADevice but the type does not include the increased instance size. Failure to do so results in an access past the bounds of struct ISADevice as soon as isa_superio_realize is called. Fix this by specifying the instance_size already in the superclass. Fixes: 4c3119a6e3 ("hw/isa/superio: Factor out the parallel code from pc87312.c") Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow Signed-off-by: Paolo Bonzini --- hw/isa/isa-superio.c | 2 +- hw/isa/smc37c669-superio.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index e06a548c682..98d50844f71 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -187,6 +187,7 @@ static const TypeInfo isa_superio_type_info = { .abstract = true, .class_size = sizeof(ISASuperIOClass), .class_init = isa_superio_class_init, + .instance_size = sizeof(ISASuperIODevice), }; /* SMS FDC37M817 Super I/O */ @@ -203,7 +204,6 @@ static void fdc37m81x_class_init(ObjectClass *klass, void *data) static const TypeInfo fdc37m81x_type_info = { .name = TYPE_FDC37M81X_SUPERIO, .parent = TYPE_ISA_SUPERIO, - .instance_size = sizeof(ISASuperIODevice), .class_init = fdc37m81x_class_init, }; diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c index 388e2ed9371..d2e58c9a895 100644 --- a/hw/isa/smc37c669-superio.c +++ b/hw/isa/smc37c669-superio.c @@ -85,7 +85,6 @@ static void smc37c669_class_init(ObjectClass *klass, void *data) static const TypeInfo smc37c669_type_info = { .name = TYPE_SMC37C669_SUPERIO, .parent = TYPE_ISA_SUPERIO, - .instance_size = sizeof(ISASuperIODevice), .class_size = sizeof(ISASuperIOClass), .class_init = smc37c669_class_init, }; From patchwork Tue Feb 13 15:50:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF58DC4829A for ; Tue, 13 Feb 2024 15:51:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv4J-0003lX-AJ; Tue, 13 Feb 2024 10:51:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv40-0003WB-Vi for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv3y-0005Yn-0t for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5HC+tz6aaJY+t7RF5sHfhbX2fGyic7JwYjzUweoBHas=; b=HJGQC6qDbkHJmS0opIozdHAUQkvKEaHQ+ZPc04NSL/AHURhSbkknsRzVi3jzEzuudn/Wff mFcbJ5ksMNbdB9hV1LdncRer0hRVugsGgSAJTHsSESEeMof4C/T50lDWmeO+y2IRYubTcU hkuNwAjuNvQ7p4cfbA3yrQHjV2Gc5bc= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-427-LsTz5QwTOHSjjyBIqrYiiw-1; Tue, 13 Feb 2024 10:51:11 -0500 X-MC-Unique: LsTz5QwTOHSjjyBIqrYiiw-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-51161adad50so953854e87.2 for ; Tue, 13 Feb 2024 07:51:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839467; x=1708444267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5HC+tz6aaJY+t7RF5sHfhbX2fGyic7JwYjzUweoBHas=; b=WxzthslP/9WhyNqL6MfvCJlfttMxLJ/cw2ny9Nto6yiBUmdBF6gwE0ZBfNfMMyv8Wv K6PSWq/qhzAnyQW3f8vjoHzZB35z7+n67UZ3Sg3PrGXs/xiY8xYrjwY/HPDGy5NQ+Do7 iOrTiIzqNXV23i961JG6OZtspJckgI2czpoP09eQtCYp7z5D3DK7//m9Fj0rBlVp3B1d jkO9Qah3SCvCAwvvui0zvnNIfQjeDXj0qZrNy+07s3SlApf6TIiiDmUb4o0AlaH5pjf1 ABiUnydtuqOXHIPY0M2Foo4YBQD7EckEAMzqf9hIJj6st6b0/lZRbvJ1Jaejn3CW2I3i 6IvA== X-Gm-Message-State: AOJu0Yy5fRImJtBVV5/xKLZbxh+AOF8AhPfQUrF3odShYl/Ru4JJp95K bSy9+r0Qls+lBsFLkSfabTlA3pC6FSIaZhYJejlEza4XQemAkmI9HD0SE3A1UiawC38ODdHHdOe 04Zf7vig1/pCox7eQIIHrrq0BUgXXqRIHQ/5dLpIU6aBj+ExstnGxAxwbUTj5RwLUKhuoALgG0/ XWt2ZjVlVySCr2aCitXRqSTUgnP7J34ousx5yM X-Received: by 2002:a05:6512:ea4:b0:511:603e:7afc with SMTP id bi36-20020a0565120ea400b00511603e7afcmr8690997lfb.46.1707839467408; Tue, 13 Feb 2024 07:51:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnl3rRCVVecFLkiOiDHb2EtiBNGi0liMe8HjMMd8P46N/dUtKKCAN6a8NjSyhGL6HUXI6rHg== X-Received: by 2002:a05:6512:ea4:b0:511:603e:7afc with SMTP id bi36-20020a0565120ea400b00511603e7afcmr8690973lfb.46.1707839467104; Tue, 13 Feb 2024 07:51:07 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXJ2YDQDO8uw9yiV3fyUh436IpKM8gYHKR6gYk/l/AgrFO4appXzGl5maRNF5cRzwPE6iq+K0huQkn15a9LpyA3cubq5mL2ZRzIY6+Y2nWE5TimZnnL Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id n5-20020a056402434500b0055d333a0584sm3802738edc.72.2024.02.13.07.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:51:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 6/9] isa: extract FDC37M81X to a separate file Date: Tue, 13 Feb 2024 16:50:01 +0100 Message-ID: <20240213155005.109954-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org isa-superio.c currently defines a SuperIO chip that is not used by any other user of the file. Extract the chip to a separate file. Reviewed-by: BALATON Zoltan Reviewed-by: Bernhard Beschow Signed-off-by: Paolo Bonzini --- hw/isa/fdc37m81x-superio.c | 32 ++++++++++++++++++++++++++++++++ hw/isa/isa-superio.c | 18 ------------------ hw/isa/Kconfig | 4 ++++ hw/isa/meson.build | 1 + hw/mips/Kconfig | 2 +- 5 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 hw/isa/fdc37m81x-superio.c diff --git a/hw/isa/fdc37m81x-superio.c b/hw/isa/fdc37m81x-superio.c new file mode 100644 index 00000000000..55e91fbca17 --- /dev/null +++ b/hw/isa/fdc37m81x-superio.c @@ -0,0 +1,32 @@ +/* + * SMS FDC37M817 Super I/O + * + * Copyright (c) 2018 Philippe Mathieu-Daudé + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/isa/superio.h" + +static void fdc37m81x_class_init(ObjectClass *klass, void *data) +{ + ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass); + + sc->serial.count = 2; /* NS16C550A */ + sc->parallel.count = 1; + sc->floppy.count = 1; /* SMSC 82077AA Compatible */ + sc->ide.count = 0; +} + +static const TypeInfo types[] = { + { + .name = TYPE_FDC37M81X_SUPERIO, + .parent = TYPE_ISA_SUPERIO, + .class_init = fdc37m81x_class_init, + }, +}; + +DEFINE_TYPES(types) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 98d50844f71..a8c8c58ef7f 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -190,27 +190,9 @@ static const TypeInfo isa_superio_type_info = { .instance_size = sizeof(ISASuperIODevice), }; -/* SMS FDC37M817 Super I/O */ -static void fdc37m81x_class_init(ObjectClass *klass, void *data) -{ - ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass); - - sc->serial.count = 2; /* NS16C550A */ - sc->parallel.count = 1; - sc->floppy.count = 1; /* SMSC 82077AA Compatible */ - sc->ide.count = 0; -} - -static const TypeInfo fdc37m81x_type_info = { - .name = TYPE_FDC37M81X_SUPERIO, - .parent = TYPE_ISA_SUPERIO, - .class_init = fdc37m81x_class_init, -}; - static void isa_superio_register_types(void) { type_register_static(&isa_superio_type_info); - type_register_static(&fdc37m81x_type_info); } type_init(isa_superio_register_types) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 5df3c09cd51..73c6470805c 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -23,6 +23,10 @@ config ISA_SUPERIO # Some users of ISA_SUPERIO do not use it #select IDE_ISA +config FDC37M81X + bool + select ISA_SUPERIO + config PC87312 bool select ISA_SUPERIO diff --git a/hw/isa/meson.build b/hw/isa/meson.build index 2ab99ce0c6b..f650b395071 100644 --- a/hw/isa/meson.build +++ b/hw/isa/meson.build @@ -4,6 +4,7 @@ system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c')) system_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c')) system_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c')) system_ss.add(when: 'CONFIG_PIIX', if_true: files('piix.c')) +system_ss.add(when: 'CONFIG_FDC37M81X', if_true: files('fdc37m81x-superio.c')) system_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c')) system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c')) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index afcfb2b8eca..e57db4f6412 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,7 +1,7 @@ config MALTA bool + select FDC37M81X select GT64120 - select ISA_SUPERIO select PIIX config MIPSSIM From patchwork Tue Feb 13 15:50:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7D64C48BC1 for ; Tue, 13 Feb 2024 15:52:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv4L-0003zS-B9; Tue, 13 Feb 2024 10:51:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv48-0003cF-RY for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv45-0005Zy-CC for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6fPhdYHmbguZEq4Osn6fTiPYnqI5591O/00HvV3hHMI=; b=cNleEEp9/aqyIkLdCVUJ7CLP88NXp8mq7Me3bbeW/FFCe7yFG497vOAeTukhfPeBodqI/P 1oQMQBWBBT/BpJALZj6RhGazVx+eD+HjezN1YHnRBG9QOEwxEOJdLlzSyyRSxcQEtkIjyt 9GrszEVbHauxCPRbc09Ll7RY8vp//n0= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-IY4pRvqEMX6vsWsMMpnMYw-1; Tue, 13 Feb 2024 10:51:19 -0500 X-MC-Unique: IY4pRvqEMX6vsWsMMpnMYw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a2bffe437b5so291655966b.1 for ; Tue, 13 Feb 2024 07:51:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839475; x=1708444275; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6fPhdYHmbguZEq4Osn6fTiPYnqI5591O/00HvV3hHMI=; b=IJZHXi4X47qb29SLbQQbwhbe+6J8Zl5JqUrpvvhGqko3rYys3gUXaMBxok22V8qMyj vIw1GHgN19HolZeFvXZDT80PknzLK/N5UmWiAz3X6APT2uYIELiFfsBnEVc2hHkCniF3 6rYQwWPXsR6qhiNPc8+LhfQNPG3NZ/cCMbaSeQ7Y5AVCvlORqos6BK86gWdZUSuyi0Fd OouLbZL4AyQd6NZVXh1skD+80zCtZSLC+/AclZ1vZOlGU/GA3zyLCk/PTECH/jouvJwl BJAfn86uRXdbBm20VYM50q/hQEU3dybdqIEUvc6alGT1wNRFP0gNYwkTnsHjFdgO/TCV 5FJQ== X-Gm-Message-State: AOJu0Ywd2NIFT0X/d7zZWucPTh2jj6ijk5DzkHQD1p/oVOxEC4n5DYSn Tbd0bo1lF1n5tXAXCY8XWhqR5V+2u0NNWyhsfN58gIB1+hT57SdcTeDOx89QpIHWmU/VNt4bev0 2fupGl2fL5P2ywCJA4UCKPVqsw4ErbNBy1qhBYoDQ5JFiiHBIRb3cvcJ5ZsuwsQbDKsBsxaYKAC oH0Ivbod5pXZQ4HnLcGCeUP8xt2T1db93wECRd X-Received: by 2002:a17:906:3489:b0:a3c:e69:a62b with SMTP id g9-20020a170906348900b00a3c0e69a62bmr7423847ejb.26.1707839475386; Tue, 13 Feb 2024 07:51:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQBd1Y6ovA7tBVl+fOjZ+1etjg3fzweiF4kylultjC1Gyb+4lY++r2TgnePsAFbczPJxUiog== X-Received: by 2002:a17:906:3489:b0:a3c:e69:a62b with SMTP id g9-20020a170906348900b00a3c0e69a62bmr7423821ejb.26.1707839474975; Tue, 13 Feb 2024 07:51:14 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUAO2ky7L46qVqxFe/t281xYd/z49pm+amqHgiomK5VBhzKsURNPjzz3S8yicyOaQvN8dD/F+NCU9RlOs/ToFeFtdFZSc9HDyKPI6K2xbm9WTJuxjwV Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id s15-20020a17090699cf00b00a3d01eb9bb5sm743523ejn.96.2024.02.13.07.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:51:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 7/9] mips: allow compiling out CONFIG_MIPS_ITU Date: Tue, 13 Feb 2024 16:50:02 +0100 Message-ID: <20240213155005.109954-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org itc_reconfigure() is referenced from TCG, compile out the helpers that reference env->itu if CONFIG_MIPS_ITU is not defined. This makes it possible to build a QEMU binary that only includes boards without a CPS device (only Malta and Boston create one). Signed-off-by: Paolo Bonzini --- target/mips/tcg/translate.h | 1 + target/mips/tcg/sysemu_helper.h.inc | 19 +++++++++++++------ target/mips/tcg/sysemu/cp0_helper.c | 8 ++++++++ target/mips/tcg/translate.c | 10 ++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index 93a78b81212..d5458f8690d 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -9,6 +9,7 @@ #define TARGET_MIPS_TRANSLATE_H #include "cpu.h" + #include "tcg/tcg-op.h" #include "exec/translator.h" #include "exec/helper-gen.h" diff --git a/target/mips/tcg/sysemu_helper.h.inc b/target/mips/tcg/sysemu_helper.h.inc index f163af1eac7..92d01c49bf6 100644 --- a/target/mips/tcg/sysemu_helper.h.inc +++ b/target/mips/tcg/sysemu_helper.h.inc @@ -9,6 +9,8 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ +#include CONFIG_DEVICES + /* CP0 helpers */ DEF_HELPER_1(mfc0_mvpcontrol, tl, env) DEF_HELPER_1(mfc0_mvpconf0, tl, env) @@ -31,8 +33,6 @@ DEF_HELPER_1(mftc0_tcschedule, tl, env) DEF_HELPER_1(mfc0_tcschefback, tl, env) DEF_HELPER_1(mftc0_tcschefback, tl, env) DEF_HELPER_1(mfc0_count, tl, env) -DEF_HELPER_1(mfc0_saar, tl, env) -DEF_HELPER_1(mfhc0_saar, tl, env) DEF_HELPER_1(mftc0_entryhi, tl, env) DEF_HELPER_1(mftc0_status, tl, env) DEF_HELPER_1(mftc0_cause, tl, env) @@ -57,7 +57,6 @@ DEF_HELPER_1(dmfc0_lladdr, tl, env) DEF_HELPER_1(dmfc0_maar, tl, env) DEF_HELPER_2(dmfc0_watchlo, tl, env, i32) DEF_HELPER_2(dmfc0_watchhi, tl, env, i32) -DEF_HELPER_1(dmfc0_saar, tl, env) #endif /* TARGET_MIPS64 */ DEF_HELPER_2(mtc0_index, void, env, tl) @@ -103,9 +102,6 @@ DEF_HELPER_2(mtc0_srsconf4, void, env, tl) DEF_HELPER_2(mtc0_hwrena, void, env, tl) DEF_HELPER_2(mtc0_pwctl, void, env, tl) DEF_HELPER_2(mtc0_count, void, env, tl) -DEF_HELPER_2(mtc0_saari, void, env, tl) -DEF_HELPER_2(mtc0_saar, void, env, tl) -DEF_HELPER_2(mthc0_saar, void, env, tl) DEF_HELPER_2(mtc0_entryhi, void, env, tl) DEF_HELPER_2(mttc0_entryhi, void, env, tl) DEF_HELPER_2(mtc0_compare, void, env, tl) @@ -189,3 +185,14 @@ DEF_HELPER_2(lcsr_drdcsr, i64, env, tl) DEF_HELPER_3(lcsr_wrcsr, void, env, tl, tl) DEF_HELPER_3(lcsr_dwrcsr, void, env, tl, tl) #endif + +#ifdef CONFIG_MIPS_ITU +DEF_HELPER_1(mfc0_saar, tl, env) +DEF_HELPER_1(mfhc0_saar, tl, env) +DEF_HELPER_2(mtc0_saari, void, env, tl) +DEF_HELPER_2(mtc0_saar, void, env, tl) +DEF_HELPER_2(mthc0_saar, void, env, tl) +#ifdef TARGET_MIPS64 +DEF_HELPER_1(dmfc0_saar, tl, env) +#endif +#endif diff --git a/target/mips/tcg/sysemu/cp0_helper.c b/target/mips/tcg/sysemu/cp0_helper.c index 62f6fb4bf65..dde890adf3f 100644 --- a/target/mips/tcg/sysemu/cp0_helper.c +++ b/target/mips/tcg/sysemu/cp0_helper.c @@ -21,6 +21,8 @@ */ #include "qemu/osdep.h" +#include CONFIG_DEVICES + #include "qemu/log.h" #include "qemu/main-loop.h" #include "cpu.h" @@ -371,6 +373,7 @@ target_ulong helper_mfc0_count(CPUMIPSState *env) return (int32_t)cpu_mips_get_count(env); } +#ifdef CONFIG_MIPS_ITU target_ulong helper_mfc0_saar(CPUMIPSState *env) { if ((env->CP0_SAARI & 0x3f) < 2) { @@ -386,6 +389,7 @@ target_ulong helper_mfhc0_saar(CPUMIPSState *env) } return 0; } +#endif target_ulong helper_mftc0_entryhi(CPUMIPSState *env) { @@ -514,6 +518,7 @@ target_ulong helper_dmfc0_watchhi(CPUMIPSState *env, uint32_t sel) return env->CP0_WatchHi[sel]; } +#ifdef CONFIG_MIPS_ITU target_ulong helper_dmfc0_saar(CPUMIPSState *env) { if ((env->CP0_SAARI & 0x3f) < 2) { @@ -521,6 +526,7 @@ target_ulong helper_dmfc0_saar(CPUMIPSState *env) } return 0; } +#endif #endif /* TARGET_MIPS64 */ void helper_mtc0_index(CPUMIPSState *env, target_ulong arg1) @@ -1100,6 +1106,7 @@ void helper_mtc0_count(CPUMIPSState *env, target_ulong arg1) cpu_mips_store_count(env, arg1); } +#ifdef CONFIG_MIPS_ITU void helper_mtc0_saari(CPUMIPSState *env, target_ulong arg1) { uint32_t target = arg1 & 0x3f; @@ -1139,6 +1146,7 @@ void helper_mthc0_saar(CPUMIPSState *env, target_ulong arg1) } } } +#endif void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1) { diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 12094cc1e7c..b130222708b 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -49,6 +49,16 @@ #ifdef CONFIG_USER_ONLY STUB_HELPER(cache, TCGv_env env, TCGv val, TCGv_i32 reg) #endif +#if defined CONFIG_SYSTEM_ONLY && !defined CONFIG_MIPS_ITU +STUB_HELPER(mfc0_saar, TCGv ret, TCGv_env env) +STUB_HELPER(mfhc0_saar, TCGv ret, TCGv_env env) +STUB_HELPER(mtc0_saari, TCGv_env env, TCGv val) +STUB_HELPER(mtc0_saar, TCGv_env env, TCGv val) +STUB_HELPER(mthc0_saar, TCGv_env env, TCGv val) +#ifdef TARGET_MIPS64 +STUB_HELPER(dmfc0_saar, TCGv ret, TCGv_env env) +#endif +#endif enum { /* indirect opcode tables */ From patchwork Tue Feb 13 15:50:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 813A4C48260 for ; Tue, 13 Feb 2024 15:57:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv9H-0006LQ-Do; Tue, 13 Feb 2024 10:56:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv9F-0006L2-Kt for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:56:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv9E-0006vR-A7 for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:56:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SxctDiX8kY4Gz+7Kaz/DqaqM25ke4UsXK6uTYvM+c50=; b=D13j5wFBKkJNVZA8WnQySr9QHFLP1p+T/u8EiAk/qk25iCLK4eEdaCxsnS1HXOgXWG6MRN uER+QR5HKMTOjQS5ws6FxgJWl2lIzxGRYO1koseNxSQsuaiEJfurY7c4w7h45K7qt/cg5H XgYF21blAgI06NrUA6GpU0Imr08M//c= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-287-ciXwR073Ozy3p5hAJ_G4Bg-1; Tue, 13 Feb 2024 10:56:38 -0500 X-MC-Unique: ciXwR073Ozy3p5hAJ_G4Bg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-560f41972easo2528098a12.0 for ; Tue, 13 Feb 2024 07:56:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839483; x=1708444283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SxctDiX8kY4Gz+7Kaz/DqaqM25ke4UsXK6uTYvM+c50=; b=Sb20iN9HcgeiW07UH9eZzJU95pRu10yGDwjHjRMrxE2W8ChgjGyKrIZUjvaKzbwkse HIEEXYxtPPOOBwBq+P4tj/Egfzi9qZIHWrFsHKFkzIu2sIDqI7wOwWktI49Ett5CPAjc G2vQI1bum/rwtGfFRTM6rQN4jMyTv46NgM62e8na6XEzsVco/z4s/TdE+so1db8q2Ik+ 08OR77nOQtxuFFEJ7hoCS0pXviLMX2aJUc6GdsKqiYyaHvpQj5sV3mtRJxwWID2KPb6n 9qxsjJNRiqSxGRrwIEPw2OYWSAZ1YKC1Y/PQbY7tTyHLHUdDVYZEC4nUijnj4dMgONHL zaFw== X-Gm-Message-State: AOJu0YyClhZIQhpV5MmYoG6oWfAHBcrycsHgp+GbvjotjQi+VZ+pCekU IVZwwZqWsx+lAL5b5Ho+rPIrGORyiYu5Hu6m0ZnEe/8+aC4vd7dMs+spyxObBdJMAZRlRq0Fdur I6k8HVtI/pAgcRkIxAqKorVnD+k3ZDI8BQh6Kn0SXWjGVImzbWFwJQ8aFQEUP86xz7+0HUCKg6m mN/eqJIezeu/2ea6JLXMJbab5i2VnovHaeWK1m X-Received: by 2002:aa7:d354:0:b0:55f:e9ce:7406 with SMTP id m20-20020aa7d354000000b0055fe9ce7406mr27025edr.29.1707839483302; Tue, 13 Feb 2024 07:51:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNfeSqJ4mQB1iWytrwj0OJZpF2aiVxE62ck/lsHfpl+ws76SQfKAPs9QZhvLDW8yRUdFrkAA== X-Received: by 2002:aa7:d354:0:b0:55f:e9ce:7406 with SMTP id m20-20020aa7d354000000b0055fe9ce7406mr27010edr.29.1707839483063; Tue, 13 Feb 2024 07:51:23 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXQ89IsHKKLtWb2YUm7LzvanFQfgAltiTYtB/NtumYfPZebmrXFAawkf8M3vBE1cdy5g1244AObIsAm7qlbPcmxT1x21vrfAPviyIV2oVCl1rgeMnlm Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id dk21-20020a0564021d9500b0055c85e6d75dsm3858934edb.87.2024.02.13.07.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:51:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 8/9] mips/loongson3_virt: do not require CONFIG_USB Date: Tue, 13 Feb 2024 16:50:03 +0100 Message-ID: <20240213155005.109954-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Once the Kconfig for hw/mips is cleaned up, it will be possible to build a binary that does not include any USB host controller and therefore that does not include the code guarded by CONFIG_USB. While the simpler creation functions such as usb_create_simple can be inlined, this is not true of usb_bus_find(). Remove it, replacing it with a search of the single USB bus created by loongson3_virt_devices_init(). Signed-off-by: Paolo Bonzini --- hw/mips/loongson3_virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index caedde2df00..bedd3d496bd 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -447,8 +447,9 @@ static inline void loongson3_virt_devices_init(MachineState *machine, if (defaults_enabled() && object_class_by_name("pci-ohci")) { pci_create_simple(pci_bus, -1, "pci-ohci"); - usb_create_simple(usb_bus_find(-1), "usb-kbd"); - usb_create_simple(usb_bus_find(-1), "usb-tablet"); + Object *usb_bus = object_resolve_path_type("", TYPE_USB_BUS, NULL); + usb_create_simple(USB_BUS(usb_bus), "usb-kbd"); + usb_create_simple(USB_BUS(usb_bus), "usb-tablet"); } pci_init_nic_devices(pci_bus, mc->default_nic); From patchwork Tue Feb 13 15:50:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13555286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D440DC48260 for ; Tue, 13 Feb 2024 15:52:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZv4P-0004p6-AN; Tue, 13 Feb 2024 10:51:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv4M-0004Tn-UQ for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZv4L-0005bx-4m for qemu-devel@nongnu.org; Tue, 13 Feb 2024 10:51:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707839496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fPwNvvXXF0dWdZecUWUuSYxtRjzXrWvMaH/cl1RwQEE=; b=hW0jNePJMS9Ekl5QPyNkA8ENoIAWinMb054VBkemeVflxwKE72IazFbvMB1+zArfhHtroi 5JkNwDWJZHZQ4ohvurCOhUs9o9SOUJtjx7MXZ5hpNMwbSUhAW3BeME4EBmRsbq3AB7PfC8 5HS/CoDRVxsTJelLgGJHdjGQAAU9/Ek= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-VBFM214HPfyfBxFGipNfEg-1; Tue, 13 Feb 2024 10:51:35 -0500 X-MC-Unique: VBFM214HPfyfBxFGipNfEg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a3c2a65d99eso159986766b.0 for ; Tue, 13 Feb 2024 07:51:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707839491; x=1708444291; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fPwNvvXXF0dWdZecUWUuSYxtRjzXrWvMaH/cl1RwQEE=; b=oUYIH3fiwpAAi+QD7zRJGbjGssGM+Vqq/0BIbqvTaonsvksRXg+MTUmLHpY3YorC3m FqK472MfEbGgqlAq4Lx3O3aeQbEcAl2Ob/ehGbUI6mpTHEsrmZd/bBP5RSkYw1aU9R+B eq+/XtIkn8BNV7oJ+/An2Sr5sTNXV4zIvIsj0AZKss0CWTDNGSYXx1S6XFIe0+zPIC9Y bNpotwfOfgDJnUK6adiGs+HFxCjhl2916+Gilww+dI+9a0fQAvQtXeKR9cZaFT2k8yNg 5d1g3bVJv54Gik2zLfGiLQGTgAyTZyRKIZXE1yAblLEVAz9LyAiTJjHo6m4PG/iWPHI6 xvyg== X-Gm-Message-State: AOJu0YzBY/mSqNxblY6eiY5cZMJw9YK/8Bt1SsJlDQ7chnf2ZYomSXxl yzHPmc9/7RcGYmCQemNM/0pj2OspKuy8UbnZn04jLmF/yX9bUnDg3MAFKz+cybYM/b/XqPWAplh j5QIcG+RDCOLXlmrT8dub1qDxDM9M7e9goThE90Qj2FpP91Ul85VwXEafG/D/dSCnOLDSYzUJWN oDNp1MzGNjTXziGPyWIZvwiKczTATpT2eBsNdN X-Received: by 2002:a17:906:a298:b0:a38:891b:4a69 with SMTP id i24-20020a170906a29800b00a38891b4a69mr6595606ejz.51.1707839491042; Tue, 13 Feb 2024 07:51:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFw8q89/cws1gngyxhv3bvEwr5N7/cooAfB7n+RJ5w9n5m41ZyixHbYXxqUAJZIXw+OT7jsZQ== X-Received: by 2002:a17:906:a298:b0:a38:891b:4a69 with SMTP id i24-20020a170906a29800b00a38891b4a69mr6595586ejz.51.1707839490747; Tue, 13 Feb 2024 07:51:30 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXXX6Sd/OX+j8uC88pYTmAsbNl/VEgXUm9brurIzGAcJrSOqR1xSilIBS+rl3nuiVz0awuMgiWgojYLu9rcilabFYMVYhlrH29mvWdp6d6fj+McItI4 Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id cx2-20020a170907168200b00a3cee467307sm1038341ejd.95.2024.02.13.07.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:51:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, shentey@gmail.com, balaton@eik.bme.hu Subject: [PATCH v3 9/9] mips: do not list individual devices from configs/ Date: Tue, 13 Feb 2024 16:50:04 +0100 Message-ID: <20240213155005.109954-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213155005.109954-1-pbonzini@redhat.com> References: <20240213155005.109954-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.504, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add new "select" and "imply" directives if needed. The resulting config-devices.mak files are the same as before. Note that builds without default devices will become much smaller than before; for this reason, it's necessary to use only the bare minimum of USB functions, in particular only those that are inlined. For this reason, usb_bus_find() must be removed, as it only exists if CONFIG_USB is selected by a host controller. Signed-off-by: Paolo Bonzini --- configs/devices/mips-softmmu/common.mak | 28 +++----------------- configs/devices/mips64el-softmmu/default.mak | 3 --- .gitlab-ci.d/buildtest.yml | 2 +- hw/display/Kconfig | 2 +- hw/mips/Kconfig | 20 +++++++++++++- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 1a853841b27..416a5d353e8 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -1,28 +1,8 @@ # Common mips*-softmmu CONFIG defines -CONFIG_ISA_BUS=y -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_VGA_ISA=y -CONFIG_VGA_MMIO=y -CONFIG_VGA_CIRRUS=y -CONFIG_VMWARE_VGA=y -CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y -CONFIG_PARALLEL=y -CONFIG_I8254=y -CONFIG_PCSPK=y -CONFIG_PCKBD=y -CONFIG_FDC=y -CONFIG_I8257=y -CONFIG_IDE_ISA=y -CONFIG_PFLASH_CFI01=y -CONFIG_I8259=y -CONFIG_MC146818RTC=y -CONFIG_MIPS_CPS=y -CONFIG_MIPS_ITU=y +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n + CONFIG_MALTA=y -CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y -CONFIG_SMBUS_EEPROM=y -CONFIG_TEST_DEVICES=y diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak index d5188f7ea58..88a37cf27f1 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -3,8 +3,5 @@ include ../mips-softmmu/common.mak CONFIG_FULOONG=y CONFIG_LOONGSON3V=y -CONFIG_ATI_VGA=y -CONFIG_RTL8139_PCI=y CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f56df59c949..3aead277246 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -659,7 +659,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu + TARGETS: avr-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1aafe1923d2..5b2b3840f7a 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -55,7 +55,7 @@ config VGA_MMIO config VMWARE_VGA bool - default y if PCI_DEVICES && PC_PCI + default y if PCI_DEVICES && (PC_PCI || MIPS) depends on PCI select VGA diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index e57db4f6412..5c83ef49cf6 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,8 +1,15 @@ config MALTA bool + imply PCNET_PCI + imply PCI_DEVICES + imply TEST_DEVICES select FDC37M81X select GT64120 + select MIPS_CPS select PIIX + select PFLASH_CFI01 + select SERIAL + select SMBUS_EEPROM config MIPSSIM bool @@ -31,17 +38,26 @@ config JAZZ config FULOONG bool + imply PCI_DEVICES + imply TEST_DEVICES + imply ATI_VGA + imply RTL8139_PCI select PCI_BONITO + select SMBUS_EEPROM select VT82C686 config LOONGSON3V bool + imply PCI_DEVICES + imply TEST_DEVICES + imply VIRTIO_PCI + imply VIRTIO_NET imply VIRTIO_VGA imply QXL if SPICE + imply USB_OHCI_PCI select SERIAL select GOLDFISH_RTC select LOONGSON_LIOINTC - select PCI_DEVICES select PCI_EXPRESS_GENERIC_BRIDGE select MSI_NONBROKEN select FW_CFG_MIPS @@ -53,6 +69,8 @@ config MIPS_CPS config MIPS_BOSTON bool + imply PCI_DEVICES + imply TEST_DEVICES select FITLOADER select MIPS_CPS select PCI_EXPRESS_XILINX