From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Robert Hancock <robert.hancock@calian.com>,
Michal Simek <michal.simek@xilinx.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Vinod Koul <vkoul@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 056/116] phy: xilinx: zynqmp: Fix bus width setting for SGMII
Date: Mon, 14 Feb 2022 10:25:55 +0100 [thread overview]
Message-ID: <20220214092500.669503172@linuxfoundation.org> (raw)
In-Reply-To: <20220214092458.668376521@linuxfoundation.org>
From: Robert Hancock <robert.hancock@calian.com>
[ Upstream commit 37291f60d0822f191748c2a54ce63b0bc669020f ]
TX_PROT_BUS_WIDTH and RX_PROT_BUS_WIDTH are single registers with
separate bit fields for each lane. The code in xpsgtr_phy_init_sgmii was
not preserving the existing register value for other lanes, so enabling
the PHY in SGMII mode on one lane zeroed out the settings for all other
lanes, causing other PS-GTR peripherals such as USB3 to malfunction.
Use xpsgtr_clr_set to only manipulate the desired bits in the register.
Fixes: 4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit Transceiver")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20220126001600.1592218-1-robert.hancock@calian.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/phy/xilinx/phy-zynqmp.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
index 2b0f921b6ee3d..b8ccac6f31467 100644
--- a/drivers/phy/xilinx/phy-zynqmp.c
+++ b/drivers/phy/xilinx/phy-zynqmp.c
@@ -134,7 +134,8 @@
#define PROT_BUS_WIDTH_10 0x0
#define PROT_BUS_WIDTH_20 0x1
#define PROT_BUS_WIDTH_40 0x2
-#define PROT_BUS_WIDTH_SHIFT 2
+#define PROT_BUS_WIDTH_SHIFT(n) ((n) * 2)
+#define PROT_BUS_WIDTH_MASK(n) GENMASK((n) * 2 + 1, (n) * 2)
/* Number of GT lanes */
#define NUM_LANES 4
@@ -443,12 +444,12 @@ static void xpsgtr_phy_init_sata(struct xpsgtr_phy *gtr_phy)
static void xpsgtr_phy_init_sgmii(struct xpsgtr_phy *gtr_phy)
{
struct xpsgtr_dev *gtr_dev = gtr_phy->dev;
+ u32 mask = PROT_BUS_WIDTH_MASK(gtr_phy->lane);
+ u32 val = PROT_BUS_WIDTH_10 << PROT_BUS_WIDTH_SHIFT(gtr_phy->lane);
/* Set SGMII protocol TX and RX bus width to 10 bits. */
- xpsgtr_write(gtr_dev, TX_PROT_BUS_WIDTH,
- PROT_BUS_WIDTH_10 << (gtr_phy->lane * PROT_BUS_WIDTH_SHIFT));
- xpsgtr_write(gtr_dev, RX_PROT_BUS_WIDTH,
- PROT_BUS_WIDTH_10 << (gtr_phy->lane * PROT_BUS_WIDTH_SHIFT));
+ xpsgtr_clr_set(gtr_dev, TX_PROT_BUS_WIDTH, mask, val);
+ xpsgtr_clr_set(gtr_dev, RX_PROT_BUS_WIDTH, mask, val);
xpsgtr_bypass_scrambler_8b10b(gtr_phy);
}
--
2.34.1
next prev parent reply other threads:[~2022-02-14 9:53 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 9:24 [PATCH 5.10 000/116] 5.10.101-rc1 review Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 001/116] integrity: check the return value of audit_log_start() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 002/116] ima: Remove ima_policy file before directory Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 003/116] ima: Allow template selection with ima_template[_fmt]= after ima_hash= Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 004/116] ima: Do not print policy rule with inactive LSM labels Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 005/116] mmc: sdhci-of-esdhc: Check for error num after setting mask Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 006/116] can: isotp: fix potential CAN frame reception race in isotp_rcv() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 007/116] net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 008/116] net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 009/116] NFS: Fix initialisation of nfs_client cl_flags field Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 010/116] NFSD: Clamp WRITE offsets Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 011/116] NFSD: Fix offset type in I/O trace points Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 012/116] drm/amdgpu: Set a suitable dev_info.gart_page_size Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 013/116] tracing: Propagate is_signed to expression Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 014/116] NFS: change nfs_access_get_cached to only report the mask Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 015/116] NFSv4 only print the label when its queried Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 016/116] nfs: nfs4clinet: check the return value of kstrdup() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 017/116] NFSv4.1: Fix uninitialised variable in devicenotify Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 018/116] NFSv4 remove zero number of fs_locations entries error check Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 019/116] NFSv4 expose nfs_parse_server_name function Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 020/116] NFSv4 handle port presence in fs_location server string Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 021/116] x86/perf: Avoid warning for Arch LBR without XSAVE Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 022/116] drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 023/116] net: sched: Clarify error message when qdisc kind is unknown Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 024/116] powerpc/fixmap: Fix VM debug warning on unmap Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 025/116] scsi: target: iscsi: Make sure the np under each tpg is unique Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 026/116] scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 027/116] scsi: qedf: Add stag_work to all the vports Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 028/116] scsi: qedf: Fix refcount issue when LOGO is received during TMF Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 029/116] scsi: pm8001: Fix bogus FW crash for maxcpus=1 Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 030/116] scsi: ufs: Treat link loss as fatal error Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 031/116] scsi: myrs: Fix crash in error case Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 032/116] PM: hibernate: Remove register_nosave_region_late() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 033/116] usb: dwc2: gadget: dont try to disable ep0 in dwc2_hsotg_suspend Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 034/116] perf: Always wake the parent event Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 035/116] nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 036/116] net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 037/116] KVM: eventfd: Fix false positive RCU usage warning Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 038/116] KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 039/116] KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 040/116] KVM: SVM: Dont kill SEV guest if SMAP erratum triggers in usermode Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 041/116] KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 042/116] riscv: fix build with binutils 2.38 Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 043/116] ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 044/116] ARM: dts: Fix boot regression on Skomer Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 045/116] ARM: socfpga: fix missing RESET_CONTROLLER Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 046/116] nvme-tcp: fix bogus request completion when failing to send AER Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 047/116] ACPI/IORT: Check node revision for PMCG resources Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 048/116] PM: s2idle: ACPI: Fix wakeup interrupts handling Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 049/116] drm/rockchip: vop: Correct RK3399 VOP register fields Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 050/116] ARM: dts: Fix timer regression for beagleboard revision c Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 051/116] ARM: dts: meson: Fix the UART compatible strings Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 052/116] ARM: dts: meson8: Fix the UART device-tree schema validation Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 053/116] ARM: dts: meson8b: " Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 054/116] staging: fbtft: Fix error path in fbtft_driver_module_init() Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 055/116] ARM: dts: imx6qdl-udoo: Properly describe the SD card detect Greg Kroah-Hartman
2022-02-14 9:25 ` Greg Kroah-Hartman [this message]
2022-02-14 9:25 ` [PATCH 5.10 057/116] ARM: dts: imx7ulp: Fix assigned-clocks-parents typo Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 058/116] usb: f_fs: Fix use-after-free for epfile Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 059/116] gpio: aggregator: Fix calling into sleeping GPIO controllers Greg Kroah-Hartman
2022-02-14 9:25 ` [PATCH 5.10 060/116] drm/vc4: hdmi: Allow DBLCLK modes even if horz timing is odd Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 061/116] misc: fastrpc: avoid double fput() on failed usercopy Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 062/116] netfilter: ctnetlink: disable helper autoassign Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 063/116] arm64: dts: meson-g12b-odroid-n2: fix typo dio2133 Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 064/116] ixgbevf: Require large buffers for build_skb on 82599VF Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 065/116] drm/panel: simple: Assign data from panel_dpi_probe() correctly Greg Kroah-Hartman
2022-02-14 9:26 ` Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 066/116] ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 067/116] gpio: sifive: use the correct register to read output values Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 068/116] bonding: pair enable_port with slave_arr_updates Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 069/116] net: dsa: mv88e6xxx: dont use devres for mdiobus Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 070/116] net: dsa: ar9331: register the mdiobus under devres Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 071/116] net: dsa: bcm_sf2: dont use devres for mdiobus Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 072/116] net: dsa: felix: " Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 073/116] net: dsa: lantiq_gswip: " Greg Kroah-Hartman
2022-02-15 9:35 ` Alexey Khoroshilov
2022-02-15 9:45 ` Vladimir Oltean
2022-02-15 10:06 ` Alexey Khoroshilov
2022-02-14 9:26 ` [PATCH 5.10 074/116] ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 075/116] nfp: flower: fix ida_idx not being released Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 076/116] net: do not keep the dst cache when uncloning an skb dst and its metadata Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 077/116] net: fix a memleak " Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 078/116] veth: fix races around rq->rx_notify_masked Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 079/116] net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 080/116] tipc: rate limit warning for received illegal binding update Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 081/116] net: amd-xgbe: disable interrupts during pci removal Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 082/116] dpaa2-eth: unregister the netdev before disconnecting from the PHY Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 083/116] ice: fix an error code in ice_cfg_phy_fec() Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 084/116] ice: fix IPIP and SIT TSO offload Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 085/116] net: mscc: ocelot: fix mutex lock error during ethtool stats read Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 086/116] net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 087/116] vt_ioctl: fix array_index_nospec in vt_setactivate Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 088/116] vt_ioctl: add array_index_nospec to VT_ACTIVATE Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 089/116] n_tty: wake up poll(POLLRDNORM) on receiving data Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 090/116] eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 091/116] usb: dwc2: drd: fix soft connect when gadget is unconfigured Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 092/116] Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 093/116] net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 094/116] usb: ulpi: Move of_node_put to ulpi_dev_release Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 095/116] usb: ulpi: Call of_node_put correctly Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 096/116] usb: dwc3: gadget: Prevent core from processing stale TRBs Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 097/116] usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 098/116] USB: gadget: validate interface OS descriptor requests Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 099/116] usb: gadget: rndis: check size of RNDIS_MSG_SET command Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 100/116] usb: gadget: f_uac2: Define specific wTerminalType Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 101/116] usb: raw-gadget: fix handling of dual-direction-capable endpoints Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 102/116] USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 103/116] USB: serial: option: add ZTE MF286D modem Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 104/116] USB: serial: ch341: add support for GW Instek USB2.0-Serial devices Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 105/116] USB: serial: cp210x: add NCR Retail IO box id Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 106/116] USB: serial: cp210x: add CPI Bulk Coin Recycler id Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 107/116] speakup-dectlk: Restore pitch setting Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 108/116] phy: ti: Fix missing sentinel for clk_div_table Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 109/116] hwmon: (dell-smm) Speed up setting of fan speed Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 110/116] Makefile.extrawarn: Move -Wunaligned-access to W=1 Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 111/116] can: isotp: fix error path in isotp_sendmsg() to unlock wait queue Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 112/116] scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 113/116] scsi: lpfc: Reduce log messages seen after firmware download Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 114/116] arm64: dts: imx8mq: fix lcdif port node Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 115/116] perf: Fix list corruption in perf_cgroup_switch() Greg Kroah-Hartman
2022-02-14 9:26 ` [PATCH 5.10 116/116] iommu: Fix potential use-after-free during probe Greg Kroah-Hartman
2022-02-14 11:34 ` [PATCH 5.10 000/116] 5.10.101-rc1 review Pavel Machek
2022-02-14 14:22 ` Jon Hunter
2022-02-14 20:36 ` Florian Fainelli
2022-02-14 21:33 ` Slade Watkins
2022-02-14 22:25 ` Shuah Khan
2022-02-15 1:52 ` Guenter Roeck
2022-02-15 2:22 ` Fox Chen
2022-02-15 6:14 ` Samuel Zou
2022-02-15 9:04 ` Naresh Kamboju
2022-02-15 15:53 ` Sudip Mukherjee
2022-02-16 6:17 ` Bagas Sanjaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220214092500.669503172@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=robert.hancock@calian.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.