Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deepin-Kernel-SIG] [deepin] PCI: Add ACS override support for debug #396

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4309,6 +4309,15 @@
nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide.
pcie_acs_override =
[PCIE] Override missing PCIe ACS support for:
downstream
All downstream ports - full ACS capabilities
multfunction
All multifunction devices - multifunction ACS subset
id:nnnn:nnnn
Specfic device - full ACS capabilities
Specified as vid:did (vendor/device ID) in hex
noioapicquirk [APIC] Disable all boot interrupt quirks.
Safety option to keep boot IRQs enabled. This
should never be necessary.
Expand Down
102 changes: 102 additions & 0 deletions drivers/pci/quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -3725,6 +3725,107 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
}

static bool acs_on_downstream;
static bool acs_on_multifunction;

#define NUM_ACS_IDS 16
struct acs_on_id {
unsigned short vendor;
unsigned short device;
};
static struct acs_on_id acs_on_ids[NUM_ACS_IDS];
static u8 max_acs_id;

static __init int pcie_acs_override_setup(char *p)
{
if (!p)
return -EINVAL;

while (*p) {
if (!strncmp(p, "downstream", 10))
acs_on_downstream = true;
if (!strncmp(p, "multifunction", 13))
acs_on_multifunction = true;
if (!strncmp(p, "id:", 3)) {
char opt[5];
int ret;
long val;

if (max_acs_id >= NUM_ACS_IDS - 1) {
pr_warn("Out of PCIe ACS override slots (%d)\n",
NUM_ACS_IDS);
goto next;
}

p += 3;
snprintf(opt, 5, "%s", p);
ret = kstrtol(opt, 16, &val);
if (ret) {
pr_warn("PCIe ACS ID parse error %d\n", ret);
goto next;
}
acs_on_ids[max_acs_id].vendor = val;

p += strcspn(p, ":");
if (*p != ':') {
pr_warn("PCIe ACS invalid ID\n");
goto next;
}

p++;
snprintf(opt, 5, "%s", p);
ret = kstrtol(opt, 16, &val);
if (ret) {
pr_warn("PCIe ACS ID parse error %d\n", ret);
goto next;
}
acs_on_ids[max_acs_id].device = val;
max_acs_id++;
}
next:
p += strcspn(p, ",");
if (*p == ',')
p++;
}

if (acs_on_downstream || acs_on_multifunction || max_acs_id)
pr_warn("Warning: PCIe ACS overrides enabled; This may allow non-IOMMU protected peer-to-peer DMA\n");

return 0;
}
early_param("pcie_acs_override", pcie_acs_override_setup);

static int pcie_acs_overrides(struct pci_dev *dev, u16 acs_flags)
{
int i;

/* Never override ACS for legacy devices or devices with ACS caps */
if (!pci_is_pcie(dev) ||
pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS))
return -ENOTTY;

for (i = 0; i < max_acs_id; i++)
if (acs_on_ids[i].vendor == dev->vendor &&
acs_on_ids[i].device == dev->device)
return 1;

switch (pci_pcie_type(dev)) {
case PCI_EXP_TYPE_DOWNSTREAM:
case PCI_EXP_TYPE_ROOT_PORT:
if (acs_on_downstream)
return 1;
break;
case PCI_EXP_TYPE_ENDPOINT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_LEG_END:
case PCI_EXP_TYPE_RC_END:
if (acs_on_multifunction && dev->multifunction)
return 1;
}

return -ENOTTY;
}

/*
* Some NVIDIA GPU devices do not work with bus reset, SBR needs to be
* prevented for those affected devices.
Expand Down Expand Up @@ -5139,6 +5240,7 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
/* Wangxun nics */
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
{ PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 }
};

Expand Down
Loading