From: "Michael S. Tsirkin" <mst@redhat.com>
To: Marcel Apfelbaum <marcel.a@redhat.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
bhelgaas@google.com, matthew@wil.cx
Subject: Re: [PATCH] PCI/shpchp: fix a bus speed issue on hotplug
Date: Thu, 1 May 2014 18:43:39 +0300 [thread overview]
Message-ID: <20140501154339.GC9180@redhat.com> (raw)
In-Reply-To: <1398954948-24219-1-git-send-email-marcel.a@redhat.com>
On Thu, May 01, 2014 at 05:35:48PM +0300, Marcel Apfelbaum wrote:
> When a board is added, the shpchp driver checks if there
> is a mismatch between the bridge's adapter and the bus speed.
> If there is, it sets the subordinate speed (if there is no device on it).
>
> However, it takes the reference of the board speed from the primary bus
> and not from the subordinate. If the primary bus is PCI and not PCIX/PCIe,
> its speed is not updated and remains 0xff. As a result hotplug fails
> with error: "Speed of bus ff and adapter 0 mismatch".
>
> Fixed that by checking the speed against the subordinate bus.
>
> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
Looking at git history, I suspect this is a regression
introduced by
commit 3749c51ac6c1560aa1cb1520066bed84c6f8152a
Author: Matthew Wilcox <matthew@wil.cx>
Date: Sun Dec 13 08:11:32 2009 -0500
PCI: Make current and maximum bus speeds part of the PCI core
At least I remember this configuration worked for me early in 2009...
> ---
> drivers/pci/hotplug/shpchp_ctrl.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
> index 5849927..6efc2ec 100644
> --- a/drivers/pci/hotplug/shpchp_ctrl.c
> +++ b/drivers/pci/hotplug/shpchp_ctrl.c
> @@ -282,8 +282,8 @@ static int board_added(struct slot *p_slot)
> return WRONG_BUS_FREQUENCY;
> }
>
> - bsp = ctrl->pci_dev->bus->cur_bus_speed;
> - msp = ctrl->pci_dev->bus->max_bus_speed;
> + bsp = ctrl->pci_dev->subordinate->cur_bus_speed;
> + msp = ctrl->pci_dev->subordinate->max_bus_speed;
>
> /* Check if there are other slots or devices on the same bus */
> if (!list_empty(&ctrl->pci_dev->subordinate->devices))
> --
> 1.8.3.1
next prev parent reply other threads:[~2014-05-01 15:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 14:35 [PATCH] PCI/shpchp: fix a bus speed issue on hotplug Marcel Apfelbaum
2014-05-01 15:43 ` Michael S. Tsirkin [this message]
2014-05-01 18:02 ` Bjorn Helgaas
2014-05-01 18:13 ` Marcel Apfelbaum
2014-05-01 18:57 ` Marcel Apfelbaum
2014-05-01 20:00 ` Bjorn Helgaas
2014-05-01 20:36 ` Marcel Apfelbaum
2014-05-04 10:40 ` Marcel Apfelbaum
2014-05-04 13:48 ` Ronen Hod
2014-05-04 14:07 ` Marcel Apfelbaum
2014-05-15 18:41 ` Bjorn Helgaas
2014-05-17 18:47 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140501154339.GC9180@redhat.com \
--to=mst@redhat.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=marcel.a@redhat.com \
--cc=matthew@wil.cx \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).