mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
IOMMU - Add DMA alias iterator (Alex Williamson) - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson) - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson) - Add DMA alias quirk for HighPoint devices (Jérôme Carretero) MSI - Fix leak in free_msi_irqs() (Alexei Starovoitov) Marvell MVEBU - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray) - Avoid setting an undefined window size (Jason Gunthorpe) - Allow several windows with the same target/attribute (Thomas Petazzoni) - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni) - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau) NVIDIA Tegra - Use new OF interrupt mapping when possible (Lucas Stach) Synopsys DesignWare - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray) - Use new OF interrupt mapping when possible (Lucas Stach) - Split Exynos and i.MX bindings (Lucas Stach) - Fix comment for setting number of lanes (Mohit Kumar) - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar) Miscellaneous - EXPORT_SYMBOL cleanup (Ryan Desfosses) - Whitespace cleanup (Ryan Desfosses) - Merge multi-line quoted strings (Ryan Desfosses) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJTmfzfAAoJEFmIoMA60/r8/YUQAJMrbeoUqtc/DqDKVOxed1ZG itkQ2tDgdQAo9G0axerpQS82+j/3SUnaQ/5FaX4+vyu5DA/Po9grQjRrJO+ppNzH 31pbeWwz3mUvAVeBkFZAf93+mbdlwQ6EMpPFsX86AftGVS81xh9eUZGek2sm/v9t VLM2AcVDbj//Bu4+7oC8l/ws1GcG17dLgvlZydvN9O07aj7mEDWlh/6+fnTKiYXU OcOwWK/ey5npeedcBHlUmQkiM/DVc8R3pHHQCSc40DZJR7YHiGoQnMxpQ/KNBin+ 42ZcOT5gPYvdft+TX6kygYgsgO6NbIU2Vnl3LvO9vlv8nq4qsCz3lbpPEz0+xGiF W0oXWXw3VjdLUsSfwL30PGSYpQ8DbVs5jGl6vJXyDNzDiF36yvPCIOM69Y6gyvvM hKdSeleG6e+tYjeW1qdmGbrnSNj+zmt6muSY16U+lkeOifcWnMTtx8BYpxrjDC76 2lXCp47V05flRapU2ZU5ocR57uTLoEsLNx01yFbnI+50SEBUamEGuKT3YMROOQnm zUiwDONhRAVT55m8QwUHXbryOGmALwCL0Zvb1RG3QetnSyGiK4mWC59t0mWubf4X nlKSE0Buaxiy9UdBIKvMt1oFLV8s0kElac5Rl2K0I2CiIzX/zBRT65GvpNGrWrwo 91pap9RTTOHGpICGSewx =woH9 -----END PGP SIGNATURE----- Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull more PCI updates from Bjorn Helgaas: "Here are some more things I'd like to see in v3.16-rc1: - DMA alias iterator, part of some work to fix IOMMU issues - MVEBU, Tegra, DesignWare changes that I forgot to include before - Some whitespace code cleanup Details: IOMMU - Add DMA alias iterator (Alex Williamson) - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson) - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson) - Add DMA alias quirk for HighPoint devices (Jérôme Carretero) MSI - Fix leak in free_msi_irqs() (Alexei Starovoitov) Marvell MVEBU - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray) - Avoid setting an undefined window size (Jason Gunthorpe) - Allow several windows with the same target/attribute (Thomas Petazzoni) - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni) - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau) NVIDIA Tegra - Use new OF interrupt mapping when possible (Lucas Stach) Synopsys DesignWare - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray) - Use new OF interrupt mapping when possible (Lucas Stach) - Split Exynos and i.MX bindings (Lucas Stach) - Fix comment for setting number of lanes (Mohit Kumar) - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar) Miscellaneous - EXPORT_SYMBOL cleanup (Ryan Desfosses) - Whitespace cleanup (Ryan Desfosses) - Merge multi-line quoted strings (Ryan Desfosses)" * tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits) PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L PCI/MSI: Fix memory leak in free_msi_irqs() PCI: Merge multi-line quoted strings PCI: Whitespace cleanup PCI: Move EXPORT_SYMBOL so it immediately follows function/variable PCI: Add bridge DMA alias quirk for ITE bridge PCI: designware: Split Exynos and i.MX bindings PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges PCI: Add support for PCIe-to-PCI bridge DMA alias quirks PCI: Add function 1 DMA alias quirk for Marvell devices PCI: Add function 0 DMA alias quirk for Ricoh devices PCI: Add support for DMA alias quirks PCI: Convert pci_dev_flags definitions to bit shifts PCI: Add DMA alias iterator PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock PCI: designware: Remove unnecessary use of 'conf_lock' spinlock PCI: designware: Use new OF interrupt mapping when possible PCI: designware: Fix iATU programming for cfg1, io and mem viewport PCI: designware: Fix comment for setting number of lanes ...
170 lines
4.3 KiB
C
170 lines
4.3 KiB
C
/*
|
|
* File: htirq.c
|
|
* Purpose: Hypertransport Interrupt Capability
|
|
*
|
|
* Copyright (C) 2006 Linux Networx
|
|
* Copyright (C) Eric Biederman <ebiederman@lnxi.com>
|
|
*/
|
|
|
|
#include <linux/irq.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/export.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/htirq.h>
|
|
|
|
/* Global ht irq lock.
|
|
*
|
|
* This is needed to serialize access to the data port in hypertransport
|
|
* irq capability.
|
|
*
|
|
* With multiple simultaneous hypertransport irq devices it might pay
|
|
* to make this more fine grained. But start with simple, stupid, and correct.
|
|
*/
|
|
static DEFINE_SPINLOCK(ht_irq_lock);
|
|
|
|
struct ht_irq_cfg {
|
|
struct pci_dev *dev;
|
|
/* Update callback used to cope with buggy hardware */
|
|
ht_irq_update_t *update;
|
|
unsigned pos;
|
|
unsigned idx;
|
|
struct ht_irq_msg msg;
|
|
};
|
|
|
|
|
|
void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
|
|
{
|
|
struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
|
|
unsigned long flags;
|
|
spin_lock_irqsave(&ht_irq_lock, flags);
|
|
if (cfg->msg.address_lo != msg->address_lo) {
|
|
pci_write_config_byte(cfg->dev, cfg->pos + 2, cfg->idx);
|
|
pci_write_config_dword(cfg->dev, cfg->pos + 4, msg->address_lo);
|
|
}
|
|
if (cfg->msg.address_hi != msg->address_hi) {
|
|
pci_write_config_byte(cfg->dev, cfg->pos + 2, cfg->idx + 1);
|
|
pci_write_config_dword(cfg->dev, cfg->pos + 4, msg->address_hi);
|
|
}
|
|
if (cfg->update)
|
|
cfg->update(cfg->dev, irq, msg);
|
|
spin_unlock_irqrestore(&ht_irq_lock, flags);
|
|
cfg->msg = *msg;
|
|
}
|
|
|
|
void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
|
|
{
|
|
struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
|
|
*msg = cfg->msg;
|
|
}
|
|
|
|
void mask_ht_irq(struct irq_data *data)
|
|
{
|
|
struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
|
|
struct ht_irq_msg msg = cfg->msg;
|
|
|
|
msg.address_lo |= 1;
|
|
write_ht_irq_msg(data->irq, &msg);
|
|
}
|
|
|
|
void unmask_ht_irq(struct irq_data *data)
|
|
{
|
|
struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
|
|
struct ht_irq_msg msg = cfg->msg;
|
|
|
|
msg.address_lo &= ~1;
|
|
write_ht_irq_msg(data->irq, &msg);
|
|
}
|
|
|
|
/**
|
|
* __ht_create_irq - create an irq and attach it to a device.
|
|
* @dev: The hypertransport device to find the irq capability on.
|
|
* @idx: Which of the possible irqs to attach to.
|
|
* @update: Function to be called when changing the htirq message
|
|
*
|
|
* The irq number of the new irq or a negative error value is returned.
|
|
*/
|
|
int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
|
|
{
|
|
struct ht_irq_cfg *cfg;
|
|
int max_irq, pos, irq;
|
|
unsigned long flags;
|
|
u32 data;
|
|
|
|
pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);
|
|
if (!pos)
|
|
return -EINVAL;
|
|
|
|
/* Verify the idx I want to use is in range */
|
|
spin_lock_irqsave(&ht_irq_lock, flags);
|
|
pci_write_config_byte(dev, pos + 2, 1);
|
|
pci_read_config_dword(dev, pos + 4, &data);
|
|
spin_unlock_irqrestore(&ht_irq_lock, flags);
|
|
|
|
max_irq = (data >> 16) & 0xff;
|
|
if (idx > max_irq)
|
|
return -EINVAL;
|
|
|
|
cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
|
|
if (!cfg)
|
|
return -ENOMEM;
|
|
|
|
cfg->dev = dev;
|
|
cfg->update = update;
|
|
cfg->pos = pos;
|
|
cfg->idx = 0x10 + (idx * 2);
|
|
/* Initialize msg to a value that will never match the first write. */
|
|
cfg->msg.address_lo = 0xffffffff;
|
|
cfg->msg.address_hi = 0xffffffff;
|
|
|
|
irq = irq_alloc_hwirq(dev_to_node(&dev->dev));
|
|
if (!irq) {
|
|
kfree(cfg);
|
|
return -EBUSY;
|
|
}
|
|
irq_set_handler_data(irq, cfg);
|
|
|
|
if (arch_setup_ht_irq(irq, dev) < 0) {
|
|
ht_destroy_irq(irq);
|
|
return -EBUSY;
|
|
}
|
|
|
|
return irq;
|
|
}
|
|
EXPORT_SYMBOL(__ht_create_irq);
|
|
|
|
/**
|
|
* ht_create_irq - create an irq and attach it to a device.
|
|
* @dev: The hypertransport device to find the irq capability on.
|
|
* @idx: Which of the possible irqs to attach to.
|
|
*
|
|
* ht_create_irq needs to be called for all hypertransport devices
|
|
* that generate irqs.
|
|
*
|
|
* The irq number of the new irq or a negative error value is returned.
|
|
*/
|
|
int ht_create_irq(struct pci_dev *dev, int idx)
|
|
{
|
|
return __ht_create_irq(dev, idx, NULL);
|
|
}
|
|
EXPORT_SYMBOL(ht_create_irq);
|
|
|
|
/**
|
|
* ht_destroy_irq - destroy an irq created with ht_create_irq
|
|
* @irq: irq to be destroyed
|
|
*
|
|
* This reverses ht_create_irq removing the specified irq from
|
|
* existence. The irq should be free before this happens.
|
|
*/
|
|
void ht_destroy_irq(unsigned int irq)
|
|
{
|
|
struct ht_irq_cfg *cfg;
|
|
|
|
cfg = irq_get_handler_data(irq);
|
|
irq_set_chip(irq, NULL);
|
|
irq_set_handler_data(irq, NULL);
|
|
irq_free_hwirq(irq);
|
|
|
|
kfree(cfg);
|
|
}
|
|
EXPORT_SYMBOL(ht_destroy_irq);
|