From nobody Wed Sep 20 16:07:21 2023 X-Original-To: dev-commits-src-all@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 4RrNhn4PCvz4trR0; Wed, 20 Sep 2023 16:07:21 +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 4RrNhn3qj6z4PG6; Wed, 20 Sep 2023 16:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226041; 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=euT0CJKemqC0CXMZ42K9UaiUatr0lcsTcR+ribbAk30=; b=FvE+eP1PTj5vjVHD9s8VjmdJMFi/fHl57j8y5Yr8gMcsLN19zdkZB9QfbiHZxYe2WNpCiC UPuYupQBQCgtXFA7QqPYzGSsInY/rbVobBbZYO/joENSSwg/sonROqOWBzuHE0g6eX9QtG DmoaHvWZ54RkNl2KaXR6gOGGaOMLESmOtLl7p093SZXsArRVlS7Udse8FU43V9o6bmYEjE lXjAkbgNf/r0iNqXDTPQrTQQGeAUIeHovSwSIXApbyBnofBazcSxA9dzbJ17GnDwPKdJ7C DQL7693CW5wA1wcz5idaBijOLnRcdqOHBATeGBPXgW9R1oT3qSqOvarl/LMhWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695226041; a=rsa-sha256; cv=none; b=RSbyNiZ3UhNX77dLx03KNuvXvLqvhmVViJsum7xWRV1p0nC2B63yR9LsC1OR+SWgcozZkk /qFmXN8o+dERb5c/VQyxLGAt7G14BG1xmeLfX9HBobCGyZ9dkq0rDXHInFmzSfM19OMwLo xXLIZ/GBYrwrfuykeE3dXvhgRgBQcEaAm0e+S0WrRrMxOXrxL1VMlnw1Ei1ZiOxdAn7UhR JiuS4zyfz9tbGljm7dzkS8xQ8bp7cSRjhca1CuisZcNqX0GTEThsv38BKR+xBny3Paua0T ZdfMbFq9P/FWKOeDvuMbMUc7EX6aaM7Wh4p6Iu0NxyZ18XEYnqJzYz66Ek+XoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226041; 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=euT0CJKemqC0CXMZ42K9UaiUatr0lcsTcR+ribbAk30=; b=I6ivdh/BdSpSn4uClRJBxDbJo/J05IQnLhwBnSVJRv3Epcz16Wz3pgTpUNp5DioyXFFr4L lGVoeQm6z64UPWrV2fH6yHw6u93URg/B19IHuKqNits8GwdbVvI5f0HIcdGVj2/3e4jXOr 8w4iJDWx08s3KKHg3OpRlEXr2DmeoVhz8hDDbPS4TGogeMFZqB72t15QgF2fiG67GHWMD+ 5unqaHFjLSFrn/x7LJmJuGBpTJeil5ecYb39eYr4D7QSOidmFnY9celJO5wXwnsEUdBKPj QLghEodobS06bofUw2NauDJGDUN/fflTO8FQsCFQvOYF7ILvw867B2V2Hj9Ljg== 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 4RrNhn2sdxz12jl; Wed, 20 Sep 2023 16:07:21 +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 38KG7LwQ052766; Wed, 20 Sep 2023 16:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KG7LX1052763; Wed, 20 Sep 2023 16:07:21 GMT (envelope-from git) Date: Wed, 20 Sep 2023 16:07:21 GMT Message-Id: <202309201607.38KG7LX1052763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c643e82dba0b - main - arm64: Fix errata workarounds that depend on smccc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 commit c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 Author: Andrew Turner AuthorDate: 2023-09-18 16:34:51 +0000 Commit: Andrew Turner CommitDate: 2023-09-20 16:01:10 +0000 arm64: Fix errata workarounds that depend on smccc Some arm64 errata depend on calling into the firmware via the SMCCC interface. This needs to happen after the psci driver has attached as they share the interface. Fix this by allowing the workarounds to mark when they depend on device drivers attaching. This is only an issue on CPU 0 as the workarounds are applied later for the non-boot CPUs. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41916 --- sys/arm64/arm64/cpu_errata.c | 46 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c index 38148ff7066c..6c294ff1237c 100644 --- a/sys/arm64/arm64/cpu_errata.c +++ b/sys/arm64/arm64/cpu_errata.c @@ -47,6 +47,9 @@ struct cpu_quirks { cpu_quirk_install *quirk_install; u_int midr_mask; u_int midr_value; +#define CPU_QUIRK_POST_DEVICE (1 << 0) /* After device attach */ + /* e.g. needs SMCCC */ + u_int flags; }; static enum { @@ -85,11 +88,13 @@ static struct cpu_quirks cpu_quirks[] = { .midr_value = CPU_ID_RAW(CPU_IMPL_CAVIUM, CPU_PART_THUNDERX2, 0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = 0, .midr_value = 0, .quirk_install = install_ssbd_workaround, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, @@ -173,8 +178,8 @@ install_thunderx_bcast_tlbi_workaround(void) } } -void -install_cpu_errata(void) +static void +install_cpu_errata_flags(u_int mask, u_int flags) { u_int midr; size_t i; @@ -183,8 +188,43 @@ install_cpu_errata(void) for (i = 0; i < nitems(cpu_quirks); i++) { if ((midr & cpu_quirks[i].midr_mask) == - cpu_quirks[i].midr_value) { + cpu_quirks[i].midr_value && + (cpu_quirks[i].flags & mask) == flags) { cpu_quirks[i].quirk_install(); } } } + +/* + * Install any CPU errata we need. On CPU 0 we only install the errata that + * don't depend on device drivers as this is called early in the boot process. + * On other CPUs the device drivers have already attached so install all + * applicable errata. + */ +void +install_cpu_errata(void) +{ + /* + * Only install early CPU errata on CPU 0, device drivers may not + * have attached and some workarounds depend on them, e.g. to query + * SMCCC. + */ + if (PCPU_GET(cpuid) == 0) { + install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, 0); + } else { + install_cpu_errata_flags(0, 0); + } +} + +/* + * Install any errata workarounds that depend on device drivers, e.g. use + * SMCCC to install a workaround. + */ +static void +install_cpu_errata_late(void *dummy __unused) +{ + MPASS(PCPU_GET(cpuid) == 0); + install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, CPU_QUIRK_POST_DEVICE); +} +SYSINIT(install_cpu_errata_late, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, + install_cpu_errata_late, NULL);