mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
bd6bf7c104
-----BEGIN PGP SIGNATURE----- iQJIBAABCgAyFiEEgMe7l+5h9hnxdsnuWYigwDrT+vwFAlvPV7IUHGJoZWxnYWFz QGdvb2dsZS5jb20ACgkQWYigwDrT+vyaUg//WnCaRIu2oKOp8c/bplZJDW5eT10d oYAN9qeyptU9RYrg4KBNbZL9UKGFTk3AoN5AUjrk8njxc/dY2ra/79esOvZyyYQy qLXBvrXKg3yZnlNlnyBneGSnUVwv/kl2hZS+kmYby2YOa8AH/mhU0FIFvsnfRK2I XvwABFm2ZYvXCqh3e5HXaHhOsR88NQ9In0AXVC7zHGqv1r/bMVn2YzPZHL/zzMrF mS79tdBTH+shSvchH9zvfgIs+UEKvvjEJsG2liwMkcQaV41i5dZjSKTdJ3EaD/Y2 BreLxXRnRYGUkBqfcon16Yx+P6VCefDRLa+RhwYO3dxFF2N4ZpblbkIdBATwKLjL npiGc6R8yFjTmZU0/7olMyMCm7igIBmDvWPcsKEE8R4PezwoQv6YKHBMwEaflIbl Rv4IUqjJzmQPaA0KkRoAVgAKHxldaNqno/6G1FR2gwz+fr68p5WSYFlQ3axhvTjc bBMJpB/fbp9WmpGJieTt6iMOI6V1pnCVjibM5ZON59WCFfytHGGpbYW05gtZEod4 d/3yRuU53JRSj3jQAQuF1B6qYhyxvv5YEtAQqIFeHaPZ67nL6agw09hE+TlXjWbE rTQRShflQ+ydnzIfKicFgy6/53D5hq7iH2l7HwJVXbXRQ104T5DB/XHUUTr+UWQn /Nkhov32/n6GjxQ= =58I4 -----END PGP SIGNATURE----- Merge tag 'pci-v4.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull PCI updates from Bjorn Helgaas: - Fix ASPM link_state teardown on removal (Lukas Wunner) - Fix misleading _OSC ASPM message (Sinan Kaya) - Make _OSC optional for PCI (Sinan Kaya) - Don't initialize ASPM link state when ACPI_FADT_NO_ASPM is set (Patrick Talbert) - Remove x86 and arm64 node-local allocation for host bridge structures (Punit Agrawal) - Pay attention to device-specific _PXM node values (Jonathan Cameron) - Support new Immediate Readiness bit (Felipe Balbi) - Differentiate between pciehp surprise and safe removal (Lukas Wunner) - Remove unnecessary pciehp includes (Lukas Wunner) - Drop pciehp hotplug_slot_ops wrappers (Lukas Wunner) - Tolerate PCIe Slot Presence Detect being hardwired to zero to workaround broken hardware, e.g., the Wilocity switch/wireless device (Lukas Wunner) - Unify pciehp controller & slot structs (Lukas Wunner) - Constify hotplug_slot_ops (Lukas Wunner) - Drop hotplug_slot_info (Lukas Wunner) - Embed hotplug_slot struct into users instead of allocating it separately (Lukas Wunner) - Initialize PCIe port service drivers directly instead of relying on initcall ordering (Keith Busch) - Restore PCI config state after a slot reset (Keith Busch) - Save/restore DPC config state along with other PCI config state (Keith Busch) - Reference count devices during AER handling to avoid race issue with concurrent hot removal (Keith Busch) - If an Upstream Port reports ERR_FATAL, don't try to read the Port's config space because it is probably unreachable (Keith Busch) - During error handling, use slot-specific reset instead of secondary bus reset to avoid link up/down issues on hotplug ports (Keith Busch) - Restore previous AER/DPC handling that does not remove and re-enumerate devices on ERR_FATAL (Keith Busch) - Notify all drivers that may be affected by error recovery resets (Keith Busch) - Always generate error recovery uevents, even if a driver doesn't have error callbacks (Keith Busch) - Make PCIe link active reporting detection generic (Keith Busch) - Support D3cold in PCIe hierarchies during system sleep and runtime, including hotplug and Thunderbolt ports (Mika Westerberg) - Handle hpmemsize/hpiosize kernel parameters uniformly, whether slots are empty or occupied (Jon Derrick) - Remove duplicated include from pci/pcie/err.c and unused variable from cpqphp (YueHaibing) - Remove driver pci_cleanup_aer_uncorrect_error_status() calls (Oza Pawandeep) - Uninline PCI bus accessors for better ftracing (Keith Busch) - Remove unused AER Root Port .error_resume method (Keith Busch) - Use kfifo in AER instead of a local version (Keith Busch) - Use threaded IRQ in AER bottom half (Keith Busch) - Use managed resources in AER core (Keith Busch) - Reuse pcie_port_find_device() for AER injection (Keith Busch) - Abstract AER interrupt handling to disconnect error injection (Keith Busch) - Refactor AER injection callbacks to simplify future improvments (Keith Busch) - Remove unused Netronome NFP32xx Device IDs (Jakub Kicinski) - Use bitmap_zalloc() for dma_alias_mask (Andy Shevchenko) - Add switch fall-through annotations (Gustavo A. R. Silva) - Remove unused Switchtec quirk variable (Joshua Abraham) - Fix pci.c kernel-doc warning (Randy Dunlap) - Remove trivial PCI wrappers for DMA APIs (Christoph Hellwig) - Add Intel GPU device IDs to spurious interrupt quirk (Bin Meng) - Run Switchtec DMA aliasing quirk only on NTB endpoints to avoid useless dmesg errors (Logan Gunthorpe) - Update Switchtec NTB documentation (Wesley Yung) - Remove redundant "default n" from Kconfig (Bartlomiej Zolnierkiewicz) - Avoid panic when drivers enable MSI/MSI-X twice (Tonghao Zhang) - Add PCI support for peer-to-peer DMA (Logan Gunthorpe) - Add sysfs group for PCI peer-to-peer memory statistics (Logan Gunthorpe) - Add PCI peer-to-peer DMA scatterlist mapping interface (Logan Gunthorpe) - Add PCI configfs/sysfs helpers for use by peer-to-peer users (Logan Gunthorpe) - Add PCI peer-to-peer DMA driver writer's documentation (Logan Gunthorpe) - Add block layer flag to indicate driver support for PCI peer-to-peer DMA (Logan Gunthorpe) - Map Infiniband scatterlists for peer-to-peer DMA if they contain P2P memory (Logan Gunthorpe) - Register nvme-pci CMB buffer as PCI peer-to-peer memory (Logan Gunthorpe) - Add nvme-pci support for PCI peer-to-peer memory in requests (Logan Gunthorpe) - Use PCI peer-to-peer memory in nvme (Stephen Bates, Steve Wise, Christoph Hellwig, Logan Gunthorpe) - Cache VF config space size to optimize enumeration of many VFs (KarimAllah Ahmed) - Remove unnecessary <linux/pci-ats.h> include (Bjorn Helgaas) - Fix VMD AERSID quirk Device ID matching (Jon Derrick) - Fix Cadence PHY handling during probe (Alan Douglas) - Signal Cadence Endpoint interrupts via AXI region 0 instead of last region (Alan Douglas) - Write Cadence Endpoint MSI interrupts with 32 bits of data (Alan Douglas) - Remove redundant controller tests for "device_type == pci" (Rob Herring) - Document R-Car E3 (R8A77990) bindings (Tho Vu) - Add device tree support for R-Car r8a7744 (Biju Das) - Drop unused mvebu PCIe capability code (Thomas Petazzoni) - Add shared PCI bridge emulation code (Thomas Petazzoni) - Convert mvebu to use shared PCI bridge emulation (Thomas Petazzoni) - Add aardvark Root Port emulation (Thomas Petazzoni) - Support 100MHz/200MHz refclocks for i.MX6 (Lucas Stach) - Add initial power management for i.MX7 (Leonard Crestez) - Add PME_Turn_Off support for i.MX7 (Leonard Crestez) - Fix qcom runtime power management error handling (Bjorn Andersson) - Update TI dra7xx unaligned access errata workaround for host mode as well as endpoint mode (Vignesh R) - Fix kirin section mismatch warning (Nathan Chancellor) - Remove iproc PAXC slot check to allow VF support (Jitendra Bhivare) - Quirk Keystone K2G to limit MRRS to 256 (Kishon Vijay Abraham I) - Update Keystone to use MRRS quirk for host bridge instead of open coding (Kishon Vijay Abraham I) - Refactor Keystone link establishment (Kishon Vijay Abraham I) - Simplify and speed up Keystone link training (Kishon Vijay Abraham I) - Remove unused Keystone host_init argument (Kishon Vijay Abraham I) - Merge Keystone driver files into one (Kishon Vijay Abraham I) - Remove redundant Keystone platform_set_drvdata() (Kishon Vijay Abraham I) - Rename Keystone functions for uniformity (Kishon Vijay Abraham I) - Add Keystone device control module DT binding (Kishon Vijay Abraham I) - Use SYSCON API to get Keystone control module device IDs (Kishon Vijay Abraham I) - Clean up Keystone PHY handling (Kishon Vijay Abraham I) - Use runtime PM APIs to enable Keystone clock (Kishon Vijay Abraham I) - Clean up Keystone config space access checks (Kishon Vijay Abraham I) - Get Keystone outbound window count from DT (Kishon Vijay Abraham I) - Clean up Keystone outbound window configuration (Kishon Vijay Abraham I) - Clean up Keystone DBI setup (Kishon Vijay Abraham I) - Clean up Keystone ks_pcie_link_up() (Kishon Vijay Abraham I) - Fix Keystone IRQ status checking (Kishon Vijay Abraham I) - Add debug messages for all Keystone errors (Kishon Vijay Abraham I) - Clean up Keystone includes and macros (Kishon Vijay Abraham I) - Fix Mediatek unchecked return value from devm_pci_remap_iospace() (Gustavo A. R. Silva) - Fix Mediatek endpoint/port matching logic (Honghui Zhang) - Change Mediatek Root Port Class Code to PCI_CLASS_BRIDGE_PCI (Honghui Zhang) - Remove redundant Mediatek PM domain check (Honghui Zhang) - Convert Mediatek to pci_host_probe() (Honghui Zhang) - Fix Mediatek MSI enablement (Honghui Zhang) - Add Mediatek system PM support for MT2712 and MT7622 (Honghui Zhang) - Add Mediatek loadable module support (Honghui Zhang) - Detach VMD resources after stopping root bus to prevent orphan resources (Jon Derrick) - Convert pcitest build process to that used by other tools (iio, perf, etc) (Gustavo Pimentel) * tag 'pci-v4.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (140 commits) PCI/AER: Refactor error injection fallbacks PCI/AER: Abstract AER interrupt handling PCI/AER: Reuse existing pcie_port_find_device() interface PCI/AER: Use managed resource allocations PCI: pcie: Remove redundant 'default n' from Kconfig PCI: aardvark: Implement emulated root PCI bridge config space PCI: mvebu: Convert to PCI emulated bridge config space PCI: mvebu: Drop unused PCI express capability code PCI: Introduce PCI bridge emulated config space common logic PCI: vmd: Detach resources after stopping root bus nvmet: Optionally use PCI P2P memory nvmet: Introduce helper functions to allocate and free request SGLs nvme-pci: Add support for P2P memory in requests nvme-pci: Use PCI p2pmem subsystem to manage the CMB IB/core: Ensure we map P2P memory correctly in rdma_rw_ctx_[init|destroy]() block: Add PCI P2P flag for request queue PCI/P2PDMA: Add P2P DMA driver writer's documentation docs-rst: Add a new directory for PCI documentation PCI/P2PDMA: Introduce configfs/sysfs enable attribute helpers PCI/P2PDMA: Add PCI p2pmem DMA mappings to adjust the bus offset ...
142 lines
4.3 KiB
C
142 lines
4.3 KiB
C
/*
|
|
* apple.c - Apple ACPI quirks
|
|
* Copyright (C) 2017 Lukas Wunner <lukas@wunner.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (version 2) as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/bitmap.h>
|
|
#include <linux/platform_data/x86/apple.h>
|
|
#include <linux/uuid.h>
|
|
|
|
/* Apple _DSM device properties GUID */
|
|
static const guid_t apple_prp_guid =
|
|
GUID_INIT(0xa0b5b7c6, 0x1318, 0x441c,
|
|
0xb0, 0xc9, 0xfe, 0x69, 0x5e, 0xaf, 0x94, 0x9b);
|
|
|
|
/**
|
|
* acpi_extract_apple_properties - retrieve and convert Apple _DSM properties
|
|
* @adev: ACPI device for which to retrieve the properties
|
|
*
|
|
* Invoke Apple's custom _DSM once to check the protocol version and once more
|
|
* to retrieve the properties. They are marshalled up in a single package as
|
|
* alternating key/value elements, unlike _DSD which stores them as a package
|
|
* of 2-element packages. Convert to _DSD format and make them available under
|
|
* the primary fwnode.
|
|
*/
|
|
void acpi_extract_apple_properties(struct acpi_device *adev)
|
|
{
|
|
unsigned int i, j = 0, newsize = 0, numprops, numvalid;
|
|
union acpi_object *props, *newprops;
|
|
unsigned long *valid = NULL;
|
|
void *free_space;
|
|
|
|
if (!x86_apple_machine)
|
|
return;
|
|
|
|
props = acpi_evaluate_dsm_typed(adev->handle, &apple_prp_guid, 1, 0,
|
|
NULL, ACPI_TYPE_BUFFER);
|
|
if (!props)
|
|
return;
|
|
|
|
if (!props->buffer.length)
|
|
goto out_free;
|
|
|
|
if (props->buffer.pointer[0] != 3) {
|
|
acpi_handle_info(adev->handle, FW_INFO
|
|
"unsupported properties version %*ph\n",
|
|
props->buffer.length, props->buffer.pointer);
|
|
goto out_free;
|
|
}
|
|
|
|
ACPI_FREE(props);
|
|
props = acpi_evaluate_dsm_typed(adev->handle, &apple_prp_guid, 1, 1,
|
|
NULL, ACPI_TYPE_PACKAGE);
|
|
if (!props)
|
|
return;
|
|
|
|
numprops = props->package.count / 2;
|
|
if (!numprops)
|
|
goto out_free;
|
|
|
|
valid = bitmap_zalloc(numprops, GFP_KERNEL);
|
|
if (!valid)
|
|
goto out_free;
|
|
|
|
/* newsize = key length + value length of each tuple */
|
|
for (i = 0; i < numprops; i++) {
|
|
union acpi_object *key = &props->package.elements[i * 2];
|
|
union acpi_object *val = &props->package.elements[i * 2 + 1];
|
|
|
|
if ( key->type != ACPI_TYPE_STRING ||
|
|
(val->type != ACPI_TYPE_INTEGER &&
|
|
val->type != ACPI_TYPE_BUFFER))
|
|
continue; /* skip invalid properties */
|
|
|
|
__set_bit(i, valid);
|
|
newsize += key->string.length + 1;
|
|
if ( val->type == ACPI_TYPE_BUFFER)
|
|
newsize += val->buffer.length;
|
|
}
|
|
|
|
numvalid = bitmap_weight(valid, numprops);
|
|
if (numprops > numvalid)
|
|
acpi_handle_info(adev->handle, FW_INFO
|
|
"skipped %u properties: wrong type\n",
|
|
numprops - numvalid);
|
|
if (numvalid == 0)
|
|
goto out_free;
|
|
|
|
/* newsize += top-level package + 3 objects for each key/value tuple */
|
|
newsize += (1 + 3 * numvalid) * sizeof(union acpi_object);
|
|
newprops = ACPI_ALLOCATE_ZEROED(newsize);
|
|
if (!newprops)
|
|
goto out_free;
|
|
|
|
/* layout: top-level package | packages | key/value tuples | strings */
|
|
newprops->type = ACPI_TYPE_PACKAGE;
|
|
newprops->package.count = numvalid;
|
|
newprops->package.elements = &newprops[1];
|
|
free_space = &newprops[1 + 3 * numvalid];
|
|
|
|
for_each_set_bit(i, valid, numprops) {
|
|
union acpi_object *key = &props->package.elements[i * 2];
|
|
union acpi_object *val = &props->package.elements[i * 2 + 1];
|
|
unsigned int k = 1 + numvalid + j * 2; /* index into newprops */
|
|
unsigned int v = k + 1;
|
|
|
|
newprops[1 + j].type = ACPI_TYPE_PACKAGE;
|
|
newprops[1 + j].package.count = 2;
|
|
newprops[1 + j].package.elements = &newprops[k];
|
|
|
|
newprops[k].type = ACPI_TYPE_STRING;
|
|
newprops[k].string.length = key->string.length;
|
|
newprops[k].string.pointer = free_space;
|
|
memcpy(free_space, key->string.pointer, key->string.length);
|
|
free_space += key->string.length + 1;
|
|
|
|
newprops[v].type = val->type;
|
|
if (val->type == ACPI_TYPE_INTEGER) {
|
|
newprops[v].integer.value = val->integer.value;
|
|
} else {
|
|
newprops[v].buffer.length = val->buffer.length;
|
|
newprops[v].buffer.pointer = free_space;
|
|
memcpy(free_space, val->buffer.pointer,
|
|
val->buffer.length);
|
|
free_space += val->buffer.length;
|
|
}
|
|
j++; /* count valid properties */
|
|
}
|
|
WARN_ON(free_space != (void *)newprops + newsize);
|
|
|
|
adev->data.pointer = newprops;
|
|
acpi_data_add_props(&adev->data, &apple_prp_guid, newprops);
|
|
|
|
out_free:
|
|
ACPI_FREE(props);
|
|
bitmap_free(valid);
|
|
}
|