Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id

Browse source 
commit 2dba285caba53f309d6060fca911b43d63f41697 upstream.

Remove wrong mask on subsys_vendor_id. Both the Vendor ID and Subsystem
Vendor ID are u16 variables and are written to a u32 register of the
controller. The Subsystem Vendor ID was always 0 because the u16 value
was masked incorrectly with GENMASK(31,16) resulting in all lower 16
bits being set to 0 prior to the shift.

Remove both masks as they are unnecessary and set the register correctly
i.e., the lower 16-bits are the Vendor ID and the upper 16-bits are the
Subsystem Vendor ID.

This is documented in the RK3399 TRM section 17.6.7.1.17

[kwilczynski: removed unnecesary newline]
Fixes: cf590b078391 ("PCI: rockchip: Add EP driver for Rockchip PCIe controller")
Link: https://lore.kernel.org/linux-pci/20240403144508.489835-1-rick.wertenbroek@gmail.com
Signed-off-by: Rick Wertenbroek <rick.wertenbroek@gmail.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rick Wertenbroek 2024-04-03 16:45:08 +02:00 committed by Ksawlii
parent ba49ec7160
commit 163c8dd6f6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/pci/controller/pcie-rockchip-ep.c
View file

@ -131,10 +131,8 @@ static int rockchip_pcie_ep_write_header(struct pci_epc *epc, u8 fn,
/* All functions share the same vendor ID with function 0 */ /* All functions share the same vendor ID with function 0 */
if (fn == 0) { if (fn == 0) {
u32 vid_regs = (hdr->vendorid & GENMASK(15, 0)) | rockchip_pcie_write(rockchip,
(hdr->subsys_vendor_id & GENMASK(31, 16)) << 16; hdr->vendorid | hdr->subsys_vendor_id << 16,
rockchip_pcie_write(rockchip, vid_regs,
PCIE_CORE_CONFIG_VENDOR); PCIE_CORE_CONFIG_VENDOR);
} }