Skip to content

Generic process implementation #2956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
keyonjie wants to merge 4 commits into from
Closed

Generic process implementation #2956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81a2789
ipc: topology: add a generic process component type
keyonjie May 9, 2020
361382e
ipc:: add subtype to sof_ipc_comp
keyonjie May 9, 2020
8a053ab
component: add handle to generic process component
keyonjie May 9, 2020
d46ccc6
ABI: bump the ABI minor version to 17
keyonjie May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/audio/component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,14 @@ struct comp_dev *comp_new(struct sof_ipc_comp *comp)
/* find the driver for our new component */
drv = get_drv(comp->type);
if (!drv) {
tr_err(&comp_tr, "comp_new(): driver not found, comp->type = %u",
comp->type);
return NULL;
tr_info(&comp_tr, "comp_new(), no type %d, fallback to use subtype",
comp->type);
Copy link
Collaborator

@dbaluta dbaluta May 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be tr_dbg instead of tr_info, when we will have full support for traces this will make a difference.

Copy link
Contributor Author

@keyonjie keyonjie May 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted this message to be logged most of the time, that's why I uses tr_info, not tr_dbg.

drv = get_drv(comp->subtype);
if (!drv) {
tr_err(&comp_tr, "comp_new(): driver not found, comp->type = %u",
comp->type);
return NULL;
}
}

/* validate size of ipc config */
Expand Down
9 changes: 7 additions & 2 deletions src/include/ipc/topology.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ enum sof_comp_type {
SOF_COMP_ASRC, /**< Asynchronous sample rate converter */
SOF_COMP_DCBLOCK,
SOF_COMP_SMART_AMP, /**< smart amplifier component */

/*
* No more _COMP_ types to be added.
* Use SOF_COMP_PROCESS from now on.
*/
SOF_COMP_PROCESS = 1000, /**< generic process component */
Copy link
Member

@lgirdwood lgirdwood May 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add.
/*No more _COMP_ types to be added. Use SOF_COMP_PROCESS from now on.

Copy link
Contributor Author

@keyonjie keyonjie May 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing.

/* keep FILEREAD/FILEWRITE as the last ones */
SOF_COMP_FILEREAD = 10000, /**< host test based file IO */
SOF_COMP_FILEWRITE = 10001, /**< host test based file IO */
Expand All @@ -65,8 +71,7 @@ struct sof_ipc_comp {
uint32_t pipeline_id;
uint32_t core;

/* reserved for future use */
uint32_t reserved[1];
uint32_t subtype; /**< flavour for generic component type */
} __attribute__((packed));

/*
Expand Down
2 changes: 1 addition & 1 deletion src/include/kernel/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/** \brief SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3
#define SOF_ABI_MINOR 16
#define SOF_ABI_MINOR 17
#define SOF_ABI_PATCH 0

/** \brief SOF ABI version number. Format within 32bit word is MMmmmppp */
Expand Down