e2e2fc3cd0
Add updated patches for 6.6. DMA/cache-handling patches have been reworked / backported from upstream. Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
88 lines
2.4 KiB
Diff
88 lines
2.4 KiB
Diff
From a53cf9b237dd53c9538b51a8df592888935c8411 Mon Sep 17 00:00:00 2001
|
|
From: Minda Chen <minda.chen@starfivetech.com>
|
|
Date: Mon, 8 Jan 2024 19:05:56 +0800
|
|
Subject: [PATCH 019/116] PCI: microchip: Move PCIe host data structures to
|
|
plda-pcie.h
|
|
|
|
Move the common data structures definition to head file for these two data
|
|
structures can be re-used.
|
|
|
|
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
|
|
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
|
|
---
|
|
.../pci/controller/plda/pcie-microchip-host.c | 20 ------------------
|
|
drivers/pci/controller/plda/pcie-plda.h | 21 +++++++++++++++++++
|
|
2 files changed, 21 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
@@ -21,9 +21,6 @@
|
|
#include "../../pci.h"
|
|
#include "pcie-plda.h"
|
|
|
|
-/* Number of MSI IRQs */
|
|
-#define PLDA_MAX_NUM_MSI_IRQS 32
|
|
-
|
|
/* PCIe Bridge Phy and Controller Phy offsets */
|
|
#define MC_PCIE1_BRIDGE_ADDR 0x00008000u
|
|
#define MC_PCIE1_CTRL_ADDR 0x0000a000u
|
|
@@ -179,23 +176,6 @@ struct event_map {
|
|
u32 event_bit;
|
|
};
|
|
|
|
-struct plda_msi {
|
|
- struct mutex lock; /* Protect used bitmap */
|
|
- struct irq_domain *msi_domain;
|
|
- struct irq_domain *dev_domain;
|
|
- u32 num_vectors;
|
|
- u64 vector_phy;
|
|
- DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
|
|
-};
|
|
-
|
|
-struct plda_pcie_rp {
|
|
- struct device *dev;
|
|
- struct irq_domain *intx_domain;
|
|
- struct irq_domain *event_domain;
|
|
- raw_spinlock_t lock;
|
|
- struct plda_msi msi;
|
|
- void __iomem *bridge_addr;
|
|
-};
|
|
|
|
struct mc_pcie {
|
|
struct plda_pcie_rp plda;
|
|
--- a/drivers/pci/controller/plda/pcie-plda.h
|
|
+++ b/drivers/pci/controller/plda/pcie-plda.h
|
|
@@ -6,6 +6,9 @@
|
|
#ifndef _PCIE_PLDA_H
|
|
#define _PCIE_PLDA_H
|
|
|
|
+/* Number of MSI IRQs */
|
|
+#define PLDA_MAX_NUM_MSI_IRQS 32
|
|
+
|
|
/* PCIe Bridge Phy Regs */
|
|
#define PCIE_PCI_IRQ_DW0 0xa8
|
|
#define MSIX_CAP_MASK BIT(31)
|
|
@@ -105,4 +108,22 @@ enum plda_int_event {
|
|
|
|
#define PLDA_MAX_INT_NUM (PLDA_NUM_DMA_EVENTS + PLDA_INT_EVENT_NUM)
|
|
|
|
+struct plda_msi {
|
|
+ struct mutex lock; /* Protect used bitmap */
|
|
+ struct irq_domain *msi_domain;
|
|
+ struct irq_domain *dev_domain;
|
|
+ u32 num_vectors;
|
|
+ u64 vector_phy;
|
|
+ DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
|
|
+};
|
|
+
|
|
+struct plda_pcie_rp {
|
|
+ struct device *dev;
|
|
+ struct irq_domain *intx_domain;
|
|
+ struct irq_domain *event_domain;
|
|
+ raw_spinlock_t lock;
|
|
+ struct plda_msi msi;
|
|
+ void __iomem *bridge_addr;
|
|
+};
|
|
+
|
|
#endif
|