* [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85
@ 2012-10-31 0:51 Taku Izumi
2012-10-31 1:34 ` Yinghai Lu
2012-11-01 12:53 ` Jiang Liu
0 siblings, 2 replies; 4+ messages in thread
From: Taku Izumi @ 2012-10-31 0:51 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Jiang Liu, wangyijing; +Cc: Yinghai Lu
PCI/portdrv: Fix regression introduced by commit 2dcfaf85
After commit 2dcfaf85, hotplug slots for port devices
w/o slot implementation come to be created.
This patch fixes this problem.
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
drivers/pci/pcie/portdrv_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: pci/drivers/pci/pcie/portdrv_core.c
===================================================================
--- pci.orig/drivers/pci/pcie/portdrv_core.c
+++ pci/drivers/pci/pcie/portdrv_core.c
@@ -272,7 +272,8 @@ static int get_port_device_capability(st
}
/* Hot-Plug Capable */
- if (cap_mask & PCIE_PORT_SERVICE_HP) {
+ if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
+ dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
if (reg32 & PCI_EXP_SLTCAP_HPC) {
services |= PCIE_PORT_SERVICE_HP;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85
2012-10-31 0:51 [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85 Taku Izumi
@ 2012-10-31 1:34 ` Yinghai Lu
2012-11-01 12:53 ` Jiang Liu
1 sibling, 0 replies; 4+ messages in thread
From: Yinghai Lu @ 2012-10-31 1:34 UTC (permalink / raw)
To: Taku Izumi; +Cc: Bjorn Helgaas, linux-pci, Jiang Liu, wangyijing
On Tue, Oct 30, 2012 at 5:51 PM, Taku Izumi <izumi.taku@jp.fujitsu.com> wrote:
>
> PCI/portdrv: Fix regression introduced by commit 2dcfaf85
>
> After commit 2dcfaf85, hotplug slots for port devices
> w/o slot implementation come to be created.
> This patch fixes this problem.
>
> Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
> ---
> drivers/pci/pcie/portdrv_core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Index: pci/drivers/pci/pcie/portdrv_core.c
> ===================================================================
> --- pci.orig/drivers/pci/pcie/portdrv_core.c
> +++ pci/drivers/pci/pcie/portdrv_core.c
> @@ -272,7 +272,8 @@ static int get_port_device_capability(st
> }
>
> /* Hot-Plug Capable */
> - if (cap_mask & PCIE_PORT_SERVICE_HP) {
> + if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
> + dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
> pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
> if (reg32 & PCI_EXP_SLTCAP_HPC) {
> services |= PCIE_PORT_SERVICE_HP;
>
Acked-by: Yinghai Lu <yinghai@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85
2012-10-31 0:51 [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85 Taku Izumi
2012-10-31 1:34 ` Yinghai Lu
@ 2012-11-01 12:53 ` Jiang Liu
2012-11-05 22:08 ` Bjorn Helgaas
1 sibling, 1 reply; 4+ messages in thread
From: Jiang Liu @ 2012-11-01 12:53 UTC (permalink / raw)
To: Taku Izumi; +Cc: Bjorn Helgaas, linux-pci, wangyijing, Yinghai Lu
Hi Taku,
It's a mistake introduced by that patch, thanks for fix it.
Reviewed-by: <jiang.liu@huawei.com>
On 2012-10-31 8:51, Taku Izumi wrote:
>
> PCI/portdrv: Fix regression introduced by commit 2dcfaf85
>
> After commit 2dcfaf85, hotplug slots for port devices
> w/o slot implementation come to be created.
> This patch fixes this problem.
>
> Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
> ---
> drivers/pci/pcie/portdrv_core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Index: pci/drivers/pci/pcie/portdrv_core.c
> ===================================================================
> --- pci.orig/drivers/pci/pcie/portdrv_core.c
> +++ pci/drivers/pci/pcie/portdrv_core.c
> @@ -272,7 +272,8 @@ static int get_port_device_capability(st
> }
>
> /* Hot-Plug Capable */
> - if (cap_mask & PCIE_PORT_SERVICE_HP) {
> + if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
> + dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
> pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
> if (reg32 & PCI_EXP_SLTCAP_HPC) {
> services |= PCIE_PORT_SERVICE_HP;
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85
2012-11-01 12:53 ` Jiang Liu
@ 2012-11-05 22:08 ` Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2012-11-05 22:08 UTC (permalink / raw)
To: Jiang Liu; +Cc: Taku Izumi, linux-pci, wangyijing, Yinghai Lu
On Thu, Nov 1, 2012 at 6:53 AM, Jiang Liu <jiang.liu@huawei.com> wrote:
> Hi Taku,
> It's a mistake introduced by that patch, thanks for fix it.
> Reviewed-by: <jiang.liu@huawei.com>
>
> On 2012-10-31 8:51, Taku Izumi wrote:
>>
>> PCI/portdrv: Fix regression introduced by commit 2dcfaf85
>>
>> After commit 2dcfaf85, hotplug slots for port devices
>> w/o slot implementation come to be created.
>> This patch fixes this problem.
I applied this to my for-linus branch as v3.7 material. Thanks!
>> Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
>> ---
>> drivers/pci/pcie/portdrv_core.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> Index: pci/drivers/pci/pcie/portdrv_core.c
>> ===================================================================
>> --- pci.orig/drivers/pci/pcie/portdrv_core.c
>> +++ pci/drivers/pci/pcie/portdrv_core.c
>> @@ -272,7 +272,8 @@ static int get_port_device_capability(st
>> }
>>
>> /* Hot-Plug Capable */
>> - if (cap_mask & PCIE_PORT_SERVICE_HP) {
>> + if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
>> + dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
>> pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
>> if (reg32 & PCI_EXP_SLTCAP_HPC) {
>> services |= PCIE_PORT_SERVICE_HP;
>>
>>
>>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-05 22:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-31 0:51 [PATCH] PCI/portdrv: Fix regression introduced by commit 2dcfaf85 Taku Izumi
2012-10-31 1:34 ` Yinghai Lu
2012-11-01 12:53 ` Jiang Liu
2012-11-05 22:08 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).