Re: [PATCH v2 12/22] MIPS/Octeon/MSI: Use MSI chip framework to configure MSI/MSI-X irq

2014-09-25 Thread Thierry Reding 
On Thu, Sep 25, 2014 at 11:14:22AM +0800, Yijing Wang wrote:
[...]
 diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
[...]
 @@ -132,12 +132,12 @@ msi_irq_allocated:
   /* Make sure the search for available interrupts didn't fail */
   if (irq = 64) {
   if (request_private_bits) {
 - pr_err(arch_setup_msi_irq: Unable to find %d free 
 interrupts, trying just one,
 + pr_err(octeon_setup_msi_irq: Unable to find %d free 
 interrupts, trying just one,
  1  request_private_bits);

Perhaps while at it make this (and other similar changes in this patch):

pr_err(%s(): Unable to ..., __func__, ...);

So that it becomes more resilient against this kind of rename?

   request_private_bits = 0;
   goto try_only_one;
   } else
 - panic(arch_setup_msi_irq: Unable to find a free MSI 
 interrupt);
 + panic(octeon_setup_msi_irq: Unable to find a free MSI 
 interrupt);

 @@ -210,14 +210,13 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, 
 int type)
  
   return 0;
  }
 -

This...

 @@ -240,7 +239,7 @@ void arch_teardown_msi_irq(unsigned int irq)
*/
   number_irqs = 0;
   while ((irq0 + number_irqs  64) 
 -(msi_multiple_irq_bitmask[index]
 + (msi_multiple_irq_bitmask[index]

... and this seem like unrelated whitespace changes.

(1ull  (irq0 + number_irqs
   number_irqs++;
   number_irqs++;
 @@ -249,8 +248,8 @@ void arch_teardown_msi_irq(unsigned int irq)
   /* Shift the mask to the correct bit location */
   bitmask = irq0;
   if ((msi_free_irq_bitmask[index]  bitmask) != bitmask)
 - panic(arch_teardown_msi_irq: Attempted to teardown MSI 
 -   interrupt (%d) not in use, irq);
 + panic(octeon_teardown_msi_irq: Attempted to teardown MSI 
 + interrupt (%d) not in use, irq);

And the second line here also needlessly changes the indentation.

Thierry


pgphO7kCbONIP.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH v2 12/22] MIPS/Octeon/MSI: Use MSI chip framework to configure MSI/MSI-X irq

2014-09-25 Thread Yijing Wang 
On 2014/9/25 15:34, Thierry Reding wrote:
 On Thu, Sep 25, 2014 at 11:14:22AM +0800, Yijing Wang wrote:
 [...]
 diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
 [...]
 @@ -132,12 +132,12 @@ msi_irq_allocated:
  /* Make sure the search for available interrupts didn't fail */
  if (irq = 64) {
  if (request_private_bits) {
 -pr_err(arch_setup_msi_irq: Unable to find %d free 
 interrupts, trying just one,
 +pr_err(octeon_setup_msi_irq: Unable to find %d free 
 interrupts, trying just one,
 1  request_private_bits);
 
 Perhaps while at it make this (and other similar changes in this patch):
 
   pr_err(%s(): Unable to ..., __func__, ...);

Will update it, thanks!

 
 So that it becomes more resilient against this kind of rename?
 
  request_private_bits = 0;
  goto try_only_one;
  } else
 -panic(arch_setup_msi_irq: Unable to find a free MSI 
 interrupt);
 +panic(octeon_setup_msi_irq: Unable to find a free MSI 
 interrupt);
 
 @@ -210,14 +210,13 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, 
 int type)
  
  return 0;
  }
 -
 
 This...

OK

 
 @@ -240,7 +239,7 @@ void arch_teardown_msi_irq(unsigned int irq)
   */
  number_irqs = 0;
  while ((irq0 + number_irqs  64) 
 -   (msi_multiple_irq_bitmask[index]
 +(msi_multiple_irq_bitmask[index]
 
 ... and this seem like unrelated whitespace changes.

OK

 
   (1ull  (irq0 + number_irqs
  number_irqs++;
  number_irqs++;
 @@ -249,8 +248,8 @@ void arch_teardown_msi_irq(unsigned int irq)
  /* Shift the mask to the correct bit location */
  bitmask = irq0;
  if ((msi_free_irq_bitmask[index]  bitmask) != bitmask)
 -panic(arch_teardown_msi_irq: Attempted to teardown MSI 
 -  interrupt (%d) not in use, irq);
 +panic(octeon_teardown_msi_irq: Attempted to teardown MSI 
 +interrupt (%d) not in use, irq);
 
 And the second line here also needlessly changes the indentation.

OK
 
 Thierry
 


-- 
Thanks!
Yijing

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH v2 12/22] MIPS/Octeon/MSI: Use MSI chip framework to configure MSI/MSI-X irq

2014-09-24 Thread Yijing Wang 
Use MSI chip framework instead of arch MSI functions to configure
MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework.

Signed-off-by: Yijing Wang wangyij...@huawei.com
---
 arch/mips/pci/msi-octeon.c |   35 ++-
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
index 63bbe07..14f2d16 100644
--- a/arch/mips/pci/msi-octeon.c
+++ b/arch/mips/pci/msi-octeon.c
@@ -57,7 +57,7 @@ static int msi_irq_size;
  *
  * Returns 0 on success.
  */
-int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
+static int octeon_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
 {
struct msi_msg msg;
u16 control;
@@ -132,12 +132,12 @@ msi_irq_allocated:
/* Make sure the search for available interrupts didn't fail */
if (irq = 64) {
if (request_private_bits) {
-   pr_err(arch_setup_msi_irq: Unable to find %d free 
interrupts, trying just one,
+   pr_err(octeon_setup_msi_irq: Unable to find %d free 
interrupts, trying just one,
   1  request_private_bits);
request_private_bits = 0;
goto try_only_one;
} else
-   panic(arch_setup_msi_irq: Unable to find a free MSI 
interrupt);
+   panic(octeon_setup_msi_irq: Unable to find a free MSI 
interrupt);
}
 
/* MSI interrupts start at logical IRQ OCTEON_IRQ_MSI_BIT0 */
@@ -168,7 +168,7 @@ msi_irq_allocated:
msg.address_hi = (0 + CVMX_SLI_PCIE_MSI_RCV)  32;
break;
default:
-   panic(arch_setup_msi_irq: Invalid octeon_dma_bar_type);
+   panic(octeon_setup_msi_irq: Invalid octeon_dma_bar_type);
}
msg.data = irq - OCTEON_IRQ_MSI_BIT0;
 
@@ -182,7 +182,7 @@ msi_irq_allocated:
return 0;
 }
 
-int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+static int octeon_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
struct msi_desc *entry;
int ret;
@@ -201,7 +201,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int 
type)
return 1;
 
list_for_each_entry(entry, dev-msi_list, list) {
-   ret = arch_setup_msi_irq(dev, entry);
+   ret = octeon_setup_msi_irq(dev, entry);
if (ret  0)
return ret;
if (ret  0)
@@ -210,14 +210,13 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, 
int type)
 
return 0;
 }
-
 /**
  * Called when a device no longer needs its MSI interrupts. All
  * MSI interrupts for the device are freed.
  *
  * @irq:The devices first irq number. There may be multple in sequence.
  */
-void arch_teardown_msi_irq(unsigned int irq)
+static void octeon_teardown_msi_irq(unsigned int irq)
 {
int number_irqs;
u64 bitmask;
@@ -226,8 +225,8 @@ void arch_teardown_msi_irq(unsigned int irq)
 
if ((irq  OCTEON_IRQ_MSI_BIT0)
|| (irq  msi_irq_size + OCTEON_IRQ_MSI_BIT0))
-   panic(arch_teardown_msi_irq: Attempted to teardown illegal 
- MSI interrupt (%d), irq);
+   panic(octeon_teardown_msi_irq: Attempted to teardown illegal 
+   MSI interrupt (%d), irq);
 
irq -= OCTEON_IRQ_MSI_BIT0;
index = irq / 64;
@@ -240,7 +239,7 @@ void arch_teardown_msi_irq(unsigned int irq)
 */
number_irqs = 0;
while ((irq0 + number_irqs  64) 
-  (msi_multiple_irq_bitmask[index]
+   (msi_multiple_irq_bitmask[index]
 (1ull  (irq0 + number_irqs
number_irqs++;
number_irqs++;
@@ -249,8 +248,8 @@ void arch_teardown_msi_irq(unsigned int irq)
/* Shift the mask to the correct bit location */
bitmask = irq0;
if ((msi_free_irq_bitmask[index]  bitmask) != bitmask)
-   panic(arch_teardown_msi_irq: Attempted to teardown MSI 
- interrupt (%d) not in use, irq);
+   panic(octeon_teardown_msi_irq: Attempted to teardown MSI 
+   interrupt (%d) not in use, irq);
 
/* Checks are done, update the in use bitmask */
spin_lock(msi_free_irq_bitmask_lock);
@@ -259,6 +258,16 @@ void arch_teardown_msi_irq(unsigned int irq)
spin_unlock(msi_free_irq_bitmask_lock);
 }
 
+static struct msi_chip octeon_msi_chip = {
+   .setup_irqs = octeon_setup_msi_irqs,
+   .teardown_irq = octeon_teardown_msi_irq,
+};
+
+struct msi_chip *arch_find_msi_chip(struct pci_dev *dev)
+{
+   return octeon_msi_chip;
+}
+
 static DEFINE_RAW_SPINLOCK(octeon_irq_msi_lock);
 
 static u64 msi_rcv_reg[4];
-- 
1.7.1

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org