From nobody Mon May 26 15:33:34 2025 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 4b5ftR0qPYz5wBgF; Mon, 26 May 2025 15:33:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftQ72nMz43KY; Mon, 26 May 2025 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273615; 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=Suf7DYIivU+1zvMUCgtbkxn5GBpcQrECbux9tH06k+4=; b=pi9NO8JWnydehUho1d4IHNgUQkH2UXIoD+Yc4To4hejMo/qnH9EUi2idON8EXzukKGxr+/ 3ERJQyKIs+6XUMpTi8+lDvRksJR/Ymmmz7CBLNZwXr/U8zptXh3cPlFP37A2ZwYbNQj4wb UxV5+P0UgP3VLNXYZnOS80/WST9NiRC++m12Xwj6Rn6BJ1Y+SRS/BMbbsX6LRb9ijDXgbP Limi88tVZlkBIyIBSDiRG3icQ4UQyolwilwr5NfTjTaJWBflfoIQlCyG0wJymBxmHvTAp+ KZc9L0QUw59K+PWmIRRVWg7ztbT07pMdwBp0gkDos1t2EAWz5M6esdRM9LAb/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273615; 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=Suf7DYIivU+1zvMUCgtbkxn5GBpcQrECbux9tH06k+4=; b=XyaeWQcJ7ud8qrzt8ogFOmxYQqbPOkvNs/qL11IVpKmjWJStFRvGI6CU4PG+suObXFGS32 hPnEDqJcmwx+ANHxfMN5ue94y5nGSVlPhgTULIgk5g95YtvYrSG1uOSRXR2tLGy8D9sPU8 A2jVQBXA5Y7l2FKBfdFKNYvfdaKRL4DCxDgQs0A52fcR7GAM3NeVv+0RLQUwjkVAnNaqXx DN2vdgs3h65TdrhvJSsEe4hloXzWQyNFIjbIl6vVTRikvjALhmqLBKyWFDKitvDZrGRnik PFitWDeD+Db/QuNLsC/X+FHjhk6lBPyD3B6RZcIQ38lv91PQ9g6tF4GkMmWzFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273615; a=rsa-sha256; cv=none; b=dmN3+fXS5daU2qYh4oXowletgAZCjs+5LQXv0eegTddCv9cgXSTkS2/Dm9EPbMvp4343hc vg6sT8LZW4qE3eybEcRGTUeJdvjLYYjjUC8vhP3+aBM7d7EvnJSn+5+szhkmwmbBYTAWV8 BORdczZMNCQDrhycELrMNsE4HkZ9iQhvv9KAHjr4fK3P4zQMjmWG/OZiDM9ZCT2iu5S+zr lcltqYa+LgH6GuuzD7suMaMK7mi7UtEmlJQD/ZHDoJzsDcQZEmAjR0RpCQkDU1iGEbPMyr +EEr98DzHHZIgTo1PRzqSyCTtt5S2k/OaoNyxgHBHArHJEfrFTRFKF6Fa5gBfg== 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 4b5ftQ6cSJz1C8K; Mon, 26 May 2025 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54QFXYm3045119; Mon, 26 May 2025 15:33:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXYFt045116; Mon, 26 May 2025 15:33:34 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:34 GMT Message-Id: <202505261533.54QFXYFt045116@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: 36b05c058892 - main - stand/powerpc/ofw: Initialize archsw at compile time 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 36b05c058892618c9411bcb7231c7ce9d15e52dd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=36b05c058892618c9411bcb7231c7ce9d15e52dd commit 36b05c058892618c9411bcb7231c7ce9d15e52dd Author: Warner Losh AuthorDate: 2025-05-26 03:34:16 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/powerpc/ofw: Initialize archsw at compile time There's no real reason to do this at runtime. Sponsored by: Netflix --- stand/powerpc/ofw/main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/stand/powerpc/ofw/main.c b/stand/powerpc/ofw/main.c index 34c7e12778e3..093dda27ae04 100644 --- a/stand/powerpc/ofw/main.c +++ b/stand/powerpc/ofw/main.c @@ -35,7 +35,21 @@ #include #include -struct arch_switch archsw; /* MI/MD interface boundary */ +#ifdef CAS +static int ppc64_autoload(void); +#endif + +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_getdev = ofw_getdev, + .arch_copyin = ofw_copyin, + .arch_copyout = ofw_copyout, + .arch_readin = ofw_readin, +#ifdef CAS + .arch_autoload = ppc64_autoload, +#else + .arch_autoload = ofw_autoload, +#endif +}; uint32_t acells, scells; @@ -163,15 +177,8 @@ main(int (*openfirm)(void *)) */ cons_probe(); - archsw.arch_getdev = ofw_getdev; - archsw.arch_copyin = ofw_copyin; - archsw.arch_copyout = ofw_copyout; - archsw.arch_readin = ofw_readin; #ifdef CAS setenv("cas", "1", 0); - archsw.arch_autoload = ppc64_autoload; -#else - archsw.arch_autoload = ofw_autoload; #endif /* Set up currdev variable to have hooks in place. */