From nobody Tue Jan 24 22:13:30 2023 X-Original-To: dev-commits-src-branches@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 4P1h7Z4ht0z3bgRx; Tue, 24 Jan 2023 22:13:30 +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 4P1h7Z35rhz3H4k; Tue, 24 Jan 2023 22:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598410; 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=Y/Yd+v8bIHQ6ml1tdMrE3MuQt/rGtGP/mNQR3vI0rS4=; b=JuFjMEoiNI0TEhWHRZko2qJS+c7+7Q+tzvci4ExXwGLTD/gSvH83tZs5BVV/9k/sGMUREa fiyBu4GMJ3rwz15DooN/zlgDAitZJizi4hzJ9D/TJO4WzIYHfFqYH6rjBIsws618WdXqfH 2zNx5JwRFk1BN3eslOidzVIiACbxrhNMd/iQJdZO2lVycX2Pm3C/v+iR+gx4lBi4xNAesQ OJouWkef5tz5GT3VIYgDoftzvlkVwa0CmHgIfozVhyQkgcgS1Mq67yYizHEKXI9sXm+udQ g7kh8VyBRxNpG++p1JOrqmK0u83sMh83iAsF6Btpo9bouo6Xp+jARdsLOHXVFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598410; 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=Y/Yd+v8bIHQ6ml1tdMrE3MuQt/rGtGP/mNQR3vI0rS4=; b=rSvp+I1qmGWpP1FTHytot4gX+36igpHG1tb83vHqHxCa6lTitmtMkGn75pvcaubx3zomS7 n1RGSRyPQQzu1KRTX9TRsN0kiv9gpqZ7plQuJpOk4UE1xqPauBNuBotWF6LvrZ1DwcdNxb wtWRKEiD0whJhcJQSImgxV0+nCNkmXviNRaEUrg7jhs7OvAyaR0ItsHlU955pl4WSa2Ske W85PvMvjw2EnSXe7goUnuwmD/mOhHpuKsioPnABuAiS3CxxC8qAgjkPKW3A7Xgvv65qmq0 7vfkirSfZsJclU3YG3D4BeVal+RXYMLvfZ0v+sg5b9pnm23TKGsV8cEb5/QArg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598410; a=rsa-sha256; cv=none; b=GYsQJPHrAwJbxJoktF7N2N6XR7qIsp4TkCyxcDV15R9NWTLonSKlPHrs5yQCxjkwigFyIO X0saK5q/oOqWEDPdwH4gMoMgl+8K1xT2SLj5d7C/18Qj0lmbPVQzNDPR1OabuX1iXGib2b 6ivHPFRkxPtXltNOAEYIpDxb5bMEKn1OPr32UXeJjFoucekePAz07MzmLq0RNRIZKfLhYc 0IsPH7VFwvf/hqeFZhOxfgUUtEPJCAhCHRH6lL76O12D2sbebAi7zyA6CZTMmxI7f47TyO t/AHs8lSN03ouVFf5VG08HvplnXxmb6hFHzkkzFM1UFktkRDY2SkP/Jrhnaz/w== 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 4P1h7Z27mMzQYn; Tue, 24 Jan 2023 22:13:30 +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 30OMDUSa088516; Tue, 24 Jan 2023 22:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDUM3088515; Tue, 24 Jan 2023 22:13:30 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:30 GMT Message-Id: <202301242213.30OMDUM3088515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c079fa5c04d8 - stable/13 - ofw/disk: Add parsedev support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c079fa5c04d8450cac1dc0c803922452c0f6b1cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c079fa5c04d8450cac1dc0c803922452c0f6b1cb commit c079fa5c04d8450cac1dc0c803922452c0f6b1cb Author: Warner Losh AuthorDate: 2022-11-30 22:10:11 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:40 +0000 ofw/disk: Add parsedev support Add a parsedev support for OpenFirmware disks. We must look at characteristics of the OFW node to know if we match this device (so supply a match routine) or not. Add a parsing routine to allocate devdesc for OpenFirmware disks as well. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37558 (cherry picked from commit 88a8c68298dbc86370d9a7eff06314da398829cb) --- stand/libofw/ofw_disk.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index 67da8cbeb310..ae2776ee4689 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -50,7 +50,8 @@ static int ofwd_close(struct open_file *f); static int ofwd_ioctl(struct open_file *f, u_long cmd, void *data); static int ofwd_print(int verbose); static char * ofwd_fmtdev(struct devdesc *); - +static int ofwd_parsedev(struct devdesc **, const char *, const char **); +static bool ofwd_match(struct devsw *, const char *); struct devsw ofwdisk = { .dv_name = "block", @@ -62,7 +63,9 @@ struct devsw ofwdisk = { .dv_ioctl = ofwd_ioctl, .dv_print = ofwd_print, .dv_cleanup = nullsys, + .dv_match = ofwd_match, .dv_fmtdev = ofwd_fmtdev, + .dv_parsedev = ofwd_parsedev, }; /* @@ -210,6 +213,16 @@ ofwd_print(int verbose __unused) return (0); } + + +static bool +ofwd_match(struct devsw *devsw, const char *devspec) +{ + const char *path; + + return (ofw_path_to_handle(devspec, devsw->dv_name, &path) != -1); +} + static char * ofwd_fmtdev(struct devdesc *idev) { @@ -217,3 +230,25 @@ ofwd_fmtdev(struct devdesc *idev) return (dev->d_path); } + +static int +ofwd_parsedev(struct devdesc **dev, const char *devspec, const char **path) +{ + const char *rem_path; + struct ofw_devdesc *idev; + + if (ofw_path_to_handle(devspec, ofwdisk.dv_name, &rem_path) == -1) + return (ENOENT); + idev = malloc(sizeof(struct ofw_devdesc)); + if (idev == NULL) { + printf("ofw_parsedev: malloc failed\n"); + return ENOMEM; + }; + strlcpy(idev->d_path, devspec, min(rem_path - devspec + 1, + sizeof(idev->d_path))); + if (dev != NULL) + *dev = &idev->dd; + if (path != NULL) + *path = rem_path; + return 0; +}