Patch "phy: zynqmp: Take the phy mutex in xlate" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    phy: zynqmp: Take the phy mutex in xlate

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     phy-zynqmp-take-the-phy-mutex-in-xlate.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f3d02435e4cc501781d129c0b2d3b601386a3de5
Author: Sean Anderson <sean.anderson@xxxxxxxxx>
Date:   Fri Jun 28 16:55:39 2024 -0400

    phy: zynqmp: Take the phy mutex in xlate
    
    [ Upstream commit d79c6840917097285e03a49f709321f5fb972750 ]
    
    Take the phy mutex in xlate to protect against concurrent
    modification/access to gtr_phy. This does not typically cause any
    issues, since in most systems the phys are only xlated once and
    thereafter accessed with the phy API (which takes the locks). However,
    we are about to allow userspace to access phys for debugging, so it's
    important to avoid any data races.
    
    Signed-off-by: Sean Anderson <sean.anderson@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240628205540.3098010-5-sean.anderson@xxxxxxxxx
    Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
index ac9a9124a36d..cc36fb7616ae 100644
--- a/drivers/phy/xilinx/phy-zynqmp.c
+++ b/drivers/phy/xilinx/phy-zynqmp.c
@@ -847,6 +847,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
 	phy_type = args->args[1];
 	phy_instance = args->args[2];
 
+	guard(mutex)(&gtr_phy->phy->mutex);
 	ret = xpsgtr_set_lane_type(gtr_phy, phy_type, phy_instance);
 	if (ret < 0) {
 		dev_err(gtr_dev->dev, "Invalid PHY type and/or instance\n");