Unverified Commit 347d1c4b authored by Slawomir Blauciak's avatar Slawomir Blauciak Committed by Mark Brown
Browse files

ASoC: SOF: ipc: replace fw ready bitfield with explicit bit ordering 



Previously the structure used bitfields, which do not guarantee bit
ordering.

This change makes sure the order is clearly defined.  It also renames
and repurposes the field for general use.

Signed-off-by: default avatarSlawomir Blauciak <slawomir.blauciak@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f8658830

include/sound/sof/info.h

+10 −10
Original line number Diff line number Diff line
@@ -18,6 +18,14 @@ 


#define SOF_IPC_MAX_ELEMS	16



/*

 * Firmware boot info flag bits (64-bit)

 */

#define SOF_IPC_INFO_BUILD		BIT(0)

#define SOF_IPC_INFO_LOCKS		BIT(1)

#define SOF_IPC_INFO_LOCKSV		BIT(2)

#define SOF_IPC_INFO_GDB		BIT(3)



/* extended data types that can be appended onto end of sof_ipc_fw_ready */

enum sof_ipc_ext_data {

	SOF_IPC_EXT_DMA_BUFFER = 0,
@@ -49,16 +57,8 @@ struct sof_ipc_fw_ready { 
	uint32_t hostbox_size;

	struct sof_ipc_fw_version version;



	/* Miscellaneous debug flags showing build/debug features enabled */

	union {

		uint64_t reserved;

		struct {

			uint64_t build:1;

			uint64_t locks:1;

			uint64_t locks_verbose:1;

			uint64_t gdb:1;

		} bits;

	} debug;

	/* Miscellaneous flags */

	uint64_t flags;



	/* reserved for future use */

	uint32_t reserved[4];

sound/soc/sof/ipc.c

+7 −4
Original line number Diff line number Diff line
@@ -763,16 +763,19 @@ int snd_sof_ipc_valid(struct snd_sof_dev *sdev) 
		}

	}



	if (ready->debug.bits.build) {

	if (ready->flags & SOF_IPC_INFO_BUILD) {

		dev_info(sdev->dev,

			 "Firmware debug build %d on %s-%s - options:\n"

			 " GDB: %s\n"

			 " lock debug: %s\n"

			 " lock vdebug: %s\n",

			 v->build, v->date, v->time,

			 ready->debug.bits.gdb ? "enabled" : "disabled",

			 ready->debug.bits.locks ? "enabled" : "disabled",

			 ready->debug.bits.locks_verbose ? "enabled" : "disabled");

			 ready->flags & SOF_IPC_INFO_GDB ?

				"enabled" : "disabled",

			 ready->flags & SOF_IPC_INFO_LOCKS ?

				"enabled" : "disabled",

			 ready->flags & SOF_IPC_INFO_LOCKSV ?

				"enabled" : "disabled");

	}



	/* copy the fw_version into debugfs at first boot */

CRA Git | Maintained and supported by SUSTech CRA and CCSE