Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230322210227.464-1-mario.limonciello@amd.com> <20230322210227.464-3-mario.limonciello@amd.com>
In-Reply-To: <20230322210227.464-3-mario.limonciello@amd.com>
From:   Mark Hasemeyer <markhas@chromium.org>
Date:   Mon, 27 Mar 2023 10:26:20 -0600
Message-ID: <CANg-bXCcbQn3CfDh6YVrSsxUAAAySR05+dVzvQ=XxLb0HaHeaQ@mail.gmail.com>
Subject: Re: [PATCH v6 2/4] crypto: ccp: Return doorbell status code as an argument
To:     Mario Limonciello <mario.limonciello@amd.com>
Cc:     =?UTF-8?B?SmFuIETEhWJyb8Wb?= <jsd@semihalf.com>,
        Grzegorz Bernacki <gjb@semihalf.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        John Allen <john.allen@amd.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>,
        linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

> -int psp_ring_platform_doorbell(int msg)
> +int psp_ring_platform_doorbell(int msg, u32 *result)
>  {
>         struct psp_device *psp = psp_get_master_device();
>         struct psp_platform_access_device *pa_dev;
> @@ -184,6 +184,8 @@ int psp_ring_platform_doorbell(int msg)
>
>         val = FIELD_GET(PSP_CMDRESP_STS, ioread32(cmd));
>         if (val) {
> +               if (result)
> +                       *result = val;
>                 ret = -EIO;
>                 goto unlock;
>         }
The bitfields in the new mailbox architecture have changed, as it is
now a dedicated mailbox for I2C arbitration. The 8 lsbs are used for
command and response status, and bit 31 is the ready bit.
Accounting for these changes, I was able to get the TPM contention
test to pass locally. I also removed calls to "check_doorbell" and
"check_recovery" as those steps weren't described in the design doc.