From: Sasha Levin Date: Mon, 4 Dec 2023 19:50:14 +0000 (-0500) Subject: Drop pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 X-Git-Tag: v4.14.332~23^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e6c04b6bd31342ca68fc02397b6da2877fe7e3;p=thirdparty%2Fkernel%2Fstable-queue.git Drop pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 b/queue-6.1/pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 deleted file mode 100644 index 5b2ce7bc1a1..00000000000 --- a/queue-6.1/pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 +++ /dev/null @@ -1,82 +0,0 @@ -From 2daa2a2adcbaf45f17b14546a31f32ab9f0150f1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 25 Oct 2023 18:30:29 +0530 -Subject: PCI: qcom-ep: Add dedicated callback for writing to DBI2 registers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Manivannan Sadhasivam - -[ Upstream commit a07d2497ed657eb2efeb967af47e22f573dcd1d6 ] - -The DWC core driver exposes the write_dbi2() callback for writing to the -DBI2 registers in a vendor-specific way. - -On the Qcom EP platforms, the DBI_CS2 bit in the ELBI region needs to be -asserted before writing to any DBI2 registers and deasserted once done. - -So, let's implement the callback for the Qcom PCIe EP driver so that the -DBI2 writes are correctly handled in the hardware. - -Without this callback, the DBI2 register writes like BAR size won't go -through and as a result, the default BAR size is set for all BARs. - -[kwilczynski: commit log, renamed function to match the DWC convention] -Fixes: f55fee56a631 ("PCI: qcom-ep: Add Qualcomm PCIe Endpoint controller driver") -Suggested-by: Serge Semin -Link: https://lore.kernel.org/linux-pci/20231025130029.74693-2-manivannan.sadhasivam@linaro.org -Signed-off-by: Manivannan Sadhasivam -Signed-off-by: Krzysztof Wilczyński -Reviewed-by: Serge Semin -Cc: stable@vger.kernel.org # 5.16+ -Signed-off-by: Sasha Levin ---- - drivers/pci/controller/dwc/pcie-qcom-ep.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c -index d4c566c1c8725..1c7fd05ce0280 100644 ---- a/drivers/pci/controller/dwc/pcie-qcom-ep.c -+++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c -@@ -120,6 +120,7 @@ - - /* ELBI registers */ - #define ELBI_SYS_STTS 0x08 -+#define ELBI_CS2_ENABLE 0xa4 - - /* DBI registers */ - #define DBI_CON_STATUS 0x44 -@@ -252,6 +253,21 @@ static void qcom_pcie_dw_stop_link(struct dw_pcie *pci) - disable_irq(pcie_ep->perst_irq); - } - -+static void qcom_pcie_dw_write_dbi2(struct dw_pcie *pci, void __iomem *base, -+ u32 reg, size_t size, u32 val) -+{ -+ struct qcom_pcie_ep *pcie_ep = to_pcie_ep(pci); -+ int ret; -+ -+ writel(1, pcie_ep->elbi + ELBI_CS2_ENABLE); -+ -+ ret = dw_pcie_write(pci->dbi_base2 + reg, size, val); -+ if (ret) -+ dev_err(pci->dev, "Failed to write DBI2 register (0x%x): %d\n", reg, ret); -+ -+ writel(0, pcie_ep->elbi + ELBI_CS2_ENABLE); -+} -+ - static int qcom_pcie_enable_resources(struct qcom_pcie_ep *pcie_ep) - { - int ret; -@@ -446,6 +462,7 @@ static const struct dw_pcie_ops pci_ops = { - .link_up = qcom_pcie_dw_link_up, - .start_link = qcom_pcie_dw_start_link, - .stop_link = qcom_pcie_dw_stop_link, -+ .write_dbi2 = qcom_pcie_dw_write_dbi2, - }; - - static int qcom_pcie_ep_get_io_resources(struct platform_device *pdev, --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 7aa741746af..344b957ec45 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,7 +92,6 @@ iommu-vt-d-add-device_block_translation-helper.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch -pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 spi-fix-null-dereference-on-suspend.patch-13256 drm-amd-display-restore-rptr-wptr-for-dmcub-as-worka.patch-32587