Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "K, Kiran" <kiran.k@intel.com>
To:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
CC:     "Srivatsa, Ravishankar" <ravishankar.srivatsa@intel.com>,
        "Tumkur Narayan, Chethan" <chethan.tumkur.narayan@intel.com>,
        "An, Tedd" <tedd.an@intel.com>
Subject: RE: [PATCH v1] btintel: Add recovery when secure verification of
 firmware fails
Thread-Topic: [PATCH v1] btintel: Add recovery when secure verification of
 firmware fails
Thread-Index: AQHZJQsd5oySqL2vJESlHtyopJLAVa6XzMYw
Date:   Tue, 10 Jan 2023 15:52:50 +0000
Message-ID: <CY4PR11MB1829647413B7BBA865C57DCDF5FF9@CY4PR11MB1829.namprd11.prod.outlook.com>
References: <20230110155905.18203-1-kiran.k@intel.com>
In-Reply-To: <20230110155905.18203-1-kiran.k@intel.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dbPnXjY+87Egy+H1WI+keaCEP2alGi1uu8/z2NsnQRQtmlB5JRO7BLEiuaoG?=
 =?us-ascii?Q?4gngnKoDZ2bnWj2LVO6YSJZ1I8ef/rxcQr2P2fMJOUcmG4v2T7KSTh+qLUsC?=
 =?us-ascii?Q?e7iSaMtL7Q2D1u9mYumspeGj5N7kXPUZAyP1S1M/RXKWathbKP1vvXG7bwtN?=
 =?us-ascii?Q?e0Z9Ui4Ij2SA9+Zs/DuVuH0DU+WIBgOdLaOG0JjucceadV9np8GP9lD4Ya23?=
 =?us-ascii?Q?Ub2RmxA6qrya0TdXJdpbxlBWnt58KzXw08BsY52cdv8QuHLoyKgGuUmQltn3?=
 =?us-ascii?Q?BKD4ogqRXogopMYynIcyMk8n8KKFvuquhulbFmAS7MCIHaFAW90CV1Mbkm1U?=
 =?us-ascii?Q?RMfJ+GwDVQ1ndce/fgnPdmcG/NJ8V8a309j7aC1nZNvEsO/WkF/lyTOncVMD?=
 =?us-ascii?Q?QwnYv8eIEIef4enek0jDK3YrCq//b1TMHegft8PoLvJB4DDCy2s++YNandjX?=
 =?us-ascii?Q?dDItOR1174SY5g1ksKdCI0g1U6TO/iPa73j0cgqpODdB/e6YCmfHjUjr0YDn?=
 =?us-ascii?Q?nsArq02xrVYRrVZP4eevFiiv0bxiMLSjgDOoKkoPy7XioH89VdBqwiDQv2pu?=
 =?us-ascii?Q?nUL1u7L/wNhf8JlkBnPF6u/2Ka1wy6i8/a54CMqgqIT3k7jAl6unECNj1t9O?=
 =?us-ascii?Q?xzHEgLDnVXl2EA210/uvq8koYEJF14AkWqg+BoJJlFSlg3kcsTSaNWmldyog?=
 =?us-ascii?Q?GhuHuKlrXfH1d1Zp2d7DdHBv4P9z/yS7UtRe8EepgaTg+MnE2pl5cs4xkpx6?=
 =?us-ascii?Q?nwrJLI7nBPuN5/d3kZDGKwBLG/sSI1aatv5b0ns6Rz5xlur8UTxsU4JhAjqW?=
 =?us-ascii?Q?3wbbp+3g1y0k7i9HNnLy2+oI9G/R0wZq4chTgAQkzWYGAUKjgVhL0dyD17yJ?=
 =?us-ascii?Q?78XRmRQ1dlau+u4KCOXjtV//ix6TAVewG53bntSqgsEDq0G1qPAg1jtxgTlr?=
 =?us-ascii?Q?95yJmbjGgO+RwOvMH18OdsTXpMZCafhZZF8kQ/Ttlt8QHU0mcJN39Ht95iWX?=
 =?us-ascii?Q?bC/M8TZzaoffmQT+O1J2k4GO3+quK4SbiBxORlZLHkuRyMcv/R1tKFP2khdx?=
 =?us-ascii?Q?OKr7EQ9YL0Rgf9RKkj6ZyXKjLNvWemy2QBl6EWZ8ZDThkkCCTts5w6mMa9Vk?=
 =?us-ascii?Q?WqFDDwdODhBeIunZs6uEyRYz38Y7pdirmgaO6iMn2Fax+mO2kTWUyVWIes3K?=
 =?us-ascii?Q?lJjhurauSwyTalJrw4P5ZtpNsihHcgTDbZGNIous2H6Td50ucCopjKjgdzZb?=
 =?us-ascii?Q?TpV2MxTFONdCzEuIyDDpiRqmCjtMkwCcpuQogh2yKFgfz2pYjChimI4dUhMM?=
 =?us-ascii?Q?+dFBdsqN50mfDeNRdF7YbEghmPkpR3vtEJNwGlINQ1mZggs/Z5cfZWhZJbAM?=
 =?us-ascii?Q?C7621A8bTNIBTK1lDZerAky2D2SeGtyMphMurQa0ygSqZ5ZNjMUpHBMKks3I?=
 =?us-ascii?Q?WyLRtlNNFgU47RTqMLgv2UF70PRA+roaqhcDe6H+nbISyZkUDna2kWAqxBxj?=
 =?us-ascii?Q?SVU784ZnAM3Eda7KE+i5eDV9IIW+5eQ4CK4l9gkH2P0L5FOu0JRkaKasSaw1?=
 =?us-ascii?Q?lXb9OVd3ICy23+Q4vjc=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1829.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 01f28ba6-36ff-42dd-342a-08daf322ba76
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2023 15:52:50.8624
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: CWdtsXFFe8dmRHj8+cJxvQSN82nGsXzZetgO4gSzlypWc1qVL1+//1MqWuvDQyIi/MPM1UHO0nPElqIiUI59Qg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7776
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Adding An, Tedd in CC list.

> -----Original Message-----
> From: K, Kiran <kiran.k@intel.com>
> Sent: Tuesday, January 10, 2023 9:29 PM
> To: linux-bluetooth@vger.kernel.org
> Cc: Srivatsa, Ravishankar <ravishankar.srivatsa@intel.com>; K, Kiran
> <kiran.k@intel.com>; Tumkur Narayan, Chethan
> <chethan.tumkur.narayan@intel.com>
> Subject: [PATCH v1] btintel: Add recovery when secure verification of
> firmware fails
>=20
> On warm reboot stress test case, firmware download failure has been
> observed with failure in secure verification of firmware and BT becomes
> completely inaccessible. This can happen due to a race condition in TOP
> registers when Wifi driver is also getting loaded at the same time. This =
patch
> adds a work around to load the BT firmware again when secure verify failu=
re
> is observed.
>=20
> Signed-off-by: Kiran K <kiran.k@intel.com>
> Signed-off-by: Chethan Tumkur Narayan
> <chethan.tumkur.narayan@intel.com>
> ---
>  drivers/bluetooth/btintel.c | 20 ++++++++++++++++----
> drivers/bluetooth/btintel.h |  1 +
>  2 files changed, 17 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c in=
dex
> d4e2cb9a4eb4..3f2976fb056a 100644
> --- a/drivers/bluetooth/btintel.c
> +++ b/drivers/bluetooth/btintel.c
> @@ -1700,6 +1700,11 @@ static int btintel_download_wait(struct hci_dev
> *hdev, ktime_t calltime, int mse
>  		return -ETIMEDOUT;
>  	}
>=20
> +	if (btintel_test_flag(hdev, INTEL_FIRMWARE_VERIFY_FAILED)) {
> +		bt_dev_err(hdev, "Firmware secure verification failed");
> +		return -EAGAIN;
> +	}
> +
>  	if (btintel_test_flag(hdev, INTEL_FIRMWARE_FAILED)) {
>  		bt_dev_err(hdev, "Firmware loading failed");
>  		return -ENOEXEC;
> @@ -1961,7 +1966,7 @@ static int btintel_download_fw(struct hci_dev
> *hdev,
>  	 * of this device.
>  	 */
>  	err =3D btintel_download_wait(hdev, calltime, 5000);
> -	if (err =3D=3D -ETIMEDOUT)
> +	if (err =3D=3D -ETIMEDOUT || err =3D=3D -EAGAIN)
>  		btintel_reset_to_bootloader(hdev);
>=20
>  done:
> @@ -2153,7 +2158,7 @@ static int btintel_prepare_fw_download_tlv(struct
> hci_dev *hdev,
>  	 * of this device.
>  	 */
>  	err =3D btintel_download_wait(hdev, calltime, 5000);
> -	if (err =3D=3D -ETIMEDOUT)
> +	if (err =3D=3D -ETIMEDOUT || err =3D=3D -EAGAIN)
>  		btintel_reset_to_bootloader(hdev);
>=20
>  done:
> @@ -2644,8 +2649,15 @@ void btintel_secure_send_result(struct hci_dev
> *hdev,
>  	if (len !=3D sizeof(*evt))
>  		return;
>=20
> -	if (evt->result)
> -		btintel_set_flag(hdev, INTEL_FIRMWARE_FAILED);
> +	if (evt->result) {
> +		bt_dev_err(hdev, "Intel Secure Send Results event result: %u
> status: %u",
> +			   evt->result, evt->status);
> +
> +		if (evt->result =3D=3D 3)
> +			btintel_set_flag(hdev,
> INTEL_FIRMWARE_VERIFY_FAILED);
> +		else
> +			btintel_set_flag(hdev, INTEL_FIRMWARE_FAILED);
> +	}
>=20
>  	if (btintel_test_and_clear_flag(hdev, INTEL_DOWNLOADING) &&
>  	    btintel_test_flag(hdev, INTEL_FIRMWARE_LOADED)) diff --git
> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index
> e0060e58573c..10e5be7e451a 100644
> --- a/drivers/bluetooth/btintel.h
> +++ b/drivers/bluetooth/btintel.h
> @@ -147,6 +147,7 @@ enum {
>  	INTEL_BOOTLOADER,
>  	INTEL_DOWNLOADING,
>  	INTEL_FIRMWARE_LOADED,
> +	INTEL_FIRMWARE_VERIFY_FAILED,
>  	INTEL_FIRMWARE_FAILED,
>  	INTEL_BOOTING,
>  	INTEL_BROKEN_INITIAL_NCMD,
> --
> 2.17.1