From nobody Sun Feb 27 16:47:50 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ECA9319EA39B; Sun, 27 Feb 2022 16:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K68Zb00xZz4mBP; Sun, 27 Feb 2022 16:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCiuRui+fAmtDUFT4SYRhv9cFaLODOXPN6y3XHZIEC8=; b=rmVbGfDytFGvzrJ+EMCUfcURdqZ27+ufAL81zX+LBaTt/1ZoH7JYsrIyN3qAc9GXoZJKSN f+fIbfvr2JEDXxnAJEoVlEBk2iyqGDStDCuihG0VFAOyp65rKVvBwJfLUqfT8UsPsomLXX Wm3YMgRtcHme8vHD3GnYSjeu06NnOzZtDFkFYr0+JK6VItqEFtWypwHxty4f0oKC0WAmcC D/Jlg7aZSC+g3Z4vBlcFFjCGmKiMd800zvthluZUcv1i4VSCcReFbvgAd+TGeeWsw1k198 kqe6WKROf6grYqnj6V8hTRLgTfZl+LQVjL88UdGZimEFgGe7m4JMaFoWR8qrrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C413A27EB; Sun, 27 Feb 2022 16:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21RGlocL036979; Sun, 27 Feb 2022 16:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGloRG036978; Sun, 27 Feb 2022 16:47:50 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:50 GMT Message-Id: <202202271647.21RGloRG036978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4e83ac7d2e6c - main - libefivar: Handle Sata device path when optional para is not specified List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e83ac7d2e6c130ba2df813505b2181f896a1a93 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCiuRui+fAmtDUFT4SYRhv9cFaLODOXPN6y3XHZIEC8=; b=IDerBW8Y1ukIKfiNHgkY2GBuw7Ram1vJbRAJmWO7ZPFDE6P9PzIItg0RHCQOTyltZIv36/ 0eEZLUMGsW4QirrkJX01j954hR0fPZ8dRke/kPdpcciiWnVZnAV4JYYq4dfhYf3WNWoYoB y/pXnLbh8QD8/88izmFqHOhWAFo7QNdl4kvZfb3GyjkD1/v2xYhtjACeGfO5OLD+ppzMZT ba2z6TE7UZfvofHE7R+FhhFlno2NX5U+V+8VZOy6WIh9UIgQ7qilGTZvHoZVvNVkuRLNT9 mLExDiuw+3OoJT8hRgQERWeKLH6DioL/4phgVwxtYrrk5nD0d9Q/9mapkwVp2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980471; a=rsa-sha256; cv=none; b=UQ8uXmiG7BQQamRwoVMl9qBEGv0qqtV9UBZbU3IJnZaWPTXkWyAAVxglUWsSnZZNYc8Wvi jxSccAUGRCU+jINIKSNW68aotOPdYyMu0cavcbTEQ+skJHtLbvg1uZOKgIlzHye0KlQidP IizpjU09SnGL8UWBPnZW3VClfPkAcJeVIudY2DPfHONSJX38G7potsKLxZLRqBqko8Kkyj RIy4P4TpR6KIPrXnJ5avkaARLVFRHiEqo5beYZY5asCPPxPhR1unOzOiPmPidhSQ2gOyO5 4JbEFhQlzxTOdBAmHlk+UtBI0jEqMi+G6/YBaOrSS5RLEWLwbFAildCK7TEXuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e83ac7d2e6c130ba2df813505b2181f896a1a93 commit 4e83ac7d2e6c130ba2df813505b2181f896a1a93 Author: Jose Luis Duran AuthorDate: 2022-02-25 17:48:26 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:20 +0000 libefivar: Handle Sata device path when optional para is not specified Sata device path format:Sata(HPN, PMPN, LUN) According to UEFI Spec, the PMPN is an integer between 0 and 65535 and is optional. If not provided, the default is 0xFFFF. This commit is to do the enhancement for Sata device path when optional para is not specified. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1243 Obtained from: https://github.com/tianocore/edk2/commit/6d9b9bbb6148831de2ca545994f31e27b3d4c675 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 8e6a7c8acad1..303fc9676425 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -3594,7 +3594,15 @@ DevPathFromTextSata ( (UINT16) sizeof (SATA_DEVICE_PATH) ); Sata->HBAPortNumber = (UINT16) Strtoi (Param1); - Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2); + + // + // According to UEFI spec, if PMPN is not provided, the default is 0xFFFF + // + if (*Param2 == '\0' ) { + Sata->PortMultiplierPortNumber = 0xFFFF; + } else { + Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2); + } Sata->Lun = (UINT16) Strtoi (Param3); return (EFI_DEVICE_PATH_PROTOCOL *) Sata;