Merge tag 'pci-v4.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas: - add framework for supporting PCIe devices in Endpoint mode (Kishon Vijay Abraham I) - use non-postable PCI config space mappings when possible (Lorenzo Pieralisi) - clean up and unify mmap of PCI BARs (David Woodhouse) - export and unify Function Level Reset support (Christoph Hellwig) - avoid FLR for Intel 82579 NICs (Sasha Neftin) - add pci_request_irq() and pci_free_irq() helpers (Christoph Hellwig) - short-circuit config access failures for disconnected devices (Keith Busch) - remove D3 sleep delay when possible (Adrian Hunter) - freeze PME scan before suspending devices (Lukas Wunner) - stop disabling MSI/MSI-X in pci_device_shutdown() (Prarit Bhargava) - disable boot interrupt quirk for ASUS M2N-LR (Stefan Assmann) - add arch-specific alignment control to improve device passthrough by avoiding multiple BARs in a page (Yongji Xie) - add sysfs sriov_drivers_autoprobe to control VF driver binding (Bodong Wang) - allow slots below PCI-to-PCIe "reverse bridges" (Bjorn Helgaas) - fix crashes when unbinding host controllers that don't support removal (Brian Norris) - add driver for MicroSemi Switchtec management interface (Logan Gunthorpe) - add driver for Faraday Technology FTPCI100 host bridge (Linus Walleij) - add i.MX7D support (Andrey Smirnov) - use generic MSI support for Aardvark (Thomas Petazzoni) - make Rockchip driver modular (Brian Norris) - advertise 128-byte Read Completion Boundary support for Rockchip (Shawn Lin) - advertise PCI_EXP_LNKSTA_SLC for Rockchip root port (Shawn Lin) - convert atomic_t to refcount_t in HV driver (Elena Reshetova) - add CPU IRQ affinity in HV driver (K. Y. Srinivasan) - fix PCI bus removal in HV driver (Long Li) - add support for ThunderX2 DMA alias topology (Jayachandran C) - add ThunderX pass2.x 2nd node MCFG quirk (Tomasz Nowicki) - add ITE 8893 bridge DMA alias quirk (Jarod Wilson) - restrict Cavium ACS quirk only to CN81xx/CN83xx/CN88xx devices (Manish Jaggi) * tag 'pci-v4.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (146 commits) PCI: Don't allow unbinding host controllers that aren't prepared ARM: DRA7: clockdomain: Change the CLKTRCTRL of CM_PCIE_CLKSTCTRL to SW_WKUP MAINTAINERS: Add PCI Endpoint maintainer Documentation: PCI: Add userguide for PCI endpoint test function tools: PCI: Add sample test script to invoke pcitest tools: PCI: Add a userspace tool to test PCI endpoint Documentation: misc-devices: Add Documentation for pci-endpoint-test driver misc: Add host side PCI driver for PCI test function device PCI: Add device IDs for DRA74x and DRA72x dt-bindings: PCI: dra7xx: Add DT bindings to enable unaligned access PCI: dwc: dra7xx: Workaround for errata id i870 dt-bindings: PCI: dra7xx: Add DT bindings for PCI dra7xx EP mode PCI: dwc: dra7xx: Add EP mode support PCI: dwc: dra7xx: Facilitate wrapper and MSI interrupts to be enabled independently dt-bindings: PCI: Add DT bindings for PCI designware EP mode PCI: dwc: designware: Add EP mode support Documentation: PCI: Add binding documentation for pci-test endpoint function ixgbe: Use pcie_flr() instead of duplicating it IB/hfi1: Use pcie_flr() instead of duplicating it PCI: imx6: Fix spelling mistake: "contol" -> "control" ...
This commit is contained in:
Linus Torvalds
@@ -333,6 +333,7 @@ header-y += parport.h
|
||||
header-y += patchkey.h
|
||||
header-y += pci.h
|
||||
header-y += pci_regs.h
|
||||
header-y += pcitest.h
|
||||
header-y += perf_event.h
|
||||
header-y += personality.h
|
||||
header-y += pfkeyv2.h
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
#define PCI_SUBSYSTEM_ID 0x2e
|
||||
#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
|
||||
#define PCI_ROM_ADDRESS_ENABLE 0x01
|
||||
#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
|
||||
#define PCI_ROM_ADDRESS_MASK (~0x7ffU)
|
||||
|
||||
#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
|
||||
|
||||
|
||||
19
include/uapi/linux/pcitest.h
Normal file
19
include/uapi/linux/pcitest.h
Normal file
@@ -0,0 +1,19 @@
|
||||
/**
|
||||
* pcitest.h - PCI test uapi defines
|
||||
*
|
||||
* Copyright (C) 2017 Texas Instruments
|
||||
* Author: Kishon Vijay Abraham I <kishon@ti.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __UAPI_LINUX_PCITEST_H
|
||||
#define __UAPI_LINUX_PCITEST_H
|
||||
|
||||
#define PCITEST_BAR _IO('P', 0x1)
|
||||
#define PCITEST_LEGACY_IRQ _IO('P', 0x2)
|
||||
#define PCITEST_MSI _IOW('P', 0x3, int)
|
||||
#define PCITEST_WRITE _IOW('P', 0x4, unsigned long)
|
||||
#define PCITEST_READ _IOW('P', 0x5, unsigned long)
|
||||
#define PCITEST_COPY _IOW('P', 0x6, unsigned long)
|
||||
|
||||
#endif /* __UAPI_LINUX_PCITEST_H */
|
||||
132
include/uapi/linux/switchtec_ioctl.h
Normal file
132
include/uapi/linux/switchtec_ioctl.h
Normal file
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Microsemi Switchtec PCIe Driver
|
||||
* Copyright (c) 2017, Microsemi Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_SWITCHTEC_IOCTL_H
|
||||
#define _UAPI_LINUX_SWITCHTEC_IOCTL_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#define SWITCHTEC_IOCTL_PART_CFG0 0
|
||||
#define SWITCHTEC_IOCTL_PART_CFG1 1
|
||||
#define SWITCHTEC_IOCTL_PART_IMG0 2
|
||||
#define SWITCHTEC_IOCTL_PART_IMG1 3
|
||||
#define SWITCHTEC_IOCTL_PART_NVLOG 4
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR0 5
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR1 6
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR2 7
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR3 8
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR4 9
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR5 10
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR6 11
|
||||
#define SWITCHTEC_IOCTL_PART_VENDOR7 12
|
||||
#define SWITCHTEC_IOCTL_NUM_PARTITIONS 13
|
||||
|
||||
struct switchtec_ioctl_flash_info {
|
||||
__u64 flash_length;
|
||||
__u32 num_partitions;
|
||||
__u32 padding;
|
||||
};
|
||||
|
||||
struct switchtec_ioctl_flash_part_info {
|
||||
__u32 flash_partition;
|
||||
__u32 address;
|
||||
__u32 length;
|
||||
__u32 active;
|
||||
};
|
||||
|
||||
struct switchtec_ioctl_event_summary {
|
||||
__u64 global;
|
||||
__u64 part_bitmap;
|
||||
__u32 local_part;
|
||||
__u32 padding;
|
||||
__u32 part[48];
|
||||
__u32 pff[48];
|
||||
};
|
||||
|
||||
#define SWITCHTEC_IOCTL_EVENT_STACK_ERROR 0
|
||||
#define SWITCHTEC_IOCTL_EVENT_PPU_ERROR 1
|
||||
#define SWITCHTEC_IOCTL_EVENT_ISP_ERROR 2
|
||||
#define SWITCHTEC_IOCTL_EVENT_SYS_RESET 3
|
||||
#define SWITCHTEC_IOCTL_EVENT_FW_EXC 4
|
||||
#define SWITCHTEC_IOCTL_EVENT_FW_NMI 5
|
||||
#define SWITCHTEC_IOCTL_EVENT_FW_NON_FATAL 6
|
||||
#define SWITCHTEC_IOCTL_EVENT_FW_FATAL 7
|
||||
#define SWITCHTEC_IOCTL_EVENT_TWI_MRPC_COMP 8
|
||||
#define SWITCHTEC_IOCTL_EVENT_TWI_MRPC_COMP_ASYNC 9
|
||||
#define SWITCHTEC_IOCTL_EVENT_CLI_MRPC_COMP 10
|
||||
#define SWITCHTEC_IOCTL_EVENT_CLI_MRPC_COMP_ASYNC 11
|
||||
#define SWITCHTEC_IOCTL_EVENT_GPIO_INT 12
|
||||
#define SWITCHTEC_IOCTL_EVENT_PART_RESET 13
|
||||
#define SWITCHTEC_IOCTL_EVENT_MRPC_COMP 14
|
||||
#define SWITCHTEC_IOCTL_EVENT_MRPC_COMP_ASYNC 15
|
||||
#define SWITCHTEC_IOCTL_EVENT_DYN_PART_BIND_COMP 16
|
||||
#define SWITCHTEC_IOCTL_EVENT_AER_IN_P2P 17
|
||||
#define SWITCHTEC_IOCTL_EVENT_AER_IN_VEP 18
|
||||
#define SWITCHTEC_IOCTL_EVENT_DPC 19
|
||||
#define SWITCHTEC_IOCTL_EVENT_CTS 20
|
||||
#define SWITCHTEC_IOCTL_EVENT_HOTPLUG 21
|
||||
#define SWITCHTEC_IOCTL_EVENT_IER 22
|
||||
#define SWITCHTEC_IOCTL_EVENT_THRESH 23
|
||||
#define SWITCHTEC_IOCTL_EVENT_POWER_MGMT 24
|
||||
#define SWITCHTEC_IOCTL_EVENT_TLP_THROTTLING 25
|
||||
#define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED 26
|
||||
#define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT 27
|
||||
#define SWITCHTEC_IOCTL_EVENT_LINK_STATE 28
|
||||
#define SWITCHTEC_IOCTL_MAX_EVENTS 29
|
||||
|
||||
#define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1
|
||||
#define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2
|
||||
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_CLEAR (1 << 0)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_EN_POLL (1 << 1)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_EN_LOG (1 << 2)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_EN_CLI (1 << 3)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_EN_FATAL (1 << 4)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_DIS_POLL (1 << 5)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_DIS_LOG (1 << 6)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_DIS_CLI (1 << 7)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_DIS_FATAL (1 << 8)
|
||||
#define SWITCHTEC_IOCTL_EVENT_FLAG_UNUSED (~0x1ff)
|
||||
|
||||
struct switchtec_ioctl_event_ctl {
|
||||
__u32 event_id;
|
||||
__s32 index;
|
||||
__u32 flags;
|
||||
__u32 occurred;
|
||||
__u32 count;
|
||||
__u32 data[5];
|
||||
};
|
||||
|
||||
#define SWITCHTEC_IOCTL_PFF_VEP 100
|
||||
struct switchtec_ioctl_pff_port {
|
||||
__u32 pff;
|
||||
__u32 partition;
|
||||
__u32 port;
|
||||
};
|
||||
|
||||
#define SWITCHTEC_IOCTL_FLASH_INFO \
|
||||
_IOR('W', 0x40, struct switchtec_ioctl_flash_info)
|
||||
#define SWITCHTEC_IOCTL_FLASH_PART_INFO \
|
||||
_IOWR('W', 0x41, struct switchtec_ioctl_flash_part_info)
|
||||
#define SWITCHTEC_IOCTL_EVENT_SUMMARY \
|
||||
_IOR('W', 0x42, struct switchtec_ioctl_event_summary)
|
||||
#define SWITCHTEC_IOCTL_EVENT_CTL \
|
||||
_IOWR('W', 0x43, struct switchtec_ioctl_event_ctl)
|
||||
#define SWITCHTEC_IOCTL_PFF_TO_PORT \
|
||||
_IOWR('W', 0x44, struct switchtec_ioctl_pff_port)
|
||||
#define SWITCHTEC_IOCTL_PORT_TO_PFF \
|
||||
_IOWR('W', 0x45, struct switchtec_ioctl_pff_port)
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user