Commit f31824a6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-6.16' of... 

Merge tag 'samsung-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes

Samsung SoC fixes for v6.16

1. Correct CONFIG option in arm64 defconfig enabling the Qualcomm SoC
   SNPS EUSB2 phy driver, because Kconfig entry was renamed when
   changing the driver to a common one, shared with Samsung SoC, thus
   defconfig lost that driver effectively.

2. Exynos ACPM: Fix timeouts happening with multiple requests.

* tag 'samsung-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  firmware: exynos-acpm: fix timeouts on xfers handling
  arm64: defconfig: update renamed PHY_SNPS_EUSB2
parents 9a5d769c 8d2c2fa2

arch/arm64/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -1573,6 +1573,7 @@ CONFIG_RESET_QCOM_AOSS=y 
CONFIG_RESET_QCOM_PDC=m

CONFIG_RESET_RZG2L_USBPHY_CTRL=y

CONFIG_RESET_TI_SCI=y

CONFIG_PHY_SNPS_EUSB2=m

CONFIG_PHY_XGENE=y

CONFIG_PHY_CAN_TRANSCEIVER=m

CONFIG_PHY_NXP_PTN3222=m
@@ -1597,7 +1598,6 @@ CONFIG_PHY_QCOM_EDP=m 
CONFIG_PHY_QCOM_PCIE2=m

CONFIG_PHY_QCOM_QMP=m

CONFIG_PHY_QCOM_QUSB2=m

CONFIG_PHY_QCOM_SNPS_EUSB2=m

CONFIG_PHY_QCOM_EUSB2_REPEATER=m

CONFIG_PHY_QCOM_M31_USB=m

CONFIG_PHY_QCOM_USB_HS=m

drivers/firmware/samsung/exynos-acpm.c

+9 −16
Original line number Diff line number Diff line
@@ -430,6 +430,9 @@ int acpm_do_xfer(const struct acpm_handle *handle, const struct acpm_xfer *xfer) 
		return -EOPNOTSUPP;

	}



	msg.chan_id = xfer->acpm_chan_id;

	msg.chan_type = EXYNOS_MBOX_CHAN_TYPE_DOORBELL;



	scoped_guard(mutex, &achan->tx_lock) {

		tx_front = readl(achan->tx.front);

		idx = (tx_front + 1) % achan->qlen;
@@ -446,25 +449,15 @@ int acpm_do_xfer(const struct acpm_handle *handle, const struct acpm_xfer *xfer) 


		/* Advance TX front. */

		writel(idx, achan->tx.front);

	}



	msg.chan_id = xfer->acpm_chan_id;

	msg.chan_type = EXYNOS_MBOX_CHAN_TYPE_DOORBELL;

		ret = mbox_send_message(achan->chan, (void *)&msg);

		if (ret < 0)

			return ret;



	ret = acpm_wait_for_message_response(achan, xfer);



	/*

	 * NOTE: we might prefer not to need the mailbox ticker to manage the

	 * transfer queueing since the protocol layer queues things by itself.

	 * Unfortunately, we have to kick the mailbox framework after we have

	 * received our message.

	 */

	mbox_client_txdone(achan->chan, ret);

		mbox_client_txdone(achan->chan, 0);

	}



	return ret;

	return acpm_wait_for_message_response(achan, xfer);

}



/**