From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ale.deltatee.com (ale.deltatee.com [207.54.116.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1F03321A04813 for ; Thu, 30 Mar 2017 15:13:46 -0700 (PDT) From: Logan Gunthorpe Date: Thu, 30 Mar 2017 16:12:33 -0600 Message-Id: <1490911959-5146-3-git-send-email-logang@deltatee.com> In-Reply-To: <1490911959-5146-1-git-send-email-logang@deltatee.com> References: <1490911959-5146-1-git-send-email-logang@deltatee.com> Subject: [RFC 2/8] cxgb4: setup pcie memory window 4 and create p2pmem region List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Christoph Hellwig , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , Steve Wise , Stephen Bates , Max Gurtovoy , Dan Williams , Keith Busch , Jason Gunthorpe Cc: linux-scsi@vger.kernel.org, linux-nvdimm@lists.01.org, linux-rdma@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org List-ID: From: Steve Wise Some cxgb4 cards expose memory as part of BAR4. This patch registers this memory as a p2pmem device. Signed-off-by: Steve Wise Signed-off-by: Logan Gunthorpe Signed-off-by: Stephen Bates --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++++++++++++++++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 ++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 163543b..e92443b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -859,6 +860,8 @@ struct adapter { /* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; + + struct p2pmem_dev *p2pmem; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index afb0967..a33bcd1 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -172,6 +172,11 @@ module_param(select_queue, int, 0644); MODULE_PARM_DESC(select_queue, "Select between kernel provided method of selecting or driver method of selecting TX queue. Default is kernel method."); +static bool use_p2pmem; +module_param(use_p2pmem, bool, 0644); +MODULE_PARM_DESC(use_p2pmem, + "Enable registering a p2pmem device with bar space (if available)"); + static struct dentry *cxgb4_debugfs_root; LIST_HEAD(adapter_list); @@ -2835,6 +2840,54 @@ static void setup_memwin_rdma(struct adapter *adap) } } +static void setup_memwin_p2pmem(struct adapter *adap) +{ + unsigned int mem_base = t4_read_reg(adap, CIM_EXTMEM2_BASE_ADDR_A); + unsigned int mem_size = t4_read_reg(adap, CIM_EXTMEM2_ADDR_SIZE_A); + + if (!use_p2pmem) + return; + + if (mem_base != 0 && mem_size != 0) { + unsigned int sz_kb, pcieofst; + + sz_kb = roundup_pow_of_two(mem_size) >> 10; + + /* + * The start offset must be aligned to the window size. + * Also, BAR4 has MSIX vectors using the first 8KB. + * Further, the min allowed p2pmem region size is 1MB, + * so set the start offset to the memory size and we're aligned + * as well as past the 8KB vector table. + */ + pcieofst = sz_kb << 10; + + dev_info(adap->pdev_dev, + "p2pmem base 0x%x, size %uB, ilog2(sk_kb) 0x%x, " + "pcieofst 0x%X\n", mem_base, mem_size, ilog2(sz_kb), + pcieofst); + + /* Write the window offset and size */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN_A, + MEMWIN_RSVD4), + pcieofst | BIR_V(2) | WINDOW_V(ilog2(sz_kb))); + + /* Write the adapter memory base/start */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4), + MEMOFST_V((mem_base >> MEMOFST_S)) | PFNUM_V(adap->pf)); + + /* Read it back to flush it */ + t4_read_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4)); + } else + dev_info(adap->pdev_dev, "p2pmem memory not reserved, " + "base 0x%x size %uB\n", mem_base, mem_size); +} + static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) { u32 v; @@ -4622,6 +4675,42 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } #endif +static int init_p2pmem(struct adapter *adapter) +{ + unsigned int mem_size = t4_read_reg(adapter, CIM_EXTMEM2_ADDR_SIZE_A); + struct p2pmem_dev *p; + int rc; + struct resource res; + + if (!mem_size || !use_p2pmem) + return 0; + + mem_size = roundup_pow_of_two(mem_size); + + /* + * Create a subset of BAR4 for the p2pmem region based on the + * exported memory size. + */ + memcpy(&res, &adapter->pdev->resource[4], sizeof(res)); + res.start += mem_size; + res.end = res.start + mem_size - 1; + dev_info(adapter->pdev_dev, "p2pmem resource start 0x%llx end 0x%llx size %lluB\n", + res.start, res.end, resource_size(&res)); + + p = p2pmem_create(&adapter->pdev->dev); + if (IS_ERR(p)) + return PTR_ERR(p); + + rc = p2pmem_add_resource(p, &res); + if (rc) { + p2pmem_unregister(p); + return rc; + } + adapter->p2pmem = p; + + return 0; +} + static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { int func, i, err, s_qpp, qpp, num_seg; @@ -4784,8 +4873,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz); #endif setup_memwin_rdma(adapter); - if (err) - goto out_unmap_bar; + + setup_memwin_p2pmem(adapter); /* configure SGE_STAT_CFG_A to read WC stats */ if (!is_t4(adapter->params.chip)) @@ -4989,6 +5078,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) print_adapter_info(adapter); setup_fw_sge_queues(adapter); + init_p2pmem(adapter); return 0; sriov: @@ -5047,7 +5137,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) free_msix_info(adapter); if (adapter->num_uld || adapter->num_ofld_uld) t4_uld_mem_free(adapter); - out_unmap_bar: if (!is_t4(adapter->params.chip)) iounmap(adapter->bar2); out_free_adapter: @@ -5075,6 +5164,8 @@ static void remove_one(struct pci_dev *pdev) return; } + p2pmem_unregister(adapter->p2pmem); + if (adapter->pf == 4) { int i; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index 3348d33..199ddfb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -735,6 +735,11 @@ #define PCIE_MEM_ACCESS_OFFSET_A 0x306c +#define MEMOFST_S 7 +#define MEMOFST_M 0x1ffffffU +#define MEMOFST_V(x) ((x) << MEMOFST_S) +#define MEMOFST_G(x) (((x) >> MEMOFST_S) & MEMOFST_M) + #define ENABLE_S 30 #define ENABLE_V(x) ((x) << ENABLE_S) #define ENABLE_F ENABLE_V(1U) -- 2.1.4 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm From mboxrd@z Thu Jan 1 00:00:00 1970 From: Logan Gunthorpe Subject: [RFC 2/8] cxgb4: setup pcie memory window 4 and create p2pmem region Date: Thu, 30 Mar 2017 16:12:33 -0600 Message-ID: <1490911959-5146-3-git-send-email-logang@deltatee.com> References: <1490911959-5146-1-git-send-email-logang@deltatee.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1490911959-5146-1-git-send-email-logang-OTvnGxWRz7hWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" To: Christoph Hellwig , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , Steve Wise , Stephen Bates , Max Gurtovoy , Dan Williams , Keith Busch , Jason Gunthorpe Cc: linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-rdma@vger.kernel.org From: Steve Wise Some cxgb4 cards expose memory as part of BAR4. This patch registers this memory as a p2pmem device. Signed-off-by: Steve Wise Signed-off-by: Logan Gunthorpe Signed-off-by: Stephen Bates --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++++++++++++++++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 ++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 163543b..e92443b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -859,6 +860,8 @@ struct adapter { /* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; + + struct p2pmem_dev *p2pmem; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index afb0967..a33bcd1 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -172,6 +172,11 @@ module_param(select_queue, int, 0644); MODULE_PARM_DESC(select_queue, "Select between kernel provided method of selecting or driver method of selecting TX queue. Default is kernel method."); +static bool use_p2pmem; +module_param(use_p2pmem, bool, 0644); +MODULE_PARM_DESC(use_p2pmem, + "Enable registering a p2pmem device with bar space (if available)"); + static struct dentry *cxgb4_debugfs_root; LIST_HEAD(adapter_list); @@ -2835,6 +2840,54 @@ static void setup_memwin_rdma(struct adapter *adap) } } +static void setup_memwin_p2pmem(struct adapter *adap) +{ + unsigned int mem_base = t4_read_reg(adap, CIM_EXTMEM2_BASE_ADDR_A); + unsigned int mem_size = t4_read_reg(adap, CIM_EXTMEM2_ADDR_SIZE_A); + + if (!use_p2pmem) + return; + + if (mem_base != 0 && mem_size != 0) { + unsigned int sz_kb, pcieofst; + + sz_kb = roundup_pow_of_two(mem_size) >> 10; + + /* + * The start offset must be aligned to the window size. + * Also, BAR4 has MSIX vectors using the first 8KB. + * Further, the min allowed p2pmem region size is 1MB, + * so set the start offset to the memory size and we're aligned + * as well as past the 8KB vector table. + */ + pcieofst = sz_kb << 10; + + dev_info(adap->pdev_dev, + "p2pmem base 0x%x, size %uB, ilog2(sk_kb) 0x%x, " + "pcieofst 0x%X\n", mem_base, mem_size, ilog2(sz_kb), + pcieofst); + + /* Write the window offset and size */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN_A, + MEMWIN_RSVD4), + pcieofst | BIR_V(2) | WINDOW_V(ilog2(sz_kb))); + + /* Write the adapter memory base/start */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4), + MEMOFST_V((mem_base >> MEMOFST_S)) | PFNUM_V(adap->pf)); + + /* Read it back to flush it */ + t4_read_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4)); + } else + dev_info(adap->pdev_dev, "p2pmem memory not reserved, " + "base 0x%x size %uB\n", mem_base, mem_size); +} + static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) { u32 v; @@ -4622,6 +4675,42 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } #endif +static int init_p2pmem(struct adapter *adapter) +{ + unsigned int mem_size = t4_read_reg(adapter, CIM_EXTMEM2_ADDR_SIZE_A); + struct p2pmem_dev *p; + int rc; + struct resource res; + + if (!mem_size || !use_p2pmem) + return 0; + + mem_size = roundup_pow_of_two(mem_size); + + /* + * Create a subset of BAR4 for the p2pmem region based on the + * exported memory size. + */ + memcpy(&res, &adapter->pdev->resource[4], sizeof(res)); + res.start += mem_size; + res.end = res.start + mem_size - 1; + dev_info(adapter->pdev_dev, "p2pmem resource start 0x%llx end 0x%llx size %lluB\n", + res.start, res.end, resource_size(&res)); + + p = p2pmem_create(&adapter->pdev->dev); + if (IS_ERR(p)) + return PTR_ERR(p); + + rc = p2pmem_add_resource(p, &res); + if (rc) { + p2pmem_unregister(p); + return rc; + } + adapter->p2pmem = p; + + return 0; +} + static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { int func, i, err, s_qpp, qpp, num_seg; @@ -4784,8 +4873,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz); #endif setup_memwin_rdma(adapter); - if (err) - goto out_unmap_bar; + + setup_memwin_p2pmem(adapter); /* configure SGE_STAT_CFG_A to read WC stats */ if (!is_t4(adapter->params.chip)) @@ -4989,6 +5078,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) print_adapter_info(adapter); setup_fw_sge_queues(adapter); + init_p2pmem(adapter); return 0; sriov: @@ -5047,7 +5137,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) free_msix_info(adapter); if (adapter->num_uld || adapter->num_ofld_uld) t4_uld_mem_free(adapter); - out_unmap_bar: if (!is_t4(adapter->params.chip)) iounmap(adapter->bar2); out_free_adapter: @@ -5075,6 +5164,8 @@ static void remove_one(struct pci_dev *pdev) return; } + p2pmem_unregister(adapter->p2pmem); + if (adapter->pf == 4) { int i; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index 3348d33..199ddfb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -735,6 +735,11 @@ #define PCIE_MEM_ACCESS_OFFSET_A 0x306c +#define MEMOFST_S 7 +#define MEMOFST_M 0x1ffffffU +#define MEMOFST_V(x) ((x) << MEMOFST_S) +#define MEMOFST_G(x) (((x) >> MEMOFST_S) & MEMOFST_M) + #define ENABLE_S 30 #define ENABLE_V(x) ((x) << ENABLE_S) #define ENABLE_F ENABLE_V(1U) -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935055AbdC3WNv (ORCPT ); Thu, 30 Mar 2017 18:13:51 -0400 Received: from ale.deltatee.com ([207.54.116.67]:44321 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935017AbdC3WNs (ORCPT ); Thu, 30 Mar 2017 18:13:48 -0400 From: Logan Gunthorpe To: Christoph Hellwig , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , Steve Wise , Stephen Bates , Max Gurtovoy , Dan Williams , Keith Busch , Jason Gunthorpe Cc: linux-pci@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, Logan Gunthorpe Date: Thu, 30 Mar 2017 16:12:33 -0600 Message-Id: <1490911959-5146-3-git-send-email-logang@deltatee.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490911959-5146-1-git-send-email-logang@deltatee.com> References: <1490911959-5146-1-git-send-email-logang@deltatee.com> X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: hch@lst.de, sagi@grimberg.me, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, axboe@kernel.dk, swise@opengridcomputing.com, sbates@raithlin.com, maxg@mellanox.com, dan.j.williams@intel.com, keith.busch@intel.com, jgunthorpe@obsidianresearch.com, linux-nvme@lists.infradead.org, linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [RFC 2/8] cxgb4: setup pcie memory window 4 and create p2pmem region X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steve Wise Some cxgb4 cards expose memory as part of BAR4. This patch registers this memory as a p2pmem device. Signed-off-by: Steve Wise Signed-off-by: Logan Gunthorpe Signed-off-by: Stephen Bates --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++++++++++++++++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 ++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 163543b..e92443b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -859,6 +860,8 @@ struct adapter { /* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; + + struct p2pmem_dev *p2pmem; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index afb0967..a33bcd1 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -172,6 +172,11 @@ module_param(select_queue, int, 0644); MODULE_PARM_DESC(select_queue, "Select between kernel provided method of selecting or driver method of selecting TX queue. Default is kernel method."); +static bool use_p2pmem; +module_param(use_p2pmem, bool, 0644); +MODULE_PARM_DESC(use_p2pmem, + "Enable registering a p2pmem device with bar space (if available)"); + static struct dentry *cxgb4_debugfs_root; LIST_HEAD(adapter_list); @@ -2835,6 +2840,54 @@ static void setup_memwin_rdma(struct adapter *adap) } } +static void setup_memwin_p2pmem(struct adapter *adap) +{ + unsigned int mem_base = t4_read_reg(adap, CIM_EXTMEM2_BASE_ADDR_A); + unsigned int mem_size = t4_read_reg(adap, CIM_EXTMEM2_ADDR_SIZE_A); + + if (!use_p2pmem) + return; + + if (mem_base != 0 && mem_size != 0) { + unsigned int sz_kb, pcieofst; + + sz_kb = roundup_pow_of_two(mem_size) >> 10; + + /* + * The start offset must be aligned to the window size. + * Also, BAR4 has MSIX vectors using the first 8KB. + * Further, the min allowed p2pmem region size is 1MB, + * so set the start offset to the memory size and we're aligned + * as well as past the 8KB vector table. + */ + pcieofst = sz_kb << 10; + + dev_info(adap->pdev_dev, + "p2pmem base 0x%x, size %uB, ilog2(sk_kb) 0x%x, " + "pcieofst 0x%X\n", mem_base, mem_size, ilog2(sz_kb), + pcieofst); + + /* Write the window offset and size */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN_A, + MEMWIN_RSVD4), + pcieofst | BIR_V(2) | WINDOW_V(ilog2(sz_kb))); + + /* Write the adapter memory base/start */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4), + MEMOFST_V((mem_base >> MEMOFST_S)) | PFNUM_V(adap->pf)); + + /* Read it back to flush it */ + t4_read_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4)); + } else + dev_info(adap->pdev_dev, "p2pmem memory not reserved, " + "base 0x%x size %uB\n", mem_base, mem_size); +} + static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) { u32 v; @@ -4622,6 +4675,42 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } #endif +static int init_p2pmem(struct adapter *adapter) +{ + unsigned int mem_size = t4_read_reg(adapter, CIM_EXTMEM2_ADDR_SIZE_A); + struct p2pmem_dev *p; + int rc; + struct resource res; + + if (!mem_size || !use_p2pmem) + return 0; + + mem_size = roundup_pow_of_two(mem_size); + + /* + * Create a subset of BAR4 for the p2pmem region based on the + * exported memory size. + */ + memcpy(&res, &adapter->pdev->resource[4], sizeof(res)); + res.start += mem_size; + res.end = res.start + mem_size - 1; + dev_info(adapter->pdev_dev, "p2pmem resource start 0x%llx end 0x%llx size %lluB\n", + res.start, res.end, resource_size(&res)); + + p = p2pmem_create(&adapter->pdev->dev); + if (IS_ERR(p)) + return PTR_ERR(p); + + rc = p2pmem_add_resource(p, &res); + if (rc) { + p2pmem_unregister(p); + return rc; + } + adapter->p2pmem = p; + + return 0; +} + static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { int func, i, err, s_qpp, qpp, num_seg; @@ -4784,8 +4873,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz); #endif setup_memwin_rdma(adapter); - if (err) - goto out_unmap_bar; + + setup_memwin_p2pmem(adapter); /* configure SGE_STAT_CFG_A to read WC stats */ if (!is_t4(adapter->params.chip)) @@ -4989,6 +5078,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) print_adapter_info(adapter); setup_fw_sge_queues(adapter); + init_p2pmem(adapter); return 0; sriov: @@ -5047,7 +5137,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) free_msix_info(adapter); if (adapter->num_uld || adapter->num_ofld_uld) t4_uld_mem_free(adapter); - out_unmap_bar: if (!is_t4(adapter->params.chip)) iounmap(adapter->bar2); out_free_adapter: @@ -5075,6 +5164,8 @@ static void remove_one(struct pci_dev *pdev) return; } + p2pmem_unregister(adapter->p2pmem); + if (adapter->pf == 4) { int i; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index 3348d33..199ddfb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -735,6 +735,11 @@ #define PCIE_MEM_ACCESS_OFFSET_A 0x306c +#define MEMOFST_S 7 +#define MEMOFST_M 0x1ffffffU +#define MEMOFST_V(x) ((x) << MEMOFST_S) +#define MEMOFST_G(x) (((x) >> MEMOFST_S) & MEMOFST_M) + #define ENABLE_S 30 #define ENABLE_V(x) ((x) << ENABLE_S) #define ENABLE_F ENABLE_V(1U) -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Logan Gunthorpe To: Christoph Hellwig , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , Steve Wise , Stephen Bates , Max Gurtovoy , Dan Williams , Keith Busch , Jason Gunthorpe Cc: linux-pci@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Logan Gunthorpe Date: Thu, 30 Mar 2017 16:12:33 -0600 Message-Id: <1490911959-5146-3-git-send-email-logang@deltatee.com> In-Reply-To: <1490911959-5146-1-git-send-email-logang@deltatee.com> References: <1490911959-5146-1-git-send-email-logang@deltatee.com> Subject: [RFC 2/8] cxgb4: setup pcie memory window 4 and create p2pmem region Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Steve Wise Some cxgb4 cards expose memory as part of BAR4. This patch registers this memory as a p2pmem device. Signed-off-by: Steve Wise Signed-off-by: Logan Gunthorpe Signed-off-by: Stephen Bates --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++++++++++++++++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 ++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 163543b..e92443b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -859,6 +860,8 @@ struct adapter { /* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; + + struct p2pmem_dev *p2pmem; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index afb0967..a33bcd1 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -172,6 +172,11 @@ module_param(select_queue, int, 0644); MODULE_PARM_DESC(select_queue, "Select between kernel provided method of selecting or driver method of selecting TX queue. Default is kernel method."); +static bool use_p2pmem; +module_param(use_p2pmem, bool, 0644); +MODULE_PARM_DESC(use_p2pmem, + "Enable registering a p2pmem device with bar space (if available)"); + static struct dentry *cxgb4_debugfs_root; LIST_HEAD(adapter_list); @@ -2835,6 +2840,54 @@ static void setup_memwin_rdma(struct adapter *adap) } } +static void setup_memwin_p2pmem(struct adapter *adap) +{ + unsigned int mem_base = t4_read_reg(adap, CIM_EXTMEM2_BASE_ADDR_A); + unsigned int mem_size = t4_read_reg(adap, CIM_EXTMEM2_ADDR_SIZE_A); + + if (!use_p2pmem) + return; + + if (mem_base != 0 && mem_size != 0) { + unsigned int sz_kb, pcieofst; + + sz_kb = roundup_pow_of_two(mem_size) >> 10; + + /* + * The start offset must be aligned to the window size. + * Also, BAR4 has MSIX vectors using the first 8KB. + * Further, the min allowed p2pmem region size is 1MB, + * so set the start offset to the memory size and we're aligned + * as well as past the 8KB vector table. + */ + pcieofst = sz_kb << 10; + + dev_info(adap->pdev_dev, + "p2pmem base 0x%x, size %uB, ilog2(sk_kb) 0x%x, " + "pcieofst 0x%X\n", mem_base, mem_size, ilog2(sz_kb), + pcieofst); + + /* Write the window offset and size */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN_A, + MEMWIN_RSVD4), + pcieofst | BIR_V(2) | WINDOW_V(ilog2(sz_kb))); + + /* Write the adapter memory base/start */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4), + MEMOFST_V((mem_base >> MEMOFST_S)) | PFNUM_V(adap->pf)); + + /* Read it back to flush it */ + t4_read_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4)); + } else + dev_info(adap->pdev_dev, "p2pmem memory not reserved, " + "base 0x%x size %uB\n", mem_base, mem_size); +} + static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) { u32 v; @@ -4622,6 +4675,42 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } #endif +static int init_p2pmem(struct adapter *adapter) +{ + unsigned int mem_size = t4_read_reg(adapter, CIM_EXTMEM2_ADDR_SIZE_A); + struct p2pmem_dev *p; + int rc; + struct resource res; + + if (!mem_size || !use_p2pmem) + return 0; + + mem_size = roundup_pow_of_two(mem_size); + + /* + * Create a subset of BAR4 for the p2pmem region based on the + * exported memory size. + */ + memcpy(&res, &adapter->pdev->resource[4], sizeof(res)); + res.start += mem_size; + res.end = res.start + mem_size - 1; + dev_info(adapter->pdev_dev, "p2pmem resource start 0x%llx end 0x%llx size %lluB\n", + res.start, res.end, resource_size(&res)); + + p = p2pmem_create(&adapter->pdev->dev); + if (IS_ERR(p)) + return PTR_ERR(p); + + rc = p2pmem_add_resource(p, &res); + if (rc) { + p2pmem_unregister(p); + return rc; + } + adapter->p2pmem = p; + + return 0; +} + static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { int func, i, err, s_qpp, qpp, num_seg; @@ -4784,8 +4873,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz); #endif setup_memwin_rdma(adapter); - if (err) - goto out_unmap_bar; + + setup_memwin_p2pmem(adapter); /* configure SGE_STAT_CFG_A to read WC stats */ if (!is_t4(adapter->params.chip)) @@ -4989,6 +5078,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) print_adapter_info(adapter); setup_fw_sge_queues(adapter); + init_p2pmem(adapter); return 0; sriov: @@ -5047,7 +5137,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) free_msix_info(adapter); if (adapter->num_uld || adapter->num_ofld_uld) t4_uld_mem_free(adapter); - out_unmap_bar: if (!is_t4(adapter->params.chip)) iounmap(adapter->bar2); out_free_adapter: @@ -5075,6 +5164,8 @@ static void remove_one(struct pci_dev *pdev) return; } + p2pmem_unregister(adapter->p2pmem); + if (adapter->pf == 4) { int i; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index 3348d33..199ddfb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -735,6 +735,11 @@ #define PCIE_MEM_ACCESS_OFFSET_A 0x306c +#define MEMOFST_S 7 +#define MEMOFST_M 0x1ffffffU +#define MEMOFST_V(x) ((x) << MEMOFST_S) +#define MEMOFST_G(x) (((x) >> MEMOFST_S) & MEMOFST_M) + #define ENABLE_S 30 #define ENABLE_V(x) ((x) << ENABLE_S) #define ENABLE_F ENABLE_V(1U) -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: logang@deltatee.com (Logan Gunthorpe) Date: Thu, 30 Mar 2017 16:12:33 -0600 Subject: [RFC 2/8] cxgb4: setup pcie memory window 4 and create p2pmem region In-Reply-To: <1490911959-5146-1-git-send-email-logang@deltatee.com> References: <1490911959-5146-1-git-send-email-logang@deltatee.com> Message-ID: <1490911959-5146-3-git-send-email-logang@deltatee.com> From: Steve Wise Some cxgb4 cards expose memory as part of BAR4. This patch registers this memory as a p2pmem device. Signed-off-by: Steve Wise Signed-off-by: Logan Gunthorpe Signed-off-by: Stephen Bates --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++++++++++++++++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 ++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 163543b..e92443b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -859,6 +860,8 @@ struct adapter { /* TC u32 offload */ struct cxgb4_tc_u32_table *tc_u32; + + struct p2pmem_dev *p2pmem; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index afb0967..a33bcd1 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -172,6 +172,11 @@ module_param(select_queue, int, 0644); MODULE_PARM_DESC(select_queue, "Select between kernel provided method of selecting or driver method of selecting TX queue. Default is kernel method."); +static bool use_p2pmem; +module_param(use_p2pmem, bool, 0644); +MODULE_PARM_DESC(use_p2pmem, + "Enable registering a p2pmem device with bar space (if available)"); + static struct dentry *cxgb4_debugfs_root; LIST_HEAD(adapter_list); @@ -2835,6 +2840,54 @@ static void setup_memwin_rdma(struct adapter *adap) } } +static void setup_memwin_p2pmem(struct adapter *adap) +{ + unsigned int mem_base = t4_read_reg(adap, CIM_EXTMEM2_BASE_ADDR_A); + unsigned int mem_size = t4_read_reg(adap, CIM_EXTMEM2_ADDR_SIZE_A); + + if (!use_p2pmem) + return; + + if (mem_base != 0 && mem_size != 0) { + unsigned int sz_kb, pcieofst; + + sz_kb = roundup_pow_of_two(mem_size) >> 10; + + /* + * The start offset must be aligned to the window size. + * Also, BAR4 has MSIX vectors using the first 8KB. + * Further, the min allowed p2pmem region size is 1MB, + * so set the start offset to the memory size and we're aligned + * as well as past the 8KB vector table. + */ + pcieofst = sz_kb << 10; + + dev_info(adap->pdev_dev, + "p2pmem base 0x%x, size %uB, ilog2(sk_kb) 0x%x, " + "pcieofst 0x%X\n", mem_base, mem_size, ilog2(sz_kb), + pcieofst); + + /* Write the window offset and size */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN_A, + MEMWIN_RSVD4), + pcieofst | BIR_V(2) | WINDOW_V(ilog2(sz_kb))); + + /* Write the adapter memory base/start */ + t4_write_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4), + MEMOFST_V((mem_base >> MEMOFST_S)) | PFNUM_V(adap->pf)); + + /* Read it back to flush it */ + t4_read_reg(adap, + PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET_A, + MEMWIN_RSVD4)); + } else + dev_info(adap->pdev_dev, "p2pmem memory not reserved, " + "base 0x%x size %uB\n", mem_base, mem_size); +} + static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) { u32 v; @@ -4622,6 +4675,42 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } #endif +static int init_p2pmem(struct adapter *adapter) +{ + unsigned int mem_size = t4_read_reg(adapter, CIM_EXTMEM2_ADDR_SIZE_A); + struct p2pmem_dev *p; + int rc; + struct resource res; + + if (!mem_size || !use_p2pmem) + return 0; + + mem_size = roundup_pow_of_two(mem_size); + + /* + * Create a subset of BAR4 for the p2pmem region based on the + * exported memory size. + */ + memcpy(&res, &adapter->pdev->resource[4], sizeof(res)); + res.start += mem_size; + res.end = res.start + mem_size - 1; + dev_info(adapter->pdev_dev, "p2pmem resource start 0x%llx end 0x%llx size %lluB\n", + res.start, res.end, resource_size(&res)); + + p = p2pmem_create(&adapter->pdev->dev); + if (IS_ERR(p)) + return PTR_ERR(p); + + rc = p2pmem_add_resource(p, &res); + if (rc) { + p2pmem_unregister(p); + return rc; + } + adapter->p2pmem = p; + + return 0; +} + static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { int func, i, err, s_qpp, qpp, num_seg; @@ -4784,8 +4873,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz); #endif setup_memwin_rdma(adapter); - if (err) - goto out_unmap_bar; + + setup_memwin_p2pmem(adapter); /* configure SGE_STAT_CFG_A to read WC stats */ if (!is_t4(adapter->params.chip)) @@ -4989,6 +5078,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) print_adapter_info(adapter); setup_fw_sge_queues(adapter); + init_p2pmem(adapter); return 0; sriov: @@ -5047,7 +5137,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) free_msix_info(adapter); if (adapter->num_uld || adapter->num_ofld_uld) t4_uld_mem_free(adapter); - out_unmap_bar: if (!is_t4(adapter->params.chip)) iounmap(adapter->bar2); out_free_adapter: @@ -5075,6 +5164,8 @@ static void remove_one(struct pci_dev *pdev) return; } + p2pmem_unregister(adapter->p2pmem); + if (adapter->pf == 4) { int i; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index 3348d33..199ddfb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -735,6 +735,11 @@ #define PCIE_MEM_ACCESS_OFFSET_A 0x306c +#define MEMOFST_S 7 +#define MEMOFST_M 0x1ffffffU +#define MEMOFST_V(x) ((x) << MEMOFST_S) +#define MEMOFST_G(x) (((x) >> MEMOFST_S) & MEMOFST_M) + #define ENABLE_S 30 #define ENABLE_V(x) ((x) << ENABLE_S) #define ENABLE_F ENABLE_V(1U) -- 2.1.4