Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90bc1097 authored by Elliot Berman's avatar Elliot Berman
Browse files

haven: dbl: Initialize cap ids to HH_CAPID_INVAL 



Currently, the cap-ids for doorbells are initialized to 0. However, 0 is
a valid value for cap-id. Instead, initialize cap-ids to HH_CAPID_INVAL
in the doorbell driver.

Change-Id: Ia1588ed372f0657444e1ab39eab9e6c1e6d3d156
Signed-off-by: default avatarElliot Berman <eberman@codeaurora.org>
parent cfa1320d

drivers/virt/haven/hh_dbl.c

+4 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int hh_dbl_validate_params(struct hh_dbl_desc *client_desc, 
	 * There are no doorbell setup for Tx or Rx

	 */

	if (dir == HH_DBL_DIRECTION_RX) {

		if (!cap_table_entry->rx_cap_id ||

		if ((cap_table_entry->rx_cap_id == HH_CAPID_INVAL) ||

		    !cap_table_entry->rx_reg_done) {

			pr_err("%s: label: %d; rx_cap_id: %llu; dir: %d rx_done: %d\n",

				__func__, client_desc->label,
@@ -76,7 +76,7 @@ static int hh_dbl_validate_params(struct hh_dbl_desc *client_desc, 
			return -EAGAIN;

		}

	} else {

		if (!cap_table_entry->tx_cap_id ||

		if ((cap_table_entry->tx_cap_id == HH_CAPID_INVAL) ||

		    !cap_table_entry->tx_reg_done) {

			pr_err("%s: label: %d; tx_cap_id: %llu; dir: %d tx_done: %d\n",

				__func__, client_desc->label,
@@ -575,6 +575,8 @@ static int __init hh_dbl_init(void) 
	for (i = 0; i < HH_DBL_LABEL_MAX; i++) {

		entry = &hh_dbl_cap_table[i];

		mutex_init(&entry->cap_entry_lock);

		entry->tx_cap_id = HH_CAPID_INVAL;

		entry->rx_cap_id = HH_CAPID_INVAL;

		entry->rx_irq_name = kasprintf(GFP_KERNEL, "hh_dbl_rx_%d", i);

		if (!entry->rx_irq_name) {

			ret = -ENOMEM;