2007-02-09 16:06:57

by Al Viro

Subject: [PATCH] ps3 usb missed the addition of new argument to ps3_alloc_io_irq()

Signed-off-by: Al Viro <[email protected]>
---
drivers/usb/host/ehci-ps3.c | 2 +-
drivers/usb/host/ohci-ps3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 371f194..4d781a2 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -104,7 +104,7 @@ static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);

- result = ps3_alloc_io_irq(dev->interrupt_id, &virq);
+ result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);

if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 69d948b..62283a3 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -107,7 +107,7 @@ static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);

- result = ps3_alloc_io_irq(dev->interrupt_id, &virq);
+ result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);

if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
--
1.5.0-rc2.GIT

2007-02-09 16:14:25

by Geoff Levand

Subject: Re: [PATCH] ps3 usb missed the addition of new argument to ps3_alloc_io_irq()

Al Viro wrote:
> Signed-off-by: Al Viro <[email protected]>

Greg had this same change queued for his usb tree.

Acked-by: Geoff Levand <[email protected]>

2007-02-09 17:08:03

by Geoff Levand

Subject: Re: [PATCH] ps3 usb missed the addition of new argument to ps3_alloc_io_irq()

Geoff Levand wrote:
> Al Viro wrote:
>> Signed-off-by: Al Viro <[email protected]>
>
> Greg had this same change queued for his usb tree.
>
> Acked-by: Geoff Levand <[email protected]>
>

Update the PS3 irq allocation routines to take an argument indicating which
cpu (processor thread) the interrupt should be serviced on.

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Geoff Levand <[email protected]>

---
I fixed Al's patch to have the proper line lengths.

-Geoff

drivers/usb/host/ehci-ps3.c | 3 ++-
drivers/usb/host/ohci-ps3.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)

--- ps3-linux-dev.orig/drivers/usb/host/ehci-ps3.c
+++ ps3-linux-dev/drivers/usb/host/ehci-ps3.c
@@ -104,7 +104,8 @@ static int ps3_ehci_sb_probe(struct ps3_
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);

- result = ps3_alloc_io_irq(dev->interrupt_id, &virq);
+ result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id,
+ &virq);

if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
--- ps3-linux-dev.orig/drivers/usb/host/ohci-ps3.c
+++ ps3-linux-dev/drivers/usb/host/ohci-ps3.c
@@ -107,7 +107,8 @@ static int ps3_ohci_sb_probe(struct ps3_
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);

- result = ps3_alloc_io_irq(dev->interrupt_id, &virq);
+ result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id,
+ &virq);

if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",