From nobody Mon Feb 9 17:05:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640912156; cv=none; d=zohomail.com; s=zohoarc; b=CL0I04Zm4ecBVNYr4zmIQlcXlcYF+uNx0v1PK6qy5EggrTdg2IQirBFfTOHLrkfFXDt6BnLwr/ZmXQIi6Kl3a1YnyIk2j6g32+rRzN9tExPXme/TkesiTWTl5kfHvJ/fPTAI/bc6UaTWtWR284/1jRj1mh/TofhZUF+JqxzUies= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640912156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gOzChpACyeatTO+0ft8wECHRMSNI7uqBSXhaq5nDK3A=; b=DDtkctmpe/s6olY5Y5dRVplbvPNOsyaCqM46ht8LuXRPKveRy1xmpL6pbgs6roAvvpqskYo1RRQHcx/QJ2pNmA8ui0A44tfWEBwSwGvd9tvaeouBxfxzu7D0NHzFjH7+8rf+AH2KjWIBwBKlnBfgQgHkzLibKb1kqiC4tInWNNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164091215606111.295007962390628; Thu, 30 Dec 2021 16:55:56 -0800 (PST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-IG1SJxLYOySmrglhurtKKw-1; Thu, 30 Dec 2021 19:55:54 -0500 Received: by mail-ed1-f69.google.com with SMTP id v18-20020a056402349200b003f8d3b7ee8dso14591413edc.23 for ; Thu, 30 Dec 2021 16:55:54 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id e26sm10096073edr.82.2021.12.30.16.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 16:55:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640912155; 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=gOzChpACyeatTO+0ft8wECHRMSNI7uqBSXhaq5nDK3A=; b=cPhDDlPEF9WJ8KsGZ6nzMdz6+X/P6v02MhPfS30fk7gl3zUGIIZGBQmeIlZ9wMszNNoZnW FG7ydqcnogM14K2lD7NU5jPCvA+uAJgY5JWy+X9EO+EjSJN6dlPlzaWlTLtQ178mF5cwc0 /qFxK8g/3p2/qShjIOeyLV04y9EJWfE= X-MC-Unique: IG1SJxLYOySmrglhurtKKw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gOzChpACyeatTO+0ft8wECHRMSNI7uqBSXhaq5nDK3A=; b=FZjqWTiA6kqeOWrC0IgO3hzl+GCFK4yZHOBBK56VLEdAa2Ovo48+LeSetvhx7OxiEv s1TRZZnn2//0ixyO/TXu7pZVNM/fRa8ByKvU6SQJiMvO0Dvaw/QZcAk0Je5tHmQcpoXO CaIHT07Nm1+8uxko2wYf+ig65xG0WfCZET4QiYKj+znK5z46f7WkgnGKwM2aEy2ts1tO 0V0yPqcX5B/fKNT5452ZP87C4siaVEhM6cXbm1yWAcOIuETKuO9RquKTPBDByM3VElo3 5mpl1OpQTd27lwdzzO1Tt5X6RAQdCiO0u4eYVTGRhaZ4bMwwynr/qVqQouCGFjmlbvl7 +FQA== X-Gm-Message-State: AOAM5326B22ysXC6x5WV762YIm922vtPfhpm07jhFmcTSYkViOyuNymw Ud9/lVfkcMzgM1dHf6arm64thx/rQEYbDGbRt+CzdsZ50NRLW2S28FC1uv1u8n3V8Z0zkuA0jK7 eAnAEf0E47I+QbA== X-Received: by 2002:a17:906:2109:: with SMTP id 9mr12119288ejt.38.1640912152732; Thu, 30 Dec 2021 16:55:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGMbhv7zja5Awvll/fHnFDn+fDCJb3TeXRvNsDtEbVJjHA+oH4sacFWwuRaQ7RCEJuQFzAcA== X-Received: by 2002:a17:906:2109:: with SMTP id 9mr12119279ejt.38.1640912152582; Thu, 30 Dec 2021 16:55:52 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 01/22] hw/scsi/megasas: Use uint32_t for reply queue head/tail values Date: Fri, 31 Dec 2021 01:55:25 +0100 Message-Id: <20211231005546.723396-2-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231005546.723396-1-philmd@redhat.com> References: <20211231005546.723396-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640912157236000001 While the reply queue values fit in 16-bit, they are accessed as 32-bit: 661: s->reply_queue_head =3D ldl_le_pci_dma(pcid, s->producer_pa); 662: s->reply_queue_head %=3D MEGASAS_MAX_FRAMES; 663: s->reply_queue_tail =3D ldl_le_pci_dma(pcid, s->consumer_pa); 664: s->reply_queue_tail %=3D MEGASAS_MAX_FRAMES; Having: 41:#define MEGASAS_MAX_FRAMES 2048 /* Firmware limit at 65535 */ In order to update the ld/st*_pci_dma() API to pass the address of the value to access, it is simpler to have the head/tail declared as 32-bit values. Replace the uint16_t by uint32_t, wasting 4 bytes in the MegasasState structure. Acked-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211223115554.3155328-20-philmd@redhat.com> --- hw/scsi/megasas.c | 4 ++-- hw/scsi/trace-events | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 8f357841004..14ec6d68bbf 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -109,8 +109,8 @@ struct MegasasState { uint64_t reply_queue_pa; void *reply_queue; uint16_t reply_queue_len; - uint16_t reply_queue_head; - uint16_t reply_queue_tail; + uint32_t reply_queue_head; + uint32_t reply_queue_tail; uint64_t consumer_pa; uint64_t producer_pa; =20 diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events index 92d5b40f892..ae8551f2797 100644 --- a/hw/scsi/trace-events +++ b/hw/scsi/trace-events @@ -42,18 +42,18 @@ mptsas_config_sas_phy(void *dev, int address, int port,= int phy_handle, int dev_ =20 # megasas.c megasas_init_firmware(uint64_t pa) "pa 0x%" PRIx64 " " -megasas_init_queue(uint64_t queue_pa, int queue_len, uint64_t head, uint64= _t tail, uint32_t flags) "queue at 0x%" PRIx64 " len %d head 0x%" PRIx64 " = tail 0x%" PRIx64 " flags 0x%x" +megasas_init_queue(uint64_t queue_pa, int queue_len, uint32_t head, uint32= _t tail, uint32_t flags) "queue at 0x%" PRIx64 " len %d head 0x%" PRIx32 " = tail 0x%" PRIx32 " flags 0x%x" megasas_initq_map_failed(int frame) "scmd %d: failed to map queue" megasas_initq_mapped(uint64_t pa) "queue already mapped at 0x%" PRIx64 megasas_initq_mismatch(int queue_len, int fw_cmds) "queue size %d max fw c= mds %d" megasas_qf_mapped(unsigned int index) "skip mapped frame 0x%x" megasas_qf_new(unsigned int index, uint64_t frame) "frame 0x%x addr 0x%" P= RIx64 megasas_qf_busy(unsigned long pa) "all frames busy for frame 0x%lx" -megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t contex= t, unsigned int head, unsigned int tail, int busy) "frame 0x%x count %d con= text 0x%" PRIx64 " head 0x%x tail 0x%x busy %d" -megasas_qf_update(unsigned int head, unsigned int tail, unsigned int busy)= "head 0x%x tail 0x%x busy %d" +megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t contex= t, uint32_t head, uint32_t tail, unsigned int busy) "frame 0x%x count %d co= ntext 0x%" PRIx64 " head 0x%" PRIx32 " tail 0x%" PRIx32 " busy %u" +megasas_qf_update(uint32_t head, uint32_t tail, unsigned int busy) "head 0= x%" PRIx32 " tail 0x%" PRIx32 " busy %u" megasas_qf_map_failed(int cmd, unsigned long frame) "scmd %d: frame %lu" megasas_qf_complete_noirq(uint64_t context) "context 0x%" PRIx64 " " -megasas_qf_complete(uint64_t context, unsigned int head, unsigned int tail= , int busy) "context 0x%" PRIx64 " head 0x%x tail 0x%x busy %d" +megasas_qf_complete(uint64_t context, uint32_t head, uint32_t tail, int bu= sy) "context 0x%" PRIx64 " head 0x%" PRIx32 " tail 0x%" PRIx32 " busy %u" megasas_frame_busy(uint64_t addr) "frame 0x%" PRIx64 " busy" megasas_unhandled_frame_cmd(int cmd, uint8_t frame_cmd) "scmd %d: MFI cmd = 0x%x" megasas_handle_scsi(const char *frame, int bus, int dev, int lun, void *sd= ev, unsigned long size) "%s dev %x/%x/%x sdev %p xfer %lu" --=20 2.33.1