From nobody Sun Aug 13 09:19:55 2023 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 4RNsSC5cc1z4qGtM; Sun, 13 Aug 2023 09:19:55 +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 4RNsSC4zmGz4Wnx; Sun, 13 Aug 2023 09:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691918395; 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=9wIkO6ix3wKMX8i7QJ7iH96PgCd1WRz0ycidXXT0rzY=; b=LuVyotGSNkthzduvkabh0NlD9lvilWUQJe3fv6XGIbOSpSvTMqiW4XiZmSA/1aJvpIlJJV 9776fIXPJ7Xv9gWYSNcX3xnKzPjsKwN17QcFk3NA+Dv5UDr74sjjmRogvroxmekmnhEpIT IWD1Dv+u7uC/maqQ6C7W9zbcYr/6wU+AerdpWmx8b4quIN5dZFDSFNM45WUBtzS3u5yhrr BmALsHrNwJVcUwxS4mymVCSvSfAVJG4//fF+v1a+dUP5NDDajgMiIS1aqGUGk5S7C2ZCjm EfPZJfUnHfLfbyYh5gOabiOpG7MNcX+d7o7ds/N6kZ6sbDjOg0PoytAMOmYeYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691918395; 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=9wIkO6ix3wKMX8i7QJ7iH96PgCd1WRz0ycidXXT0rzY=; b=tztN9NUq6fZXJbiVor8VEqI9P4ijmsde62apFF6M4BiUatOBDsrymAjQ+t+mEedT/7cl0p LVia6CfQn1n8fWBUDSsY/ICvj44iMRd8BCkFZXE+wH5mThyvy0Um2zzgMJKahqRtEF8nOm 8LG54GVzy2hUiQ3qyGbJ5gyTHIO88X2/Kxw7YrHhWTWvz7iEtxU0g9sNHPlp7Yo2RUgyEu iYHVeMT/nUhhGsmIuhR14CD0uO8YHu7LJV2HZnukRLHLPHGEmNirvGZWLKGY0JCYJ76nU4 tsgL6KfIRoE6ac5kVIQnevCFTqWxuMBqOGo/WGAw1KylD7zfzYhAWAWgsal0lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691918395; a=rsa-sha256; cv=none; b=HQRzyLIQy7OzWL0xk8j5Ii3P/tSC8CEjqfP7ibzpzdeBNtsVDuFfImT1Ngs2oNCX35kYTb MVQDv53snjP1gIxUwH+XhEtbQa7VgpkUrmqVB+H6lZsdqs4MrwsAN2tJfD7tD9qKP7z5sR J9EL+MoOtF2/vMJIHAhyaNk24PxF3S9xWY4DCKWMiHEuxTAz6jdoVf/PaQxHTer3Swg495 LbrjFb0p/X3XXV0jgHXuAfdSJcB/9wN0zAmIuORFNudegHZwGw59rN6vPwS5VnDl6WuNtX 5FvBYA8FsBMZ8DHo0TO2X64N1krJKesEhlBoRbv+0JqL8BDbmpdzy52uaJml0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNsSC3pFNzwZc; Sun, 13 Aug 2023 09:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D9Jt1L003151; Sun, 13 Aug 2023 09:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D9JtjW003148; Sun, 13 Aug 2023 09:19:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 09:19:55 GMT Message-Id: <202308130919.37D9JtjW003148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 69f8cc60aa1e - main - ofw_firmware: Only match if there is no compatible 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f8cc60aa1e3140f41a75c859333a3d56c947fb Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=69f8cc60aa1e3140f41a75c859333a3d56c947fb commit 69f8cc60aa1e3140f41a75c859333a3d56c947fb Author: Emmanuel Vadot AuthorDate: 2023-08-13 06:28:13 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-13 09:19:44 +0000 ofw_firmware: Only match if there is no compatible If there is a compatible string it likely means that the firmware needs a dedicated driver (like on RPI*). PR: 273087 Tested-by: Mark Millard Sponsored by: Beckhoff Automation GmbH & Co. KG Fixes: fdfd3a90b6ce ("ofw: Add a ofw_firmware driver") --- sys/dev/ofw/ofw_firmware.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_firmware.c b/sys/dev/ofw/ofw_firmware.c index faba123c3e09..7d62fc317c1d 100644 --- a/sys/dev/ofw/ofw_firmware.c +++ b/sys/dev/ofw/ofw_firmware.c @@ -100,11 +100,14 @@ ofw_firmware_add_device(device_t dev, phandle_t node, u_int order, static int ofw_firmware_probe(device_t dev) { - const char *name; + const char *name, *compat; name = ofw_bus_get_name(dev); if (name == NULL || strcmp(name, "firmware") != 0) return (ENXIO); + compat = ofw_bus_get_compat(dev); + if (compat != NULL) + return (ENXIO); device_set_desc(dev, "OFW Firmware Group"); return (0);