Changes in 4.9.249 spi: bcm2835aux: Fix use-after-free on unbind spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe iwlwifi: pcie: limit memory read spin time arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. ARC: stack unwinding: don't assume non-current task is sleeping platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Input: cm109 - do not stomp on control URB Input: i8042 - add Acer laptops to the i8042 reset list pinctrl: amd: remove debounce filter setting in IRQ type setting scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" spi: Prevent adding devices below an unregistering controller net/mlx4_en: Avoid scheduling restart task if it is already running tcp: fix cwnd-limited bug for TSO deferral where we send nothing net: stmmac: delete the eee_ctrl_timer after napi disabled net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux net: bridge: vlan: fix error return code in __vlan_add() mac80211: mesh: fix mesh_pathtbl_init() error path USB: dummy-hcd: Fix uninitialized array use in init() USB: add RESET_RESUME quirk for Snapscan 1212 ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap xhci: Give USB2 ports time to enter U3 in bus suspend USB: sisusbvga: Make console support depend on BROKEN ALSA: pcm: oss: Fix potential out-of-bounds shift serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off scsi: bnx2i: Requires MMU can: softing: softing_netdev_open(): fix error handling RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling drm/tegra: sor: Disable clocks on error in tegra_sor_init() scsi: mpt3sas: Increase IOCInit request timeout to 30s dm table: Remove BUG_ON(in_interrupt()) soc/tegra: fuse: Fix index bug in get_process_id USB: serial: option: add interface-number sanity check to flag handling USB: gadget: f_acm: add support for SuperSpeed Plus USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU HID: i2c-hid: add Vero K147 to descriptor override serial_core: Check for port state when tty is in error state media: msi2500: assign SPI bus number dynamically md: fix a warning caused by a race between concurrent md_ioctl()s Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() drm/gma500: fix double free of gma_connector RDMA/rxe: Compute PSN windows correctly ARM: p2v: fix handling of LPAE translation in BE mode crypto: talitos - Fix return type of current_desc_hdr() spi: img-spfi: fix reference leak in img_spfi_resume ASoC: pcm: DRAIN support reactivation arm64: dts: exynos: Correct psci compatible used on Exynos7 Bluetooth: Fix null pointer dereference in hci_event_packet() spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops RDMa/mthca: Work around -Wenum-conversion warning MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA staging: greybus: codecs: Fix reference counter leak in error handling media: solo6x10: fix missing snd_card_free in error handling case drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Input: ads7846 - fix integer overflow on Rt calculation Input: ads7846 - fix unaligned access on 7845 powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe RDMA/cxgb4: Validate the number of CQEs memstick: fix a double-free bug in memstick_check ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host orinoco: Move context allocation after processing the skb cw1200: fix missing destroy_workqueue() on error in cw1200_init_common media: siano: fix memory leak of debugfs members in smsdvb_hotplug mips: cdmm: fix use-after-free in mips_cdmm_bus_discover HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() ARM: dts: at91: at91sam9rl: fix ADC triggers NFSv4.2: condition READDIR's mask for security label based on LSM state SUNRPC: xprt_load_transport() needs to support the netid "rdma6" lockd: don't use interval-based rebinding over TCP NFS: switch nfsiod to be an UNBOUND workqueue. vfio-pci: Use io_remap_pfn_range() for PCI IO memory media: saa7146: fix array overflow in vidioc_s_audio() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() memstick: r592: Fix error return in r592_probe() ASoC: jz4740-i2s: add missed checks for clk_get() dm ioctl: fix error return code in target_message clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS scsi: pm80xx: Fix error return in pm8001_pci_probe() seq_buf: Avoid type mismatch for seq_buf_init scsi: fnic: Fix error return code in fnic_probe() powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create speakup: fix uninitialized flush_lock nfsd: Fix message level for normal termination nfs_common: need lock during iterate through the list x86/kprobes: Restore BTF if the single-stepping is cancelled clk: tegra: Fix duplicated SE clock entry extcon: max77693: Fix modalias string ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() irqchip/alpine-msi: Fix freeing of interrupts on allocation error path um: chan_xterm: Fix fd leak nfc: s3fwrn5: Release the nfc firmware powerpc/ps3: use dma_mapping_error() checkpatch: fix unescaped left brace net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function net: korina: fix return value watchdog: qcom: Avoid context switch in restart handler clk: ti: Fix memleak in ti_fapll_synth_setup perf record: Fix memory leak when using '--user-regs=?' to list registers qlcnic: Fix error code in probe clk: s2mps11: Fix a resource leak in error handling paths in the probe function cfg80211: initialize rekey_data Input: cros_ec_keyb - send 'scancodes' in addition to key events Input: goodix - add upside-down quirk for Teclast X98 Pro tablet media: gspca: Fix memory leak in probe media: sunxi-cir: ensure IR is handled when it is continuous media: netup_unidvb: Don't leak SPI master in probe error path Input: cyapa_gen6 - fix out-of-bounds stack access Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" ACPI: PNP: compare the string length in the matching_id() ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list staging: comedi: mf6x4: Fix AI end-of-conversion detection powerpc/perf: Exclude kernel samples while counting events in user space. USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Btrfs: fix selftests failure due to uninitialized i_mode in test inodes btrfs: fix return value mixup in btrfs_get_extent ext4: fix a memory leak of ext4_free_data KVM: arm64: Introduce handling of AArch32 TTBCR2 traps powerpc/xmon: Change printk() to pr_cont() ceph: fix race in concurrent __ceph_remove_cap invocations jffs2: Fix GC exit abnormally jfs: Fix array index bounds check in dbAdjTree drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path soc: qcom: smp2p: Safely acquire spinlock without IRQs mtd: parser: cmdline: Fix parsing of part-names with colons iio: buffer: Fix demux update iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume iio:pressure:mpl3115: Force alignment of buffer clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 xen-blkback: set ring->xenblkd to NULL after kthread_stop() PCI: Fix pci_slot_release() NULL pointer dereference Linux 4.9.249 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4829a32e2ea6e76eefea716f35f42ee02b75c265
293 lines
7.0 KiB
C
293 lines
7.0 KiB
C
/*
|
|
* Annapurna Labs MSIX support services
|
|
*
|
|
* Copyright (C) 2016, Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
*
|
|
* Antoine Tenart <antoine.tenart@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/irqchip.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <linux/msi.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_pci.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/msi.h>
|
|
|
|
/* MSIX message address format: local GIC target */
|
|
#define ALPINE_MSIX_SPI_TARGET_CLUSTER0 BIT(16)
|
|
|
|
struct alpine_msix_data {
|
|
spinlock_t msi_map_lock;
|
|
phys_addr_t addr;
|
|
u32 spi_first; /* The SGI number that MSIs start */
|
|
u32 num_spis; /* The number of SGIs for MSIs */
|
|
unsigned long *msi_map;
|
|
};
|
|
|
|
static void alpine_msix_mask_msi_irq(struct irq_data *d)
|
|
{
|
|
pci_msi_mask_irq(d);
|
|
irq_chip_mask_parent(d);
|
|
}
|
|
|
|
static void alpine_msix_unmask_msi_irq(struct irq_data *d)
|
|
{
|
|
pci_msi_unmask_irq(d);
|
|
irq_chip_unmask_parent(d);
|
|
}
|
|
|
|
static struct irq_chip alpine_msix_irq_chip = {
|
|
.name = "MSIx",
|
|
.irq_mask = alpine_msix_mask_msi_irq,
|
|
.irq_unmask = alpine_msix_unmask_msi_irq,
|
|
.irq_eoi = irq_chip_eoi_parent,
|
|
.irq_set_affinity = irq_chip_set_affinity_parent,
|
|
};
|
|
|
|
static int alpine_msix_allocate_sgi(struct alpine_msix_data *priv, int num_req)
|
|
{
|
|
int first;
|
|
|
|
spin_lock(&priv->msi_map_lock);
|
|
|
|
first = bitmap_find_next_zero_area(priv->msi_map, priv->num_spis, 0,
|
|
num_req, 0);
|
|
if (first >= priv->num_spis) {
|
|
spin_unlock(&priv->msi_map_lock);
|
|
return -ENOSPC;
|
|
}
|
|
|
|
bitmap_set(priv->msi_map, first, num_req);
|
|
|
|
spin_unlock(&priv->msi_map_lock);
|
|
|
|
return priv->spi_first + first;
|
|
}
|
|
|
|
static void alpine_msix_free_sgi(struct alpine_msix_data *priv, unsigned sgi,
|
|
int num_req)
|
|
{
|
|
int first = sgi - priv->spi_first;
|
|
|
|
spin_lock(&priv->msi_map_lock);
|
|
|
|
bitmap_clear(priv->msi_map, first, num_req);
|
|
|
|
spin_unlock(&priv->msi_map_lock);
|
|
}
|
|
|
|
static void alpine_msix_compose_msi_msg(struct irq_data *data,
|
|
struct msi_msg *msg)
|
|
{
|
|
struct alpine_msix_data *priv = irq_data_get_irq_chip_data(data);
|
|
phys_addr_t msg_addr = priv->addr;
|
|
|
|
msg_addr |= (data->hwirq << 3);
|
|
|
|
msg->address_hi = upper_32_bits(msg_addr);
|
|
msg->address_lo = lower_32_bits(msg_addr);
|
|
msg->data = 0;
|
|
}
|
|
|
|
static struct msi_domain_info alpine_msix_domain_info = {
|
|
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
|
|
MSI_FLAG_PCI_MSIX,
|
|
.chip = &alpine_msix_irq_chip,
|
|
};
|
|
|
|
static struct irq_chip middle_irq_chip = {
|
|
.name = "alpine_msix_middle",
|
|
.irq_mask = irq_chip_mask_parent,
|
|
.irq_unmask = irq_chip_unmask_parent,
|
|
.irq_eoi = irq_chip_eoi_parent,
|
|
.irq_set_affinity = irq_chip_set_affinity_parent,
|
|
.irq_compose_msi_msg = alpine_msix_compose_msi_msg,
|
|
};
|
|
|
|
static int alpine_msix_gic_domain_alloc(struct irq_domain *domain,
|
|
unsigned int virq, int sgi)
|
|
{
|
|
struct irq_fwspec fwspec;
|
|
struct irq_data *d;
|
|
int ret;
|
|
|
|
if (!is_of_node(domain->parent->fwnode))
|
|
return -EINVAL;
|
|
|
|
fwspec.fwnode = domain->parent->fwnode;
|
|
fwspec.param_count = 3;
|
|
fwspec.param[0] = 0;
|
|
fwspec.param[1] = sgi;
|
|
fwspec.param[2] = IRQ_TYPE_EDGE_RISING;
|
|
|
|
ret = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
|
|
if (ret)
|
|
return ret;
|
|
|
|
d = irq_domain_get_irq_data(domain->parent, virq);
|
|
d->chip->irq_set_type(d, IRQ_TYPE_EDGE_RISING);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,
|
|
unsigned int virq,
|
|
unsigned int nr_irqs, void *args)
|
|
{
|
|
struct alpine_msix_data *priv = domain->host_data;
|
|
int sgi, err, i;
|
|
|
|
sgi = alpine_msix_allocate_sgi(priv, nr_irqs);
|
|
if (sgi < 0)
|
|
return sgi;
|
|
|
|
for (i = 0; i < nr_irqs; i++) {
|
|
err = alpine_msix_gic_domain_alloc(domain, virq + i, sgi + i);
|
|
if (err)
|
|
goto err_sgi;
|
|
|
|
irq_domain_set_hwirq_and_chip(domain, virq + i, sgi + i,
|
|
&middle_irq_chip, priv);
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_sgi:
|
|
irq_domain_free_irqs_parent(domain, virq, i - 1);
|
|
alpine_msix_free_sgi(priv, sgi, nr_irqs);
|
|
return err;
|
|
}
|
|
|
|
static void alpine_msix_middle_domain_free(struct irq_domain *domain,
|
|
unsigned int virq,
|
|
unsigned int nr_irqs)
|
|
{
|
|
struct irq_data *d = irq_domain_get_irq_data(domain, virq);
|
|
struct alpine_msix_data *priv = irq_data_get_irq_chip_data(d);
|
|
|
|
irq_domain_free_irqs_parent(domain, virq, nr_irqs);
|
|
alpine_msix_free_sgi(priv, d->hwirq, nr_irqs);
|
|
}
|
|
|
|
static const struct irq_domain_ops alpine_msix_middle_domain_ops = {
|
|
.alloc = alpine_msix_middle_domain_alloc,
|
|
.free = alpine_msix_middle_domain_free,
|
|
};
|
|
|
|
static int alpine_msix_init_domains(struct alpine_msix_data *priv,
|
|
struct device_node *node)
|
|
{
|
|
struct irq_domain *middle_domain, *msi_domain, *gic_domain;
|
|
struct device_node *gic_node;
|
|
|
|
gic_node = of_irq_find_parent(node);
|
|
if (!gic_node) {
|
|
pr_err("Failed to find the GIC node\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
gic_domain = irq_find_host(gic_node);
|
|
if (!gic_domain) {
|
|
pr_err("Failed to find the GIC domain\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
middle_domain = irq_domain_add_tree(NULL,
|
|
&alpine_msix_middle_domain_ops,
|
|
priv);
|
|
if (!middle_domain) {
|
|
pr_err("Failed to create the MSIX middle domain\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
middle_domain->parent = gic_domain;
|
|
|
|
msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node),
|
|
&alpine_msix_domain_info,
|
|
middle_domain);
|
|
if (!msi_domain) {
|
|
pr_err("Failed to create MSI domain\n");
|
|
irq_domain_remove(middle_domain);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int alpine_msix_init(struct device_node *node,
|
|
struct device_node *parent)
|
|
{
|
|
struct alpine_msix_data *priv;
|
|
struct resource res;
|
|
int ret;
|
|
|
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
spin_lock_init(&priv->msi_map_lock);
|
|
|
|
ret = of_address_to_resource(node, 0, &res);
|
|
if (ret) {
|
|
pr_err("Failed to allocate resource\n");
|
|
goto err_priv;
|
|
}
|
|
|
|
/*
|
|
* The 20 least significant bits of addr provide direct information
|
|
* regarding the interrupt destination.
|
|
*
|
|
* To select the primary GIC as the target GIC, bits [18:17] must be set
|
|
* to 0x0. In this case, bit 16 (SPI_TARGET_CLUSTER0) must be set.
|
|
*/
|
|
priv->addr = res.start & GENMASK_ULL(63,20);
|
|
priv->addr |= ALPINE_MSIX_SPI_TARGET_CLUSTER0;
|
|
|
|
if (of_property_read_u32(node, "al,msi-base-spi", &priv->spi_first)) {
|
|
pr_err("Unable to parse MSI base\n");
|
|
ret = -EINVAL;
|
|
goto err_priv;
|
|
}
|
|
|
|
if (of_property_read_u32(node, "al,msi-num-spis", &priv->num_spis)) {
|
|
pr_err("Unable to parse MSI numbers\n");
|
|
ret = -EINVAL;
|
|
goto err_priv;
|
|
}
|
|
|
|
priv->msi_map = kzalloc(sizeof(*priv->msi_map) * BITS_TO_LONGS(priv->num_spis),
|
|
GFP_KERNEL);
|
|
if (!priv->msi_map) {
|
|
ret = -ENOMEM;
|
|
goto err_priv;
|
|
}
|
|
|
|
pr_debug("Registering %d msixs, starting at %d\n",
|
|
priv->num_spis, priv->spi_first);
|
|
|
|
ret = alpine_msix_init_domains(priv, node);
|
|
if (ret)
|
|
goto err_map;
|
|
|
|
return 0;
|
|
|
|
err_map:
|
|
kfree(priv->msi_map);
|
|
err_priv:
|
|
kfree(priv);
|
|
return ret;
|
|
}
|
|
IRQCHIP_DECLARE(alpine_msix, "al,alpine-msix", alpine_msix_init);
|