From nobody Tue May 7 14:39:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1606211390; cv=none; d=zohomail.com; s=zohoarc; b=h8pUkd+VljrJEhm9pjvBEcea59ACBTKDGMJ5lyzgpKMKwCbe6JVIngvczkvFFUWoxf+UT+uVYI7S1mYgdeX6mcSya5LOiwT28lwcYYn8xeyh3E/8MIQJ6bhb+FAeH9Fl23czyl/oubO+FvicHArUz6ONhs4dPCxesz13bRFoir0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606211390; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2fdT5nSgJj6P22RjOGpymEVG7wA8ueQZ3y7adF/mr7A=; b=F0aT9UI6E2TERvld0bjLZiCA9gfuQYppmOJex61JlNwwsd8vkWMUS9/3RYRLT+bEYdRhME6113bD1ZuvJlsGDFuCVZDHqsBuveULsNQRbxOvvRVSzcGJYmgaWi7aSx2DPL7M8nXWOhvMyic7ka5hWLHR1FNCNISy0I3NgfVRPR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1606211390670239.62246656888533; Tue, 24 Nov 2020 01:49:50 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id 1so2175115wme.3 for ; Tue, 24 Nov 2020 01:49:50 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id x4sm9715261wrv.81.2020.11.24.01.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 01:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2fdT5nSgJj6P22RjOGpymEVG7wA8ueQZ3y7adF/mr7A=; b=E9Uefg39cmAPFf7QKShS91lgKQoeTqGMGm5QOJwHgkKjDKXD+M62fer5hPbHg5hyGq mmir6S1KQr5JguByQTtKxYBTvumaVoGlkLyIYsnisp1dG+DV7v6FnF9DSqCQi23PE/rs sK8V10t4H9WxDPZ943VbmXeBelejOUC5z0SP/SdY2KfWyXpecnkk7gNI3hJ9yUQan35f vRzGaMpZt15X0j6QPtWNibb5Mfm6Z73eB/TaUGTLmGQxI+JLiPmq+4adfF1bh3udCYxi Osk7KsEH9DznRHP4HJvjMfJbntpcsYcTT81KKDRK+7+udMl47x9DvZNhp7zLunO6n1Mu n3bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2fdT5nSgJj6P22RjOGpymEVG7wA8ueQZ3y7adF/mr7A=; b=fwsg7aOUAI/8CpMp05Fi9PYcpx2fNUwhntFEQj0xvQzqeaBU8wK5VZCMkRzI56jmOo DpLJYwcGlpbrdhn87nzFiuC7+m4rLHhRdYLOpzYlsKXCqokZLkgUZgtPcZgqZxtx9EXP X1Hbz6sKm1w4qAoy8x6F3PAj79BBeQTdRwmJSBtpsJOw/6ckmL1WXpFIeehzJgfwJgqT Eq028LE57OyDY1UuBi33uHOuPnTbgWOdwJCfLoQMjN+pPknNfW8sacqhACseuuM78Vxn FAChlJWLjnkmuzF2e03bQu3I5bxRzcaiW74rts44u0392qv3VRYhpfDywL4Dklb31eKW dknQ== X-Gm-Message-State: AOAM5314VGnOM0iD2IARxE+1XHCzdVg2wAHpOy3LU3Sjjdb0MesLQSwi +HlBIl+gNNzRCOI+jThdrWI= X-Google-Smtp-Source: ABdhPJwUNgD+gzGd97T2fSsGiXnfjDdy1XOrf94pC2Eg14ZCVTUGqQZOSxBERHi+xgbI11PbNlbj/w== X-Received: by 2002:a7b:cd99:: with SMTP id y25mr3447646wmj.128.1606211388683; Tue, 24 Nov 2020 01:49:48 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , Igor Mitsyanko , qemu-arm@nongnu.org, Jean-Christophe Dubois , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Aghaian Subject: [PATCH-for-5.2? 1/4] hw/arm/fsl-imx: Add SD bus QOM alias on the SoC Date: Tue, 24 Nov 2020 10:49:38 +0100 Message-Id: <20201124094941.485767-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201124094941.485767-1-f4bug@amsat.org> References: <20201124094941.485767-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to select a particular SD bus from the command line, add a QOM alias on the SoC (using an unique name). Buglink: https://bugs.launchpad.net/qemu/+bug/1895895 Reported-by: David Aghaian Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/fsl-imx25.c | 6 ++++++ hw/arm/fsl-imx6.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 08a98f828fc..6e66ae742af 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -239,6 +239,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error *= *errp) { FSL_IMX25_ESDHC1_ADDR, FSL_IMX25_ESDHC1_IRQ }, { FSL_IMX25_ESDHC2_ADDR, FSL_IMX25_ESDHC2_IRQ }, }; + g_autofree char *bus_name =3D NULL; =20 object_property_set_uint(OBJECT(&s->esdhc[i]), "sd-spec-version", = 2, &error_abort); @@ -253,6 +254,11 @@ static void fsl_imx25_realize(DeviceState *dev, Error = **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->esdhc[i]), 0, qdev_get_gpio_in(DEVICE(&s->avic), esdhc_table[i].irq)); + + /* Alias controller SD bus to the SoC itself */ + bus_name =3D g_strdup_printf("sd-bus%d", i); + object_property_add_alias(OBJECT(s), bus_name, + OBJECT(&s->esdhc[i]), "sd-bus"); } =20 /* USB */ diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 00dafe3f62d..144bcdcaf6c 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -314,6 +314,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) { FSL_IMX6_uSDHC3_ADDR, FSL_IMX6_uSDHC3_IRQ }, { FSL_IMX6_uSDHC4_ADDR, FSL_IMX6_uSDHC4_IRQ }, }; + g_autofree char *bus_name =3D NULL; =20 /* UHS-I SDIO3.0 SDR104 1.8V ADMA */ object_property_set_uint(OBJECT(&s->esdhc[i]), "sd-spec-version", = 3, @@ -329,6 +330,11 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->esdhc[i]), 0, qdev_get_gpio_in(DEVICE(&s->a9mpcore), esdhc_table[i].irq)); + + /* Alias controller SD bus to the SoC itself */ + bus_name =3D g_strdup_printf("sd-bus%d", i); + object_property_add_alias(OBJECT(s), bus_name, + OBJECT(&s->esdhc[i]), "sd-bus"); } =20 /* USB */ --=20 2.26.2 From nobody Tue May 7 14:39:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1606211395; cv=none; d=zohomail.com; s=zohoarc; b=YVPEoQudvmdSRaEYAHSdbKUd0uvtiwTYzZemlBlBWymC0spEVTV7gK59K1CQa7ze7lo7wbK8j5lXjgI4CRynEuiHCq/nlioQJFKgF0qU0TawoIvarp9cdTTLL+8N1tkIhkq8W4dmKdyAlqczkIFkc29QkmaOaYdv4fWrZuccNKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606211395; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NfRI0+56SFFtHGyrX9unE7nGxVbOu1hWXRLHpH7OE80=; b=Y1kP5+kPBcs0ri2ssjrQQid8xgaVR/v5Q8AfpZNTceBtvde5CGqN1dUKyCACgSutmlDWouJl8CKJ2zVA22zZq+NZWzBkeeis6mabNLkhXXPnQItpC2UeE67AfOXJKR0ChKoGVRwcKFL+mWcHizGJfxCJymnrSlFt52HrLto8p58= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1606211395733457.7305394910044; Tue, 24 Nov 2020 01:49:55 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id p8so21630114wrx.5 for ; Tue, 24 Nov 2020 01:49:55 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id w15sm24813651wrp.52.2020.11.24.01.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 01:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NfRI0+56SFFtHGyrX9unE7nGxVbOu1hWXRLHpH7OE80=; b=G5ccGzqTQyIITHD7IcZUmDnczwnQEeINoKcSuoAW6gaaJm7JHfgeQPSSCOepWg5HSr Y7n5baj+PbvQ1fej0rDZP7uQ54XDb7OqLyE8nWkzy0SKLRSHT6ASEWawKz6WQU7OcxrU V5o5jeVQwKhCae08xjIKxMahsrW9QgxtVUAgBgZGgZzHh1cwDg/C/jATR/DvHH+BhzFY SH0Lbgz6C7M8Y6bGc/KBFtPI7oOSaMq1c3i74zpmxShw10sIa8PWznz1u4JqbBVHOIe7 BgPYMwzVCLv2Bhqg80Yd+alwY4sJKgQF1plcbf7wLcORO5KEYNspiWCDK49yo/IzCdbZ OkMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NfRI0+56SFFtHGyrX9unE7nGxVbOu1hWXRLHpH7OE80=; b=mxDmGJWcCXUvhXUurBNHoyvs8TEGzMJ8HliX0CWJdddvknPTIpI9No6DrgEa56fHXk qnA9OidHAtqYPKUCTBxC9TZbTJSF3MxJecd8IsZVcGtDMONd6DipbQV8OhQ8ZyiJAn/P l+aktr9o2r0YJNRQh90aHqZCKNUMQLA7xoIimIBSU6U9r0/G2XzhFwhT4VWEj9B5LXMq 5gHIzPLNUuinX2rvTn96mRqDQIdZmLNQWVbB29Jz4MmWIDE+8tYy43SP7x+pyiNGzsmU AHKm1I92HSfGKmlvegXbhZIabH+VQqub15Ww3Ry2mGDvNlfnfiaF0KyUpCXhYlbTA7rv EKqw== X-Gm-Message-State: AOAM531l5mdISZ4q/KynmNY9HsslOwxCx/5adk2qQl5XsX35JA5TKsa8 Gq25XpxT034otQicWD1F/Go= X-Google-Smtp-Source: ABdhPJxi1zfmtR+drn0VQuVmAuyyGkUJw6l4d6UBQ0Z3YknDsTq6pqzv/nLxmYIB1vOGQQVAoptsgA== X-Received: by 2002:adf:a549:: with SMTP id j9mr4251967wrb.199.1606211393726; Tue, 24 Nov 2020 01:49:53 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , Igor Mitsyanko , qemu-arm@nongnu.org, Jean-Christophe Dubois , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2? 2/4] hw/arm/exynos4210: Add SD bus QOM alias on the SoC Date: Tue, 24 Nov 2020 10:49:39 +0100 Message-Id: <20201124094941.485767-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201124094941.485767-1-f4bug@amsat.org> References: <20201124094941.485767-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to select a particular SD bus from the command line, add a QOM alias on the SoC (using an unique name). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/exynos4210.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index ced2769b102..a60f08d372a 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -408,6 +408,7 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) =20 /*** SD/MMC host controllers ***/ for (n =3D 0; n < EXYNOS4210_SDHCI_NUMBER; n++) { + g_autofree char *bus_name =3D NULL; DeviceState *carddev; BlockBackend *blk; DriveInfo *di; @@ -432,6 +433,10 @@ static void exynos4210_realize(DeviceState *socdev, Er= ror **errp) sysbus_mmio_map(busdev, 0, EXYNOS4210_SDHCI_ADDR(n)); sysbus_connect_irq(busdev, 0, s->irq_table[exynos4210_get_irq(29, = n)]); =20 + /* Alias controller SD bus to the SoC itself */ + bus_name =3D g_strdup_printf("sd-bus%d", n); + object_property_add_alias(OBJECT(s), bus_name, OBJECT(dev), "sd-bu= s"); + di =3D drive_get(IF_SD, 0, n); blk =3D di ? blk_by_legacy_dinfo(di) : NULL; carddev =3D qdev_new(TYPE_SD_CARD); --=20 2.26.2 From nobody Tue May 7 14:39:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1606211400; cv=none; d=zohomail.com; s=zohoarc; b=HomeCDyTfa/kdQCfZ6OESM9X89mYAB1P08cwOrVkOIyU9Ba6yyKJ74fm/OPocSPpr4euV6FZ3y5W1mGpi8akyMxKD8e27qZYDLBAKJPLaWDCYTSjhq0Z9oFUOIshycNj1IA3GR3Cwc8snk9h3pjTxHqDkyHPWlU9+0qX+I69Png= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606211400; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j/L4jKVy7EB9p4IWKxtjmkSOQPywQXedYQSAO4hGKmg=; b=h7S86t23xZkJkiE2jr/hfYpUCUb4FJcFUOtUoYEbVdlnXji/s6djjJ48JXR0PcG6bXozhcnLr9c2cKuh5GxA62KJHOYWyaa9um17hILfU0tdgalNHj7MzzqNJh+cQE3V/rEkILt9xWe/vQa1rI9DPW83SiLDt8SnxM74+rFxuIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1606211400560760.6611565336464; Tue, 24 Nov 2020 01:50:00 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id l1so21597399wrb.9 for ; Tue, 24 Nov 2020 01:49:59 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id b73sm4924765wmb.0.2020.11.24.01.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 01:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j/L4jKVy7EB9p4IWKxtjmkSOQPywQXedYQSAO4hGKmg=; b=kghlIHEU5CIyK2ZAD78yMs0WATKojSPI6sVEtROO5301efVZlBQlAsPa6u+D8Bx/WJ 4gtnKkZ832p7DAJhZPHneR9m/SGOOLRdZdXOV5pmq7vyn+JpttJgyYAmjgB7IEKk/+Be qNAfP3jc5yCaBq1F+HkZ3IZa9dCZ0hmSzhivOisgRoUODVqzEHireXG/zEENIxVzQ/Wz P0wmOwtr3CcnkSc6Z/Rc9jjYh81zn2W9nkqn4VrZSqkZ+F6gdG1Nex5Xydi6gLktUzSf CRu0OghxQUCWXs2Wko4ayNZroPFyXarZBOeFGXIEih9qwfYLlgMFtSaqde5myE+MUFdB M1sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=j/L4jKVy7EB9p4IWKxtjmkSOQPywQXedYQSAO4hGKmg=; b=XLxqNCDfqqKFZiNh9Fm4Vm6QNufq9dKdsEWBs6Wf47+5RRRt1rpCDJ+EbC35MJk1rJ 8Sre1s2PzLMOb5MMhzfunjpNnd2UDXWTVMWM+HPOBaqzWYm5IOLHzAoI924f5IynUUl+ jeLQQQ6mZbD7dc6MPndbzb/w4ykmgaOFjmUcyOIiRpdFPRfmMiiBHUz4pVP1Wk95NMA3 doM7CaU8QCldsGGfWEAG0wM1V4Mpczl4w22QCMZP9oy1PloxDuBVgRc298FS4ElsanNV WTDdK94ojOScNqXESNsMEtnRSWc9qIAY6n/K7w107JQmaUMVKCgfLXiDTnvqcd8zT9Mo 3Prw== X-Gm-Message-State: AOAM531MyvDpWfAemIhLipiTkYg3SnCrSjZoJi5wj1Vi9qv8TVNIC8VF a12P2R5fudjesSjidyo/Uzc= X-Google-Smtp-Source: ABdhPJwhMuvJnBR9YOegzwyRckzY6+FW1x4xGIvuzPZbOIy09LDYqko3h2M/Bqam7vbkbbHSumMzvw== X-Received: by 2002:adf:f143:: with SMTP id y3mr4233532wro.138.1606211398763; Tue, 24 Nov 2020 01:49:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , Igor Mitsyanko , qemu-arm@nongnu.org, Jean-Christophe Dubois , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2? 3/4] hw/arm/xlnx-versal: Add SD bus QOM alias on the SoC Date: Tue, 24 Nov 2020 10:49:40 +0100 Message-Id: <20201124094941.485767-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201124094941.485767-1-f4bug@amsat.org> References: <20201124094941.485767-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to select a particular SD bus from the command line, add a QOM alias on the SoC (using an unique name). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xlnx-versal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 12ba6c4ebae..da3ee24a5b9 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -210,6 +210,7 @@ static void versal_create_sds(Versal *s, qemu_irq *pic) int i; =20 for (i =3D 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) { + g_autofree char *bus_name =3D NULL; DeviceState *dev; MemoryRegion *mr; =20 @@ -224,6 +225,10 @@ static void versal_create_sds(Versal *s, qemu_irq *pic) object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal); sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); =20 + /* Alias controller SD bus to the SoC itself */ + bus_name =3D g_strdup_printf("sd-bus%d", i); + object_property_add_alias(OBJECT(s), bus_name, OBJECT(dev), "sd-bu= s"); + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); memory_region_add_subregion(&s->mr_ps, MM_PMC_SD0 + i * MM_PMC_SD0_SIZE, mr); --=20 2.26.2 From nobody Tue May 7 14:39:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1606211405; cv=none; d=zohomail.com; s=zohoarc; b=RTMoG6Fv66znwrpyXSts6tKPBOR1xuaTM088ZCg3t5AH/7KFlNcVrGU2piNxkDVG1T65vPuI46ELcXCjbom6wkLSfNBR/JVJ3HVqHrTnDI86E3DPWI3YinE3OuJJgsFaH9x5ODBQa7XNSE2gfhTLHw0Vgl3PNEYTHW8KDYVXzJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606211405; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HZTdjbmWHnGTuptVuo3d7Aeku+k4NYLvw5VlNk50nF8=; b=QNZRnzUzqYZ5LTVWiGASHSizqVCE0+ouHTGbqtQaTLiMxnhzBOQIgi4hMIbb2ir3JD6uO4uQXut+yg7pZSkLdphdEb4xLZ4mdpGJ9szA6IWPGTe5tcRHxTWjk9XaLT6hapLWNfmGQ0XwOS5FCe1KMHZ7AIea9q32hv3S9AbTXVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1606211405744228.42326552723694; Tue, 24 Nov 2020 01:50:05 -0800 (PST) Received: by mail-wm1-f67.google.com with SMTP id w24so2208582wmi.0 for ; Tue, 24 Nov 2020 01:50:05 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id k84sm4454454wmf.42.2020.11.24.01.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 01:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HZTdjbmWHnGTuptVuo3d7Aeku+k4NYLvw5VlNk50nF8=; b=u8RQG6t7FQixuV7R41zhnmuROphjzW2Bkg0W2uHS7osEgDxmDvzMl3Tds8st9rTnbV pCAlhqjz/MLZsvy1klIcvuNnQq1emJRziehxlssAXDk4chOi2o1JLEN+SeBuw7rBElUh 2FBQWDqfhir26vM2mFhCvHSFh3wLQZJaDfCFe6zZ8Etw5vUzewz4Rz/xBreqmqz4b39k QzFHpyog/69bOAxDUuw7yWqHOfiV2jDrDvrIGHU80sBaX37hyjAx1/6E7l2pqJaphp85 9F9Hy+/rJFtryuGzTavN8KadVGsJkWsZO/3o9X0L+xoyoHGjfqqn999tEplJ1gI2z/P4 XtIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HZTdjbmWHnGTuptVuo3d7Aeku+k4NYLvw5VlNk50nF8=; b=Zbnxd1Yb8m+PgrwK4hQRNUnQW7KofbQUnP06OFzcYDu2NbcYoAIPiyYVGJ1XYs5K+1 stO3fvFM0odWrXeMy00Ha1INqLyPEzgkqQ0n2l+e3NOaS9SdaBJeN8/VnLPHd8ewH8ZK xsxEtW00hDrdjBGRW/6ZPd3EDb4CRxqAEVUAtAfhRVdpYPXpItCEeY0HT7dnB7q+OFu0 y2ii5in3JvlA3ZARd2dc8jrDvIFnk0gYyr9zUkkz2LAM1b8MMhqHxB1520jxlb3ryF5+ 3S3uyFbE+ARRpp14I+Fvv6c4RErSfU+EzCzSEQQ7ZHxnJrmIrGIQezbC3TQtwfZ4r6oY 14ww== X-Gm-Message-State: AOAM530eQQ3Dp6yhmw5TJ8UhXG42C6/lvWVBAaAXUB35dm0qY3SS9raI eUskbYbywKOEV8Ua7QZhG+E= X-Google-Smtp-Source: ABdhPJwPqCGLXa4WZ7XiWVMejE80iZdj3K8VnrWmAbXmDsThsabxlaVkIzjNOrq9V4rkc8+jmyMiZA== X-Received: by 2002:a1c:6184:: with SMTP id v126mr3395095wmb.64.1606211403759; Tue, 24 Nov 2020 01:50:03 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , Igor Mitsyanko , qemu-arm@nongnu.org, Jean-Christophe Dubois , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2? 4/4] hw/arm/xilinx_zynq: Add SD bus QOM alias on the machine Date: Tue, 24 Nov 2020 10:49:41 +0100 Message-Id: <20201124094941.485767-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201124094941.485767-1-f4bug@amsat.org> References: <20201124094941.485767-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to select a particular SD bus from the command line, add a QOM alias on the machine (using an unique name). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index b72772bc824..6a4a1de88cf 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -286,6 +286,7 @@ static void zynq_init(MachineState *machine) DriveInfo *di; BlockBackend *blk; DeviceState *carddev; + g_autofree char *bus_name =3D NULL; =20 /* Compatible with: * - SD Host Controller Specification Version 2.0 Part A2 @@ -299,6 +300,11 @@ static void zynq_init(MachineState *machine) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, hci_addr); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[hci_irq - IRQ_OFFSE= T]); =20 + /* Alias controller SD bus to the machine itself */ + bus_name =3D g_strdup_printf("sd-bus%d", n); + object_property_add_alias(OBJECT(machine), bus_name, + OBJECT(dev), "sd-bus"); + di =3D drive_get_next(IF_SD); blk =3D di ? blk_by_legacy_dinfo(di) : NULL; carddev =3D qdev_new(TYPE_SD_CARD); --=20 2.26.2