From nobody Tue Jan 24 22:13:22 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 4P1h7Q5Wxdz3bg8s; Tue, 24 Jan 2023 22:13:22 +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 4P1h7Q3dfvz3GdC; Tue, 24 Jan 2023 22:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598402; 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=7ykk9sE2e5iymGRou3nv7Q9B988dNFM7K/HOOqUhQhQ=; b=L5Uz6qZRokLmgIoRAgV49ewnBnte6nssyhrLfX5OSJ7FZuurWzchLwUSnBHRdy+NH10Cf/ t7XGrvhtZTT/GAVtyX0h1T3J4oBu6She2NkkGV1jd8OsvYVPGIhy179EYHsBI1yxtcJApj 2RR/o/w3ENsKEet6aQplglLwRv1JaQd7fpJNsfHZm2Ru7JnrR4mZWKkqqAogsW890Hf3N6 YyYDfXWGtdcIAzKDCg5WEnef1LDwm/MWQSg50ZhzOLag0rKWivhrPGkLQ7s89UsdYs6cvH kHkekgPKSuKkiAj5LnyfhbmPsn084nSVn/VmtrEW9OCikrZiIK/Zbhh+4CHtnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598402; 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=7ykk9sE2e5iymGRou3nv7Q9B988dNFM7K/HOOqUhQhQ=; b=vTurUMpssvgYxUW5X49sLiB6Dc9P67GIhKhgDOw4alz+1nlTPx2nOOMlfTC5Dbz5YeLE7g hL7JlJFTBF0WvgwgPxo5DFLy531xL7Idwr7f9od8itRc1QqQunJa4LDEhu6ge7Hg5V9RMa AwRJDO3zAXk48nJ4W8dUohI1RfaUfTfX3o/ngqbePPDR1CMZNSH2qn6dYGpljm6xJZNWa1 SrD+t+h/dFxMf/XBFuJhREZ4hK69QvS38od61HvdgKK6S5sugloSHUEXBq0gVrdKuqy7H3 rAlghPh8wEbfA9+12cJU2S8IUAhg1iy3ZUAsSd0b+WKoAKT2P7QSmRwY5yYITQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598402; a=rsa-sha256; cv=none; b=YYwNMpGlb9gBBlH+7ZoZP/wYSANly4VOP1cUDFoCoij6OJSlyIt9e9MOHZIdg95M9UlI0i ersXXH9DgBU6d8RmAunpud5QVH3NlZGAkqv8BrkE+0aAjxPTNxdZGmrD6tSkLn2HhOl+Ru TbqbNpqcfNj/il52UsUvmWNmh6c3mLSHMlBkH85yAClbHfjNllJqN0leHonzUNeUitHxW+ vgOWAf3mupJ+M9PTODjoLca3VNPQmmd6YGX96gat9E4wIFMRCrXm1a7Sd27EOT9hMiiw8A PYs0BJT+rKAF0xpL9Ca5vcWtQ/MRm2Oahq5xOIT2ArjukHiEqvapHis1VWNSrA== 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 4P1h7Q2j9czQYh; Tue, 24 Jan 2023 22:13:22 +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 30OMDMMa088334; Tue, 24 Jan 2023 22:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDMxL088333; Tue, 24 Jan 2023 22:13:22 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:22 GMT Message-Id: <202301242213.30OMDMxL088333@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: b148cd6c8c5b - stable/13 - stand/ofw: ofw_disk isn't really a disk 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: b148cd6c8c5b0b88df1ac16b3fd61441e293daec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b148cd6c8c5b0b88df1ac16b3fd61441e293daec commit b148cd6c8c5b0b88df1ac16b3fd61441e293daec Author: Warner Losh AuthorDate: 2022-11-30 22:09:23 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:39 +0000 stand/ofw: ofw_disk isn't really a disk The rest of the code in the tree assumes that a DEVT_DISK uses a disk_devdesc to represent the device. However ofw_disk diesn't, so we can't use disk_fmtdev, nor disk_parsedev. ofw needs to have a dv_match-like routine to use devpasrse, though, since we have two drivers (net and block) that claim the same sort of devices (eg /path/to/ofw-dev) based on the device-type property. In the interim, we can't use devmatch and ofw_disk's and the default net driver's parsing is offloaded ofw_parsedev. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37347 (cherry picked from commit daaf594e8469b1fb4fb7861c2f7129f4d61c6d4d) --- stand/libofw/libofw.h | 2 ++ stand/libofw/ofw_disk.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/stand/libofw/libofw.h b/stand/libofw/libofw.h index 0483c9dbf754..59c7ec1fa6b7 100644 --- a/stand/libofw/libofw.h +++ b/stand/libofw/libofw.h @@ -28,6 +28,8 @@ #include "openfirm.h" #include +#define DEVT_OFDISK 1001 + struct ofw_devdesc { struct devdesc dd; union { diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index 524bc7b77d5c..8f4c0162d32b 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -49,10 +49,12 @@ static int ofwd_open(struct open_file *f, ...); 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 *); + struct devsw ofwdisk = { .dv_name = "block", - .dv_type = DEVT_DISK, + .dv_type = DEVT_OFDISK, .dv_init = ofwd_init, .dv_strategy = ofwd_strategy, .dv_open = ofwd_open, @@ -60,8 +62,7 @@ struct devsw ofwdisk = { .dv_ioctl = ofwd_ioctl, .dv_print = ofwd_print, .dv_cleanup = nullsys, - .dv_fmtdev = disk_fmtdev, - .dv_parsedev = disk_parsedev, + .dv_fmtdev = ofwd_fmtdev, }; /* @@ -185,3 +186,10 @@ ofwd_print(int verbose __unused) { return (0); } +static char * +ofwd_fmtdev(struct devdesc *idev) +{ + struct ofw_devdesc *dev = (struct ofw_devdesc *)idev; + + return (dev->d_path); +}