From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1599721305; cv=none; d=zohomail.com; s=zohoarc; b=AN3Nl+LyfbgZtUN+HWARMVXGjzApZfotdnYl6S4VZCMMs2u777MdIXcqYY8l8T0leY6E4KAEHLZo7MXy3FK9IX4k2AlAnBUyCPIMGGkTU0Yg9I8rskVRMMyFd+HV/z1uqXxdQcvTxeGGuXjoGmvMIRbwNwB4m6v0Itv3Xiwe0gE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3LVq3GBMxvuW5ThC5No6G6me9ou9dAQJhQkLuf9vMHg=; b=LSiFyTGYoQEfUmo2zI2u/yFMS2lbBew4PJj5h2f470grIdsLWISs44OJWfp2z3M4kao76ZQseZJJG0VjKzMx39E1ZhbsdLD4J5x0f8DQ/pDGZYzvoVr1RamCPkOAspAPTrOQVNvM1Fmb6KTCN2Pq+DF7XRy/uCQwhxVFzLudTAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 159972130598939.176895730537694; Thu, 10 Sep 2020 00:01:45 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-468-ELsNedL8Nwayxa_uRpf3OQ-1; Thu, 10 Sep 2020 03:01:42 -0400 Received: by mail-wm1-f71.google.com with SMTP id d22so1760210wmd.6 for ; Thu, 10 Sep 2020 00:01:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id o124sm2127336wmb.2.2020.09.10.00.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721304; 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=3LVq3GBMxvuW5ThC5No6G6me9ou9dAQJhQkLuf9vMHg=; b=UK08I8nXlyfmHECo5Fg8Z/IzlsNM8GH2OROUt8m7SooHeO+fpnOfBo865IhXpY3xfjNz2l 1JTGi1dP/nfRqibk3G5OBgOzFnomPiVo8ROzzMDgzTs9215802YWMSpvDRzmCFOTGX5tK5 yuGu9Zx+Wy8xhHGWiLXGAG3bvlMIMAk= X-MC-Unique: ELsNedL8Nwayxa_uRpf3OQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3LVq3GBMxvuW5ThC5No6G6me9ou9dAQJhQkLuf9vMHg=; b=E35Vp09AcUAHqVn54f1VxKsYS+0gDv1wpbu846sDvhqNGo13lLssJUmVvyyO9OYt7C Hel8+lfdRwm9RM5wedHpZudXsZ4rpjIEMB3wkfXYPg3HZVVD4WaDsLrnPLDxBLIDsgnu 8jjj97eV4mUFTex/8d/DFtiwL6Kp8GuYRu0mzv/yF0mH0RKwT3HJliA7jvzsxh1+pxSy h06N+izf64EbEtX0pbcRkedSScoPof7VIO1M32ZiFM60sr8xugl4rHFJ/fNxH+PF5YSf 7dS9UHGemtHnHSA515CiMMdyqtmTlNlZ08Y97gplRv7NOzLEcYoPjaZp/MsX1i8ZgpXO 5VIg== X-Gm-Message-State: AOAM533IG5Pg0mHvMRIo49fUPUibjQcQlVkSnrURcV3opArZedfbfg/J /TBLsxVidwTPid8scJmEPJ1+x/JkrZODMp6IQCSnuC/fAmC8/c1i45g0u7xwaaND2PeLj52pQCv u0ulEexjfKqfbNA== X-Received: by 2002:a7b:c182:: with SMTP id y2mr6733468wmi.21.1599721299921; Thu, 10 Sep 2020 00:01:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgp6jskt+jFoWEu9oClQRannFnMaW2ju14kuX/HT2/8P8+6b5Zro3I2ovA3LneRaIpwyvZzA== X-Received: by 2002:a7b:c182:: with SMTP id y2mr6733445wmi.21.1599721299694; Thu, 10 Sep 2020 00:01:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/6] hw/ssi/aspeed_smc: Rename max_slaves as max_devices Date: Thu, 10 Sep 2020 09:01:26 +0200 Message-Id: <20200910070131.435543-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename max_slaves as max_devices. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Thomas Huth --- include/hw/ssi/aspeed_smc.h | 2 +- hw/ssi/aspeed_smc.c | 40 ++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 6fbbb238f15..52ae34e38d1 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -42,7 +42,7 @@ typedef struct AspeedSMCController { uint8_t r_timings; uint8_t nregs_timings; uint8_t conf_enable_w0; - uint8_t max_slaves; + uint8_t max_devices; const AspeedSegments *segments; hwaddr flash_window_base; uint32_t flash_window_size; diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 795784e5f36..8219272016c 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -259,7 +259,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 1, + .max_devices =3D 1, .segments =3D aspeed_segments_legacy, .flash_window_base =3D ASPEED_SOC_SMC_FLASH_BASE, .flash_window_size =3D 0x6000000, @@ -275,7 +275,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 5, + .max_devices =3D 5, .segments =3D aspeed_segments_fmc, .flash_window_base =3D ASPEED_SOC_FMC_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -293,7 +293,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_SPI_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D SPI_CONF_ENABLE_W0, - .max_slaves =3D 1, + .max_devices =3D 1, .segments =3D aspeed_segments_spi, .flash_window_base =3D ASPEED_SOC_SPI_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -309,7 +309,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 3, + .max_devices =3D 3, .segments =3D aspeed_segments_ast2500_fmc, .flash_window_base =3D ASPEED_SOC_FMC_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -327,7 +327,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 2, + .max_devices =3D 2, .segments =3D aspeed_segments_ast2500_spi1, .flash_window_base =3D ASPEED_SOC_SPI_FLASH_BASE, .flash_window_size =3D 0x8000000, @@ -343,7 +343,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 2, + .max_devices =3D 2, .segments =3D aspeed_segments_ast2500_spi2, .flash_window_base =3D ASPEED_SOC_SPI2_FLASH_BASE, .flash_window_size =3D 0x8000000, @@ -359,7 +359,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 1, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 3, + .max_devices =3D 3, .segments =3D aspeed_segments_ast2600_fmc, .flash_window_base =3D ASPEED26_SOC_FMC_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -377,7 +377,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 2, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 2, + .max_devices =3D 2, .segments =3D aspeed_segments_ast2600_spi1, .flash_window_base =3D ASPEED26_SOC_SPI_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -395,7 +395,7 @@ static const AspeedSMCController controllers[] =3D { .r_timings =3D R_TIMINGS, .nregs_timings =3D 3, .conf_enable_w0 =3D CONF_ENABLE_W0, - .max_slaves =3D 3, + .max_devices =3D 3, .segments =3D aspeed_segments_ast2600_spi2, .flash_window_base =3D ASPEED26_SOC_SPI2_FLASH_BASE, .flash_window_size =3D 0x10000000, @@ -476,7 +476,7 @@ static bool aspeed_smc_flash_overlap(const AspeedSMCSta= te *s, AspeedSegments seg; int i; =20 - for (i =3D 0; i < s->ctrl->max_slaves; i++) { + for (i =3D 0; i < s->ctrl->max_devices; i++) { if (i =3D=3D cs) { continue; } @@ -537,7 +537,7 @@ static void aspeed_smc_flash_set_segment(AspeedSMCState= *s, int cs, */ if ((s->ctrl->segments =3D=3D aspeed_segments_ast2500_spi1 || s->ctrl->segments =3D=3D aspeed_segments_ast2500_spi2) && - cs =3D=3D s->ctrl->max_slaves && + cs =3D=3D s->ctrl->max_devices && seg.addr + seg.size !=3D s->ctrl->segments[cs].addr + s->ctrl->segments[cs].size) { qemu_log_mask(LOG_GUEST_ERROR, @@ -948,7 +948,7 @@ static void aspeed_smc_reset(DeviceState *d) } =20 /* setup the default segment register values and regions for all */ - for (i =3D 0; i < s->ctrl->max_slaves; ++i) { + for (i =3D 0; i < s->ctrl->max_devices; ++i) { aspeed_smc_flash_set_segment_region(s, i, s->ctrl->segment_to_reg(s, &s->ctrl->segments[i])); } @@ -995,8 +995,8 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr ad= dr, unsigned int size) (s->ctrl->has_dma && addr =3D=3D R_DMA_DRAM_ADDR) || (s->ctrl->has_dma && addr =3D=3D R_DMA_LEN) || (s->ctrl->has_dma && addr =3D=3D R_DMA_CHECKSUM) || - (addr >=3D R_SEG_ADDR0 && addr < R_SEG_ADDR0 + s->ctrl->max_slaves= ) || - (addr >=3D s->r_ctrl0 && addr < s->r_ctrl0 + s->ctrl->max_slaves))= { + (addr >=3D R_SEG_ADDR0 && addr < R_SEG_ADDR0 + s->ctrl->max_device= s) || + (addr >=3D s->r_ctrl0 && addr < s->r_ctrl0 + s->ctrl->max_devices)= ) { =20 trace_aspeed_smc_read(addr, size, s->regs[addr]); =20 @@ -1270,7 +1270,7 @@ static void aspeed_smc_write(void *opaque, hwaddr add= r, uint64_t data, int cs =3D addr - s->r_ctrl0; aspeed_smc_flash_update_ctrl(&s->flashes[cs], value); } else if (addr >=3D R_SEG_ADDR0 && - addr < R_SEG_ADDR0 + s->ctrl->max_slaves) { + addr < R_SEG_ADDR0 + s->ctrl->max_devices) { int cs =3D addr - R_SEG_ADDR0; =20 if (value !=3D s->regs[R_SEG_ADDR0 + cs]) { @@ -1341,10 +1341,10 @@ static void aspeed_smc_realize(DeviceState *dev, Er= ror **errp) s->conf_enable_w0 =3D s->ctrl->conf_enable_w0; =20 /* Enforce some real HW limits */ - if (s->num_cs > s->ctrl->max_slaves) { + if (s->num_cs > s->ctrl->max_devices) { qemu_log_mask(LOG_GUEST_ERROR, "%s: num_cs cannot exceed: %d\n", - __func__, s->ctrl->max_slaves); - s->num_cs =3D s->ctrl->max_slaves; + __func__, s->ctrl->max_devices); + s->num_cs =3D s->ctrl->max_devices; } =20 /* DMA irq. Keep it first for the initialization in the SoC */ @@ -1376,7 +1376,7 @@ static void aspeed_smc_realize(DeviceState *dev, Erro= r **errp) s->ctrl->flash_window_size); sysbus_init_mmio(sbd, &s->mmio_flash); =20 - s->flashes =3D g_new0(AspeedSMCFlash, s->ctrl->max_slaves); + s->flashes =3D g_new0(AspeedSMCFlash, s->ctrl->max_devices); =20 /* * Let's create a sub memory region for each possible slave. All @@ -1385,7 +1385,7 @@ static void aspeed_smc_realize(DeviceState *dev, Erro= r **errp) * module behind to handle the memory accesses. This depends on * the board configuration. */ - for (i =3D 0; i < s->ctrl->max_slaves; ++i) { + for (i =3D 0; i < s->ctrl->max_devices; ++i) { AspeedSMCFlash *fl =3D &s->flashes[i]; =20 snprintf(name, sizeof(name), "%s.%d", s->ctrl->name, i); --=20 2.26.2 From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1599721310; cv=none; d=zohomail.com; s=zohoarc; b=I0fFfcJ5IH6Ir4LBsbGJ/yhOfu6NMhHhvsskKfkEPu5XUiu9IVfJrTYj2ilkiP67BJYpSv74sNUjHuzw9TxQlHawidbIQO6nndW5O6MwsZxTHgGtq3tK0KQDH3uhbsvuH4WFebvLtY8BuMDeCqvaCcwItkR+CpctWdV17VImKrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721310; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=b0T1TKEFtJudYcKDE1y3V/OeBWNRPWJ4rA6G6tqZdeNwATdBXRKWPHCc8J10F4yPrBJkJ/8DWeKbhotsW+VGRflATG1+CndlLnEfvWVoE93C5C6ogMMVldl2R9e+W+ETYyyxvJA/ZbGsyraUwLdQx1gQkI5wnuR2ClkqOqePZEE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1599721310710442.62876751762576; Thu, 10 Sep 2020 00:01:50 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-G4zk2_s_NxuEoDk3EAXyTg-1; Thu, 10 Sep 2020 03:01:47 -0400 Received: by mail-wr1-f72.google.com with SMTP id f18so1881248wrv.19 for ; Thu, 10 Sep 2020 00:01:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id z7sm7666348wrw.93.2020.09.10.00.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721309; 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=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=JQWqLZgL3+6ESTe9xeUTqFY4cASa0xqGRxoCIQfIrlN0KNrjKBTDNcDbet4UbjYjo1ItYy +H73VTXMVcP3kw8QtzNUupDgzNAcvHNKI+/wTUs00G4f0dS9litjP6wQxPSDO1K3vZ8MS1 Uqo1//1CgV/jUpIZlar93mArkYWxOKA= X-MC-Unique: G4zk2_s_NxuEoDk3EAXyTg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=iYn5IidV9u1TMYM6Kr22qFPJoAjc2uSkzPe8Hc2AELL9GxCSsWPt/JcCsnlw/dArNt 5Q/fHlGki8rvw90hezzhrNhCACEQjuVDYW0w9AC60qbSa9VmigY6o7Wj18hWJc7538H5 BnS6+DloVFBltLu7DJXhP61udCGIlsYLh0gQKdii/5Kx8v02qyOa6bPU1+DYNOcvUPSH eh60/PM3C6LMPF59xU0KFCS4LV0dtsYju/OZzGZjx1X9QJpFS2rIpYpFAPDwqH3Tj6aq 0dTHvtePAy9mRohr+bsVuBKjloMK6kW8bYR8dkuE7ZwDfq7lHeTrcvhhsKqHlKxfTYCC 8aVA== X-Gm-Message-State: AOAM533UHO1L1a/c3VYVsc1k+DvJs/tpKqJFHcmCPGhsn71Orxbyxa8x 2RdCwrtCOntzstTgnHwkZ9gHTr+HLBhlLwWqYHvuhS9R2JFFq9Fm9NT5tlZbI1RgBbXTsCS1UiC OAIkwtZ8dDg0lqA== X-Received: by 2002:a7b:ce17:: with SMTP id m23mr6726956wmc.98.1599721305931; Thu, 10 Sep 2020 00:01:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7BwDX40M9FcvmDDKL7Sv5M5flTDXcgcHzKzgkmRdWZC6SYh+Ne8NxJgQ8zHZWT11W+dNcDQ== X-Received: by 2002:a7b:ce17:: with SMTP id m23mr6726926wmc.98.1599721305563; Thu, 10 Sep 2020 00:01:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/6] hw/core/stream: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:27 +0200 Message-Id: <20200910070131.435543-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename 'slave stream' as 'sink stream'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias --- include/hw/ssi/xilinx_spips.h | 2 +- include/hw/stream.h | 46 +++++++++++++++++------------------ hw/core/stream.c | 20 +++++++-------- hw/dma/xilinx_axidma.c | 32 ++++++++++++------------ hw/net/xilinx_axienet.c | 20 +++++++-------- hw/ssi/xilinx_spips.c | 2 +- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index 6a39b55a7bd..fde8a3ebda6 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -97,7 +97,7 @@ typedef struct { typedef struct { XilinxQSPIPS parent_obj; =20 - StreamSlave *dma; + StreamSink *dma; int gqspi_irqline; =20 uint32_t regs[XLNX_ZYNQMP_SPIPS_R_MAX]; diff --git a/include/hw/stream.h b/include/hw/stream.h index ed09e83683d..8ca161991ca 100644 --- a/include/hw/stream.h +++ b/include/hw/stream.h @@ -3,52 +3,52 @@ =20 #include "qom/object.h" =20 -/* stream slave. Used until qdev provides a generic way. */ -#define TYPE_STREAM_SLAVE "stream-slave" +/* stream sink. Used until qdev provides a generic way. */ +#define TYPE_STREAM_SINK "stream-slave" =20 -#define STREAM_SLAVE_CLASS(klass) \ - OBJECT_CLASS_CHECK(StreamSlaveClass, (klass), TYPE_STREAM_SLAVE) -#define STREAM_SLAVE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(StreamSlaveClass, (obj), TYPE_STREAM_SLAVE) -#define STREAM_SLAVE(obj) \ - INTERFACE_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) +#define STREAM_SINK_CLASS(klass) \ + OBJECT_CLASS_CHECK(StreamSinkClass, (klass), TYPE_STREAM_SINK) +#define STREAM_SINK_GET_CLASS(obj) \ + OBJECT_GET_CLASS(StreamSinkClass, (obj), TYPE_STREAM_SINK) +#define STREAM_SINK(obj) \ + INTERFACE_CHECK(StreamSink, (obj), TYPE_STREAM_SINK) =20 -typedef struct StreamSlave StreamSlave; +typedef struct StreamSink StreamSink; =20 typedef void (*StreamCanPushNotifyFn)(void *opaque); =20 -typedef struct StreamSlaveClass { +typedef struct StreamSinkClass { InterfaceClass parent; /** - * can push - determine if a stream slave is capable of accepting at l= east + * can push - determine if a stream sink is capable of accepting at le= ast * one byte of data. Returns false if cannot accept. If not implemente= d, the - * slave is assumed to always be capable of receiving. - * @notify: Optional callback that the slave will call when the slave = is + * sink is assumed to always be capable of receiving. + * @notify: Optional callback that the sink will call when the sink is * capable of receiving again. Only called if false is returned. * @notify_opaque: opaque data to pass to notify call. */ - bool (*can_push)(StreamSlave *obj, StreamCanPushNotifyFn notify, + bool (*can_push)(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque); /** - * push - push data to a Stream slave. The number of bytes pushed is - * returned. If the slave short returns, the master must wait before t= rying - * again, the slave may continue to just return 0 waiting for the vm t= ime to + * push - push data to a Stream sink. The number of bytes pushed is + * returned. If the sink short returns, the master must wait before tr= ying + * again, the sink may continue to just return 0 waiting for the vm ti= me to * advance. The can_push() function can be used to trap the point in t= ime - * where the slave is ready to receive again, otherwise polling on a Q= EMU + * where the sink is ready to receive again, otherwise polling on a QE= MU * timer will work. - * @obj: Stream slave to push to + * @obj: Stream sink to push to * @buf: Data to write * @len: Maximum number of bytes to write * @eop: End of packet flag */ - size_t (*push)(StreamSlave *obj, unsigned char *buf, size_t len, bool = eop); -} StreamSlaveClass; + size_t (*push)(StreamSink *obj, unsigned char *buf, size_t len, bool e= op); +} StreamSinkClass; =20 size_t -stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop); +stream_push(StreamSink *sink, uint8_t *buf, size_t len, bool eop); =20 bool -stream_can_push(StreamSlave *sink, StreamCanPushNotifyFn notify, +stream_can_push(StreamSink *sink, StreamCanPushNotifyFn notify, void *notify_opaque); =20 =20 diff --git a/hw/core/stream.c b/hw/core/stream.c index a65ad1208d8..19477d0f2df 100644 --- a/hw/core/stream.c +++ b/hw/core/stream.c @@ -3,32 +3,32 @@ #include "qemu/module.h" =20 size_t -stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop) +stream_push(StreamSink *sink, uint8_t *buf, size_t len, bool eop) { - StreamSlaveClass *k =3D STREAM_SLAVE_GET_CLASS(sink); + StreamSinkClass *k =3D STREAM_SINK_GET_CLASS(sink); =20 return k->push(sink, buf, len, eop); } =20 bool -stream_can_push(StreamSlave *sink, StreamCanPushNotifyFn notify, +stream_can_push(StreamSink *sink, StreamCanPushNotifyFn notify, void *notify_opaque) { - StreamSlaveClass *k =3D STREAM_SLAVE_GET_CLASS(sink); + StreamSinkClass *k =3D STREAM_SINK_GET_CLASS(sink); =20 return k->can_push ? k->can_push(sink, notify, notify_opaque) : true; } =20 -static const TypeInfo stream_slave_info =3D { - .name =3D TYPE_STREAM_SLAVE, +static const TypeInfo stream_sink_info =3D { + .name =3D TYPE_STREAM_SINK, .parent =3D TYPE_INTERFACE, - .class_size =3D sizeof(StreamSlaveClass), + .class_size =3D sizeof(StreamSinkClass), }; =20 =20 -static void stream_slave_register_types(void) +static void stream_sink_register_types(void) { - type_register_static(&stream_slave_info); + type_register_static(&stream_sink_info); } =20 -type_init(stream_slave_register_types) +type_init(stream_sink_register_types) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index a4812e480a0..cf12a852ea1 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -131,8 +131,8 @@ struct XilinxAXIDMA { AddressSpace as; =20 uint32_t freqhz; - StreamSlave *tx_data_dev; - StreamSlave *tx_control_dev; + StreamSink *tx_data_dev; + StreamSink *tx_control_dev; XilinxAXIDMAStreamSlave rx_data_dev; XilinxAXIDMAStreamSlave rx_control_dev; =20 @@ -264,8 +264,8 @@ static void stream_complete(struct Stream *s) ptimer_transaction_commit(s->ptimer); } =20 -static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_de= v, - StreamSlave *tx_control_dev) +static void stream_process_mem2s(struct Stream *s, StreamSink *tx_data_dev, + StreamSink *tx_control_dev) { uint32_t prev_d; uint32_t txlen; @@ -387,7 +387,7 @@ static void xilinx_axidma_reset(DeviceState *dev) } =20 static size_t -xilinx_axidma_control_stream_push(StreamSlave *obj, unsigned char *buf, +xilinx_axidma_control_stream_push(StreamSink *obj, unsigned char *buf, size_t len, bool eop) { XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); @@ -403,7 +403,7 @@ xilinx_axidma_control_stream_push(StreamSlave *obj, uns= igned char *buf, } =20 static bool -xilinx_axidma_data_stream_can_push(StreamSlave *obj, +xilinx_axidma_data_stream_can_push(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque) { @@ -420,7 +420,7 @@ xilinx_axidma_data_stream_can_push(StreamSlave *obj, } =20 static size_t -xilinx_axidma_data_stream_push(StreamSlave *obj, unsigned char *buf, size_= t len, +xilinx_axidma_data_stream_push(StreamSink *obj, unsigned char *buf, size_t= len, bool eop) { XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); @@ -591,9 +591,9 @@ static void xilinx_axidma_init(Object *obj) static Property axidma_properties[] =3D { DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA, - tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_data_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA, - tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_control_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -606,21 +606,21 @@ static void axidma_class_init(ObjectClass *klass, voi= d *data) device_class_set_props(dc, axidma_properties); } =20 -static StreamSlaveClass xilinx_axidma_data_stream_class =3D { +static StreamSinkClass xilinx_axidma_data_stream_class =3D { .push =3D xilinx_axidma_data_stream_push, .can_push =3D xilinx_axidma_data_stream_can_push, }; =20 -static StreamSlaveClass xilinx_axidma_control_stream_class =3D { +static StreamSinkClass xilinx_axidma_control_stream_class =3D { .push =3D xilinx_axidma_control_stream_push, }; =20 static void xilinx_axidma_stream_class_init(ObjectClass *klass, void *data) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 - ssc->push =3D ((StreamSlaveClass *)data)->push; - ssc->can_push =3D ((StreamSlaveClass *)data)->can_push; + ssc->push =3D ((StreamSinkClass *)data)->push; + ssc->can_push =3D ((StreamSinkClass *)data)->can_push; } =20 static const TypeInfo axidma_info =3D { @@ -638,7 +638,7 @@ static const TypeInfo xilinx_axidma_data_stream_info = =3D { .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_data_stream_class, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; @@ -650,7 +650,7 @@ static const TypeInfo xilinx_axidma_control_stream_info= =3D { .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_control_stream_class, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 2e89f236b4a..0c4ac727207 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -323,8 +323,8 @@ struct XilinxAXIEnet { SysBusDevice busdev; MemoryRegion iomem; qemu_irq irq; - StreamSlave *tx_data_dev; - StreamSlave *tx_control_dev; + StreamSink *tx_data_dev; + StreamSink *tx_control_dev; XilinxAXIEnetStreamSlave rx_data_dev; XilinxAXIEnetStreamSlave rx_control_dev; NICState *nic; @@ -855,7 +855,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t= *buf, size_t size) } =20 static size_t -xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t = len, +xilinx_axienet_control_stream_push(StreamSink *obj, uint8_t *buf, size_t l= en, bool eop) { int i; @@ -877,7 +877,7 @@ xilinx_axienet_control_stream_push(StreamSlave *obj, ui= nt8_t *buf, size_t len, } =20 static size_t -xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t siz= e, +xilinx_axienet_data_stream_push(StreamSink *obj, uint8_t *buf, size_t size, bool eop) { XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); @@ -1005,9 +1005,9 @@ static Property xilinx_enet_properties[] =3D { DEFINE_PROP_UINT32("txmem", XilinxAXIEnet, c_txmem, 0x1000), DEFINE_NIC_PROPERTIES(XilinxAXIEnet, conf), DEFINE_PROP_LINK("axistream-connected", XilinxAXIEnet, - tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_data_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIEnet, - tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_control_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1023,14 +1023,14 @@ static void xilinx_enet_class_init(ObjectClass *kla= ss, void *data) static void xilinx_enet_control_stream_class_init(ObjectClass *klass, void *data) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 ssc->push =3D xilinx_axienet_control_stream_push; } =20 static void xilinx_enet_data_stream_class_init(ObjectClass *klass, void *d= ata) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 ssc->push =3D xilinx_axienet_data_stream_push; } @@ -1049,7 +1049,7 @@ static const TypeInfo xilinx_enet_data_stream_info = =3D { .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), .class_init =3D xilinx_enet_data_stream_class_init, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; @@ -1060,7 +1060,7 @@ static const TypeInfo xilinx_enet_control_stream_info= =3D { .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), .class_init =3D xilinx_enet_control_stream_class_init, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b9371dbf8d7..6109ba55107 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1353,7 +1353,7 @@ static void xlnx_zynqmp_qspips_init(Object *obj) { XlnxZynqMPQSPIPS *rq =3D XLNX_ZYNQMP_QSPIPS(obj); =20 - object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SLAV= E, + object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SINK, (Object **)&rq->dma, object_property_allow_set_link, OBJ_PROP_LINK_STRONG); --=20 2.26.2 From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1599721317; cv=none; d=zohomail.com; s=zohoarc; b=JvxIjKh2mqeRTRDfBrC0mtQofX+JEC3T23qBrneagI20DoLMnt5xoalt+GZSvJHaJhY+7MZGkMyVl3XYQ8xmGEgJc77ZkawOt0oHsGLghGYQHCpr/5bkT9//zSa9IukO9/oabQ/ezmYd7eLpOnDyNcitLP6BEpuFOk6Giac7akc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=PkMw+hhNfixvMBCMG6+deNzxlo4/Zg7wgblcm2kdCOCRZOKnkz1L02RwvFT2tERSbaBj9G5dc231f9BlVikZrvR2WVK13e/U6KiuEYfvsQXY4795EQsD+FtauR5EGXVaPrpIbcD6UWRB25zer4QuJAwIRUWizvxE3aHJn6o+6Xg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1599721317670421.30471259172236; Thu, 10 Sep 2020 00:01:57 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-b-kN3cc7Nvm83rdRht-mlw-1; Thu, 10 Sep 2020 03:01:52 -0400 Received: by mail-wm1-f69.google.com with SMTP id g79so551615wmg.0 for ; Thu, 10 Sep 2020 00:01:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id n21sm2230672wmi.21.2020.09.10.00.01.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721316; 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=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=TrxS+4zHj3gLTE/lhdybqFzS3xouImV4qx1j3MwfOV3UPiQCjENZS0S3YXXOZb+ZGY4w2S dHfQPXyrnMFVCzDa9Tc2krC7C9j4Mo6siiJm5FNjXZBUEf+DW94mFxWq2ANqqlWQUs4d4s M6A2eYe1PouvXuPNB3Nw1sffLCLccdY= X-MC-Unique: b-kN3cc7Nvm83rdRht-mlw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=gOVcZGigW9sjkDLyZTcJ2P9qV1jud3ASQsAwhjsRcPGmJe7aWV/d+z1BPr/SQUAe1r vh9I7dYIeZU6jMCWjsoU7n58dEvujKJmVnX2eLhz4Df0/cUT+8vc2+RViCTXFFRlcoNR acP6DJ63rv8CS8+b8/uh4Lh7mGSEuBHw4CneXizVreYcbov0W2Az+Wm3bgdOU2/K+RV0 0ZSAugf/tdd7e5Ax8d4VCUvBeXcSwJsvcxFPbHVsfZavGpmKaQYJPdxD4VR6D1Xs/cnY XssVTJC5FwyUTjZYYpxt2WDsUfFUvgtVMgG0HXY4LCbfmJ3MlgZbBl/Wt0Y7mMTbPAyM NtiA== X-Gm-Message-State: AOAM533mtqz8SSZo2AN3OTlci/cv38xz6AzJJdeJwwfaruIjc80vjbOY UnBh1SGQrQlPXqu9ANLIrolLiv7MvWZY7vRDw6y8OO9nA6al3UMIem97w6pZ2o5epdb9bwWcuWE TcXtMC9+Qv+PbBw== X-Received: by 2002:a5d:4ccb:: with SMTP id c11mr7278671wrt.159.1599721311426; Thu, 10 Sep 2020 00:01:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8i7cmKf45V5kbz2l0XObKJh2WEGqkHysM6c4v7BhvhCTsiOpA+VO+/qwWJnvJcR5KLi5V/A== X-Received: by 2002:a5d:4ccb:: with SMTP id c11mr7278646wrt.159.1599721311241; Thu, 10 Sep 2020 00:01:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/6] hw/dma/xilinx_axidma: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:28 +0200 Message-Id: <20200910070131.435543-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename 'slave stream' as 'sink stream'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias --- hw/dma/xilinx_axidma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index cf12a852ea1..19e14a2997e 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -46,11 +46,11 @@ OBJECT_CHECK(XilinxAXIDMA, (obj), TYPE_XILINX_AXI_DMA) =20 #define XILINX_AXI_DMA_DATA_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIDMAStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIDMAStreamSink, (obj),\ TYPE_XILINX_AXI_DMA_DATA_STREAM) =20 #define XILINX_AXI_DMA_CONTROL_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIDMAStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIDMAStreamSink, (obj),\ TYPE_XILINX_AXI_DMA_CONTROL_STREAM) =20 #define R_DMACR (0x00 / 4) @@ -63,7 +63,7 @@ #define CONTROL_PAYLOAD_SIZE (CONTROL_PAYLOAD_WORDS * (sizeof(uint32_t))) =20 typedef struct XilinxAXIDMA XilinxAXIDMA; -typedef struct XilinxAXIDMAStreamSlave XilinxAXIDMAStreamSlave; +typedef struct XilinxAXIDMAStreamSink XilinxAXIDMAStreamSink; =20 enum { DMACR_RUNSTOP =3D 1, @@ -118,7 +118,7 @@ struct Stream { unsigned char txbuf[16 * 1024]; }; =20 -struct XilinxAXIDMAStreamSlave { +struct XilinxAXIDMAStreamSink { Object parent; =20 struct XilinxAXIDMA *dma; @@ -133,8 +133,8 @@ struct XilinxAXIDMA { uint32_t freqhz; StreamSink *tx_data_dev; StreamSink *tx_control_dev; - XilinxAXIDMAStreamSlave rx_data_dev; - XilinxAXIDMAStreamSlave rx_control_dev; + XilinxAXIDMAStreamSink rx_data_dev; + XilinxAXIDMAStreamSink rx_control_dev; =20 struct Stream streams[2]; =20 @@ -390,7 +390,7 @@ static size_t xilinx_axidma_control_stream_push(StreamSink *obj, unsigned char *buf, size_t len, bool eop) { - XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); + XilinxAXIDMAStreamSink *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); struct Stream *s =3D &cs->dma->streams[1]; =20 if (len !=3D CONTROL_PAYLOAD_SIZE) { @@ -407,7 +407,7 @@ xilinx_axidma_data_stream_can_push(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque) { - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s =3D &ds->dma->streams[1]; =20 if (!stream_running(s) || stream_idle(s)) { @@ -423,7 +423,7 @@ static size_t xilinx_axidma_data_stream_push(StreamSink *obj, unsigned char *buf, size_t= len, bool eop) { - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s =3D &ds->dma->streams[1]; size_t ret; =20 @@ -534,8 +534,8 @@ static const MemoryRegionOps axidma_ops =3D { static void xilinx_axidma_realize(DeviceState *dev, Error **errp) { XilinxAXIDMA *s =3D XILINX_AXI_DMA(dev); - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(&s->rx_data= _dev); - XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM( + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(&s->rx_data_= dev); + XilinxAXIDMAStreamSink *cs =3D XILINX_AXI_DMA_CONTROL_STREAM( &s->rx_control= _dev); int i; =20 @@ -634,7 +634,7 @@ static const TypeInfo axidma_info =3D { static const TypeInfo xilinx_axidma_data_stream_info =3D { .name =3D TYPE_XILINX_AXI_DMA_DATA_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIDMAStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIDMAStreamSink), .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_data_stream_class, .interfaces =3D (InterfaceInfo[]) { @@ -646,7 +646,7 @@ static const TypeInfo xilinx_axidma_data_stream_info = =3D { static const TypeInfo xilinx_axidma_control_stream_info =3D { .name =3D TYPE_XILINX_AXI_DMA_CONTROL_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIDMAStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIDMAStreamSink), .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_control_stream_class, .interfaces =3D (InterfaceInfo[]) { --=20 2.26.2 From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1599721322; cv=none; d=zohomail.com; s=zohoarc; b=foDgxzVmUL3Sgjvh6+QJ3N864Jaz/C0E3llQMSSXjUXeTbzvR2M8UKUrQeuzKpTEwjDNj6T1eVeA65GCuo70ORERdWto5dPJPPWrsgMKDyy/Otk08Khplccfm8qDmRTFknhPdlPO6GqoXMdp8ZcYpX4akjKGjUAOonWezHN6ve0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=J5wW7hkPUaXzTCdVuOiLBRmlEJJqH/qTOhkNbpDnRl8f9W7rN5as9twT9zOuqUihRurwu0e9yxNCt68LdE3KCHdX0R4cDdDc8+L6Xi7omtAR4XpmiJcoPDOLqOTzSE4TDvjYZOts5iHA5tXnC3Bzpit47hUUwEsPGXgYddM6Qn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1599721322663518.0907913580606; Thu, 10 Sep 2020 00:02:02 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-A4jhG-KBMleGG28cHWjqDA-1; Thu, 10 Sep 2020 03:01:58 -0400 Received: by mail-wr1-f71.google.com with SMTP id v12so1889020wrm.9 for ; Thu, 10 Sep 2020 00:01:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id f6sm2615123wme.32.2020.09.10.00.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721321; 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=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=E8HoDR1xakX1Zi/Tk+P3apWt62fnF/8LzuoaQLhUiPQ1/RxXFiBa6luEkKGd23xnMyXszt Qv+xkCpyOiGeFUl7T4zO7XhVARYPNJfltRxIeHJbxdRQksLPZCKmigCWh+pniBgnGJuvQt r0hKNROiRD1A8NtlT0pPKCCq/bk0dzo= X-MC-Unique: A4jhG-KBMleGG28cHWjqDA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=no+nB7WdEGLmu0KnfRxWiciHzfOpW5vvVqpeNzjz3eWwO9BnGsHQX7ny3Nn70M681W mx0vNxSlOK3aVllT7DfzY1fhKP8I9n8nBxJvslHrxVRfQ+iGcMjjsWtdPc4VFH8kjevP y8XrpWotFXhn63Er0J1tW+VSh/cWk69jHfb1FYYljtKjhWh/lPYH9PMyXzDokdsSIsfo euFLEyNhyfDmzAboiWHhisroaQQdhcmGTOWWP0DN4d6naF76DCa/ZII1XYCtgHQAskPl iwxQO6AEku2UX64hXz3Lxra11JkBUEft6u8UbT3Bjdp/3lF2RFlzcidDmJtVRBdw6fQO Mvqw== X-Gm-Message-State: AOAM532Ws93Lsuj8zsc45qnHVRn5cSb6LkAaEWrew1j3jNF8x0C3OmZ3 L6Bo/OXQ8H5pnQTRveovKAIoZnKBze8c5lw+hpCe9ZTFbwOh0Z5yy35zv9sZr1zNr6raFvGM4Xi yFpoOT/6B7brKyA== X-Received: by 2002:adf:e852:: with SMTP id d18mr8003813wrn.40.1599721316984; Thu, 10 Sep 2020 00:01:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlwpG0tUUcWG7cYI6DeHX0M5TDMJpNZQcQfEC1vqrWrbjug/Hj3GDkPn1UBSppzX4Ol1mWhw== X-Received: by 2002:adf:e852:: with SMTP id d18mr8003791wrn.40.1599721316799; Thu, 10 Sep 2020 00:01:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/6] hw/net/xilinx_axienet: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:29 +0200 Message-Id: <20200910070131.435543-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename 'slave stream' as 'sink stream'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias --- hw/net/xilinx_axienet.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 0c4ac727207..4e48535f373 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -46,11 +46,11 @@ OBJECT_CHECK(XilinxAXIEnet, (obj), TYPE_XILINX_AXI_ENET) =20 #define XILINX_AXI_ENET_DATA_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIEnetStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIEnetStreamSink, (obj),\ TYPE_XILINX_AXI_ENET_DATA_STREAM) =20 #define XILINX_AXI_ENET_CONTROL_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIEnetStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIEnetStreamSink, (obj),\ TYPE_XILINX_AXI_ENET_CONTROL_STREAM) =20 /* Advertisement control register. */ @@ -310,10 +310,10 @@ struct TEMAC { void *parent; }; =20 -typedef struct XilinxAXIEnetStreamSlave XilinxAXIEnetStreamSlave; +typedef struct XilinxAXIEnetStreamSink XilinxAXIEnetStreamSink; typedef struct XilinxAXIEnet XilinxAXIEnet; =20 -struct XilinxAXIEnetStreamSlave { +struct XilinxAXIEnetStreamSink { Object parent; =20 struct XilinxAXIEnet *enet; @@ -325,8 +325,8 @@ struct XilinxAXIEnet { qemu_irq irq; StreamSink *tx_data_dev; StreamSink *tx_control_dev; - XilinxAXIEnetStreamSlave rx_data_dev; - XilinxAXIEnetStreamSlave rx_control_dev; + XilinxAXIEnetStreamSink rx_data_dev; + XilinxAXIEnetStreamSink rx_control_dev; NICState *nic; NICConf conf; =20 @@ -859,7 +859,7 @@ xilinx_axienet_control_stream_push(StreamSink *obj, uin= t8_t *buf, size_t len, bool eop) { int i; - XilinxAXIEnetStreamSlave *cs =3D XILINX_AXI_ENET_CONTROL_STREAM(obj); + XilinxAXIEnetStreamSink *cs =3D XILINX_AXI_ENET_CONTROL_STREAM(obj); XilinxAXIEnet *s =3D cs->enet; =20 assert(eop); @@ -880,7 +880,7 @@ static size_t xilinx_axienet_data_stream_push(StreamSink *obj, uint8_t *buf, size_t size, bool eop) { - XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); + XilinxAXIEnetStreamSink *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); XilinxAXIEnet *s =3D ds->enet; =20 /* TX enable ? */ @@ -954,8 +954,8 @@ static NetClientInfo net_xilinx_enet_info =3D { static void xilinx_enet_realize(DeviceState *dev, Error **errp) { XilinxAXIEnet *s =3D XILINX_AXI_ENET(dev); - XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(&s->rx_da= ta_dev); - XilinxAXIEnetStreamSlave *cs =3D XILINX_AXI_ENET_CONTROL_STREAM( + XilinxAXIEnetStreamSink *ds =3D XILINX_AXI_ENET_DATA_STREAM(&s->rx_dat= a_dev); + XilinxAXIEnetStreamSink *cs =3D XILINX_AXI_ENET_CONTROL_STREAM( &s->rx_control= _dev); =20 object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet", @@ -1046,7 +1046,7 @@ static const TypeInfo xilinx_enet_info =3D { static const TypeInfo xilinx_enet_data_stream_info =3D { .name =3D TYPE_XILINX_AXI_ENET_DATA_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIEnetStreamSink), .class_init =3D xilinx_enet_data_stream_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_STREAM_SINK }, @@ -1057,7 +1057,7 @@ static const TypeInfo xilinx_enet_data_stream_info = =3D { static const TypeInfo xilinx_enet_control_stream_info =3D { .name =3D TYPE_XILINX_AXI_ENET_CONTROL_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIEnetStreamSink), .class_init =3D xilinx_enet_control_stream_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_STREAM_SINK }, --=20 2.26.2 From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1599721344; cv=none; d=zohomail.com; s=zohoarc; b=SYpf5648zxVzqsgXKgTLHc2vbnPmcBgvq3EJUp5/T040W3t9/2+vhxVX/XIYxq/gd4hwgghjeFMCulC6jp+ySfnag18GQPYKfnoJT7n305SZJHOSE8BqZgymFa0xCJUEt+3oB6MsmswG+gX8Rh2wQy9HAZE3rSKx22mq8TEw4gA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721344; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=O4TiFU/E5h3g7pzVC+3Y38BqYPnJSqtGxVteMoOcLyc=; b=mNup8R5Q7gvPLoytrDbCeAtFuWVm8Skj7GyFGpcmTQdwKvv03UEPn6ESnMjSROpsGJ8/TBywJKvU9BHy7BhkgLB7Y3DoF+KXolNrzigPEuHCRsyh9D7YQypLkoLaqSQ2x7oSyZEBlTFZa9AtKW+jcG4OpIhzeEaS/K9WpSpGQyM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1599721344889110.82790818024705; Thu, 10 Sep 2020 00:02:24 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-z5zsFtC3ODyJ2UfUM5Ebmw-1; Thu, 10 Sep 2020 03:02:03 -0400 Received: by mail-wm1-f72.google.com with SMTP id x6so1297411wmb.6 for ; Thu, 10 Sep 2020 00:02:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id z15sm7347660wrv.94.2020.09.10.00.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721343; 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=O4TiFU/E5h3g7pzVC+3Y38BqYPnJSqtGxVteMoOcLyc=; b=BMhgYCnGueU4TWXiP7TzNKk2Vt5NSV2dFlXsOVRORIvjhO1JPSf9kpbRzigW3nAZYSZ+N/ 7vpSGmxaNmo9RfC13IrvFrBF0GEjXXMLErvlo+uPmOajOmCZW/BMb/vPstampZKKhAkSpK HVHii1rNly8IMrxyA531Uzd3WXIb1ps= X-MC-Unique: z5zsFtC3ODyJ2UfUM5Ebmw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O4TiFU/E5h3g7pzVC+3Y38BqYPnJSqtGxVteMoOcLyc=; b=sZX7r3ACEx23MY+PlUtHe+K8F3ZdZ4ai5Ff+9ipBPymYx497EtGvrpYz/P0Hf6Dcgx rccF1G8F46yUa8TxKbXMyIqHmoWPzt4POoDfwarkwXJdrbL8XQ9L05cbfG/VqIYiGagp /dRZA0YWh/gC/Cb/x1oJpTz6Ga6mjhqrB60pDVRRPaw4VfTS3B823oHJIv8eSmDq6br4 9wbS79lHRGwO5lwfj+iNYnXXfoRvreBw+5hijlC6eJRtUMSozoJbTVTlC423Syrmy+BE UIrVrTVYz24/hUR6U20gbcXIKG3ijqvJb/VfazFeYiF7opRJynYrFfyEGJHe4ak5s3Qp T+4Q== X-Gm-Message-State: AOAM533zwTaViuuux6JIPnWEKte3PWTJdhi47Zz4oAI9CrorZMrmSDNG Eqv9ZFVndmSxcHY6xSVsfI5+qH5z9MZ0sIKKL5pmA7B8hqdnL29cKZ6KAffVqSN448DRq2bUmS8 cdPtASkdXrkuq/g== X-Received: by 2002:a1c:c256:: with SMTP id s83mr7016235wmf.93.1599721322687; Thu, 10 Sep 2020 00:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRCTkH+/DmTsf56gy1ymOQ2OzxrWvy46F4cviEpju4FPjr5Ind5bZnv+UsKffp56Gc1+5NYw== X-Received: by 2002:a1c:c256:: with SMTP id s83mr7016210wmf.93.1599721322497; Thu, 10 Sep 2020 00:02:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/6] hw/pci-host/q35: Rename PCI 'black hole as '(memory) hole' Date: Thu, 10 Sep 2020 09:01:30 +0200 Message-Id: <20200910070131.435543-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename "blackhole" as "(memory)hole". Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/q35.h | 4 ++-- hw/pci-host/q35.c | 38 +++++++++++++++++++------------------- tests/qtest/q35-test.c | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 070305f83df..0fb90aca18b 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -48,8 +48,8 @@ typedef struct MCHPCIState { PAMMemoryRegion pam_regions[13]; MemoryRegion smram_region, open_high_smram; MemoryRegion smram, low_smram, high_smram; - MemoryRegion tseg_blackhole, tseg_window; - MemoryRegion smbase_blackhole, smbase_window; + MemoryRegion tseg_hole, tseg_window; + MemoryRegion smbase_hole, smbase_window; bool has_smram_at_smbase; Range pci_hole; uint64_t below_4g_mem_size; diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index b67cb9c29f8..21f58ccfa28 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -266,20 +266,20 @@ static const TypeInfo q35_host_info =3D { * MCH D0:F0 */ =20 -static uint64_t blackhole_read(void *ptr, hwaddr reg, unsigned size) +static uint64_t memoryhole_read(void *ptr, hwaddr reg, unsigned size) { return 0xffffffff; } =20 -static void blackhole_write(void *opaque, hwaddr addr, uint64_t val, +static void memoryhole_write(void *opaque, hwaddr addr, uint64_t val, unsigned width) { /* nothing */ } =20 -static const MemoryRegionOps blackhole_ops =3D { - .read =3D blackhole_read, - .write =3D blackhole_write, +static const MemoryRegionOps memoryhole_ops =3D { + .read =3D memoryhole_read, + .write =3D memoryhole_write, .endianness =3D DEVICE_NATIVE_ENDIAN, .valid.min_access_size =3D 1, .valid.max_access_size =3D 4, @@ -393,12 +393,12 @@ static void mch_update_smram(MCHPCIState *mch) } else { tseg_size =3D 0; } - memory_region_del_subregion(mch->system_memory, &mch->tseg_blackhole); - memory_region_set_enabled(&mch->tseg_blackhole, tseg_size); - memory_region_set_size(&mch->tseg_blackhole, tseg_size); + memory_region_del_subregion(mch->system_memory, &mch->tseg_hole); + memory_region_set_enabled(&mch->tseg_hole, tseg_size); + memory_region_set_size(&mch->tseg_hole, tseg_size); memory_region_add_subregion_overlap(mch->system_memory, mch->below_4g_mem_size - tseg_size, - &mch->tseg_blackhole, 1); + &mch->tseg_hole, 1); =20 memory_region_set_enabled(&mch->tseg_window, tseg_size); memory_region_set_size(&mch->tseg_window, tseg_size); @@ -456,7 +456,7 @@ static void mch_update_smbase_smram(MCHPCIState *mch) } else { lck =3D false; } - memory_region_set_enabled(&mch->smbase_blackhole, lck); + memory_region_set_enabled(&mch->smbase_hole, lck); memory_region_set_enabled(&mch->smbase_window, lck); memory_region_transaction_commit(); } @@ -601,13 +601,13 @@ static void mch_realize(PCIDevice *d, Error **errp) memory_region_set_enabled(&mch->high_smram, true); memory_region_add_subregion(&mch->smram, 0xfeda0000, &mch->high_smram); =20 - memory_region_init_io(&mch->tseg_blackhole, OBJECT(mch), - &blackhole_ops, NULL, - "tseg-blackhole", 0); - memory_region_set_enabled(&mch->tseg_blackhole, false); + memory_region_init_io(&mch->tseg_hole, OBJECT(mch), + &memoryhole_ops, NULL, + "tseg-hole", 0); + memory_region_set_enabled(&mch->tseg_hole, false); memory_region_add_subregion_overlap(mch->system_memory, mch->below_4g_mem_size, - &mch->tseg_blackhole, 1); + &mch->tseg_hole, 1); =20 memory_region_init_alias(&mch->tseg_window, OBJECT(mch), "tseg-window", mch->ram_memory, mch->below_4g_mem_size, 0); @@ -619,13 +619,13 @@ static void mch_realize(PCIDevice *d, Error **errp) * This is not what hardware does, so it's QEMU specific hack. * See commit message for details. */ - memory_region_init_io(&mch->smbase_blackhole, OBJECT(mch), &blackhole_= ops, - NULL, "smbase-blackhole", + memory_region_init_io(&mch->smbase_hole, OBJECT(mch), &memoryhole_ops, + NULL, "smbase-hole", MCH_HOST_BRIDGE_SMBASE_SIZE); - memory_region_set_enabled(&mch->smbase_blackhole, false); + memory_region_set_enabled(&mch->smbase_hole, false); memory_region_add_subregion_overlap(mch->system_memory, MCH_HOST_BRIDGE_SMBASE_ADDR, - &mch->smbase_blackhole, 1); + &mch->smbase_hole, 1); =20 memory_region_init_alias(&mch->smbase_window, OBJECT(mch), "smbase-window", mch->ram_memory, diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c index b7cf1449906..7cddd0a7f61 100644 --- a/tests/qtest/q35-test.c +++ b/tests/qtest/q35-test.c @@ -231,7 +231,7 @@ static void test_smram_smbase_lock(void) qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i); g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) =3D= =3D 0x02); =20 - /* RAM access should go into black hole */ + /* RAM access should go into memory hole */ qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN); g_assert_cmpint(qtest_readb(qts, SMBASE), =3D=3D, 0xff); } --=20 2.26.2 From nobody Sun May 5 16:55:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1599721334; cv=none; d=zohomail.com; s=zohoarc; b=U/Mtg2eplly7AFVr0q+9mqJC+qMJQTxCBWvZtFe+o1IQsTvMsnvNOzguFmwfMVmcqwkLnqL/drDyPjiaQ2Q2CoGxGOjTaGYF0WEZTfKOOd7Ee+J42QB+oemdLIAbbv9aWPdUWw08OgJ6B9hKHwLCjVjJ0Z95he5TH2OKG4Veo2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=lGs5ABKm8y9Jc/D3T2fzKVj+EYzhUQk9uXM+DI2xiY8=; b=LABw7wcAvgtzt7D9JuREgkxP8ZtRuYYN4BFWuY/oXqqgavRy6+z702RQ8L35qgIxtQ+Hbh/uXvqm0KQ77WxHM3o/VIpanLaBXf3DrlgGN1xZ2rD+qpzSx8Vt9PjRFDe2cxG0Pa+1uV5QBEA7hYgQX5tNJ8WI1+Va/R2XZy4arH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1599721334516650.0355471574022; Thu, 10 Sep 2020 00:02:14 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-4ooZalg-MYK-36m_5Uq-0w-1; Thu, 10 Sep 2020 03:02:09 -0400 Received: by mail-wr1-f71.google.com with SMTP id v12so1889211wrm.9 for ; Thu, 10 Sep 2020 00:02:08 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id m185sm2221410wmf.5.2020.09.10.00.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721333; 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=lGs5ABKm8y9Jc/D3T2fzKVj+EYzhUQk9uXM+DI2xiY8=; b=e2PkHEo93uOKXntqt7yzCppa9vPoqPKBAUJ7iJfeL7IpSBxRSzjCW0TCc5H78HDGU63B+a PZUA9JkVd8AKnaAQuS8UVjsJMLToplK6dBvwxQaw9xXvv2LRo6IuzhnpdtRWygr3tQXsyL tEJrQ8orJolzLtPYEqjqyWMCK0HvwzA= X-MC-Unique: 4ooZalg-MYK-36m_5Uq-0w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lGs5ABKm8y9Jc/D3T2fzKVj+EYzhUQk9uXM+DI2xiY8=; b=lJbKYdour0Cl3Sz/RoH6AcRmqdpWUnf65Ky6JGkVCLZhLPzuBC4F/SiNptNcTzd7lb 0aOWZCGnKyf3E3NN+Vl26sTrOufhkqgn94eBrBwXa+C+C/2LrqmaaajOAbcs0Vr4QF42 nKfR9jwcXBJANNrg5thr7x508n75TX+a92zMtYFg4ZXWXyKzSMFgtlB5Si1bST7e/NNs JcwjkYI423lfhyXrFeCJfDSDEi7xFCgaSqrpdTlCOn+YCbyJEWQ3gi/dGLTItqsd6obU A6ouS+0MbWWuRO0GlXNL4Pb1QyicSnv675RVTipnOoeWwOOWiq2WFrLkYybyF56FzbbK gm1A== X-Gm-Message-State: AOAM530p4Ql8WxUrwk9/RhgS1zjqBcxNSnqRu6sPOfLmgkq3hydj3WjZ mw1Nub76yglCAavRU4KOsGcBJN7+oaPUcaz3y2oupsPRbwVdR9l5AjG1mhZUXsQZ+PDH78ARw2k 5qCXuXOfY4Cwb5Q== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr6890991wma.111.1599721328156; Thu, 10 Sep 2020 00:02:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwE0Z695VXU3e9M0JVMx/m5jixlhhfySuGaTkiZxpc9kM9WGt9z1mdGK0NlEetghntMunzOLg== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr6890972wma.111.1599721327946; Thu, 10 Sep 2020 00:02:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/6] target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() Date: Thu, 10 Sep 2020 09:01:31 +0200 Message-Id: <20200910070131.435543-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename host_tsx_blacklisted() as host_tsx_broken(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Thomas Huth --- target/i386/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 205b68bc0ce..3d640a8decf 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -302,7 +302,7 @@ static int get_para_features(KVMState *s) return features; } =20 -static bool host_tsx_blacklisted(void) +static bool host_tsx_broken(void) { int family, model, stepping;\ char vendor[CPUID_VENDOR_SZ + 1]; @@ -408,7 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint= 32_t function, } else if (function =3D=3D 6 && reg =3D=3D R_EAX) { ret |=3D CPUID_6_EAX_ARAT; /* safe to allow because of emulated AP= IC */ } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EBX) { - if (host_tsx_blacklisted()) { + if (host_tsx_broken()) { ret &=3D ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); } } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EDX) { --=20 2.26.2