From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web10.8154.1570792081897433438 for ; Fri, 11 Oct 2019 04:08:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=AJzWJmvH; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.66, mailfrom: pete@akeo.ie) Received: by mail-wr1-f66.google.com with SMTP id z9so11426789wrl.11 for ; Fri, 11 Oct 2019 04:08:01 -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=ZHPaG40b0cz76xQuBYG345mFwkF0qQVps7JBZHRyi4Y=; b=AJzWJmvHppcRW4q9PD4pa3ZyLnO/zfkAm3arq8ZSf52leTB0HEckEt6Cg4hdfuplNe rqvUdhXz0z1DkOlND+ne+T9FzrCaVO1BZmOfVKNvEcg6Pr7oLMLztHIjWx2d7umD6p+G PSYwu4vN69JnwjkYRryd0W3lIr+swOzXQvMUK2bvSWrW/MrugGwpB8XECnjI0SdNIKfm 0K2itqgd2gp8sm1RYcwpEoZEPPsdOnHOKYBbWkqWN6c+EUO2iqDx4qwGrMEcv1jAMEbq nEzwCUbAcSHfYXsSJZwoScW8AUxOEUnAIoPjfoyyMLTYilh7S9OOdqh0oVKjqwZ8lrVj 3HQQ== 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=ZHPaG40b0cz76xQuBYG345mFwkF0qQVps7JBZHRyi4Y=; b=Yp//iHgdI5pNOLfvby60jCCNO3sMs3HrJgYTWxbJNNBOqr66nzan8XJAuiMxVMBvTH Gzp4Sim9jON3p3XlPFfojG2Tgv7Ko6aaipX/hcx4LyEyRfqc9cAWp/qBWJeholc8eQod 3NdnJrcRF3DAg7gmBh2cgIvYa3X7V5m8vCYVeE9LdxAiN3bRht5IfFl+b1U1pknd9jfN s44NVCKqDvhASufoFGuxl3ORopV5wVtpc+Rd4qI3tFTfiPZo+HJSGo6FDRpggvGzE5TS P+MVyTeCoNgeTQCkMRXDFaWA2SfDoCaJHlOpBzJwo+5MTVPksHHJ3nSpQ0Y8iAHPLR16 aE4Q== X-Gm-Message-State: APjAAAWi5qVQ4ffdCjoJKq5FLuxoW24NnWYbsOHGgqiaaXSXtOgFhWCl hyhv2v0BYAIwJMlesQBqx17Wo5cZY5U= X-Google-Smtp-Source: APXvYqx45IdYqNJoxMKIcBmE9PjjZkStClm3lfM0CNA8MhM6snkPpn95OHz7igo4N/K5Cf5SrWIeow== X-Received: by 2002:adf:fd0a:: with SMTP id e10mr11880708wrr.55.1570792080195; Fri, 11 Oct 2019 04:08:00 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.40.122]) by smtp.gmail.com with ESMTPSA id r18sm12806044wme.48.2019.10.11.04.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 04:07:59 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Subject: [edk2-platforms][PATCH v3 2/5] Platform/RPi3/RpiFirmwareDxe: Improve serial number population Date: Fri, 11 Oct 2019 12:07:43 +0100 Message-Id: <20191011110746.1952-3-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20191011110746.1952-1-pete@akeo.ie> References: <20191011110746.1952-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Improve RpiFirmwareGetSerial() to derive a serial number from the MAC address, in case the platform returns 0 for the serial number. Signed-off-by: Pete Batard --- Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c index 25d7fa3974c0..5a9d4c3f1787 100644 --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c @@ -393,7 +393,14 @@ RpiFirmwareGetSerial ( } *Serial = Cmd->TagBody.Serial; - return EFI_SUCCESS; + // Some platforms return 0 for serial. For those, try to use the MAC address. + if (*Serial == 0) { + Status = RpiFirmwareGetMacAddress ((UINT8*) Serial); + // Convert to a more user-friendly value + *Serial = SwapBytes64 (*Serial << 16); + } + + return Status; } #pragma pack() -- 2.21.0.windows.1