From patchwork Thu Jun 26 18:58:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 4430011 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C5C409F319 for ; Thu, 26 Jun 2014 18:58:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9994202AE for ; Thu, 26 Jun 2014 18:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A27E820272 for ; Thu, 26 Jun 2014 18:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750878AbaFZS6l (ORCPT ); Thu, 26 Jun 2014 14:58:41 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:44717 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703AbaFZS6k (ORCPT ); Thu, 26 Jun 2014 14:58:40 -0400 Received: by mail-pa0-f42.google.com with SMTP id lj1so3540547pab.15 for ; Thu, 26 Jun 2014 11:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=wIhj8mRQlMOTKijJlums0Wp6sQKou5A5kGsQ4iO2EcM=; b=BNfEPx6QUxHBPcXQa9v540U0KGcyHj5BSxsMxcBV8H7Fgj3CRkIRBe/zPr72THVizX 79RHBZ+ohl9eF71JW5KoSqU/OOCz8AlUdm8uf9NQAVNyxrEm6tjD4rGLQZWWIGIdT4t5 gHkJ0Pl3zrnsRwqQ7BcdsMrAcNVOBBQODCVQUNdjxMk354BDDZFG0Hp/qHhaptpw3/kV 8tx2sVof2Q0q93xzSSeXWinbsIydUa6VNYZ1AUICIBcgCnjuJI1FlFZd8SY/U2w/zq5d HoQjqabTHVPs0FNgg7YCSGsaur4Y1HcV/TP+dceoxhWmSIubDcaEsGtb87viPRaIZhoZ EpJw== X-Received: by 10.68.131.230 with SMTP id op6mr24364946pbb.55.1403809118696; Thu, 26 Jun 2014 11:58:38 -0700 (PDT) Received: from [192.168.95.129] ([66.129.239.12]) by mx.google.com with ESMTPSA id gu1sm11232883pbd.0.2014.06.26.11.58.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 11:58:38 -0700 (PDT) Message-ID: <53AC6D6F.5000308@gmail.com> Date: Thu, 26 Jun 2014 11:58:55 -0700 From: Rajat Jain User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org CC: Guenter Roeck , Rajat Jain , rajatjain.linux@gmail.com Subject: [PATCH] pciehp: Remove the field controller->no_cmd_completed Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After following recent cleanups by Bjorn: http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/hotplug 2cc56f3 PCI: pciehp: Remove assumptions about which commands cause 40b9608 PCI: pciehp: Compute timeout from hotplug command start time 3461a06 PCI: pciehp: Wait for hotplug command completion lazily 4283c70 PCI: pciehp: Make pcie_wait_cmd() self-contained the bitfield no_cmd_complete is not really needed anymore, as there is only a single occurance of its use. Hence remove the unnecessary bit field, and use existing macro NO_CMD_CMPL() instead. Signed-off-by: Rajat Jain Signed-off-by: Rajat Jain Signed-off-by: Guenter Roeck --- (This is rebased on top of Bjorn's pci/hotplug branch mentioned above) drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/hotplug/pciehp_hpc.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index c496258..9e5a9fb 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -96,7 +96,6 @@ struct controller { struct timer_list poll_timer; unsigned long cmd_started; /* jiffies */ unsigned int cmd_busy:1; - unsigned int no_cmd_complete:1; unsigned int link_active_reporting:1; unsigned int notification_enabled:1; unsigned int power_fault_detected; diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index a3a5c65..f7c3709 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -140,7 +140,7 @@ static void pcie_wait_cmd(struct controller *ctrl) * If the controller does not generate notifications for command * completions, we never need to wait between writes. */ - if (ctrl->no_cmd_complete) + if (NO_CMD_CMPL(ctrl)) return; if (!ctrl->cmd_busy) @@ -772,15 +772,6 @@ struct controller *pcie_init(struct pcie_device *dev) init_waitqueue_head(&ctrl->queue); dbg_ctrl(ctrl); - /* - * Controller doesn't notify of command completion if the "No - * Command Completed Support" bit is set in Slot Capabilities. - * If set, it means the controller can accept hotplug commands - * with no delay between them. - */ - if (NO_CMD_CMPL(ctrl)) - ctrl->no_cmd_complete = 1; - /* Check if Data Link Layer Link Active Reporting is implemented */ pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap); if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {