From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=mOEUgvXm; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.128.67, mailfrom: pete@akeo.ie) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Fri, 23 Aug 2019 05:11:32 -0700 Received: by mail-wm1-f67.google.com with SMTP id f72so8698802wmf.5 for ; Fri, 23 Aug 2019 05:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FdNV5pxmSlNS1vfWPnDbnY37SNM4B1BRJhJtfnd8s8s=; b=mOEUgvXmX43Hq2wkMLaIxydm0cN+jywi23prnonl6tddlkn2fnd1Q/b3cHu0jsBthO ilxm28asyOPV5kXwNWr2D9QcYCyNZHtRwhT5wllVHzxAiPxYMjA+TJNQ0Nd0tAv1O4vG Th78jw7gUrmh2BzFEOBoprAJwXwX10lX0M05T4jVfml+kY69FdVZ3dqMs6bVXwayOFN6 xrevtCcob6OwEdrPPcKKZeUIrswWzHNmRm+JTfFLHEPx6DDwsE6eCi5/Nr/qYfzajHDk bEklXZqHPuGKwnwHwIVl1C8+F8L5pQlEb7Hm+B5u9zwXL2HrGWdSWBDzyFC7CYUARF0T U6Tg== 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=FdNV5pxmSlNS1vfWPnDbnY37SNM4B1BRJhJtfnd8s8s=; b=pkzXxjLVVrquPzWOAbkmevGFq/EUW7/Dkjac34P+uY69+fkcgKL+roBK1o6zLhb58I IOTa4RrS6Cj1MjOcDfUT1Iscqjp2QBppG/+bznGU3UcGCWPnbgLP3CBnKdJeHcMlsm13 lc6K/qN3B4HEr1aCNW1jtMs464obsnW7GufXqt1qqhelb3i7b0P6dmYtwrSH80kJOCfR KsiabmkRpJnaNc+p8BHFBOk7DfoUwAMk3ncrTRSQdjfrxlBtLRn5UvcOxlABvY0sy//9 ckKk7/KU/+6axKNRTzQ32nEoczyLoZNS0NRDdC06nQtqgcDdXga9OwgswT83mpGYg4BF O0SQ== X-Gm-Message-State: APjAAAUtkg7f6uWParX4FlwFes+auSUBrZO/JSBbEeOo+j3bjIM5qnLi VxlxITm9VAKeX6PiUmiUKN/VgothV8A= X-Google-Smtp-Source: APXvYqzirkUoPdwdJW4u+gvRx49i6fxHV+IjkY/W/hP1M7DA4vVKxvMu7VC5uQUHWw1vxZAdsOZHTw== X-Received: by 2002:a1c:a852:: with SMTP id r79mr4717834wme.36.1566562290160; Fri, 23 Aug 2019 05:11:30 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.87.76]) by smtp.gmail.com with ESMTPSA id 16sm3247579wmx.45.2019.08.23.05.11.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Aug 2019 05:11:29 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Subject: [edk2-platforms: PATCH 1/1] Platform/Rpi3: Add compatible property to the "usb" Device Tree node Date: Fri, 23 Aug 2019 13:11:17 +0100 Message-Id: <20190823121117.5624-2-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190823121117.5624-1-pete@akeo.ie> References: <20190823121117.5624-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Some Linux kernels (e.g. Debian) require "bcm,bcm2835-usb" to be present in the list of compatible properties for the "usb" node, else they are unable to handle some USB devices. This patch ensures that the compatible property is added if not present. Signed-off-by: Pete Batard --- Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 74 ++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c index 45ffe2e394a2..399a48430457 100644 --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c +++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c @@ -135,6 +135,75 @@ UpdateMacAddress ( return EFI_SUCCESS; } +// +// Add "bcm2835-usb" to the USB compatible property list, if not present. +// Required because some Linux kernels can't handle USB devices otherwise. +// +STATIC +EFI_STATUS +AddUsbCompatibleProperty ( + VOID + ) +{ + CONST CHAR8 Prop[] = "brcm,bcm2708-usb"; + CONST CHAR8 NewProp[] = "brcm,bcm2835-usb"; + CONST CHAR8 *List; + CHAR8 *NewList; + INT32 ListSize; + INTN Node; + INTN Retval; + + // Locate the node that the 'usb' alias refers to + Node = fdt_path_offset (mFdtImage, "usb"); + if (Node < 0) { + DEBUG ((DEBUG_ERROR, "%a: failed to locate 'usb' alias\n", __FUNCTION__)); + return EFI_NOT_FOUND; + } + + // Get the property list. This is a list of NUL terminated strings. + List = fdt_getprop (mFdtImage, Node, "compatible", &ListSize); + if (List == NULL) { + DEBUG ((DEBUG_ERROR, "%a: failed to locate properties\n", __FUNCTION__)); + return EFI_NOT_FOUND; + } + + // Check if the compatible value we plan to add is already present + if (fdt_stringlist_contains (List, ListSize, NewProp)) { + DEBUG ((DEBUG_INFO, "%a: property '%a' is already set.\n", + __FUNCTION__, NewProp)); + return EFI_SUCCESS; + } + + // Make sure the compatible device is what we expect + if (!fdt_stringlist_contains (List, ListSize, Prop)) { + DEBUG ((DEBUG_ERROR, "%a: property '%a' is missing!\n", + __FUNCTION__, Prop)); + return EFI_NOT_FOUND; + } + + // Add the new NUL terminated entry to our list + DEBUG ((DEBUG_INFO, "%a: adding '%a' to the properties\n", + __FUNCTION__, NewProp)); + + NewList = AllocatePool (ListSize + sizeof (NewProp)); + if (NewList == NULL) { + DEBUG ((DEBUG_ERROR, "%a: failed to allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES;; + } + CopyMem (NewList, List, ListSize); + CopyMem (&NewList[ListSize], NewProp, sizeof (NewProp)); + + Retval = fdt_setprop (mFdtImage, Node, "compatible", NewList, + ListSize + sizeof (NewProp)); + if (Retval != 0) { + DEBUG ((DEBUG_ERROR, "%a: failed to update properties (%d)\n", + __FUNCTION__, Retval)); + return EFI_NOT_FOUND; + } + + return EFI_SUCCESS; +} + STATIC EFI_STATUS CleanMemoryNodes ( @@ -486,6 +555,11 @@ FdtDxeInitialize ( Print (L"Failed to update MAC address: %r\n", Status); } + Status = AddUsbCompatibleProperty (); + if (EFI_ERROR (Status)) { + Print (L"Failed to update USB compatible properties: %r\n", Status); + } + if (Internal) { /* * A GPU-provided DTB already has the full command line. -- 2.21.0.windows.1