From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793297770; b=ftik9zTiFhhdt5qZ9me0pY7FLz3pjMOtVfehvQcJVUECZJV00YLvYXcczR+zbWO9s7eX BDcqSCyC7El2s8Ec3swVPFowsxpOKuiYq9j9c7yq9UJUrOAl/5Ux/KyGaoEdMQvNtElMa hjIk89pXUO9nlqRd3xYt31wJdu+DQoX2Hde7eC5JsBs+IM1Gh/vVTGafxOH9SZp4GvX6g AA1CkpRE400VLhPdT0pUr+HjuxGoS9jSWBKSTeXjqibySMM+qVmFN7L/Eoa7YlQK6Pj40 4ZP4060Zm1mDd3RVCCdEgyi8BcY2X/JswHvIBrFuDZHZRGDYtW+zse4mbzu0ZgK+95g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793297770; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received: X-Received:Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=nGbV526QYB4VsnB/uA2p0ZO8WxsOlxTrEargwGdR0Ng=; b=WBD75MZAcGSRq11QWkDfaMr5NcO2XIfKszy+isM+GHtjR6w3DAz5pSD1S/pURYHQg7Tk KM727V3Aa/5naqUxMGpRDR6LzDprPrdHMw87ioKXGlAreipqNMhja8mDLATXpbciNSmqu R484hLw+OhXZhZ94SA0BcmxZi4OCB+25TUU7HSFmg9JzkylXbJkbKchutkj/ic24YvgfY LmhPgTZXLQJ0gzLN9lDbwCyfn7XtaG0ZKMjQUrYILF3Q2eDw6kGs/oumzCwf+WjUip3n6 72XorwzelcU6Vx7b8duco9sGfYgcCy5FQ8KbyTSu8wKZaLCzxOblloqeiALFp9lhKHA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L7AW8eAQ; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=UNg8YmR8; arc=none smtp.remote-ip=170.10.129.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21A99606A31C for ; Thu, 29 Oct 2026 18:16:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 21A99606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L7AW8eAQ; dkim=pass (2048-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=UNg8YmR8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793297769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nGbV526QYB4VsnB/uA2p0ZO8WxsOlxTrEargwGdR0Ng=; b=L7AW8eAQWCgJHcPqKtpU+xvkG5PwBM0LUSm2BVoGiqQXrq4rgq249/M5CufXZzQ0ha12G0 weafqP/sojNX8mJzHzcrpRDv/FVqr2yzPuaD1GAMOZBTrH5i5CFn+BXO5wrLhA4MktFpS1 ZJl+qqRIkYe6VpO/DQYPBIjp2tvi1HU= Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-eN1voUleMzaTlUw2vgmF0A-1; Thu, 29 Oct 2026 14:16:07 -0400 X-MC-Unique: eN1voUleMzaTlUw2vgmF0A-1 X-Mimecast-MFC-AGG-ID: eN1voUleMzaTlUw2vgmF0A_1793297767 Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-36a190c53a3so1408590eec.0 for ; Thu, 29 Oct 2026 11:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1793297767; x=1793902567; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nGbV526QYB4VsnB/uA2p0ZO8WxsOlxTrEargwGdR0Ng=; b=UNg8YmR8fN4vqTR1+WKL5qlPS0PeeyAFtBcdEv4I1HDpeftGPaDRnYRyPuF03RKbLv 5DvyTi8Gl5Ar/KVOOqkg0vNz6clCQgkAi06AoD2mX40uLTZwDMgWt1v23Ob8NZ4Pf4Lx 0kjlnQbVNCLr4OBiC/IfY0MY/QT1pJRSKDZcKTXT6RUZ2ryveWMfiUllw9hmvUwGcZdY sF2/s3r9V5+CU0aBKmtVxDRvzn4WmPZ0nf+BfLqJbLEcjJ+G/4lrT8GF0Jxe+5/wROef X7phx27l5K4SBWl503r5GipUSsu7zlNHjpDw6faf9OB02urVVIU8szS7bE2S70wy6VFD BikA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793297767; x=1793902567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=nGbV526QYB4VsnB/uA2p0ZO8WxsOlxTrEargwGdR0Ng=; b=YH1IHvQntvYdXU/KcOE73QtiaWPRJtLabGAMO86VS8ofJzF5JEF8EMq4jE8yyLIc2E 0iA2AYNecUjRsPLp3emfjkF4itK89FpeokJJRAjcsBtnK5P41L3M3sUlUEuhwpZeW0eW 7YQZvW0KPHiHtatOgKUW6Cqe3bbjcD+vYYVWjjZUy4ORPtpFgLzxnQee6FjioujzDsNs 8PODxXLqwpSvo75u6A2IG3Pwxe3LcqfKmHrrF5+P43jtKkMDSpt15mVpSG4Oz/QGmVwF MSNM+Pw9Zq8Kizk1EhnDOzDOUW9ChhT20J3jdE7MghXpKfVSudwSFFYknWUJDh6H4lg6 I4fQ== X-Forwarded-Encrypted: i=1; AKwUvBwrHASAcAAqVUBEDS+17Asabfnytih/cOzZiYGc4gL2z1tZzIg1nVLEATLfoHeg4m7T6FYQ919gJj0qgzXINGk=@vger.kernel.org X-Gm-Message-State: AFq9FYLJAYgnjAqEm619WzK1IpOAyA3rJYIW4AhQddnZckot/0TEBqq+ h+gugRStb26CEvmydT0yRhm6fqYz1pJNr9KpuRH0jJvqOVftyzIjJwRgvxDtYLcM0AuLaOW3nC+ rhET/gYnDbEBSa2aT51Ta03GdLdxps2iaqGDEPWd8pk3VgcVQAzynQwepVIqeg/DN1EZUAA== X-Gm-Gg: AYBFou0NwqdsJoTBo/q9bN0DGsIctAE3fF4MtYh13GydoTLTTwgYTkj64R43mbeEdNy BbSxSKNg+bpA0dSl8jgjDVuvCDKgdx+jpJmXGWGQGUoLVavU34SUdC2eJbTFCLC/bd4qAkwAXp4 kvupmyBLo/iOhqMGDzwz6tDx1gyllvlWUj2HQ5wBogwxikRLWof8UZ9vwgxG4Ad3ucXF8KzYjKC xDqHjjRa2/Crbhupj/SRRCE3RfNR7ziqJ/+evt79UqKrd6rvb073iAy31z+ae1E7opj2TwbMp8w +EnB001/Lpp/+fn2W2MXae9zAcddH1djPkkIPpLEgdeaMRlTdKVFZtF8jupRyMG/e3itRg4VHIJ Jsqc15ndqspRd9xQ0vlh+OetRy5jIBTQxQiPVlr1s11FqaXvVxfsbiJ4lyCzcUocSxpdI3WV9VY 1zxXtwqB+5VYX8pw== X-Received: by 2002:a05:7300:7b22:b0:369:f5e0:b801 with SMTP id 5a478bee46e88-36a30052111mr4245375eec.17.1793297766571; Thu, 29 Oct 2026 11:16:06 -0700 (PDT) X-Received: by 2002:a05:7300:7b22:b0:369:f5e0:b801 with SMTP id 5a478bee46e88-36a30052111mr4245317eec.17.1793297765815; Thu, 29 Oct 2026 11:16:05 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.47.195.13]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a428af4e6sm259163eec.4.2026.10.29.11.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 11:16:04 -0700 (PDT) From: Arun Menon To: linux-kernel@vger.kernel.org Cc: Jarkko Sakkinen , Jason Gunthorpe , Peter Huewe , linux-integrity@vger.kernel.org, Arun Menon Subject: [PATCH v5 2/7] tpm_crb: Split start method into a separate header Date: Thu, 29 Oct 2026 23:45:36 +0530 Message-ID: <20261029181541.99505-3-armenon@redhat.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261029181541.99505-1-armenon@redhat.com> References: <20261029181541.99505-1-armenon@redhat.com> X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arun Menon The current implementation handles different platform start methods (ACPI, ARM SMC, and ARM FFA) directly within crb_send(). Move this logic into a new helper function, tpm_crb_start(). This is a pure refactor with no functional changes intended. Signed-off-by: Arun Menon Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_crb.c | 52 +++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index d76f9e30f036..148ef5c487ce 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -446,6 +446,34 @@ static int tpm_crb_smc_start(struct device *dev, unsigned long func_id) } #endif +static int tpm_crb_start(struct tpm_chip *chip) +{ + struct crb_priv *priv = dev_get_drvdata(&chip->dev); + int rc = 0; + + /* + * The reason for the extra quirk is that the PTT in 4th Gen Core CPUs + * report only ACPI start but in practice seems to require both + * CRB start, hence invoking CRB start method if hid == MSFT0101. + */ + if (priv->sm == ACPI_TPM2_COMMAND_BUFFER || + priv->sm == ACPI_TPM2_MEMORY_MAPPED || + !strcmp(priv->hid, "MSFT0101")) + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + if (priv->sm == ACPI_TPM2_START_METHOD || + priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) + rc = crb_do_acpi_start(chip); + if (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id); + } + if (priv->sm == ACPI_TPM2_CRB_WITH_ARM_FFA) { + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + rc = tpm_crb_ffa_start(CRB_FFA_START_TYPE_COMMAND, chip->locality); + } + return rc; +} + static int crb_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz, size_t len) { struct crb_priv *priv = dev_get_drvdata(&chip->dev); @@ -471,29 +499,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz, size_t len) /* Make sure that cmd is populated before issuing start. */ wmb(); - /* The reason for the extra quirk is that the PTT in 4th Gen Core CPUs - * report only ACPI start but in practice seems to require both - * CRB start, hence invoking CRB start method if hid == MSFT0101. - */ - if (priv->sm == ACPI_TPM2_COMMAND_BUFFER || - priv->sm == ACPI_TPM2_MEMORY_MAPPED || - !strcmp(priv->hid, "MSFT0101")) - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - - if (priv->sm == ACPI_TPM2_START_METHOD || - priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) - rc = crb_do_acpi_start(chip); - - if (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id); - } - - if (priv->sm == ACPI_TPM2_CRB_WITH_ARM_FFA) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc = tpm_crb_ffa_start(CRB_FFA_START_TYPE_COMMAND, chip->locality); - } - + rc = tpm_crb_start(chip); if (rc) return rc; -- 2.56.0