Re: [PATCH v2 3/8] PCI: designware: update pcie core driver to work with dw hw version 3.65
From: Murali Karicheri
Date: Fri Jun 20 2014 - 13:28:40 EST
On 6/18/2014 3:13 AM, Mohit KUMAR DCG wrote:
Hello Murali,
-----Original Message-----
From: Murali Karicheri [mailto:m-karicheri2@xxxxxx]
Sent: Wednesday, June 11, 2014 12:21 AM
To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
linux-pci@xxxxxxxxxxxxxxx; devicetree@xxxxxxxxxxxxxxx; linux-
doc@xxxxxxxxxxxxxxx
Cc: Murali Karicheri; Santosh Shilimkar; Russell King; Grant Likely; Rob Herring;
Mohit KUMAR DCG; Jingoo Han; Bjorn Helgaas; Pratyush ANAND; Richard
Zhu; Kishon Vijay Abraham I; Marek Vasut; Arnd Bergmann; Pawel Moll;
Mark Rutland; Ian Campbell; Kumar Gala; Randy Dunlap
Subject: [PATCH v2 3/8] PCI: designware: update pcie core driver to work
with dw hw version 3.65
v3.65 version of the dw hw has MSI controller implemented in the application
space. Add a version variable in the port struct to identify v3.65 hardware for
different code treatment. This variable will have DW_V3_65 bit set when
running on this hw version. The host init code is expected to set this version
based on compatibility string dw,snps-pcie-v3.65.
Some of the MSI specific functions from current DW driver are re-used on
v3.65 hw. However on v3.65, MSI controller registers are in the application
register space and PCIE_MSI_INTR0_ENABLE is not applicable.
Modify assign_irq() to check for version and not execute the code for
PCIE_MSI_INTR0_ENABLE configuration on v3.65 hw. Additionally MSI IRQ
register in application space is written by EP to raise an MSI IRQ. So add a
get_msi_data() function in pcie_host_ops to retrieve the register address in
dw_msi_setup_irq(). v3.65 dw core driver implements this function.
Also make some of the functions available in dw core driver global and make
their prototypes available in the header file for re-use on v3.65.
- Pls apply MSI specific changes on the top of Lucas patches:
[PATCH 0/4] proper multi MSI handling for designware host
Thanks
Mohit
Ok. I have pulled in Lucas's patches and use it for my work.
Murali
Signed-off-by: Murali Karicheri <m-karicheri2@xxxxxx>
CC: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
CC: Russell King <linux@xxxxxxxxxxxxxxxx>
CC: Grant Likely <grant.likely@xxxxxxxxxx>
CC: Rob Herring <robh+dt@xxxxxxxxxx>
CC: Mohit Kumar <mohit.kumar@xxxxxx>
CC: Jingoo Han <jg1.han@xxxxxxxxxxx>
CC: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
CC: Pratyush Anand <pratyush.anand@xxxxxx>
CC: Richard Zhu <r65037@xxxxxxxxxxxxx>
CC: Kishon Vijay Abraham I <kishon@xxxxxx>
CC: Marek Vasut <marex@xxxxxxx>
CC: Arnd Bergmann <arnd@xxxxxxxx>
CC: Pawel Moll <pawel.moll@xxxxxxx>
CC: Mark Rutland <mark.rutland@xxxxxxx>
CC: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
CC: Kumar Gala <galak@xxxxxxxxxxxxxx>
CC: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
CC: Grant Likely <grant.likely@xxxxxxxxxx>
---
drivers/pci/host/pcie-designware.c | 27 +++++++++++++++++----------
drivers/pci/host/pcie-designware.h | 16 ++++++++++++++++
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-
designware.c
index e4bd19a..f985811 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -277,11 +277,15 @@ static int assign_irq(int no_irqs, struct msi_desc
*desc, int *pos)
}
set_bit(pos0 + i, pp->msi_irq_in_use);
/*Enable corresponding interrupt in MSI interrupt controller
*/
- res = ((pos0 + i) / 32) * 12;
- bit = (pos0 + i) % 32;
- dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res,
4, &val);
- val |= 1 << bit;
- dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res,
4, val);
+ if (!(pp->version & DW_V3_65)) {
+ res = ((pos0 + i) / 32) * 12;
+ bit = (pos0 + i) % 32;
+ dw_pcie_rd_own_conf(pp,
PCIE_MSI_INTR0_ENABLE + res,
+ 4, &val);
+ val |= 1 << bit;
+ dw_pcie_wr_own_conf(pp,
PCIE_MSI_INTR0_ENABLE + res,
+ 4, val);
+ }
}
*pos = pos0;
@@ -349,7 +353,10 @@ static int dw_msi_setup_irq(struct msi_chip *chip,
struct pci_dev *pdev,
*/
desc->msi_attrib.multiple = msgvec;
- msg.address_lo = virt_to_phys((void *)pp->msi_data);
+ if (pp->ops->get_msi_data)
+ msg.address_lo = pp->ops->get_msi_data(pp);
+ else
+ msg.address_lo = virt_to_phys((void *)pp->msi_data);
msg.address_hi = 0x0;
msg.data = pos;
write_msi_msg(irq, &msg);
@@ -768,7 +775,7 @@ static struct pci_ops dw_pcie_ops = {
.write = dw_pcie_wr_conf,
};
-static int dw_pcie_setup(int nr, struct pci_sys_data *sys)
+int dw_pcie_setup(int nr, struct pci_sys_data *sys)
{
struct pcie_port *pp;
@@ -791,7 +798,7 @@ static int dw_pcie_setup(int nr, struct pci_sys_data
*sys)
return 1;
}
-static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
+struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
{
struct pci_bus *bus;
struct pcie_port *pp = sys_to_pcie(sys); @@ -808,7 +815,7 @@ static
struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
return bus;
}
-static int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);
int irq;
@@ -820,7 +827,7 @@ static int dw_pcie_map_irq(const struct pci_dev
*dev, u8 slot, u8 pin)
return irq;
}
-static void dw_pcie_add_bus(struct pci_bus *bus)
+void dw_pcie_add_bus(struct pci_bus *bus)
{
if (IS_ENABLED(CONFIG_PCI_MSI)) {
struct pcie_port *pp = sys_to_pcie(bus->sysdata); diff --git
a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h
index 2d6dd66..3a6a6eb 100644
--- a/drivers/pci/host/pcie-designware.h
+++ b/drivers/pci/host/pcie-designware.h
@@ -39,6 +39,12 @@ struct pcie_port {
void __iomem *va_cfg0_base;
u64 cfg1_base;
void __iomem *va_cfg1_base;
+ /*
+ * v3.65 DW hw implements application register space for
+ * MSI and has no ATU view port
+ */
+#define DW_V3_65 BIT(0)
+ u32 version;
u64 io_base;
u64 mem_base;
spinlock_t conf_lock;
@@ -68,6 +74,7 @@ struct pcie_host_ops {
unsigned int devfn, int where, int size, u32 val);
int (*link_up)(struct pcie_port *pp);
void (*host_init)(struct pcie_port *pp);
+ u32 (*get_msi_data)(struct pcie_port *pp);
};
int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val);
@@ -77,5 +84,14 @@ void dw_pcie_msi_init(struct pcie_port *pp); int
dw_pcie_link_up(struct pcie_port *pp); void dw_pcie_setup_rc(struct
pcie_port *pp); int dw_pcie_host_init(struct pcie_port *pp);
+int dw_pcie_setup(int nr, struct pci_sys_data *sys); struct pci_bus
+*dw_pcie_scan_bus(int nr, struct pci_sys_data *sys); void
+dw_pcie_add_bus(struct pci_bus *bus); int
dw_pcie_parse_resource(struct
+pcie_port *pp);
+/* internal to DW common core driver */ int
+dw_pcie_common_host_init(struct pcie_port *pp, struct hw_pci *hw); int
+dw_pcie_msi_host_init(struct pcie_port *pp, struct device_node *np,
+ const struct irq_domain_ops *irq_ops); int
dw_pcie_map_irq(const
+struct pci_dev *dev, u8 slot, u8 pin);
#endif /* _PCIE_DESIGNWARE_H */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/