Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d61c9b authored by Alex Williamson's avatar Alex Williamson Committed by Bjorn Helgaas
Browse files

PCI: Reverse standard ACS vs device-specific ACS enabling 



The original thought was that if a device implemented ACS, then surely
we want to use that... well, it turns out that devices can make an ACS
capability so broken that we still need to fall back to quirks.

Reverse the order of ACS enabling to give quirks first shot at it.

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 8bcf4525

drivers/pci/pci.c

+4 −6
Original line number Diff line number Diff line
@@ -2547,7 +2547,7 @@ void pci_request_acs(void) 
 * pci_std_enable_acs - enable ACS on devices using standard ACS capabilites

 * @dev: the PCI device

 */

static int pci_std_enable_acs(struct pci_dev *dev)

static void pci_std_enable_acs(struct pci_dev *dev)

{

	int pos;

	u16 cap;
@@ -2555,7 +2555,7 @@ static int pci_std_enable_acs(struct pci_dev *dev) 


	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS);

	if (!pos)

		return -ENODEV;

		return;



	pci_read_config_word(dev, pos + PCI_ACS_CAP, &cap);

	pci_read_config_word(dev, pos + PCI_ACS_CTRL, &ctrl);
@@ -2573,8 +2573,6 @@ static int pci_std_enable_acs(struct pci_dev *dev) 
	ctrl |= (cap & PCI_ACS_UF);



	pci_write_config_word(dev, pos + PCI_ACS_CTRL, ctrl);



	return 0;

}



/**
@@ -2586,10 +2584,10 @@ void pci_enable_acs(struct pci_dev *dev) 
	if (!pci_acs_enable)

		return;



	if (!pci_std_enable_acs(dev))

	if (!pci_dev_specific_enable_acs(dev))

		return;



	pci_dev_specific_enable_acs(dev);

	pci_std_enable_acs(dev);

}



static bool pci_acs_flags_enabled(struct pci_dev *pdev, u16 acs_flags)

drivers/pci/quirks.c

+4 −2
Original line number Diff line number Diff line
@@ -4201,7 +4201,7 @@ static const struct pci_dev_enable_acs { 
	{ 0 }

};



void pci_dev_specific_enable_acs(struct pci_dev *dev)

int pci_dev_specific_enable_acs(struct pci_dev *dev)

{

	const struct pci_dev_enable_acs *i;

	int ret;
@@ -4213,9 +4213,11 @@ void pci_dev_specific_enable_acs(struct pci_dev *dev) 
		     i->device == (u16)PCI_ANY_ID)) {

			ret = i->enable_acs(dev);

			if (ret >= 0)

				return;

				return ret;

		}

	}



	return -ENOTTY;

}



/*

include/linux/pci.h

+5 −2
Original line number Diff line number Diff line
@@ -1663,7 +1663,7 @@ enum pci_fixup_pass { 
#ifdef CONFIG_PCI_QUIRKS

void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);

int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags);

void pci_dev_specific_enable_acs(struct pci_dev *dev);

int pci_dev_specific_enable_acs(struct pci_dev *dev);

#else

static inline void pci_fixup_device(enum pci_fixup_pass pass,

				    struct pci_dev *dev) { }
@@ -1672,7 +1672,10 @@ static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev, 
{

	return -ENOTTY;

}

static inline void pci_dev_specific_enable_acs(struct pci_dev *dev) { }

static inline int pci_dev_specific_enable_acs(struct pci_dev *dev)

{

	return -ENOTTY;

}

#endif



void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);