Commit 9a9eec47 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/DPC: Use FIELD_GET() 

Use FIELD_GET() to remove dependencies on the field position, i.e., the
shift value. No functional change intended.

Link: https://lore.kernel.org/r/20231018113254.17616-5-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent abaaac48

drivers/pci/pcie/dpc.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define dev_fmt(fmt) "DPC: " fmt



#include <linux/aer.h>

#include <linux/bitfield.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/init.h>
@@ -202,7 +203,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev) 


	/* Get First Error Pointer */

	pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &dpc_status);

	first_error = (dpc_status & 0x1f00) >> 8;

	first_error = FIELD_GET(PCI_EXP_DPC_RP_PIO_FEP, dpc_status);



	for (i = 0; i < ARRAY_SIZE(rp_pio_error_string); i++) {

		if ((status & ~mask) & (1 << i))
@@ -338,7 +339,7 @@ void pci_dpc_init(struct pci_dev *pdev) 
	/* Quirks may set dpc_rp_log_size if device or firmware is buggy */

	if (!pdev->dpc_rp_log_size) {

		pdev->dpc_rp_log_size =

			(cap & PCI_EXP_DPC_RP_PIO_LOG_SIZE) >> 8;

				FIELD_GET(PCI_EXP_DPC_RP_PIO_LOG_SIZE, cap);

		if (pdev->dpc_rp_log_size < 4 || pdev->dpc_rp_log_size > 9) {

			pci_err(pdev, "RP PIO log size %u is invalid\n",

				pdev->dpc_rp_log_size);

drivers/pci/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -6154,7 +6154,7 @@ static void dpc_log_size(struct pci_dev *dev) 
	if (!(val & PCI_EXP_DPC_CAP_RP_EXT))

		return;



	if (!((val & PCI_EXP_DPC_RP_PIO_LOG_SIZE) >> 8)) {

	if (FIELD_GET(PCI_EXP_DPC_RP_PIO_LOG_SIZE, val) == 0) {

		pci_info(dev, "Overriding RP PIO Log Size to 4\n");

		dev->dpc_rp_log_size = 4;

	}

include/uapi/linux/pci_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,7 @@ 
#define  PCI_EXP_DPC_STATUS_INTERRUPT	    0x0008 /* Interrupt Status */

#define  PCI_EXP_DPC_RP_BUSY		    0x0010 /* Root Port Busy */

#define  PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT 0x0060 /* Trig Reason Extension */

#define  PCI_EXP_DPC_RP_PIO_FEP		    0x1f00 /* RP PIO First Err Ptr */



#define PCI_EXP_DPC_SOURCE_ID		 0x0A	/* DPC Source Identifier */