From: Rajat Jain <rajatjain.linux@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Alex Williamson <alex.williamson@redhat.com>,
Yijing Wang <wangyijing@huawei.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Guenter Roeck <groeck@juniper.net>,
Rajat Jain <rajatjain@juniper.net>,
Rajat Jain <rajatxjain@gmail.com>
Subject: [PATCH v3 4/8] pciehp: Don't disable the link permanently, during removal
Date: Tue, 17 Dec 2013 12:06:05 -0800 [thread overview]
Message-ID: <52B0AEAD.6050604@gmail.com> (raw)
We need future link up events for hot-add, thus don't disable
the link permanently during device removal. Also, remove the static
functions that are now left unused.
Signed-off-by: Rajat Jain <rajatjain@juniper.net>
Signed-off-by: Guenter Roeck <groeck@juniper.net>
---
v3: no change, created by splitting the patch v2 [2/4]
v2: (non existent)
v1: (non existent)
drivers/pci/hotplug/pciehp_hpc.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index b45b568..ab12555 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -278,11 +278,6 @@ static void pcie_wait_link_active(struct controller *ctrl)
__pcie_wait_link_active(ctrl, true);
}
-static void pcie_wait_link_not_active(struct controller *ctrl)
-{
- __pcie_wait_link_active(ctrl, false);
-}
-
static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)
{
u32 l;
@@ -383,11 +378,6 @@ static int pciehp_link_enable(struct controller *ctrl)
return __pciehp_link_set(ctrl, true);
}
-static int pciehp_link_disable(struct controller *ctrl)
-{
- return __pciehp_link_set(ctrl, false);
-}
-
int pciehp_get_attention_status(struct slot *slot, u8 *status)
{
struct controller *ctrl = slot->ctrl;
@@ -620,14 +610,6 @@ int pciehp_power_off_slot(struct slot * slot)
u16 cmd_mask;
int retval;
- /* Disable the link at first */
- pciehp_link_disable(ctrl);
- /* wait the link is down */
- if (ctrl->link_active_reporting)
- pcie_wait_link_not_active(ctrl);
- else
- msleep(1000);
-
slot_cmd = POWER_OFF;
cmd_mask = PCI_EXP_SLTCTL_PCC;
retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
--
1.7.9.5
next reply other threads:[~2013-12-17 20:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 20:06 Rajat Jain [this message]
2013-12-18 1:02 ` [PATCH v3 4/8] pciehp: Don't disable the link permanently, during removal Bjorn Helgaas
2013-12-18 3:20 ` Rajat Jain
2013-12-18 3:40 ` Guenter Roeck
2013-12-18 4:06 ` Rajat Jain
2013-12-18 5:14 ` Yinghai Lu
2013-12-18 6:17 ` Rajat Jain
2013-12-18 6:50 ` Yinghai Lu
2014-01-05 17:53 ` Rajat Jain
2014-01-07 0:03 ` Bjorn Helgaas
2014-01-07 18:20 ` Rajat Jain
2014-01-09 20:45 ` Rajat Jain
2014-01-09 20:58 ` Bjorn Helgaas
2014-01-13 8:30 ` Rajat Jain
2014-01-13 17:38 ` Bjorn Helgaas
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=52B0AEAD.6050604@gmail.com \
--to=rajatjain.linux@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=groeck@juniper.net \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rajatjain@juniper.net \
--cc=rajatxjain@gmail.com \
--cc=wangyijing@huawei.com \
--cc=yhlu.kernel@gmail.com \
/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).