From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74254+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74254+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822171; cv=none; d=zohomail.com; s=zohoarc; b=h4U0ID5zIDPXicyXC80Xf6r0m0GSfcYBkWpZxaRxgjv5TQ+cnsF+x6wTyCb48eWLX0O/upb+uIqcCKMhyc7+mR3CptnmKfIm/Mq3qGitro4MAQ9Fw83kPjc+qaVHWvHimugUF+S3Nq3URmYzsLSTBOG6ZHUiUMlL6wUkBAFRsBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822171; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dmTO7RdOxdtwpl5DSggadG7YcgbeoJqa/ZeT6dZ6wmE=; b=W0lwAam/xqC2DkcR/JOD9veckdIiRu6acusU7N2bkwEssZzRX5Fmh4C8SYuWDGILNqW9WA50e2UIfQuIygmlQsiRIVKDxJ8fCmYtikQ7iH3TjG14yWz9pGNJDuw/aOysKEecsx3CuYnhthHr27R91iFTLHtTmClmCipsYxLf0xo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74254+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822171731459.6888770894851; Mon, 19 Apr 2021 01:49:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id m0kcYY1788612xZ7t3fymidP; Mon, 19 Apr 2021 01:49:31 -0700 X-Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web10.6254.1618822170608991680 for ; Mon, 19 Apr 2021 01:49:30 -0700 X-Received: by mail-ed1-f53.google.com with SMTP id j12so14635870edy.3 for ; Mon, 19 Apr 2021 01:49:30 -0700 (PDT) X-Gm-Message-State: uGRaBwlW23wObGr2X44pBBADx1787277AA= X-Google-Smtp-Source: ABdhPJyoQKnf6VvdXRg7l4MGAuCjmvIgPAoOFb25gG7aiSA66TMyosRRB3WlJ5i/2sdnUiUwivn3eg== X-Received: by 2002:a05:6402:2794:: with SMTP id b20mr6625540ede.48.1618822169218; Mon, 19 Apr 2021 01:49:29 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:28 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 1/6] Marvell/Armada80x0Db: Update CP0 MMC settings Date: Mon, 19 Apr 2021 10:48:56 +0200 Message-Id: <20210419084901.380576-2-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822171; bh=p6cx7iHdynVkhjAPuzDvckK7RgqnlEdZHq8cPXtt+Sg=; h=Cc:Date:From:Reply-To:Subject:To; b=ipjTF/fv9ErUI1myWugvXVFZQVTsNc3xNMiMarcPJFrlst+Vlxr2CasXXF0K1xQPZ2J E3BBZwDW/2VM6JAgKMwrt2vwJxCOS1Iw1DbMYdflCvg41pezqeBoL4gyf2Gj3ohfCSx2E 7sblwtHzv8PgaQMAsPU/4h9GbSc3H0OHJc4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch enables switching to 1.8V power supply on the VCCQ rail of the CP0 MMC interface, which allows to operate at HS200 in EDK2 and when booting with ACPI. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDe= scLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada8= 0x0DbBoardDescLib.c b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLi= b/Armada80x0DbBoardDescLib.c index 144009cae8..2b119fa2a7 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBo= ardDescLib.c +++ b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBo= ardDescLib.c @@ -110,7 +110,7 @@ MV_BOARD_SDMMC_DESC mSdMmcDescTemplate[] =3D { { /* SD/MMC 0xF2780000 */ 0, /* SOC will be filled by MvBoardDescDxe */ 0, /* SdMmcDevCount will be filled by MvBoardDescDxe */ - FALSE, /* Xenon1v8Enabled */ + TRUE, /* Xenon1v8Enabled */ FALSE, /* Xenon8BitBusEnabled */ FALSE, /* XenonSlowModeEnabled */ 0x19, /* XenonTuningStepDivisor */ --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74254): https://edk2.groups.io/g/devel/message/74254 Mute This Topic: https://groups.io/mt/82204164/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74255+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74255+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822172; cv=none; d=zohomail.com; s=zohoarc; b=irZeKcgqRAPkPPj/RC35OH67nhU482FuMoGt5kcYnjKg04TfAWOcsqNLb4DuqNh1QHj6hHmXwVXOEZu9JuY364wKRwVDXv0gU6o9t77lUWY9GhZGGhzVD8EoOEWhZSgIJ1t8Lu6r9ffv0hGXmf8Y60CrhilaTAqawms617VLtAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822172; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=7Q2rG+M8excOTbCU8F4Hc+IXFP/0a7hZpJOjVBNm1Ek=; b=E32t9IKJQ3zhaKgtbNj7uzue55UUCl2sJ5XAwQOkYcIxjTD2IKjrAPOMJ94ShivteKqnHEbgYk/3qm7inZ4YrxH9OJhqP+5ZB11q+U42L5ixziYNHw7cjgbtcCA7pNbeOFJDGuqaw/17eXLwoBw5sunknhXIpbyU0HHrEM5SKlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74255+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822172759628.8344833008506; Mon, 19 Apr 2021 01:49:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cVhhYY1788612xgz6R07EZ1g; Mon, 19 Apr 2021 01:49:32 -0700 X-Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web08.6350.1618822171544058045 for ; Mon, 19 Apr 2021 01:49:31 -0700 X-Received: by mail-ej1-f44.google.com with SMTP id v6so50357049ejo.6 for ; Mon, 19 Apr 2021 01:49:31 -0700 (PDT) X-Gm-Message-State: NqD0f2zKfNGzVBeN79ByZHcgx1787277AA= X-Google-Smtp-Source: ABdhPJx1fykA3KZjK1iF+yBKwWmPDkCtJTEg780JOGGGvKg+a9eF4J3lwA8fiwZGaoK/M5PJPZa5zw== X-Received: by 2002:a17:906:7f0e:: with SMTP id d14mr20462747ejr.487.1618822170144; Mon, 19 Apr 2021 01:49:30 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:29 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 2/6] Marvell/Armada80x0Db: Introduce SD/MMC ACPI description Date: Mon, 19 Apr 2021 10:48:57 +0200 Message-Id: <20210419084901.380576-3-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822172; bh=MgZ1uoSpItUHYXW4MvnbDt+pQrLKasloQm/xmElphfo=; h=Cc:Date:From:Reply-To:Subject:To; b=o3BwApJI2PzKWI7nCRrwxIjDSBvOLuRsjohbeMhuk3PEqn3PsQObDJYiMq2AlzZ0F4V DYahY3/DGScgQABesb6iF7wXvamzVh8fg2TwbX7FL4VSRRM7d1RT0+qwr3B4xrqpgmWVi bf7CGzwvEH2NdSEixSV10+gDwfNVaUG/nYU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch adds a new description of the board's SD/MMC interfaces in DSDT table that can work with the newly introduced support in Linux. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 59 +++++++++= +++++++++++ 1 file changed, 59 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/= Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl index faf1846c22..62ba62c7d2 100644 --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl @@ -87,6 +87,65 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMAD= A8K", 3) }) } =20 + Device (MMC0) + { + Name (_HID, "MRVL0002") // _HID: Hardware ID + Name (_UID, 0x00) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF06E0000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + 48 + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 8 }, + Package () { "marvell,xenon-phy-slow-mode", 0x1 }, + Package () { "no-sd", 0x1 }, + Package () { "no-sdio", 0x1 }, + Package () { "non-removable", 0x1 }, + } + }) + } + + Device (MMC1) + { + Name (_HID, "MRVL0004") // _HID: Hardware ID + Name (_UID, 0x01) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF2780000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + CP_GIC_SPI_CP0_SDMMC + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 4 }, + Package () { "no-sd", 0x1 }, + Package () { "no-sdio", 0x1 }, + Package () { "non-removable", 0x1 }, + } + }) + } + Device (XHC0) { Name (_HID, "PNP0D10") // _HID: Hardware ID --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74255): https://edk2.groups.io/g/devel/message/74255 Mute This Topic: https://groups.io/mt/82204165/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74256+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74256+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822173; cv=none; d=zohomail.com; s=zohoarc; b=IC7hKiX+2PRQbclhY9C/Kjx0uYEVfWRzpI6Dt8GepZUHoxZTbPihKx2fgVvGe989zm75dTf+xdXCZBEb+KlF+qaSouElcec8iFF+NQc/SEy+f2L7gIstJ2Is3nPXVGuo2KXfz9Sv1vEkxcwFaeNQW4ziMNaRoe3KSgxlu4vELfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822173; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=S1cZOqwwpknKCHt2xZ18ZdxTgClq4wv7K4UgBNxL1Vc=; b=SiNI2lEVeOr02RF/1W6CWmkhWNvRjgkvdsSdP44EqJmG1nPQjt6c8CMH2hxnv8Q8eSfYAupaaMQp1pXpBIHCz1S5bosabR2Bh8AZ+fvSoJAS+5gc/Gp3j2bcElbPnCLBbOIO9WHshuwj3nV/yhpjjf16N5QRbX0VT+dHEhTLO+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74256+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822173627351.0985355640438; Mon, 19 Apr 2021 01:49:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KzOoYY1788612x3JkDzxPAzS; Mon, 19 Apr 2021 01:49:33 -0700 X-Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web11.6213.1618822172494606860 for ; Mon, 19 Apr 2021 01:49:32 -0700 X-Received: by mail-ej1-f48.google.com with SMTP id g5so44938723ejx.0 for ; Mon, 19 Apr 2021 01:49:32 -0700 (PDT) X-Gm-Message-State: aiW66DrJIVCRn9qCzHmcnQjVx1787277AA= X-Google-Smtp-Source: ABdhPJzoAecJV/bo1REdvZL0TgzPtnxHPv3HsUKluk2JjSrFIyzZGMAIP3C0NM0j7U2ddFW7fjwiqA== X-Received: by 2002:a17:907:210a:: with SMTP id qn10mr21535634ejb.414.1618822171032; Mon, 19 Apr 2021 01:49:31 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:30 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 3/6] Marvell/Armada70x0Db: Update CP0 MMC settings Date: Mon, 19 Apr 2021 10:48:58 +0200 Message-Id: <20210419084901.380576-4-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822173; bh=EAlIxmYc2jLw96kLPxf+Lf+F7rgOZuRAXSYxPTGRbvw=; h=Cc:Date:From:Reply-To:Subject:To; b=W751rDXtYglyX3ttzKfUwrr6yZodFqbahv2Mk1N5c3syvyVF3GpfCOHpsKqmFSxMZOs bb1FMPGDH0GiocF6L8whFaya9BABUi8GjeU9D4iCeqds4rp2Dd/JUGZ8q5yj1MqkHvH/r 2xLNcs0rLAKSMa4MQc36e9EaGbirRKP5Tbk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch enables switching to 1.8V power supply on the VCCQ rail of the CP0 MMC interface, which allows to operate at HS200 in EDK2 and when booting with ACPI. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLi= b.h | 1 + Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDe= scLib.c | 2 +- Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLi= b.c | 79 +++++++++++++++----- 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscov= erableInitLib.h b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonD= iscoverableInitLib.h index 73a71ad3c4..85af61ec3f 100644 --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableI= nitLib.h +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableI= nitLib.h @@ -13,5 +13,6 @@ #define ARMADA_70x0_DB_VBUS0_LIMIT_PIN 4 #define ARMADA_70x0_DB_VBUS1_PIN 1 #define ARMADA_70x0_DB_VBUS1_LIMIT_PIN 5 +#define ARMADA_70x0_DB_SDMMC_CP0_VCCQ_PIN 15 =20 #endif diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada7= 0x0DbBoardDescLib.c b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLi= b/Armada70x0DbBoardDescLib.c index ae13e0a845..b0b6855bbb 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBo= ardDescLib.c +++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBo= ardDescLib.c @@ -104,7 +104,7 @@ MV_BOARD_SDMMC_DESC mSdMmcDescTemplate[] =3D { { /* SD/MMC 0xF2780000 */ 0, /* SOC will be filled by MvBoardDescDxe */ 0, /* SdMmcDevCount will be filled by MvBoardDescDxe */ - FALSE, /* Xenon1v8Enabled */ + TRUE, /* Xenon1v8Enabled */ FALSE, /* Xenon8BitBusEnabled */ FALSE, /* XenonSlowModeEnabled */ 0x19, /* XenonTuningStepDivisor */ diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscov= erableInitLib.c b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonD= iscoverableInitLib.c index 92a14bb4f0..4d790103a4 100644 --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableI= nitLib.c +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableI= nitLib.c @@ -21,6 +21,37 @@ =20 #include "NonDiscoverableInitLib.h" =20 +STATIC +EFI_STATUS +EFIAPI +ConfigurePins ( + IN CONST MV_GPIO_PIN *VbusPin, + IN UINTN PinCount, + IN MV_GPIO_DRIVER_TYPE DriverType + ) +{ + EMBEDDED_GPIO_MODE Mode; + EMBEDDED_GPIO_PIN Gpio; + EMBEDDED_GPIO *GpioProtocol; + EFI_STATUS Status; + UINTN Index; + + Status =3D MvGpioGetProtocol (DriverType, &GpioProtocol); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: Unable to find GPIO protocol\n", __FUNCTION_= _)); + return Status; + } + + for (Index =3D 0; Index < PinCount; Index++) { + Mode =3D VbusPin->ActiveHigh ? GPIO_MODE_OUTPUT_1 : GPIO_MODE_OUTPUT_0; + Gpio =3D GPIO (VbusPin->ControllerId, VbusPin->PinNumber); + GpioProtocol->Set (GpioProtocol, Gpio, Mode); + VbusPin++; + } + + return EFI_SUCCESS; +} + STATIC CONST MV_GPIO_PIN mXhciVbusPins[] =3D { { MV_GPIO_DRIVER_TYPE_PCA95XX, @@ -55,28 +86,30 @@ XhciInit ( IN NON_DISCOVERABLE_DEVICE *This ) { - CONST MV_GPIO_PIN *VbusPin; - EMBEDDED_GPIO_MODE Mode; - EMBEDDED_GPIO_PIN Gpio; - EMBEDDED_GPIO *GpioProtocol; - EFI_STATUS Status; - UINTN Index; - - Status =3D MvGpioGetProtocol (MV_GPIO_DRIVER_TYPE_PCA95XX, &GpioProtocol= ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Unable to find GPIO protocol\n", __FUNCTION_= _)); - return Status; - } + return ConfigurePins (mXhciVbusPins, + ARRAY_SIZE (mXhciVbusPins), + MV_GPIO_DRIVER_TYPE_PCA95XX); +} =20 - VbusPin =3D mXhciVbusPins; - for (Index =3D 0; Index < ARRAY_SIZE (mXhciVbusPins); Index++) { - Mode =3D VbusPin->ActiveHigh ? GPIO_MODE_OUTPUT_1 : GPIO_MODE_OUTPUT_0; - Gpio =3D GPIO (VbusPin->ControllerId, VbusPin->PinNumber); - GpioProtocol->Set (GpioProtocol, Gpio, Mode); - VbusPin++; - } +STATIC CONST MV_GPIO_PIN mCp0SdMmcPins[] =3D { + { + MV_GPIO_DRIVER_TYPE_PCA95XX, + ARMADA_70x0_DB_IO_EXPANDER0, + ARMADA_70x0_DB_SDMMC_CP0_VCCQ_PIN, + TRUE, + }, +}; =20 - return EFI_SUCCESS; +STATIC +EFI_STATUS +EFIAPI +Cp0SdMmcInit ( + IN NON_DISCOVERABLE_DEVICE *This + ) +{ + return ConfigurePins (mCp0SdMmcPins, + ARRAY_SIZE (mCp0SdMmcPins), + MV_GPIO_DRIVER_TYPE_PCA95XX); } =20 NON_DISCOVERABLE_DEVICE_INIT @@ -90,5 +123,11 @@ NonDiscoverableDeviceInitializerGet ( return XhciInit; } =20 + if (Type =3D=3D NonDiscoverableDeviceTypeSdhci) { + switch (Index) { + case 1: + return Cp0SdMmcInit; + } + } return NULL; } --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74256): https://edk2.groups.io/g/devel/message/74256 Mute This Topic: https://groups.io/mt/82204166/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74257+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74257+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822174; cv=none; d=zohomail.com; s=zohoarc; b=ifx3Jh+EL3lefnuQyU9kgs68gbQtw17OP5d0ea+DsH9Eieg8lGgI0QJdWxmIicR8Ka192IQPCzt/MAqAL20hnJNfXCI38wHUbwsZRK9+VhLlVjILug2dgm+oKAoXSOT0FvGgH2p8HnQNCv36G5Df9tUu4KXEpqEJqV3P91zFggs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822174; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vYflX7cIx+5PH6HBChNsFIFX8HNJicCZFM8ITTDmM9c=; b=jixXBmY4JHLN1oXZIW2hC83FT7P3dMG21/kudvRyOK+EWvLvFO8lP9RkmiRC9cKJyirue9HRoe+cepxZcfn7lWhrgvptg9EKEmmskQMyxgCDIWskRIN/ONjF7exPK4y0TU+DcGmPVP7Y8ZnrpyQizgjfBC07ya7vkbIGniIBMaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74257+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822174543208.95982975437084; Mon, 19 Apr 2021 01:49:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id CJh4YY1788612x6SU66YNBki; Mon, 19 Apr 2021 01:49:34 -0700 X-Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web12.6342.1618822173381816738 for ; Mon, 19 Apr 2021 01:49:33 -0700 X-Received: by mail-ed1-f47.google.com with SMTP id j12so14636059edy.3 for ; Mon, 19 Apr 2021 01:49:33 -0700 (PDT) X-Gm-Message-State: BECt8d8GrKCkQV1fnmioF7T4x1787277AA= X-Google-Smtp-Source: ABdhPJzu7/HqDdrI50+CpfBF0VZW9XAiUuwoztt02dBsB0kDTNJnDfxMbhxsCvbyPZGfr2sWEYYQCw== X-Received: by 2002:a50:e702:: with SMTP id a2mr24753757edn.3.1618822171957; Mon, 19 Apr 2021 01:49:31 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:31 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 4/6] Marvell/Armada70x0Db: Introduce SD/MMC ACPI description Date: Mon, 19 Apr 2021 10:48:59 +0200 Message-Id: <20210419084901.380576-5-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822174; bh=8QzRmWTj3eKwSlxVHFa1UvpLIDV/o5NmtejP6U/hV1Y=; h=Cc:Date:From:Reply-To:Subject:To; b=XzXIfCSJSN2Fi4HyNMdhbqVI1aXl77u4C0dKqtEiT4PeKQd4ujyXume4KqecssxrL1n LAo0R4a9v0HTCuxTLKXdXMbp3otX4BHirQKBhYscASyTn0bQ8ug7B4btHVy5cLn0sZmxi saS5VYwkHoCIH8ZDRf7zKyE9MsmYEMK4mVo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch adds a new description of the board's SD/MMC interfaces in DSDT table that can work with the newly introduced support in Linux. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 56 +++++++++= +++++++++++ 1 file changed, 56 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/= Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl index af6dbdaef0..d4902652ec 100644 --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl @@ -62,6 +62,62 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMAD= A7K", 3) }) } =20 + Device (MMC0) + { + Name (_HID, "MRVL0002") // _HID: Hardware ID + Name (_UID, 0x00) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF06E0000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + 48 + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 4 }, + Package () { "marvell,xenon-phy-slow-mode", 0x1 }, + Package () { "no-1-8-v", 0x1 }, + Package () { "non-removable", 0x1 }, + } + }) + } + + Device (MMC1) + { + Name (_HID, "MRVL0004") // _HID: Hardware ID + Name (_UID, 0x01) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF2780000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + CP_GIC_SPI_CP0_SDMMC + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 4 }, + Package () { "non-removable", 0x1 }, + } + }) + } + Device (XHC0) { Name (_HID, "PNP0D10") // _HID: Hardware ID --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74257): https://edk2.groups.io/g/devel/message/74257 Mute This Topic: https://groups.io/mt/82204168/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74258+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74258+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822175; cv=none; d=zohomail.com; s=zohoarc; b=CHDnLRiik+enEzxBW8fkWwPfU3rgGqvJKZQa6VirNuiS1r+nsX+kE4kVXsvIXC8MPhDO4jsFtflpvyd+vEe9YycWAmeoPEf+AC9YFfFNhDLdsp8DtcZIEJh5cGbN96GXJjj96r+cH97sIMUiWmGYZp0hXx+CO4gxi5HHd0rdeas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822175; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2SJWBMRhksswn6BRbAgl/kvWZ3LqAJe6f3FfQfsKSEU=; b=WWmugt+RhIGBXT4VzoUNRUqwJVja0MhGaxORJ39IEuQUAp4tNX0BLyD9jUbCypH4Uq4h+jQfB/y9iBNYYMBOECEiWbIUlK6LGml+J7VfxHX9ytvfYxJtZvj4z+gU5ACDdw5iFG7dioW/UT+HL1semmMKtUXOORxhkOxEabDcd8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74258+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822175397701.6850221754664; Mon, 19 Apr 2021 01:49:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7kVCYY1788612xTHbeATl9q8; Mon, 19 Apr 2021 01:49:35 -0700 X-Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.groups.io with SMTP id smtpd.web08.6351.1618822174346299656 for ; Mon, 19 Apr 2021 01:49:34 -0700 X-Received: by mail-ed1-f42.google.com with SMTP id e7so39579614edu.10 for ; Mon, 19 Apr 2021 01:49:34 -0700 (PDT) X-Gm-Message-State: ya5R7qoWZXQcfienaLSwWbihx1787277AA= X-Google-Smtp-Source: ABdhPJyWuN+m8/APtfRMGcdk4hPSr4Bh3mYcZ/Rui/BrxC1GXQtTVoRKhfPdZ/NL31tAgQ2T7LKNJw== X-Received: by 2002:aa7:dac5:: with SMTP id x5mr23982384eds.286.1618822172956; Mon, 19 Apr 2021 01:49:32 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:32 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 5/6] Marvell/Cn913xDb: Update AP807 MMC settings Date: Mon, 19 Apr 2021 10:49:00 +0200 Message-Id: <20210419084901.380576-6-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822175; bh=5A5cXc7Wo2xNUSU87dQ4ldPcdN5VENOR2/K/FCrq78g=; h=Cc:Date:From:Reply-To:Subject:To; b=AkHciRpsokhFX0m55xLHQZyhSqTTyL/Imu/ZoO35OaBHWpzbRS86QcHviZ6Wyc95ZgM JryfBz3wOAb0ufqyrzgTXqlI6o6lDWslvsvV4NEFjqCwYto4JXXvXTaqydNGT0l0ksjLD jFOVTfLbhdvOl3Br8tnvjubuYF/4zozhrm4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch enables switching to 1.8V power supply on the VCCQ rail of the AP807 MMC interface, which allows to operate at HS400 when booting with ACPI. Since there are issues with this mode in EDK2 Xenon SD/MMC driver apply a workaround, that limits the mode to HS200 by forcing bus width to 4. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.h = | 1 + Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.c = | 8 +++++-- Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.c = | 23 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverab= leInitLib.h b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscovera= bleInitLib.h index a641420ef7..00449d4390 100644 --- a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitL= ib.h +++ b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitL= ib.h @@ -13,6 +13,7 @@ #define CN9130_DB_VBUS0_LIMIT_PIN 4 #define CN9130_DB_VBUS1_PIN 1 #define CN9130_DB_VBUS1_LIMIT_PIN 5 +#define CN9130_DB_AP_MMC_VCCQ_PIN 8 #define CN9130_DB_SDMMC_VCC_PIN 14 #define CN9130_DB_SDMMC_VCCQ_PIN 15 #define CN9131_DB_VBUS0_PIN 3 diff --git a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDe= scLib.c b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescL= ib.c index 2b46d141cd..2755600f53 100644 --- a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.c +++ b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.c @@ -95,8 +95,12 @@ MV_BOARD_SDMMC_DESC mSdMmcDescTemplate[] =3D { { /* eMMC 0xF06E0000 */ 0, /* SOC will be filled by MvBoardDescDxe */ 0, /* SdMmcDevCount will be filled by MvBoardDescDxe */ - FALSE, /* Xenon1v8Enabled */ - TRUE, /* Xenon8BitBusEnabled */ + TRUE, /* Xenon1v8Enabled */ + /* + * Force 4-bit bus width - work-around for non + * functional HS400 mode. + */ + FALSE, /* Xenon8BitBusEnabled */ FALSE, /* XenonSlowModeEnabled */ 0x40, /* XenonTuningStepDivisor */ EmbeddedSlot /* SlotType */ diff --git a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverab= leInitLib.c b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscovera= bleInitLib.c index 42dc54a892..965d8efe57 100644 --- a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitL= ib.c +++ b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitL= ib.c @@ -157,6 +157,27 @@ Cp2XhciInit ( MV_GPIO_DRIVER_TYPE_SOC_CONTROLLER); } =20 +STATIC CONST MV_GPIO_PIN mApSdMmcPins[] =3D { + { + MV_GPIO_DRIVER_TYPE_PCA95XX, + CN9130_DB_IO_EXPANDER0, + CN9130_DB_AP_MMC_VCCQ_PIN, + TRUE, + }, +}; + +STATIC +EFI_STATUS +EFIAPI +ApSdMmcInit ( + IN NON_DISCOVERABLE_DEVICE *This + ) +{ + return ConfigurePins (mApSdMmcPins, + ARRAY_SIZE (mApSdMmcPins), + MV_GPIO_DRIVER_TYPE_PCA95XX); +} + STATIC CONST MV_GPIO_PIN mCp0SdMmcPins[] =3D { { MV_GPIO_DRIVER_TYPE_PCA95XX, @@ -206,6 +227,8 @@ NonDiscoverableDeviceInitializerGet ( =20 if (Type =3D=3D NonDiscoverableDeviceTypeSdhci) { switch (Index) { + case 0: + return ApSdMmcInit; case 1: return Cp0SdMmcInit; } --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74258): https://edk2.groups.io/g/devel/message/74258 Mute This Topic: https://groups.io/mt/82204169/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 19 21:05:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+74259+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74259+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1618822176; cv=none; d=zohomail.com; s=zohoarc; b=W4sZ62XedYTgHTwvv2WT9wBZc/vXXUBePlbpaEMyZ4aHJsPTRKdHQJxGqkH3MCVOuGIDmFmhOCQ7vQxXx9ZOhsehJtNhrzfghQ31aFQLiiVFylSwxrgzbZZFgqaFQRK9P27c2lp4z6SyPoNaLqMCyLmJ3FZEkFuGCbq3oKbk07Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822176; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=jiWRGz35mfUjgjj1520EQPGIj4OgUrgDJyL3fcmCkDQ=; b=MFNdiiwSoSHAqBqwZTJwCaDBlIBwbNS9hfgef9Cfl+c/xI9L4mXzxoBAAXIAJI9pLNcTYd3uz8mYFw3PTJzNh09eznCpsrlzjwSw/jEd1x34ucezX5NIolqfS42R/OWIdsH0z5hb8yH55KS5W3R2M8O7JGHzPGYhtyfpcj3mW7k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+74259+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618822176758680.9262668357684; Mon, 19 Apr 2021 01:49:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3GoOYY1788612xKe1A0vV30A; Mon, 19 Apr 2021 01:49:36 -0700 X-Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web09.6205.1618822175281929740 for ; Mon, 19 Apr 2021 01:49:35 -0700 X-Received: by mail-ed1-f51.google.com with SMTP id h10so39641937edt.13 for ; Mon, 19 Apr 2021 01:49:35 -0700 (PDT) X-Gm-Message-State: Lg8X5RKiPqZIGJHphd635ziTx1787277AA= X-Google-Smtp-Source: ABdhPJwtyaawKTZCrhIy3IDkuarw1Gq7S/RVCZLtIWslC09rxtRAYMJEc5UiX+lXwKHtobRP7DT2Nw== X-Received: by 2002:a05:6402:2d1:: with SMTP id b17mr7008931edx.144.1618822173850; Mon, 19 Apr 2021 01:49:33 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id z17sm12351102edx.36.2021.04.19.01.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 01:49:33 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, kostap@marvell.com, upstream@semihalf.com Subject: [edk2-devel] [edk2-platforms PATCH 6/6] Marvell/Cn913xDb: Introduce SD/MMC ACPI description Date: Mon, 19 Apr 2021 10:49:01 +0200 Message-Id: <20210419084901.380576-7-mw@semihalf.com> In-Reply-To: <20210419084901.380576-1-mw@semihalf.com> References: <20210419084901.380576-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618822176; bh=Z3BUMmLQK4L8ICVp/HgxnVNjBWwciVIl3tnIfXuN68U=; h=Cc:Date:From:Reply-To:Subject:To; b=cexR2tlW3yy3n10K5965372OYF2pmPCEEe99XzMOSax69Wb9T6NLJRN3118Nds2YGnI BWWcvkU77hwcV6gnjFTyJXO9IO+UwjYrbhOySKnl1Fic/AXhPuv1j1UEqaUsA+JUU5Y5+ HAZU5HEjjkGMPM89a2cxA/iIHn8fqIDPUTQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch adds a new description of the board's SD/MMC interfaces in DSDT table that can work with the newly introduced support in Linux. Signed-off-by: Marcin Wojtas Acked-by: Ard Biesheuvel --- Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl | 59 ++++++++++= ++++++++++ 1 file changed, 59 insertions(+) diff --git a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl b/S= ilicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl index 470ae047f9..30de868907 100644 --- a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl +++ b/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl @@ -62,6 +62,65 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "CN913= 0", 3) }) } =20 + Device (MMC0) + { + Name (_HID, "MRVL0003") // _HID: Hardware ID + Name (_UID, 0x00) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF06E0000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + 48 + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 8 }, + Package () { "no-sd", 0x1 }, + Package () { "no-sdio", 0x1 }, + Package () { "mmc-ddr-1_8v", 0x1 }, + Package () { "mmc-hs400-1_8v", 0x1 }, + Package () { "non-removable", 0x1 }, + } + }) + } + + Device (MMC1) + { + Name (_HID, "MRVL0004") // _HID: Hardware ID + Name (_UID, 0x01) // _UID: Unique ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xF2780000, // Address Base (MMIO) + 0x00000300, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) + { + CP_GIC_SPI_CP0_SDMMC + } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "clock-frequency", 400000000 }, + Package () { "bus-width", 4 }, + Package () { "broken-cd", 0x1 }, + Package () { "no-1-8-v", 0x1 }, + } + }) + } + Device (XHC0) { Name (_HID, "PNP0D10") // _HID: Hardware ID --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74259): https://edk2.groups.io/g/devel/message/74259 Mute This Topic: https://groups.io/mt/82204170/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-