openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: ccp - Modify PCI support in prep for arm64 support 

Modify the PCI device support in prep for supporting the
CCP as a platform device for arm64.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tom Lendacky 2014-06-05 10:17:45 -05:00 committed by Herbert Xu
parent 64d1cdfbe2
commit 3d77565ba5
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/ccp/ccp-dev.h
View File

@ -23,8 +23,6 @@
#include <linux/hw_random.h> #include <linux/hw_random.h>
#define IO_OFFSET 0x20000
#define MAX_DMAPOOL_NAME_LEN 32 #define MAX_DMAPOOL_NAME_LEN 32
#define MAX_HW_QUEUES 5 #define MAX_HW_QUEUES 5
@ -194,6 +192,7 @@ struct ccp_device {
void *dev_specific; void *dev_specific;
int (*get_irq)(struct ccp_device *ccp); int (*get_irq)(struct ccp_device *ccp);
void (*free_irq)(struct ccp_device *ccp); void (*free_irq)(struct ccp_device *ccp);
unsigned int irq;
/* /*
* I/O area used for device communication. The register mapping * I/O area used for device communication. The register mapping

39
drivers/crypto/ccp/ccp-pci.c
View File

@ -12,8 +12,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/device.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/dma-mapping.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -24,6 +26,8 @@
#include "ccp-dev.h" #include "ccp-dev.h"
#define IO_BAR 2 #define IO_BAR 2
#define IO_OFFSET 0x20000
#define MSIX_VECTORS 2 #define MSIX_VECTORS 2
struct ccp_msix { struct ccp_msix {
@ -89,7 +93,8 @@ static int ccp_get_msi_irq(struct ccp_device *ccp)
if (ret) if (ret)
return ret; return ret;
ret = request_irq(pdev->irq, ccp_irq_handler, 0, "ccp", dev); ccp->irq = pdev->irq;
ret = request_irq(ccp->irq, ccp_irq_handler, 0, "ccp", dev);
if (ret) { if (ret) {
dev_notice(dev, "unable to allocate MSI IRQ (%d)\n", ret); dev_notice(dev, "unable to allocate MSI IRQ (%d)\n", ret);
goto e_msi; goto e_msi;
@ -136,7 +141,7 @@ static void ccp_free_irqs(struct ccp_device *ccp)
dev); dev);
pci_disable_msix(pdev); pci_disable_msix(pdev);
} else { } else {
free_irq(pdev->irq, dev); free_irq(ccp->irq, dev);
pci_disable_msi(pdev); pci_disable_msi(pdev);
} }
} }
@ -147,21 +152,12 @@ static int ccp_find_mmio_area(struct ccp_device *ccp)
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
resource_size_t io_len; resource_size_t io_len;
unsigned long io_flags; unsigned long io_flags;
int bar;
io_flags = pci_resource_flags(pdev, IO_BAR); io_flags = pci_resource_flags(pdev, IO_BAR);
io_len = pci_resource_len(pdev, IO_BAR); io_len = pci_resource_len(pdev, IO_BAR);
if ((io_flags & IORESOURCE_MEM) && (io_len >= (IO_OFFSET + 0x800))) if ((io_flags & IORESOURCE_MEM) && (io_len >= (IO_OFFSET + 0x800)))
return IO_BAR; return IO_BAR;
for (bar = 0; bar < PCI_STD_RESOURCE_END; bar++) {
io_flags = pci_resource_flags(pdev, bar);
io_len = pci_resource_len(pdev, bar);
if ((io_flags & IORESOURCE_MEM) &&
(io_len >= (IO_OFFSET + 0x800)))
return bar;
}
return -EIO; return -EIO;
} }
@ -214,20 +210,13 @@ static int ccp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
ccp->io_regs = ccp->io_map + IO_OFFSET; ccp->io_regs = ccp->io_map + IO_OFFSET;
ret = dma_set_mask(dev, DMA_BIT_MASK(48)); ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));
if (ret == 0) { if (ret) {
ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(48)); ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret) { if (ret) {
dev_err(dev, dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n",
"pci_set_consistent_dma_mask failed (%d)\n",
ret); ret);
goto e_bar0; goto e_iomap;
}
} else {
ret = dma_set_mask(dev, DMA_BIT_MASK(32));
if (ret) {
dev_err(dev, "pci_set_dma_mask failed (%d)\n", ret);
goto e_bar0;
} }
} }
@ -235,13 +224,13 @@ static int ccp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ret = ccp_init(ccp); ret = ccp_init(ccp);
if (ret) if (ret)
goto e_bar0; goto e_iomap;
dev_notice(dev, "enabled\n"); dev_notice(dev, "enabled\n");
return 0; return 0;
e_bar0: e_iomap:
pci_iounmap(pdev, ccp->io_map); pci_iounmap(pdev, ccp->io_map);
e_device: e_device: