From patchwork Tue Aug 23 05:41:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathya Perla X-Patchwork-Id: 111045 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 913EFB6F98 for ; Tue, 23 Aug 2011 15:43:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754085Ab1HWFm6 (ORCPT ); Tue, 23 Aug 2011 01:42:58 -0400 Received: from exht1.emulex.com ([138.239.113.183]:27624 "EHLO exht1.ad.emulex.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752298Ab1HWFmt (ORCPT ); Tue, 23 Aug 2011 01:42:49 -0400 Received: from S20-BMW.localdomain (10.192.238.20) by exht1.ad.emulex.com (138.239.113.183) with Microsoft SMTP Server id 8.3.159.2; Mon, 22 Aug 2011 22:40:23 -0700 From: Sathya Perla To: Subject: [PATCH net-next 2/5] be2net: get rid of memory mapped pci-cfg space address Date: Tue, 23 Aug 2011 11:11:52 +0530 Message-ID: <1314078115-8121-3-git-send-email-sathya.perla@emulex.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1314078115-8121-1-git-send-email-sathya.perla@emulex.com> References: <1314078115-8121-1-git-send-email-sathya.perla@emulex.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Get rid of adapter->pcicfg and its use. Use pci_config_read/write_dword() instead. Signed-off-by: Sathya Perla --- drivers/net/ethernet/emulex/benet/be.h | 1 - drivers/net/ethernet/emulex/benet/be_main.c | 27 ++++++++------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 12b5b51..868d7f4 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -298,7 +298,6 @@ struct be_adapter { u8 __iomem *csr; u8 __iomem *db; /* Door Bell */ - u8 __iomem *pcicfg; /* PCI config space */ struct mutex mbox_lock; /* For serializing mbox cmds to BE card */ struct be_dma_mem mbox_mem; diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 09eb699..2375c0c 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -141,13 +141,15 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q, static void be_intr_set(struct be_adapter *adapter, bool enable) { - u8 __iomem *addr = adapter->pcicfg + PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET; - u32 reg = ioread32(addr); - u32 enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; + u32 reg, enabled; if (adapter->eeh_err) return; + pci_read_config_dword(adapter->pdev, PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET, + ®); + enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; + if (!enabled && enable) reg |= MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; else if (enabled && !enable) @@ -155,7 +157,8 @@ static void be_intr_set(struct be_adapter *adapter, bool enable) else return; - iowrite32(reg, addr); + pci_write_config_dword(adapter->pdev, + PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET, reg); } static void be_rxq_notify(struct be_adapter *adapter, u16 qid, u16 posted) @@ -2951,14 +2954,12 @@ static void be_unmap_pci_bars(struct be_adapter *adapter) iounmap(adapter->csr); if (adapter->db) iounmap(adapter->db); - if (adapter->pcicfg && be_physfn(adapter)) - iounmap(adapter->pcicfg); } static int be_map_pci_bars(struct be_adapter *adapter) { u8 __iomem *addr; - int pcicfg_reg, db_reg; + int db_reg; if (lancer_chip(adapter)) { addr = ioremap_nocache(pci_resource_start(adapter->pdev, 0), @@ -2978,10 +2979,8 @@ static int be_map_pci_bars(struct be_adapter *adapter) } if (adapter->generation == BE_GEN2) { - pcicfg_reg = 1; db_reg = 4; } else { - pcicfg_reg = 0; if (be_physfn(adapter)) db_reg = 4; else @@ -2993,16 +2992,6 @@ static int be_map_pci_bars(struct be_adapter *adapter) goto pci_map_err; adapter->db = addr; - if (be_physfn(adapter)) { - addr = ioremap_nocache( - pci_resource_start(adapter->pdev, pcicfg_reg), - pci_resource_len(adapter->pdev, pcicfg_reg)); - if (addr == NULL) - goto pci_map_err; - adapter->pcicfg = addr; - } else - adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET; - return 0; pci_map_err: be_unmap_pci_bars(adapter);