From patchwork Tue Oct 15 10:38:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 835433 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c8f:0:b0:37d:45d0:187 with SMTP id z15csp162221wrs; Tue, 15 Oct 2024 03:42:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZRvZ+qU7BSNE8MArcUztSxF538fyAPbIey+Hx8+tDxPES7v7rqkm5FZkE+U8/5S0HQW+Z+A==@linaro.org X-Google-Smtp-Source: AGHT+IFGJoNzPM7ELOslymPXXm6KkCT8dt0vRt1tFMwWHrlxmad8Y9bYXlFJyCrpqFMdAkLkB/Oi X-Received: by 2002:a05:620a:170f:b0:7b1:e64:901f with SMTP id af79cd13be357-7b11a3bc147mr2037992885a.62.1728988967140; Tue, 15 Oct 2024 03:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728988967; cv=none; d=google.com; s=arc-20240605; b=QSUtNrevdKl3ngxQ7c4veZoADps4AL29ZlJ7tlRqUJGvN4RWw8zcK9jIV/WUqEdIMV h0kbYBIww36SCx/uBcZ6M7eQvkVKZqKF6Gam0APAywoqv2GaUqWrlND52MmKnTwDAJ0S rVJn2pX+2oT77uUPGTqooc3TD7OayfKnQwWuMbfTpzq6vY1zEojmlXYp2sLneUeHhs3u 0tEwL7QJESUDcvcW7ei0B+6K0IO2+duqN7d2pfcgSpsKf5jhy1h8qwHYKJIuUS0IkZNO VBefYZ4drg17MONqAumn4LkmJCT1yZcoY7JSXPZYJ+XnK3Povvs2L42cSYCVU3P5MDhH wm4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mHFb28H8fgPDxISHxl0zh7MOKojU7kn29hs6Fm1zhd8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=U8wxNRTRwHdpPetHE2gKNgHgXHJwTucK9Yiw2yAnw2eh2JZqvHM43MpRQwnILdtwOH p6dLf8T+n0N5lBb1ck40OBPOKGfjrzeHgAQFOtFHaZYDvAU+YYAB4+Z443OSllyl/Hxc HoXrabeaznYptSKzsZKJg88ohs4ZhFekjlnmtL8KAKa4o+I3hQMmCi3b0OOTAu6W/Mp3 Vg16+iwhkjzm11UAH6j6tYZ2215F6rlpN9hYfEpmDElOfSjF2p4iwqDDYTEhcXeuHAyr 5MTDQBby0qBezyWtK554ae/tMVJw7T+tA/HDqiWJ4RHiZhW5/CQB16AVzG0p0Pfdy7zz 5z4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="I5/+gbPn"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4607b4e6f03si10727431cf.710.2024.10.15.03.42.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Oct 2024 03:42:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="I5/+gbPn"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0ewt-0006k2-7I; Tue, 15 Oct 2024 06:38:43 -0400 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 1t0ewb-0006hR-Np for qemu-devel@nongnu.org; Tue, 15 Oct 2024 06:38:28 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t0ewZ-0005z4-BB for qemu-devel@nongnu.org; Tue, 15 Oct 2024 06:38:24 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-37d55f0cf85so2492304f8f.3 for ; Tue, 15 Oct 2024 03:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728988701; x=1729593501; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mHFb28H8fgPDxISHxl0zh7MOKojU7kn29hs6Fm1zhd8=; b=I5/+gbPnZQsvkgLNPGKMTh2rdtYdp5BfZq+gE4kT1mBDatsDipKhZCSHtuyEI0N8vu 8B991XTjzYZRcoRDu8BVlxghvknnTqD/oCOgANu2bgK62jUdjXeU8fLKDVgnmd+PvjYO 7QhEJlQuZQo8qmWWncbpKjTQSt9OqccC5iA4o7VqWCqwxRADIezotCgfOrtxX3c1RamL Io0tzaDPUXkePS18b/Pdd5KtK9hxunQKKvlQ+oBp+VVavCICFVEQn9hf7VDSanx1IwpM 3jaVFL6ubI1zfobU+qi6HYOqrkRvEf7MVqGYoK4T0IVltVaggwB4vhcj2m4DXTB8S7oe paSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728988701; x=1729593501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mHFb28H8fgPDxISHxl0zh7MOKojU7kn29hs6Fm1zhd8=; b=p4HvAKoVVmK4Ru2M2B1VhhFoVuXjpEIgVzxwam+dn8sHE9CAvc0K2bbwRm8EOQo/1e z+p1RqUwpGbv+PcN6NDav8OuxU07lXMBmfExtvZ1nfBroksvzClE8y3oSG+q1Zse5O+6 HlitDJSfxLzvgb9l8Ya986efr9G787MGvTwyyAfbDLBqfjCm9Ck2xA9p050Lf0pbTMrp 4aJN8iVkAh54KxODmUOocEocjtzas6Wv7M4+RUWZMSVGmpvfaBrkSDHEKwSZ6KVsfvHy oRyos2dFdhQTyWTTms29Zt3u7idkpMzvXjLcA85RlCqJIUHIxiiLFcHaRc5FmpF2vTrZ Tjdg== X-Gm-Message-State: AOJu0YwH5U+EgGmdfoVQTphX9cqdOAZjA7ihInwO1PS40WKkeRxG7U3b WQaJRGHICtr7o87HhJVrHSUasMoGEWV+C3o4rUllc3xcJAT89IWkDo5IEDGtG3EoROdm7DA7vZZ W X-Received: by 2002:a5d:654b:0:b0:37d:4647:155a with SMTP id ffacd0b85a97d-37d54e0a606mr10354159f8f.0.1728988701406; Tue, 15 Oct 2024 03:38:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d7fa7a06dsm1241635f8f.5.2024.10.15.03.38.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 03:38:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/28] hw: Remove PCMCIA subsystem Date: Tue, 15 Oct 2024 11:38:04 +0100 Message-Id: <20241015103808.133024-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015103808.133024-1-peter.maydell@linaro.org> References: <20241015103808.133024-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The only PCMCIA subsystem was the PXA2xx SoC and the machines using it, which have now been removed. Although in theory we have a few machine types which have PCMCIA (e.g. kzm, the strongarm machines, sh4's sh7750), none of those machines implement their PCMCIA controller, and they're all old and no longer very interesting machine types. Rather than keeping all the PCMCIA code in-tree without any active users of it, delete it. If we need PCMCIA in future we can always resurrect it. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20241003140010.1653808-5-peter.maydell@linaro.org --- include/hw/pcmcia.h | 63 ------------------------------------------- hw/pcmcia/pcmcia.c | 24 ----------------- hw/Kconfig | 1 - hw/meson.build | 1 - hw/pcmcia/Kconfig | 2 -- hw/pcmcia/meson.build | 1 - 6 files changed, 92 deletions(-) delete mode 100644 include/hw/pcmcia.h delete mode 100644 hw/pcmcia/pcmcia.c delete mode 100644 hw/pcmcia/Kconfig delete mode 100644 hw/pcmcia/meson.build diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h deleted file mode 100644 index 6c08ad616a5..00000000000 --- a/include/hw/pcmcia.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef HW_PCMCIA_H -#define HW_PCMCIA_H - -/* PCMCIA/Cardbus */ - -#include "hw/qdev-core.h" -#include "qom/object.h" - -typedef struct PCMCIASocket { - qemu_irq irq; - bool attached; -} PCMCIASocket; - -#define TYPE_PCMCIA_CARD "pcmcia-card" -OBJECT_DECLARE_TYPE(PCMCIACardState, PCMCIACardClass, PCMCIA_CARD) - -struct PCMCIACardState { - /*< private >*/ - DeviceState parent_obj; - /*< public >*/ - - PCMCIASocket *slot; -}; - -struct PCMCIACardClass { - /*< private >*/ - DeviceClass parent_class; - /*< public >*/ - - int (*attach)(PCMCIACardState *state); - int (*detach)(PCMCIACardState *state); - - const uint8_t *cis; - int cis_len; - - /* Only valid if attached */ - uint8_t (*attr_read)(PCMCIACardState *card, uint32_t address); - void (*attr_write)(PCMCIACardState *card, uint32_t address, uint8_t value); - uint16_t (*common_read)(PCMCIACardState *card, uint32_t address); - void (*common_write)(PCMCIACardState *card, - uint32_t address, uint16_t value); - uint16_t (*io_read)(PCMCIACardState *card, uint32_t address); - void (*io_write)(PCMCIACardState *card, uint32_t address, uint16_t value); -}; - -#define CISTPL_DEVICE 0x01 /* 5V Device Information Tuple */ -#define CISTPL_NO_LINK 0x14 /* No Link Tuple */ -#define CISTPL_VERS_1 0x15 /* Level 1 Version Tuple */ -#define CISTPL_JEDEC_C 0x18 /* JEDEC ID Tuple */ -#define CISTPL_JEDEC_A 0x19 /* JEDEC ID Tuple */ -#define CISTPL_CONFIG 0x1a /* Configuration Tuple */ -#define CISTPL_CFTABLE_ENTRY 0x1b /* 16-bit PCCard Configuration */ -#define CISTPL_DEVICE_OC 0x1c /* Additional Device Information */ -#define CISTPL_DEVICE_OA 0x1d /* Additional Device Information */ -#define CISTPL_DEVICE_GEO 0x1e /* Additional Device Information */ -#define CISTPL_DEVICE_GEO_A 0x1f /* Additional Device Information */ -#define CISTPL_MANFID 0x20 /* Manufacture ID Tuple */ -#define CISTPL_FUNCID 0x21 /* Function ID Tuple */ -#define CISTPL_FUNCE 0x22 /* Function Extension Tuple */ -#define CISTPL_END 0xff /* Tuple End */ -#define CISTPL_ENDMARK 0xff - -#endif diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c deleted file mode 100644 index 03d13e7d670..00000000000 --- a/hw/pcmcia/pcmcia.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * PCMCIA emulation - * - * Copyright 2013 SUSE LINUX Products GmbH - */ - -#include "qemu/osdep.h" -#include "qemu/module.h" -#include "hw/pcmcia.h" - -static const TypeInfo pcmcia_card_type_info = { - .name = TYPE_PCMCIA_CARD, - .parent = TYPE_DEVICE, - .instance_size = sizeof(PCMCIACardState), - .abstract = true, - .class_size = sizeof(PCMCIACardClass), -}; - -static void pcmcia_register_types(void) -{ - type_register_static(&pcmcia_card_type_info); -} - -type_init(pcmcia_register_types) diff --git a/hw/Kconfig b/hw/Kconfig index 6fdaff1b1be..1b4e9bb07f7 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -27,7 +27,6 @@ source nvme/Kconfig source nvram/Kconfig source pci-bridge/Kconfig source pci-host/Kconfig -source pcmcia/Kconfig source pci/Kconfig source remote/Kconfig source rtc/Kconfig diff --git a/hw/meson.build b/hw/meson.build index e86badc5417..b827c82c5d7 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -27,7 +27,6 @@ subdir('nvram') subdir('pci') subdir('pci-bridge') subdir('pci-host') -subdir('pcmcia') subdir('rtc') subdir('scsi') subdir('sd') diff --git a/hw/pcmcia/Kconfig b/hw/pcmcia/Kconfig deleted file mode 100644 index 41f2df91366..00000000000 --- a/hw/pcmcia/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -config PCMCIA - bool diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build deleted file mode 100644 index edcb7f5d263..00000000000 --- a/hw/pcmcia/meson.build +++ /dev/null @@ -1 +0,0 @@ -system_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))