From patchwork Mon Mar 10 00:06:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 872081 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp746332wri; Sun, 9 Mar 2025 17:12:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdyJOlQs6uj8fML8u2pAuGvF2FooC5ZreU3wwhv/FtGNpyWFAxesu1B+oL8hSevDic9pPqPw==@linaro.org X-Google-Smtp-Source: AGHT+IFsHa85ckbXckwItd1zdxYqOA06Y8WOaOeToC4Na7osIg4qOX/qbgbZVjOFoK9JMQ+uc9fH X-Received: by 2002:a05:6214:1d22:b0:6e8:9525:2ac3 with SMTP id 6a1803df08f44-6e9006adc67mr177424896d6.34.1741565537985; Sun, 09 Mar 2025 17:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741565537; cv=none; d=google.com; s=arc-20240605; b=idN3X46juRtg809jlRm8eyRb+L2I252uevu9sqBFzq3IUShPMrfzQM9tIfU9GL3AAK OGP918jZ7+sf3oenq9o+xsXpU5j0I3+BBWB9Xu1mU9kWLET276P/GAUyeYnj3uLynSbX 3Nfq7DqRQeNrlwsh8uLmzYaWmq5mo0ajZZs8/7gL7KzHZZ420AgXi5xTSVr87GUF6dX2 BAfQ3WF8TlMYBvKfpuKGZPrVDClJCWgStWcx9pFgn/6yWt1AfH6kPe2ySC3YjHCcDskb ROMkG6aqzEP4aennghu2k3LFLLIjvRE3+PrTJHV1MDyw+E7oWMTXDZXHxKKlZzK+uEZT 8PdQ== 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:cc:to :from:dkim-signature; bh=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=; fh=SYhxgKrRP+cj51PvOGwZ36tlKrdeZPUrqqCEo4tNByY=; b=BJy4OiptQaQ00DaWflgbKzswuyZjXlAcDUYQcnwtXZ9OUoterKVAGV/l2pS58n/qCD ieV2du9FlSk8rOir5RqrMkm8zJu4hYmp7sLOuaZzfcWQY4/P89InD05fVT+VbDq944hT DKIwbUOr2P5/a+zOvZokZ9nRd6og7Em5xLkhnp3eSYU7T3HFw46AEDf0HkiEtDVYCgCX oTYWDTGH9APpM5/85cJl4cbOTaVwSEKllZF1d5vNajRD35EyV58EKWJn/F3qSIrnWDsp VPj5FXRqjxdz52la4JbSoGenDeMd6N9Vz3LNosevjbbccLo3N1yHItFxV/uXUst1ILsu 97lg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nRfKj3jJ; 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 6a1803df08f44-6e904fdfc5bsi54113356d6.504.2025.03.09.17.12.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Mar 2025 17:12:17 -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=nRfKj3jJ; 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 1trQi7-0004sV-7z; Sun, 09 Mar 2025 20:09:36 -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 1trQgJ-0002Oa-4l for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:46 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trQgF-0007X5-Mj for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:42 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf257158fso3630415e9.2 for ; Sun, 09 Mar 2025 17:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741565257; x=1742170057; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=; b=nRfKj3jJK0n+ktgfvCysL+fqGjlXEFaUR6XIbHhc47agQACnwWCwSOt7MYQv3CNQQQ gvk0xf5EPdhlda7pOAAA6RUM6GhfVFyBB+46CaO7B0z6McMCfaomBhYiF2XDMMPSlJgy pvmpG9DInqygAfxO/EUmGe/TNmg47+H21v+yDe2Vzx/g6J6UmZOMvIbgfSBQFuq7LDli eN++sM2HE16GptmpojUeNl70IPyHeVODf9DXybn69BhlE8veC3x08HMK8R9tHLa0/i8P MLHzzIlVI1cH7c3uwrmCXxrh4iy09AN0Gr3o5awa8RILJy7iOsLu4ifv//ebU8HJ/ZHZ /RDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741565257; x=1742170057; 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=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=; b=A8K93kTXtQ93EpN1kf0YJYYi3eizmde4WsdM8BNUhAHv/u/Bj0Ln3BLxfWusxA2o3/ hRbw/5D4msGK1x/O1D4SO3/99+0JlaRPWItLT5TAOE8D//4QNBt49wDEQ3il4gpir7Pi /iwJtqoggNaOcghpz5pfDZkXUVCZzkJKygHQRpwHmgJWI+70yihqt2PRrLHV3QqsLhvS kmXnb/SxNuQMf2ywWewjekIz6h/wCj3aQapylyse8EngfTddftgCNtjs1GkfEL2+g6he m162vgHExP/XFfKI49qk3es8YJMyYep5NP4DHg8dKzX0qKiY4bjLyDR1dx+tfqbO1rTs OQxw== X-Forwarded-Encrypted: i=1; AJvYcCXzcwq6jQABexm2jseVqlW1tqDxDQ4V1QHqeGim4NA/KYcUg85rrVG/j3KbBIKYyEEwwapmbuJoV8pz@nongnu.org X-Gm-Message-State: AOJu0YzuBYmL1ebIX8I39VviCli7lQrbdLlVSKyKg1zHqaDFw6L+81/D rqHW4b7jfrQH2y364uk+PYvO4vu0R6rvVkxsb0qOklQYeqnFhbdnREqxISl3Jg0= X-Gm-Gg: ASbGnctO0Ypo1y4rjrcocO9wesukCQMUJ5uL9r0TqmivzXLjY9H9/KnSWNc46WlvGLE rLjoQeYALjkxzwo6MDt+BOZ3tbV9qhc1QqR1mBrQVwMyOXoz/qZf0T7oeSN8JPFG3VGOmgvXyiy Z8K50Zu1fKG6Vt6oxa070yA96BTfHtKXXv0t1bhHp/HjlrruReGgrxXfVRnSJsudLzrvsCNCud8 +rLM+a9WnquZLu0xSghJh1nd5ETqzb/sDGIYsypAqVAIqi9YkjiYtfg+elJz7evRK3Zxd8ax5yH IE3ItWI+Vtfv5NhrUn33/QVfdUVFLt7V7edzSg/dRLDIpROikQJ07E+Jucu62zazecJExHE2P93 Fr/pblnQFzzaiQxXumi9YCEH5KZT1YQ== X-Received: by 2002:a05:600c:1c04:b0:43c:f629:66f4 with SMTP id 5b1f17b1804b1-43cf62969f2mr14732705e9.0.1741565257265; Sun, 09 Mar 2025 17:07:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfcfbsm12872089f8f.28.2025.03.09.17.07.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 09 Mar 2025 17:07:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: BALATON Zoltan , qemu-devel@nongnu.org Cc: Steven Lee , Joel Stanley , Bernhard Beschow , Peter Maydell , qemu-arm@nongnu.org, Andrey Smirnov , Paolo Bonzini , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Eduardo Habkost , qemu-ppc@nongnu.org, =?utf-8?q?Danie?= =?utf-8?q?l_P=2E_Berrang=C3=A9?= , Guenter Roeck , Andrew Jeffery , Troy Lee , Jean-Christophe Dubois , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , qemu-block@nongnu.org, Jamin Lin Subject: [PATCH v5 14/14] hw/sd/sdhci: Remove unnecessary 'endianness' property Date: Mon, 10 Mar 2025 01:06:20 +0100 Message-ID: <20250310000620.70120-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250310000620.70120-1-philmd@linaro.org> References: <20250310000620.70120-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable 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 previous commit removed the single use of instance setting the "endianness" property. Since classes can register their io_ops with correct endianness, no need to support different ones. Remove the code related to SDHCIState::endianess field. Remove the now unused SDHCIState::io_ops field, since we directly use the class one. Suggested-by: Bernhard Beschow Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci-internal.h | 1 - include/hw/sd/sdhci.h | 2 -- hw/sd/sdhci.c | 33 +++------------------------------ 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index d99a8493db2..e4da6c831d1 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -308,7 +308,6 @@ extern const VMStateDescription sdhci_vmstate; #define SDHC_CAPAB_REG_DEFAULT 0x057834b4 #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ - DEFINE_PROP_UINT8("endianness", _state, endianness, DEVICE_LITTLE_ENDIAN), \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ \ diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index e8fced5eedc..1016a5b5b77 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -54,7 +54,6 @@ struct SDHCIState { AddressSpace sysbus_dma_as; AddressSpace *dma_as; MemoryRegion *dma_mr; - const MemoryRegionOps *io_ops; QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; @@ -105,7 +104,6 @@ struct SDHCIState { /* Configurable properties */ uint32_t quirks; - uint8_t endianness; uint8_t sd_spec_version; uint8_t uhs_mode; }; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 47e4bd1a610..cbb9f4ae8c0 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1391,17 +1391,6 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) } static const MemoryRegionOps sdhci_mmio_le_ops = { - .read = sdhci_read, - .write = sdhci_write, - .valid = { - .min_access_size = 1, - .max_access_size = 4, - .unaligned = false - }, - .endianness = DEVICE_LITTLE_ENDIAN, -}; - -static const MemoryRegionOps sdhci_mmio_be_ops = { .read = sdhci_read, .write = sdhci_write, .impl = { @@ -1413,7 +1402,7 @@ static const MemoryRegionOps sdhci_mmio_be_ops = { .max_access_size = 4, .unaligned = false }, - .endianness = DEVICE_BIG_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) @@ -1467,23 +1456,6 @@ void sdhci_common_realize(SDHCIState *s, Error **errp) SDHCIClass *sc = s->sc; const char *class_name = object_get_typename(OBJECT(s)); - s->io_ops = sc->io_ops ?: &sdhci_mmio_le_ops; - switch (s->endianness) { - case DEVICE_LITTLE_ENDIAN: - /* s->io_ops is little endian by default */ - break; - case DEVICE_BIG_ENDIAN: - if (s->io_ops != &sdhci_mmio_le_ops) { - error_setg(errp, "SD controller doesn't support big endianness"); - return; - } - s->io_ops = &sdhci_mmio_be_ops; - break; - default: - error_setg(errp, "Incorrect endianness"); - return; - } - sdhci_init_readonly_registers(s, errp); if (*errp) { return; @@ -1493,7 +1465,7 @@ void sdhci_common_realize(SDHCIState *s, Error **errp) s->fifo_buffer = g_malloc0(s->buf_maxsz); assert(sc->iomem_size >= SDHC_REGISTERS_MAP_SIZE); - memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, class_name, + memory_region_init_io(&s->iomem, OBJECT(s), sc->io_ops, s, class_name, sc->iomem_size); } @@ -1578,6 +1550,7 @@ void sdhci_common_class_init(ObjectClass *klass, const void *data) dc->vmsd = &sdhci_vmstate; device_class_set_legacy_reset(dc, sdhci_poweron_reset); + sc->io_ops = &sdhci_mmio_le_ops; sc->iomem_size = SDHC_REGISTERS_MAP_SIZE; }