2018-01-26 18:50:27 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-03-27 09:45:05 +00:00
|
|
|
/**
|
2017-09-01 21:35:50 +00:00
|
|
|
* Synopsys DesignWare PCIe Endpoint controller driver
|
2017-03-27 09:45:05 +00:00
|
|
|
*
|
|
|
|
* Copyright (C) 2017 Texas Instruments
|
|
|
|
* Author: Kishon Vijay Abraham I <kishon@ti.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/of.h>
|
|
|
|
|
|
|
|
#include "pcie-designware.h"
|
|
|
|
#include <linux/pci-epc.h>
|
|
|
|
#include <linux/pci-epf.h>
|
|
|
|
|
|
|
|
void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)
|
|
|
|
{
|
|
|
|
struct pci_epc *epc = ep->epc;
|
|
|
|
|
|
|
|
pci_epc_linkup(epc);
|
|
|
|
}
|
|
|
|
|
2018-03-28 11:50:14 +00:00
|
|
|
static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar,
|
|
|
|
int flags)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
reg = PCI_BASE_ADDRESS_0 + (4 * bar);
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_en(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
dw_pcie_writel_dbi2(pci, reg, 0x0);
|
|
|
|
dw_pcie_writel_dbi(pci, reg, 0x0);
|
2018-03-28 11:50:16 +00:00
|
|
|
if (flags & PCI_BASE_ADDRESS_MEM_TYPE_64) {
|
|
|
|
dw_pcie_writel_dbi2(pci, reg + 4, 0x0);
|
|
|
|
dw_pcie_writel_dbi(pci, reg + 4, 0x0);
|
|
|
|
}
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_dis(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
}
|
|
|
|
|
2018-03-28 11:50:14 +00:00
|
|
|
void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)
|
|
|
|
{
|
|
|
|
__dw_pcie_ep_reset_bar(pci, bar, 0);
|
|
|
|
}
|
|
|
|
|
2018-07-19 08:32:14 +00:00
|
|
|
static u8 __dw_pcie_ep_find_next_cap(struct dw_pcie *pci, u8 cap_ptr,
|
|
|
|
u8 cap)
|
|
|
|
{
|
|
|
|
u8 cap_id, next_cap_ptr;
|
|
|
|
u16 reg;
|
|
|
|
|
|
|
|
reg = dw_pcie_readw_dbi(pci, cap_ptr);
|
|
|
|
next_cap_ptr = (reg & 0xff00) >> 8;
|
|
|
|
cap_id = (reg & 0x00ff);
|
|
|
|
|
|
|
|
if (!next_cap_ptr || cap_id > PCI_CAP_ID_MAX)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (cap_id == cap)
|
|
|
|
return cap_ptr;
|
|
|
|
|
|
|
|
return __dw_pcie_ep_find_next_cap(pci, next_cap_ptr, cap);
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8 dw_pcie_ep_find_capability(struct dw_pcie *pci, u8 cap)
|
|
|
|
{
|
|
|
|
u8 next_cap_ptr;
|
|
|
|
u16 reg;
|
|
|
|
|
|
|
|
reg = dw_pcie_readw_dbi(pci, PCI_CAPABILITY_LIST);
|
|
|
|
next_cap_ptr = (reg & 0x00ff);
|
|
|
|
|
|
|
|
if (!next_cap_ptr)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return __dw_pcie_ep_find_next_cap(pci, next_cap_ptr, cap);
|
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no,
|
2017-03-27 09:45:05 +00:00
|
|
|
struct pci_epf_header *hdr)
|
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_en(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
dw_pcie_writew_dbi(pci, PCI_VENDOR_ID, hdr->vendorid);
|
|
|
|
dw_pcie_writew_dbi(pci, PCI_DEVICE_ID, hdr->deviceid);
|
|
|
|
dw_pcie_writeb_dbi(pci, PCI_REVISION_ID, hdr->revid);
|
|
|
|
dw_pcie_writeb_dbi(pci, PCI_CLASS_PROG, hdr->progif_code);
|
|
|
|
dw_pcie_writew_dbi(pci, PCI_CLASS_DEVICE,
|
|
|
|
hdr->subclass_code | hdr->baseclass_code << 8);
|
|
|
|
dw_pcie_writeb_dbi(pci, PCI_CACHE_LINE_SIZE,
|
|
|
|
hdr->cache_line_size);
|
|
|
|
dw_pcie_writew_dbi(pci, PCI_SUBSYSTEM_VENDOR_ID,
|
|
|
|
hdr->subsys_vendor_id);
|
|
|
|
dw_pcie_writew_dbi(pci, PCI_SUBSYSTEM_ID, hdr->subsys_id);
|
|
|
|
dw_pcie_writeb_dbi(pci, PCI_INTERRUPT_PIN,
|
|
|
|
hdr->interrupt_pin);
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_dis(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, enum pci_barno bar,
|
|
|
|
dma_addr_t cpu_addr,
|
|
|
|
enum dw_pcie_as_type as_type)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u32 free_win;
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
2017-12-14 13:01:44 +00:00
|
|
|
free_win = find_first_zero_bit(ep->ib_window_map, ep->num_ib_windows);
|
2017-03-27 09:45:05 +00:00
|
|
|
if (free_win >= ep->num_ib_windows) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(pci->dev, "No free inbound window\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = dw_pcie_prog_inbound_atu(pci, free_win, bar, cpu_addr,
|
|
|
|
as_type);
|
|
|
|
if (ret < 0) {
|
|
|
|
dev_err(pci->dev, "Failed to program IB window\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ep->bar_to_atu[bar] = free_win;
|
2017-12-14 13:01:44 +00:00
|
|
|
set_bit(free_win, ep->ib_window_map);
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, phys_addr_t phys_addr,
|
|
|
|
u64 pci_addr, size_t size)
|
|
|
|
{
|
|
|
|
u32 free_win;
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
2017-12-14 13:01:44 +00:00
|
|
|
free_win = find_first_zero_bit(ep->ob_window_map, ep->num_ob_windows);
|
2017-03-27 09:45:05 +00:00
|
|
|
if (free_win >= ep->num_ob_windows) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(pci->dev, "No free outbound window\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
dw_pcie_prog_outbound_atu(pci, free_win, PCIE_ATU_TYPE_MEM,
|
|
|
|
phys_addr, pci_addr, size);
|
|
|
|
|
2017-12-14 13:01:44 +00:00
|
|
|
set_bit(free_win, ep->ob_window_map);
|
2017-03-27 09:45:05 +00:00
|
|
|
ep->outbound_addr[free_win] = phys_addr;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no,
|
2018-03-28 11:50:14 +00:00
|
|
|
struct pci_epf_bar *epf_bar)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
2018-03-28 11:50:14 +00:00
|
|
|
enum pci_barno bar = epf_bar->barno;
|
2017-03-27 09:45:05 +00:00
|
|
|
u32 atu_index = ep->bar_to_atu[bar];
|
|
|
|
|
2018-03-28 11:50:14 +00:00
|
|
|
__dw_pcie_ep_reset_bar(pci, bar, epf_bar->flags);
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND);
|
2017-12-14 13:01:44 +00:00
|
|
|
clear_bit(atu_index, ep->ib_window_map);
|
2017-03-27 09:45:05 +00:00
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no,
|
2018-03-28 11:50:07 +00:00
|
|
|
struct pci_epf_bar *epf_bar)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
2018-03-28 11:50:07 +00:00
|
|
|
enum pci_barno bar = epf_bar->barno;
|
|
|
|
size_t size = epf_bar->size;
|
|
|
|
int flags = epf_bar->flags;
|
2017-03-27 09:45:05 +00:00
|
|
|
enum dw_pcie_as_type as_type;
|
|
|
|
u32 reg = PCI_BASE_ADDRESS_0 + (4 * bar);
|
|
|
|
|
|
|
|
if (!(flags & PCI_BASE_ADDRESS_SPACE))
|
|
|
|
as_type = DW_PCIE_AS_MEM;
|
|
|
|
else
|
|
|
|
as_type = DW_PCIE_AS_IO;
|
|
|
|
|
2018-03-28 11:50:07 +00:00
|
|
|
ret = dw_pcie_ep_inbound_atu(ep, bar, epf_bar->phys_addr, as_type);
|
2017-03-27 09:45:05 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_en(pci);
|
2018-03-28 11:50:11 +00:00
|
|
|
|
|
|
|
dw_pcie_writel_dbi2(pci, reg, lower_32_bits(size - 1));
|
2017-03-27 09:45:05 +00:00
|
|
|
dw_pcie_writel_dbi(pci, reg, flags);
|
2018-03-28 11:50:11 +00:00
|
|
|
|
|
|
|
if (flags & PCI_BASE_ADDRESS_MEM_TYPE_64) {
|
|
|
|
dw_pcie_writel_dbi2(pci, reg + 4, upper_32_bits(size - 1));
|
|
|
|
dw_pcie_writel_dbi(pci, reg + 4, 0);
|
|
|
|
}
|
|
|
|
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_dis(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dw_pcie_find_index(struct dw_pcie_ep *ep, phys_addr_t addr,
|
|
|
|
u32 *atu_index)
|
|
|
|
{
|
|
|
|
u32 index;
|
|
|
|
|
|
|
|
for (index = 0; index < ep->num_ob_windows; index++) {
|
|
|
|
if (ep->outbound_addr[index] != addr)
|
|
|
|
continue;
|
|
|
|
*atu_index = index;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
|
|
|
|
phys_addr_t addr)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u32 atu_index;
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
|
|
|
ret = dw_pcie_find_index(ep, addr, &atu_index);
|
|
|
|
if (ret < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_OUTBOUND);
|
2017-12-14 13:01:44 +00:00
|
|
|
clear_bit(atu_index, ep->ob_window_map);
|
2017-03-27 09:45:05 +00:00
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
|
|
|
|
phys_addr_t addr,
|
2017-03-27 09:45:05 +00:00
|
|
|
u64 pci_addr, size_t size)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
|
|
|
ret = dw_pcie_ep_outbound_atu(ep, addr, pci_addr, size);
|
|
|
|
if (ret) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(pci->dev, "Failed to enable address\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static int dw_pcie_ep_get_msi(struct pci_epc *epc, u8 func_no)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
2018-07-19 08:32:15 +00:00
|
|
|
u32 val, reg;
|
|
|
|
|
|
|
|
if (!ep->msi_cap)
|
|
|
|
return -EINVAL;
|
2017-03-27 09:45:05 +00:00
|
|
|
|
2018-07-19 08:32:15 +00:00
|
|
|
reg = ep->msi_cap + PCI_MSI_FLAGS;
|
|
|
|
val = dw_pcie_readw_dbi(pci, reg);
|
|
|
|
if (!(val & PCI_MSI_FLAGS_ENABLE))
|
2017-03-27 09:45:05 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2018-07-19 08:32:15 +00:00
|
|
|
val = (val & PCI_MSI_FLAGS_QSIZE) >> 4;
|
|
|
|
|
2017-03-27 09:45:05 +00:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2018-07-19 08:32:15 +00:00
|
|
|
static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 func_no, u8 interrupts)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
2018-07-19 08:32:15 +00:00
|
|
|
u32 val, reg;
|
2017-03-27 09:45:05 +00:00
|
|
|
|
2018-07-19 08:32:15 +00:00
|
|
|
if (!ep->msi_cap)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
reg = ep->msi_cap + PCI_MSI_FLAGS;
|
|
|
|
val = dw_pcie_readw_dbi(pci, reg);
|
|
|
|
val &= ~PCI_MSI_FLAGS_QMASK;
|
|
|
|
val |= (interrupts << 1) & PCI_MSI_FLAGS_QMASK;
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_en(pci);
|
2018-07-19 08:32:15 +00:00
|
|
|
dw_pcie_writew_dbi(pci, reg, val);
|
2017-12-19 23:29:24 +00:00
|
|
|
dw_pcie_dbi_ro_wr_dis(pci);
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-19 08:32:14 +00:00
|
|
|
static int dw_pcie_ep_get_msix(struct pci_epc *epc, u8 func_no)
|
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
u32 val, reg;
|
|
|
|
|
|
|
|
if (!ep->msix_cap)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
reg = ep->msix_cap + PCI_MSIX_FLAGS;
|
|
|
|
val = dw_pcie_readw_dbi(pci, reg);
|
|
|
|
if (!(val & PCI_MSIX_FLAGS_ENABLE))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
val &= PCI_MSIX_FLAGS_QSIZE;
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dw_pcie_ep_set_msix(struct pci_epc *epc, u8 func_no, u16 interrupts)
|
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
u32 val, reg;
|
|
|
|
|
|
|
|
if (!ep->msix_cap)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
reg = ep->msix_cap + PCI_MSIX_FLAGS;
|
|
|
|
val = dw_pcie_readw_dbi(pci, reg);
|
|
|
|
val &= ~PCI_MSIX_FLAGS_QSIZE;
|
|
|
|
val |= interrupts;
|
|
|
|
dw_pcie_dbi_ro_wr_en(pci);
|
|
|
|
dw_pcie_writew_dbi(pci, reg, val);
|
|
|
|
dw_pcie_dbi_ro_wr_dis(pci);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-30 20:56:56 +00:00
|
|
|
static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no,
|
2018-07-19 08:32:13 +00:00
|
|
|
enum pci_epc_irq_type type, u16 interrupt_num)
|
2017-03-27 09:45:05 +00:00
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
|
|
|
|
if (!ep->ops->raise_irq)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2018-02-01 17:36:07 +00:00
|
|
|
return ep->ops->raise_irq(ep, func_no, type, interrupt_num);
|
2017-03-27 09:45:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dw_pcie_ep_stop(struct pci_epc *epc)
|
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
|
|
|
if (!pci->ops->stop_link)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pci->ops->stop_link(pci);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dw_pcie_ep_start(struct pci_epc *epc)
|
|
|
|
{
|
|
|
|
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
|
|
|
|
if (!pci->ops->start_link)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return pci->ops->start_link(pci);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct pci_epc_ops epc_ops = {
|
|
|
|
.write_header = dw_pcie_ep_write_header,
|
|
|
|
.set_bar = dw_pcie_ep_set_bar,
|
|
|
|
.clear_bar = dw_pcie_ep_clear_bar,
|
|
|
|
.map_addr = dw_pcie_ep_map_addr,
|
|
|
|
.unmap_addr = dw_pcie_ep_unmap_addr,
|
|
|
|
.set_msi = dw_pcie_ep_set_msi,
|
|
|
|
.get_msi = dw_pcie_ep_get_msi,
|
2018-07-19 08:32:14 +00:00
|
|
|
.set_msix = dw_pcie_ep_set_msix,
|
|
|
|
.get_msix = dw_pcie_ep_get_msix,
|
2017-03-27 09:45:05 +00:00
|
|
|
.raise_irq = dw_pcie_ep_raise_irq,
|
|
|
|
.start = dw_pcie_ep_start,
|
|
|
|
.stop = dw_pcie_ep_stop,
|
|
|
|
};
|
|
|
|
|
2018-07-19 08:32:16 +00:00
|
|
|
int dw_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep, u8 func_no)
|
|
|
|
{
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
struct device *dev = pci->dev;
|
|
|
|
|
|
|
|
dev_err(dev, "EP cannot trigger legacy IRQs\n");
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2018-02-01 17:36:07 +00:00
|
|
|
int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
|
2017-12-19 23:29:27 +00:00
|
|
|
u8 interrupt_num)
|
|
|
|
{
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
struct pci_epc *epc = ep->epc;
|
|
|
|
u16 msg_ctrl, msg_data;
|
2018-07-19 08:32:15 +00:00
|
|
|
u32 msg_addr_lower, msg_addr_upper, reg;
|
2017-12-19 23:29:27 +00:00
|
|
|
u64 msg_addr;
|
|
|
|
bool has_upper;
|
|
|
|
int ret;
|
|
|
|
|
2018-07-19 08:32:15 +00:00
|
|
|
if (!ep->msi_cap)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-12-19 23:29:27 +00:00
|
|
|
/* Raise MSI per the PCI Local Bus Specification Revision 3.0, 6.8.1. */
|
2018-07-19 08:32:15 +00:00
|
|
|
reg = ep->msi_cap + PCI_MSI_FLAGS;
|
|
|
|
msg_ctrl = dw_pcie_readw_dbi(pci, reg);
|
2017-12-19 23:29:27 +00:00
|
|
|
has_upper = !!(msg_ctrl & PCI_MSI_FLAGS_64BIT);
|
2018-07-19 08:32:15 +00:00
|
|
|
reg = ep->msi_cap + PCI_MSI_ADDRESS_LO;
|
|
|
|
msg_addr_lower = dw_pcie_readl_dbi(pci, reg);
|
2017-12-19 23:29:27 +00:00
|
|
|
if (has_upper) {
|
2018-07-19 08:32:15 +00:00
|
|
|
reg = ep->msi_cap + PCI_MSI_ADDRESS_HI;
|
|
|
|
msg_addr_upper = dw_pcie_readl_dbi(pci, reg);
|
|
|
|
reg = ep->msi_cap + PCI_MSI_DATA_64;
|
|
|
|
msg_data = dw_pcie_readw_dbi(pci, reg);
|
2017-12-19 23:29:27 +00:00
|
|
|
} else {
|
|
|
|
msg_addr_upper = 0;
|
2018-07-19 08:32:15 +00:00
|
|
|
reg = ep->msi_cap + PCI_MSI_DATA_32;
|
|
|
|
msg_data = dw_pcie_readw_dbi(pci, reg);
|
2017-12-19 23:29:27 +00:00
|
|
|
}
|
|
|
|
msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
|
2018-02-01 17:36:07 +00:00
|
|
|
ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
|
2017-12-19 23:29:27 +00:00
|
|
|
epc->mem->page_size);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
writel(msg_data | (interrupt_num - 1), ep->msi_mem);
|
|
|
|
|
2018-02-01 17:36:07 +00:00
|
|
|
dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);
|
2017-12-19 23:29:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-19 08:32:14 +00:00
|
|
|
int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
|
|
|
|
u16 interrupt_num)
|
|
|
|
{
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
struct pci_epc *epc = ep->epc;
|
|
|
|
u16 tbl_offset, bir;
|
|
|
|
u32 bar_addr_upper, bar_addr_lower;
|
|
|
|
u32 msg_addr_upper, msg_addr_lower;
|
|
|
|
u32 reg, msg_data, vec_ctrl;
|
|
|
|
u64 tbl_addr, msg_addr, reg_u64;
|
|
|
|
void __iomem *msix_tbl;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
reg = ep->msix_cap + PCI_MSIX_TABLE;
|
|
|
|
tbl_offset = dw_pcie_readl_dbi(pci, reg);
|
|
|
|
bir = (tbl_offset & PCI_MSIX_TABLE_BIR);
|
|
|
|
tbl_offset &= PCI_MSIX_TABLE_OFFSET;
|
|
|
|
tbl_offset >>= 3;
|
|
|
|
|
|
|
|
reg = PCI_BASE_ADDRESS_0 + (4 * bir);
|
|
|
|
bar_addr_upper = 0;
|
|
|
|
bar_addr_lower = dw_pcie_readl_dbi(pci, reg);
|
|
|
|
reg_u64 = (bar_addr_lower & PCI_BASE_ADDRESS_MEM_TYPE_MASK);
|
|
|
|
if (reg_u64 == PCI_BASE_ADDRESS_MEM_TYPE_64)
|
|
|
|
bar_addr_upper = dw_pcie_readl_dbi(pci, reg + 4);
|
|
|
|
|
|
|
|
tbl_addr = ((u64) bar_addr_upper) << 32 | bar_addr_lower;
|
|
|
|
tbl_addr += (tbl_offset + ((interrupt_num - 1) * PCI_MSIX_ENTRY_SIZE));
|
|
|
|
tbl_addr &= PCI_BASE_ADDRESS_MEM_MASK;
|
|
|
|
|
|
|
|
msix_tbl = ioremap_nocache(ep->phys_base + tbl_addr,
|
|
|
|
PCI_MSIX_ENTRY_SIZE);
|
|
|
|
if (!msix_tbl)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
msg_addr_lower = readl(msix_tbl + PCI_MSIX_ENTRY_LOWER_ADDR);
|
|
|
|
msg_addr_upper = readl(msix_tbl + PCI_MSIX_ENTRY_UPPER_ADDR);
|
|
|
|
msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
|
|
|
|
msg_data = readl(msix_tbl + PCI_MSIX_ENTRY_DATA);
|
|
|
|
vec_ctrl = readl(msix_tbl + PCI_MSIX_ENTRY_VECTOR_CTRL);
|
|
|
|
|
|
|
|
iounmap(msix_tbl);
|
|
|
|
|
|
|
|
if (vec_ctrl & PCI_MSIX_ENTRY_CTRL_MASKBIT)
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
|
|
|
|
epc->mem->page_size);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
writel(msg_data, ep->msi_mem);
|
|
|
|
|
|
|
|
dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-03-27 09:45:05 +00:00
|
|
|
void dw_pcie_ep_exit(struct dw_pcie_ep *ep)
|
|
|
|
{
|
|
|
|
struct pci_epc *epc = ep->epc;
|
|
|
|
|
2017-12-19 23:29:25 +00:00
|
|
|
pci_epc_mem_free_addr(epc, ep->msi_mem_phys, ep->msi_mem,
|
|
|
|
epc->mem->page_size);
|
|
|
|
|
2017-03-27 09:45:05 +00:00
|
|
|
pci_epc_mem_exit(epc);
|
|
|
|
}
|
|
|
|
|
|
|
|
int dw_pcie_ep_init(struct dw_pcie_ep *ep)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
void *addr;
|
|
|
|
struct pci_epc *epc;
|
|
|
|
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
|
|
|
|
struct device *dev = pci->dev;
|
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
|
|
|
|
if (!pci->dbi_base || !pci->dbi_base2) {
|
2018-02-01 14:02:23 +00:00
|
|
|
dev_err(dev, "dbi_base/dbi_base2 is not populated\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
PCI: dwc: Don't hard-code DBI/ATU offset
The DWC PCIe core contains various separate register spaces: DBI, DBI2,
ATU, DMA, etc. The relationship between the addresses of these register
spaces is entirely determined by the implementation of the IP block, not
by the IP block design itself. Hence, the DWC driver must not make
assumptions that one register space can be accessed at a fixed offset from
any other register space. To avoid such assumptions, introduce an
explicit/separate register pointer for the ATU register space. In
particular, the current assumption is not valid for NVIDIA's T194 SoC.
The ATU register space is only used on systems that require unrolled ATU
access. This property is detected at run-time for host controllers, and
when this is detected, this patch provides a default value for atu_base
that matches the previous assumption re: register layout. An alternative
would be to update all drivers for HW that requires unrolled access to
explicitly set atu_base. However, it's hard to tell which drivers would
require atu_base to be set. The unrolled property is not detected for
endpoint systems, and so any endpoint driver that requires unrolled access
must explicitly set the iatu_unroll_enabled flag (none do at present), and
so a check is added to require the driver to also set atu_base while at
it.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Acked-by: Vidya Sagar <vidyas@nvidia.com>
2018-11-30 18:37:19 +00:00
|
|
|
if (pci->iatu_unroll_enabled && !pci->atu_base) {
|
|
|
|
dev_err(dev, "atu_base is not populated\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
ret = of_property_read_u32(np, "num-ib-windows", &ep->num_ib_windows);
|
|
|
|
if (ret < 0) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(dev, "Unable to read *num-ib-windows* property\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2017-12-14 13:01:44 +00:00
|
|
|
if (ep->num_ib_windows > MAX_IATU_IN) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(dev, "Invalid *num-ib-windows*\n");
|
2017-12-14 13:01:44 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2017-03-27 09:45:05 +00:00
|
|
|
|
|
|
|
ret = of_property_read_u32(np, "num-ob-windows", &ep->num_ob_windows);
|
|
|
|
if (ret < 0) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(dev, "Unable to read *num-ob-windows* property\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2017-12-14 13:01:44 +00:00
|
|
|
if (ep->num_ob_windows > MAX_IATU_OUT) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(dev, "Invalid *num-ob-windows*\n");
|
2017-12-14 13:01:44 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 21:07:58 +00:00
|
|
|
ep->ib_window_map = devm_kcalloc(dev,
|
2017-12-14 13:01:44 +00:00
|
|
|
BITS_TO_LONGS(ep->num_ib_windows),
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 21:07:58 +00:00
|
|
|
sizeof(long),
|
2017-12-14 13:01:44 +00:00
|
|
|
GFP_KERNEL);
|
|
|
|
if (!ep->ib_window_map)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 21:07:58 +00:00
|
|
|
ep->ob_window_map = devm_kcalloc(dev,
|
2017-12-14 13:01:44 +00:00
|
|
|
BITS_TO_LONGS(ep->num_ob_windows),
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 21:07:58 +00:00
|
|
|
sizeof(long),
|
2017-12-14 13:01:44 +00:00
|
|
|
GFP_KERNEL);
|
|
|
|
if (!ep->ob_window_map)
|
|
|
|
return -ENOMEM;
|
2017-03-27 09:45:05 +00:00
|
|
|
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 21:07:58 +00:00
|
|
|
addr = devm_kcalloc(dev, ep->num_ob_windows, sizeof(phys_addr_t),
|
2017-03-27 09:45:05 +00:00
|
|
|
GFP_KERNEL);
|
|
|
|
if (!addr)
|
|
|
|
return -ENOMEM;
|
|
|
|
ep->outbound_addr = addr;
|
|
|
|
|
|
|
|
epc = devm_pci_epc_create(dev, &epc_ops);
|
|
|
|
if (IS_ERR(epc)) {
|
2018-05-14 15:09:48 +00:00
|
|
|
dev_err(dev, "Failed to create epc device\n");
|
2017-03-27 09:45:05 +00:00
|
|
|
return PTR_ERR(epc);
|
|
|
|
}
|
|
|
|
|
2018-07-19 08:32:11 +00:00
|
|
|
ep->epc = epc;
|
|
|
|
epc_set_drvdata(epc, ep);
|
|
|
|
|
|
|
|
if (ep->ops->ep_init)
|
|
|
|
ep->ops->ep_init(ep);
|
|
|
|
|
2017-03-27 09:45:05 +00:00
|
|
|
ret = of_property_read_u8(np, "max-functions", &epc->max_functions);
|
|
|
|
if (ret < 0)
|
|
|
|
epc->max_functions = 1;
|
|
|
|
|
2017-08-18 14:58:02 +00:00
|
|
|
ret = __pci_epc_mem_init(epc, ep->phys_base, ep->addr_size,
|
|
|
|
ep->page_size);
|
2017-03-27 09:45:05 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
dev_err(dev, "Failed to initialize address space\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-12-19 23:29:25 +00:00
|
|
|
ep->msi_mem = pci_epc_mem_alloc_addr(epc, &ep->msi_mem_phys,
|
|
|
|
epc->mem->page_size);
|
|
|
|
if (!ep->msi_mem) {
|
2018-07-19 08:32:14 +00:00
|
|
|
dev_err(dev, "Failed to reserve memory for MSI/MSI-X\n");
|
2017-12-19 23:29:25 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2018-07-19 08:32:14 +00:00
|
|
|
ep->msi_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSI);
|
|
|
|
|
|
|
|
ep->msix_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSIX);
|
2017-12-19 23:29:25 +00:00
|
|
|
|
2017-03-27 09:45:05 +00:00
|
|
|
dw_pcie_setup(pci);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|