luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NTB: Use NUMA memory in Intel driver

Browse Source 
Allocate memory for the NUMA node of the NTB device.

Signed-off-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Allen Hubbe 2015-05-19 12:04:52 -04:00 committed by Jon Mason
parent 1199aa6126
commit 0e041fb536
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ntb/hw/intel/ntb_hw_intel.c
View File

@ -413,10 +413,12 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev,
int msix_shift, int total_shift) int msix_shift, int total_shift)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
int rc, i, msix_count; int rc, i, msix_count, node;
pdev = ndev_pdev(ndev); pdev = ndev_pdev(ndev);
node = dev_to_node(&pdev->dev);
/* Mask all doorbell interrupts */ /* Mask all doorbell interrupts */
ndev->db_mask = ndev->db_valid_mask; ndev->db_mask = ndev->db_valid_mask;
ndev->reg->db_iowrite(ndev->db_mask, ndev->reg->db_iowrite(ndev->db_mask,
@ -425,11 +427,13 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev,
/* Try to set up msix irq */ /* Try to set up msix irq */
ndev->vec = kcalloc(msix_max, sizeof(*ndev->vec), GFP_KERNEL); ndev->vec = kzalloc_node(msix_max * sizeof(*ndev->vec),
GFP_KERNEL, node);
if (!ndev->vec) if (!ndev->vec)
goto err_msix_vec_alloc; goto err_msix_vec_alloc;
ndev->msix = kcalloc(msix_max, sizeof(*ndev->msix), GFP_KERNEL); ndev->msix = kzalloc_node(msix_max * sizeof(*ndev->msix),
GFP_KERNEL, node);
if (!ndev->msix) if (!ndev->msix)
goto err_msix_alloc; goto err_msix_alloc;
@ -1955,10 +1959,12 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct intel_ntb_dev *ndev; struct intel_ntb_dev *ndev;
int rc; int rc, node;
node = dev_to_node(&pdev->dev);
if (pdev_is_bwd(pdev)) { if (pdev_is_bwd(pdev)) {
ndev = kzalloc(sizeof(*ndev), GFP_KERNEL); ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);
if (!ndev) { if (!ndev) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_ndev; goto err_ndev;
@ -1975,7 +1981,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
goto err_init_dev; goto err_init_dev;
} else if (pdev_is_snb(pdev)) { } else if (pdev_is_snb(pdev)) {
ndev = kzalloc(sizeof(*ndev), GFP_KERNEL); ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);
if (!ndev) { if (!ndev) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_ndev; goto err_ndev;