Created
April 8, 2014 15:12
-
-
Save tpetazzoni/10140121 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c | |
index 5409564..69c5cc3 100644 | |
--- a/drivers/irqchip/irq-armada-370-xp.c | |
+++ b/drivers/irqchip/irq-armada-370-xp.c | |
@@ -112,6 +112,8 @@ static int armada_370_xp_alloc_msi(void) | |
set_bit(hwirq, msi_used); | |
mutex_unlock(&msi_used_lock); | |
+ pr_info("===> allocated MSI %d\n", hwirq); | |
+ | |
return hwirq; | |
} | |
@@ -131,11 +133,15 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, | |
{ | |
struct msi_msg msg; | |
irq_hw_number_t hwirq; | |
- int virq; | |
+ int virq, ret; | |
- hwirq = armada_370_xp_alloc_msi(); | |
- if (hwirq < 0) | |
- return hwirq; | |
+ ret = armada_370_xp_alloc_msi(); | |
+ if (ret < 0) { | |
+ pr_info("Cannot allocate MSI, %d\n", ret); | |
+ return ret; | |
+ } | |
+ | |
+ hwirq = ret; | |
virq = irq_create_mapping(armada_370_xp_msi_domain, hwirq); | |
if (!virq) { | |
@@ -157,8 +163,12 @@ static void armada_370_xp_teardown_msi_irq(struct msi_chip *chip, | |
unsigned int irq) | |
{ | |
struct irq_data *d = irq_get_irq_data(irq); | |
+ unsigned long hwirq = d->hwirq; | |
+ | |
+ pr_info("Freeing MSI %d\n", hwirq); | |
+ | |
irq_dispose_mapping(irq); | |
- armada_370_xp_free_msi(d->hwirq); | |
+ armada_370_xp_free_msi(hwirq); | |
} | |
static struct irq_chip armada_370_xp_msi_irq_chip = { | |
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c | |
index 0e79665..1e26a39 100644 | |
--- a/drivers/pci/host/pci-mvebu.c | |
+++ b/drivers/pci/host/pci-mvebu.c | |
@@ -364,6 +364,8 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port) | |
(((port->bridge.memlimit & 0xFFF0) << 16) | 0xFFFFF) - | |
port->memwin_base; | |
+ pr_info("====> PCI CREATE WINDOW BASE = 0x%x, SIZE = 0x%x\n", | |
+ port->memwin_base, port->memwin_size); | |
mvebu_mbus_add_window_by_id(port->mem_target, port->mem_attr, | |
port->memwin_base, port->memwin_size); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment