Merge branch 'pci/endpoint'
- Make pci_epf_bus_type const (Ricardo B. Marliere) - Update pci_epf_alloc_space() interface and move bar_fixed_size[] testing from pci_epf_test_alloc_space() and pci_epf_configure_bar() into it (Niklas Cassel) - Drop redundant size & alignment checking from epf_ntb_db_bar_init() since pci_epf_alloc_space() already does it (Niklas Cassel) - Fix ntb_register_device() name leak in error path (Yang Yingliang) - Return actual error code for pci_vntb_probe() failure (Yang Yingliang) - Prefix sysfs function names with "pci_epf_mhi_", e.g., "/sys/kernel/config/functions/pci_epf_mhi_sdx55", to leave room for other endpoint functions (Manivannan Sadhasivam) - Add EPF MHI support for SA8775P SoC (Mrinmay Sarkar) - Consolidate endpoint BAR hardware description in new struct pci_epc_bar_desc (Niklas Cassel) - Drop only_64bit on reserved BARs (Niklas Cassel) * pci/endpoint: PCI: endpoint: Drop only_64bit on reserved BARs PCI: endpoint: Clean up hardware description for BARs PCI: epf-mhi: Add support for SA8775P SoC PCI: epf-mhi: Add "pci_epf_mhi_" prefix to the function names PCI: epf-vntb: Return actual error code during pci_vntb_probe() failure NTB: fix possible name leak in ntb_register_device() PCI: endpoint: pci-epf-vntb: Remove superfluous checks for pci_epf_alloc_space() API PCI: endpoint: pci-epf-test: Remove superfluous checks for pci_epf_alloc_space() API PCI: endpoint: Improve pci_epf_alloc_space() API PCI: endpoint: Refactor pci_epf_alloc_space() API PCI: endpoint: Make pci_epf_bus_type const
This commit is contained in:
commit
f931e3cb96
@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
|
||||
|
||||
int ntb_register_device(struct ntb_dev *ntb)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (!ntb)
|
||||
return -EINVAL;
|
||||
if (!ntb->pdev)
|
||||
@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
|
||||
ntb->ctx_ops = NULL;
|
||||
spin_lock_init(&ntb->ctx_lock);
|
||||
|
||||
return device_register(&ntb->dev);
|
||||
ret = device_register(&ntb->dev);
|
||||
if (ret)
|
||||
put_device(&ntb->dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(ntb_register_device);
|
||||
|
||||
|
@ -1081,7 +1081,8 @@ static const struct pci_epc_features imx8m_pcie_epc_features = {
|
||||
.linkup_notifier = false,
|
||||
.msi_capable = true,
|
||||
.msix_capable = false,
|
||||
.reserved_bar = 1 << BAR_1 | 1 << BAR_3,
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.align = SZ_64K,
|
||||
};
|
||||
|
||||
|
@ -924,12 +924,12 @@ static const struct pci_epc_features ks_pcie_am654_epc_features = {
|
||||
.linkup_notifier = false,
|
||||
.msi_capable = true,
|
||||
.msix_capable = true,
|
||||
.reserved_bar = 1 << BAR_0 | 1 << BAR_1,
|
||||
.bar_fixed_64bit = 1 << BAR_0,
|
||||
.bar_fixed_size[2] = SZ_1M,
|
||||
.bar_fixed_size[3] = SZ_64K,
|
||||
.bar_fixed_size[4] = 256,
|
||||
.bar_fixed_size[5] = SZ_1M,
|
||||
.bar[BAR_0] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .type = BAR_FIXED, .fixed_size = SZ_1M, },
|
||||
.bar[BAR_3] = { .type = BAR_FIXED, .fixed_size = SZ_64K, },
|
||||
.bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256, },
|
||||
.bar[BAR_5] = { .type = BAR_FIXED, .fixed_size = SZ_1M, },
|
||||
.align = SZ_1M,
|
||||
};
|
||||
|
||||
|
@ -250,7 +250,10 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
|
||||
pci->dev = dev;
|
||||
pci->ops = pcie->drvdata->dw_pcie_ops;
|
||||
|
||||
ls_epc->bar_fixed_64bit = (1 << BAR_2) | (1 << BAR_4);
|
||||
ls_epc->bar[BAR_2].only_64bit = true;
|
||||
ls_epc->bar[BAR_3].type = BAR_RESERVED;
|
||||
ls_epc->bar[BAR_4].only_64bit = true;
|
||||
ls_epc->bar[BAR_5].type = BAR_RESERVED;
|
||||
ls_epc->linkup_notifier = true;
|
||||
|
||||
pcie->pci = pci;
|
||||
|
@ -312,8 +312,12 @@ static const struct pci_epc_features keembay_pcie_epc_features = {
|
||||
.linkup_notifier = false,
|
||||
.msi_capable = true,
|
||||
.msix_capable = true,
|
||||
.reserved_bar = BIT(BAR_1) | BIT(BAR_3) | BIT(BAR_5),
|
||||
.bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4),
|
||||
.bar[BAR_0] = { .only_64bit = true, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .only_64bit = true, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_4] = { .only_64bit = true, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
.align = SZ_16K,
|
||||
};
|
||||
|
||||
|
@ -383,7 +383,9 @@ static const struct pci_epc_features rcar_gen4_pcie_epc_features = {
|
||||
.linkup_notifier = false,
|
||||
.msi_capable = true,
|
||||
.msix_capable = false,
|
||||
.reserved_bar = 1 << BAR_1 | 1 << BAR_3 | 1 << BAR_5,
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
.align = SZ_1M,
|
||||
};
|
||||
|
||||
|
@ -2007,9 +2007,13 @@ static const struct pci_epc_features tegra_pcie_epc_features = {
|
||||
.core_init_notifier = true,
|
||||
.msi_capable = false,
|
||||
.msix_capable = false,
|
||||
.reserved_bar = 1 << BAR_2 | 1 << BAR_3 | 1 << BAR_4 | 1 << BAR_5,
|
||||
.bar_fixed_64bit = 1 << BAR_0,
|
||||
.bar_fixed_size[0] = SZ_1M,
|
||||
.bar[BAR_0] = { .type = BAR_FIXED, .fixed_size = SZ_1M,
|
||||
.only_64bit = true, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_4] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
};
|
||||
|
||||
static const struct pci_epc_features*
|
||||
|
@ -411,8 +411,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = {
|
||||
.msi_capable = true,
|
||||
.msix_capable = false,
|
||||
.align = 1 << 16,
|
||||
.bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4),
|
||||
.reserved_bar = BIT(BAR_4),
|
||||
.bar[BAR_0] = { .only_64bit = true, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .only_64bit = true, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_4] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
},
|
||||
};
|
||||
|
||||
@ -425,7 +429,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_nx1_data = {
|
||||
.msi_capable = true,
|
||||
.msix_capable = false,
|
||||
.align = 1 << 12,
|
||||
.bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4),
|
||||
.bar[BAR_0] = { .only_64bit = true, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .only_64bit = true, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_4] = { .only_64bit = true, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -440,11 +440,15 @@ static const struct pci_epc_features rcar_pcie_epc_features = {
|
||||
.msi_capable = true,
|
||||
.msix_capable = false,
|
||||
/* use 64-bit BARs so mark BAR[1,3,5] as reserved */
|
||||
.reserved_bar = 1 << BAR_1 | 1 << BAR_3 | 1 << BAR_5,
|
||||
.bar_fixed_64bit = 1 << BAR_0 | 1 << BAR_2 | 1 << BAR_4,
|
||||
.bar_fixed_size[0] = 128,
|
||||
.bar_fixed_size[2] = 256,
|
||||
.bar_fixed_size[4] = 256,
|
||||
.bar[BAR_0] = { .type = BAR_FIXED, .fixed_size = 128,
|
||||
.only_64bit = true, },
|
||||
.bar[BAR_1] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_2] = { .type = BAR_FIXED, .fixed_size = 256,
|
||||
.only_64bit = true, },
|
||||
.bar[BAR_3] = { .type = BAR_RESERVED, },
|
||||
.bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256,
|
||||
.only_64bit = true, },
|
||||
.bar[BAR_5] = { .type = BAR_RESERVED, },
|
||||
};
|
||||
|
||||
static const struct pci_epc_features*
|
||||
|
@ -123,6 +123,22 @@ static const struct pci_epf_mhi_ep_info sm8450_info = {
|
||||
.flags = MHI_EPF_USE_DMA,
|
||||
};
|
||||
|
||||
static struct pci_epf_header sa8775p_header = {
|
||||
.vendorid = PCI_VENDOR_ID_QCOM,
|
||||
.deviceid = 0x0306, /* FIXME: Update deviceid for sa8775p EP */
|
||||
.baseclass_code = PCI_CLASS_OTHERS,
|
||||
.interrupt_pin = PCI_INTERRUPT_INTA,
|
||||
};
|
||||
|
||||
static const struct pci_epf_mhi_ep_info sa8775p_info = {
|
||||
.config = &mhi_v1_config,
|
||||
.epf_header = &sa8775p_header,
|
||||
.bar_num = BAR_0,
|
||||
.epf_flags = PCI_BASE_ADDRESS_MEM_TYPE_32,
|
||||
.msi_count = 32,
|
||||
.mru = 0x8000,
|
||||
};
|
||||
|
||||
struct pci_epf_mhi {
|
||||
const struct pci_epc_features *epc_features;
|
||||
const struct pci_epf_mhi_ep_info *info;
|
||||
@ -913,8 +929,9 @@ static int pci_epf_mhi_probe(struct pci_epf *epf,
|
||||
}
|
||||
|
||||
static const struct pci_epf_device_id pci_epf_mhi_ids[] = {
|
||||
{ .name = "sdx55", .driver_data = (kernel_ulong_t)&sdx55_info },
|
||||
{ .name = "sm8450", .driver_data = (kernel_ulong_t)&sm8450_info },
|
||||
{ .name = "pci_epf_mhi_sa8775p", .driver_data = (kernel_ulong_t)&sa8775p_info },
|
||||
{ .name = "pci_epf_mhi_sdx55", .driver_data = (kernel_ulong_t)&sdx55_info },
|
||||
{ .name = "pci_epf_mhi_sm8450", .driver_data = (kernel_ulong_t)&sm8450_info },
|
||||
{},
|
||||
};
|
||||
|
||||
|
@ -1012,13 +1012,13 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb,
|
||||
|
||||
epc_features = ntb_epc->epc_features;
|
||||
barno = ntb_epc->epf_ntb_bar[BAR_CONFIG];
|
||||
size = epc_features->bar_fixed_size[barno];
|
||||
size = epc_features->bar[barno].fixed_size;
|
||||
align = epc_features->align;
|
||||
|
||||
peer_ntb_epc = ntb->epc[!type];
|
||||
peer_epc_features = peer_ntb_epc->epc_features;
|
||||
peer_barno = ntb_epc->epf_ntb_bar[BAR_PEER_SPAD];
|
||||
peer_size = peer_epc_features->bar_fixed_size[peer_barno];
|
||||
peer_size = peer_epc_features->bar[peer_barno].fixed_size;
|
||||
|
||||
/* Check if epc_features is populated incorrectly */
|
||||
if ((!IS_ALIGNED(size, align)))
|
||||
@ -1067,7 +1067,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb,
|
||||
else if (size < ctrl_size + spad_size)
|
||||
return -EINVAL;
|
||||
|
||||
base = pci_epf_alloc_space(epf, size, barno, align, type);
|
||||
base = pci_epf_alloc_space(epf, size, barno, epc_features, type);
|
||||
if (!base) {
|
||||
dev_err(dev, "%s intf: Config/Status/SPAD alloc region fail\n",
|
||||
pci_epc_interface_string(type));
|
||||
|
@ -729,7 +729,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
|
||||
*/
|
||||
add = (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ? 2 : 1;
|
||||
|
||||
if (!!(epc_features->reserved_bar & (1 << bar)))
|
||||
if (epc_features->bar[bar].type == BAR_RESERVED)
|
||||
continue;
|
||||
|
||||
ret = pci_epc_set_bar(epc, epf->func_no, epf->vfunc_no,
|
||||
@ -841,14 +841,8 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
|
||||
}
|
||||
test_reg_size = test_reg_bar_size + msix_table_size + pba_size;
|
||||
|
||||
if (epc_features->bar_fixed_size[test_reg_bar]) {
|
||||
if (test_reg_size > bar_size[test_reg_bar])
|
||||
return -ENOMEM;
|
||||
test_reg_size = bar_size[test_reg_bar];
|
||||
}
|
||||
|
||||
base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar,
|
||||
epc_features->align, PRIMARY_INTERFACE);
|
||||
epc_features, PRIMARY_INTERFACE);
|
||||
if (!base) {
|
||||
dev_err(dev, "Failed to allocated register space\n");
|
||||
return -ENOMEM;
|
||||
@ -862,12 +856,11 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
|
||||
if (bar == test_reg_bar)
|
||||
continue;
|
||||
|
||||
if (!!(epc_features->reserved_bar & (1 << bar)))
|
||||
if (epc_features->bar[bar].type == BAR_RESERVED)
|
||||
continue;
|
||||
|
||||
base = pci_epf_alloc_space(epf, bar_size[bar], bar,
|
||||
epc_features->align,
|
||||
PRIMARY_INTERFACE);
|
||||
epc_features, PRIMARY_INTERFACE);
|
||||
if (!base)
|
||||
dev_err(dev, "Failed to allocate space for BAR%d\n",
|
||||
bar);
|
||||
@ -881,16 +874,12 @@ static void pci_epf_configure_bar(struct pci_epf *epf,
|
||||
const struct pci_epc_features *epc_features)
|
||||
{
|
||||
struct pci_epf_bar *epf_bar;
|
||||
bool bar_fixed_64bit;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < PCI_STD_NUM_BARS; i++) {
|
||||
epf_bar = &epf->bar[i];
|
||||
bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i));
|
||||
if (bar_fixed_64bit)
|
||||
if (epc_features->bar[i].only_64bit)
|
||||
epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64;
|
||||
if (epc_features->bar_fixed_size[i])
|
||||
bar_size[i] = epc_features->bar_fixed_size[i];
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -422,7 +422,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
|
||||
epf->func_no,
|
||||
epf->vfunc_no);
|
||||
barno = ntb->epf_ntb_bar[BAR_CONFIG];
|
||||
size = epc_features->bar_fixed_size[barno];
|
||||
size = epc_features->bar[barno].fixed_size;
|
||||
align = epc_features->align;
|
||||
|
||||
if ((!IS_ALIGNED(size, align)))
|
||||
@ -446,7 +446,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
|
||||
else if (size < ctrl_size + spad_size)
|
||||
return -EINVAL;
|
||||
|
||||
base = pci_epf_alloc_space(epf, size, barno, align, 0);
|
||||
base = pci_epf_alloc_space(epf, size, barno, epc_features, 0);
|
||||
if (!base) {
|
||||
dev_err(dev, "Config/Status/SPAD alloc region fail\n");
|
||||
return -ENOMEM;
|
||||
@ -527,7 +527,6 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb)
|
||||
static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
|
||||
{
|
||||
const struct pci_epc_features *epc_features;
|
||||
u32 align;
|
||||
struct device *dev = &ntb->epf->dev;
|
||||
int ret;
|
||||
struct pci_epf_bar *epf_bar;
|
||||
@ -538,19 +537,9 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
|
||||
epc_features = pci_epc_get_features(ntb->epf->epc,
|
||||
ntb->epf->func_no,
|
||||
ntb->epf->vfunc_no);
|
||||
align = epc_features->align;
|
||||
|
||||
if (size < 128)
|
||||
size = 128;
|
||||
|
||||
if (align)
|
||||
size = ALIGN(size, align);
|
||||
else
|
||||
size = roundup_pow_of_two(size);
|
||||
|
||||
barno = ntb->epf_ntb_bar[BAR_DB];
|
||||
|
||||
mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0);
|
||||
mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, epc_features, 0);
|
||||
if (!mw_addr) {
|
||||
dev_err(dev, "Failed to allocate OB address\n");
|
||||
return -ENOMEM;
|
||||
@ -1269,21 +1258,17 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot set DMA mask\n");
|
||||
return -EINVAL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = ntb_register_device(&ndev->ntb);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to register NTB device\n");
|
||||
goto err_register_dev;
|
||||
return ret;
|
||||
}
|
||||
|
||||
dev_dbg(dev, "PCI Virtual NTB driver loaded\n");
|
||||
return 0;
|
||||
|
||||
err_register_dev:
|
||||
put_device(&ndev->ntb.dev);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static struct pci_device_id pci_vntb_table[] = {
|
||||
|
@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(pci_epc_get);
|
||||
* @epc_features: pci_epc_features structure that holds the reserved bar bitmap
|
||||
*
|
||||
* Invoke to get the first unreserved BAR that can be used by the endpoint
|
||||
* function. For any incorrect value in reserved_bar return '0'.
|
||||
* function.
|
||||
*/
|
||||
enum pci_barno
|
||||
pci_epc_get_first_free_bar(const struct pci_epc_features *epc_features)
|
||||
@ -102,32 +102,27 @@ EXPORT_SYMBOL_GPL(pci_epc_get_first_free_bar);
|
||||
* @bar: the starting BAR number from where unreserved BAR should be searched
|
||||
*
|
||||
* Invoke to get the next unreserved BAR starting from @bar that can be used
|
||||
* for endpoint function. For any incorrect value in reserved_bar return '0'.
|
||||
* for endpoint function.
|
||||
*/
|
||||
enum pci_barno pci_epc_get_next_free_bar(const struct pci_epc_features
|
||||
*epc_features, enum pci_barno bar)
|
||||
{
|
||||
unsigned long free_bar;
|
||||
int i;
|
||||
|
||||
if (!epc_features)
|
||||
return BAR_0;
|
||||
|
||||
/* If 'bar - 1' is a 64-bit BAR, move to the next BAR */
|
||||
if ((epc_features->bar_fixed_64bit << 1) & 1 << bar)
|
||||
if (bar > 0 && epc_features->bar[bar - 1].only_64bit)
|
||||
bar++;
|
||||
|
||||
/* Find if the reserved BAR is also a 64-bit BAR */
|
||||
free_bar = epc_features->reserved_bar & epc_features->bar_fixed_64bit;
|
||||
for (i = bar; i < PCI_STD_NUM_BARS; i++) {
|
||||
/* If the BAR is not reserved, return it. */
|
||||
if (epc_features->bar[i].type != BAR_RESERVED)
|
||||
return i;
|
||||
}
|
||||
|
||||
/* Set the adjacent bit if the reserved BAR is also a 64-bit BAR */
|
||||
free_bar <<= 1;
|
||||
free_bar |= epc_features->reserved_bar;
|
||||
|
||||
free_bar = find_next_zero_bit(&free_bar, 6, bar);
|
||||
if (free_bar > 5)
|
||||
return NO_BAR;
|
||||
|
||||
return free_bar;
|
||||
return NO_BAR;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pci_epc_get_next_free_bar);
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
static DEFINE_MUTEX(pci_epf_mutex);
|
||||
|
||||
static struct bus_type pci_epf_bus_type;
|
||||
static const struct bus_type pci_epf_bus_type;
|
||||
static const struct device_type pci_epf_type;
|
||||
|
||||
/**
|
||||
@ -251,14 +251,17 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
|
||||
* @epf: the EPF device to whom allocate the memory
|
||||
* @size: the size of the memory that has to be allocated
|
||||
* @bar: the BAR number corresponding to the allocated register space
|
||||
* @align: alignment size for the allocation region
|
||||
* @epc_features: the features provided by the EPC specific to this EPF
|
||||
* @type: Identifies if the allocation is for primary EPC or secondary EPC
|
||||
*
|
||||
* Invoke to allocate memory for the PCI EPF register space.
|
||||
*/
|
||||
void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,
|
||||
size_t align, enum pci_epc_interface_type type)
|
||||
const struct pci_epc_features *epc_features,
|
||||
enum pci_epc_interface_type type)
|
||||
{
|
||||
u64 bar_fixed_size = epc_features->bar[bar].fixed_size;
|
||||
size_t align = epc_features->align;
|
||||
struct pci_epf_bar *epf_bar;
|
||||
dma_addr_t phys_addr;
|
||||
struct pci_epc *epc;
|
||||
@ -268,6 +271,15 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,
|
||||
if (size < 128)
|
||||
size = 128;
|
||||
|
||||
if (epc_features->bar[bar].type == BAR_FIXED && bar_fixed_size) {
|
||||
if (size > bar_fixed_size) {
|
||||
dev_err(&epf->dev,
|
||||
"requested BAR size is larger than fixed size\n");
|
||||
return NULL;
|
||||
}
|
||||
size = bar_fixed_size;
|
||||
}
|
||||
|
||||
if (align)
|
||||
size = ALIGN(size, align);
|
||||
else
|
||||
@ -507,7 +519,7 @@ static void pci_epf_device_remove(struct device *dev)
|
||||
epf->driver = NULL;
|
||||
}
|
||||
|
||||
static struct bus_type pci_epf_bus_type = {
|
||||
static const struct bus_type pci_epf_bus_type = {
|
||||
.name = "pci-epf",
|
||||
.match = pci_epf_device_match,
|
||||
.probe = pci_epf_device_probe,
|
||||
|
@ -145,6 +145,37 @@ struct pci_epc {
|
||||
unsigned long function_num_map;
|
||||
};
|
||||
|
||||
/**
|
||||
* @BAR_PROGRAMMABLE: The BAR mask can be configured by the EPC.
|
||||
* @BAR_FIXED: The BAR mask is fixed by the hardware.
|
||||
* @BAR_RESERVED: The BAR should not be touched by an EPF driver.
|
||||
*/
|
||||
enum pci_epc_bar_type {
|
||||
BAR_PROGRAMMABLE = 0,
|
||||
BAR_FIXED,
|
||||
BAR_RESERVED,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct pci_epc_bar_desc - hardware description for a BAR
|
||||
* @type: the type of the BAR
|
||||
* @fixed_size: the fixed size, only applicable if type is BAR_FIXED_MASK.
|
||||
* @only_64bit: if true, an EPF driver is not allowed to choose if this BAR
|
||||
* should be configured as 32-bit or 64-bit, the EPF driver must
|
||||
* configure this BAR as 64-bit. Additionally, the BAR succeeding
|
||||
* this BAR must be set to type BAR_RESERVED.
|
||||
*
|
||||
* only_64bit should not be set on a BAR of type BAR_RESERVED.
|
||||
* (If BARx is a 64-bit BAR that an EPF driver is not allowed to
|
||||
* touch, then both BARx and BARx+1 must be set to type
|
||||
* BAR_RESERVED.)
|
||||
*/
|
||||
struct pci_epc_bar_desc {
|
||||
enum pci_epc_bar_type type;
|
||||
u64 fixed_size;
|
||||
bool only_64bit;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct pci_epc_features - features supported by a EPC device per function
|
||||
* @linkup_notifier: indicate if the EPC device can notify EPF driver on link up
|
||||
@ -152,9 +183,7 @@ struct pci_epc {
|
||||
* for initialization
|
||||
* @msi_capable: indicate if the endpoint function has MSI capability
|
||||
* @msix_capable: indicate if the endpoint function has MSI-X capability
|
||||
* @reserved_bar: bitmap to indicate reserved BAR unavailable to function driver
|
||||
* @bar_fixed_64bit: bitmap to indicate fixed 64bit BARs
|
||||
* @bar_fixed_size: Array specifying the size supported by each BAR
|
||||
* @bar: array specifying the hardware description for each BAR
|
||||
* @align: alignment size required for BAR buffer allocation
|
||||
*/
|
||||
struct pci_epc_features {
|
||||
@ -162,9 +191,7 @@ struct pci_epc_features {
|
||||
unsigned int core_init_notifier : 1;
|
||||
unsigned int msi_capable : 1;
|
||||
unsigned int msix_capable : 1;
|
||||
u8 reserved_bar;
|
||||
u8 bar_fixed_64bit;
|
||||
u64 bar_fixed_size[PCI_STD_NUM_BARS];
|
||||
struct pci_epc_bar_desc bar[PCI_STD_NUM_BARS];
|
||||
size_t align;
|
||||
};
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include <linux/pci.h>
|
||||
|
||||
struct pci_epf;
|
||||
struct pci_epc_features;
|
||||
enum pci_epc_interface_type;
|
||||
|
||||
enum pci_barno {
|
||||
@ -216,7 +217,8 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
|
||||
struct module *owner);
|
||||
void pci_epf_unregister_driver(struct pci_epf_driver *driver);
|
||||
void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,
|
||||
size_t align, enum pci_epc_interface_type type);
|
||||
const struct pci_epc_features *epc_features,
|
||||
enum pci_epc_interface_type type);
|
||||
void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar,
|
||||
enum pci_epc_interface_type type);
|
||||
int pci_epf_bind(struct pci_epf *epf);
|
||||
|
Loading…
Reference in New Issue
Block a user