Commit 8af4fad5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v7.0-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Remove power-off from pwrctrl drivers since this is now done directly
   by the PCI controller drivers (Chen-Yu Tsai)

 - Fix pwrctrl device node leak (Felix Gu)

 - Document a TLP header decoder for AER log messages (Lukas Wunner)

* tag 'pci-v7.0-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  Documentation: PCI: Document PCIe TLP Header decoder for AER messages
  PCI/pwrctrl: Fix pci_pwrctrl_is_required() device node leak
  PCI/pwrctrl: Do not power off on pwrctrl device removal
parents 83ce1c75 05f643d6

Documentation/PCI/pcieaer-howto.rst

+10 −0
Original line number Diff line number Diff line
@@ -85,6 +85,16 @@ In the example, 'Requester ID' means the ID of the device that sent 
the error message to the Root Port. Please refer to PCIe specs for other

fields.



The 'TLP Header' is the prefix/header of the TLP that caused the error

in raw hex format. To decode the TLP Header into human-readable form

one may use tlp-tool:



https://github.com/mmpg-x86/tlp-tool



Example usage::



  curl -L https://git.kernel.org/linus/2ca1c94ce0b6 | rtlp-tool --aer



AER Ratelimits

--------------

drivers/pci/pwrctrl/core.c

+3 −1
Original line number Diff line number Diff line
@@ -299,11 +299,13 @@ static bool pci_pwrctrl_is_required(struct device_node *np) 
			struct device_node *remote __free(device_node) =

				of_graph_get_remote_port_parent(endpoint);

			if (remote) {

				if (of_pci_supply_present(remote))

				if (of_pci_supply_present(remote)) {

					of_node_put(endpoint);

					return true;

				}

			}

		}

	}



	return false;

}

drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c

+0 −12
Original line number Diff line number Diff line
@@ -68,13 +68,6 @@ static int pwrseq_pwrctrl_power_off(struct pci_pwrctrl *pwrctrl) 
	return pwrseq_power_off(pwrseq->pwrseq);

}



static void devm_pwrseq_pwrctrl_power_off(void *data)

{

	struct pwrseq_pwrctrl *pwrseq = data;



	pwrseq_pwrctrl_power_off(&pwrseq->pwrctrl);

}



static int pwrseq_pwrctrl_probe(struct platform_device *pdev)

{

	const struct pwrseq_pwrctrl_pdata *pdata;
@@ -101,11 +94,6 @@ static int pwrseq_pwrctrl_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, PTR_ERR(pwrseq->pwrseq),

				     "Failed to get the power sequencer\n");



	ret = devm_add_action_or_reset(dev, devm_pwrseq_pwrctrl_power_off,

				       pwrseq);

	if (ret)

		return ret;



	pwrseq->pwrctrl.power_on = pwrseq_pwrctrl_power_on;

	pwrseq->pwrctrl.power_off = pwrseq_pwrctrl_power_off;

drivers/pci/pwrctrl/slot.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static void devm_slot_pwrctrl_release(void *data) 
{

	struct slot_pwrctrl *slot = data;



	slot_pwrctrl_power_off(&slot->pwrctrl);

	regulator_bulk_free(slot->num_supplies, slot->supplies);

}