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

Commit 81616dfa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-tables', 'acpi-cppc' and 'acpi-pci' 

* acpi-tables:
  ACPI: add NFIT and HMAT to the initrd override list

* acpi-cppc:
  ACPI / CPPC: Update all pr_(debug/err) messages to log the susbspace id

* acpi-pci:
  ACPI / PCI: pci_link: Allow the absence of _PRS and change log level
parents 0c9ed61b 24bada79 d29abc83 92d1b381

drivers/acpi/cppc_acpi.c

+16 −11
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static int check_pcc_chan(int pcc_ss_id, bool chk_err_bit) 
	if (likely(!ret))

		pcc_ss_data->platform_owns_pcc = false;

	else

		pr_err("PCC check channel failed. Status=%x\n", status);

		pr_err("PCC check channel failed for ss: %d. Status=%x\n",

		       pcc_ss_id, status);



	return ret;

}
@@ -291,7 +292,8 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd) 
			time_delta = ktime_ms_delta(ktime_get(),

						    pcc_ss_data->last_mpar_reset);

			if ((time_delta < 60 * MSEC_PER_SEC) && pcc_ss_data->last_mpar_reset) {

				pr_debug("PCC cmd not sent due to MPAR limit");

				pr_debug("PCC cmd for subspace %d not sent due to MPAR limit",

					 pcc_ss_id);

				ret = -EIO;

				goto end;

			}
@@ -312,8 +314,8 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd) 
	/* Ring doorbell */

	ret = mbox_send_message(pcc_ss_data->pcc_channel, &cmd);

	if (ret < 0) {

		pr_err("Err sending PCC mbox message. cmd:%d, ret:%d\n",

				cmd, ret);

		pr_err("Err sending PCC mbox message. ss: %d cmd:%d, ret:%d\n",

		       pcc_ss_id, cmd, ret);

		goto end;

	}
@@ -553,7 +555,8 @@ static int register_pcc_channel(int pcc_ss_idx) 
			pcc_mbox_request_channel(&cppc_mbox_cl,	pcc_ss_idx);



		if (IS_ERR(pcc_data[pcc_ss_idx]->pcc_channel)) {

			pr_err("Failed to find PCC communication channel\n");

			pr_err("Failed to find PCC channel for subspace %d\n",

			       pcc_ss_idx);

			return -ENODEV;

		}
@@ -566,7 +569,8 @@ static int register_pcc_channel(int pcc_ss_idx) 
		cppc_ss = (pcc_data[pcc_ss_idx]->pcc_channel)->con_priv;



		if (!cppc_ss) {

			pr_err("No PCC subspace found for CPPC\n");

			pr_err("No PCC subspace found for %d CPPC\n",

			       pcc_ss_idx);

			return -ENODEV;

		}
@@ -584,7 +588,8 @@ static int register_pcc_channel(int pcc_ss_idx) 
		pcc_data[pcc_ss_idx]->pcc_comm_addr =

			acpi_os_ioremap(cppc_ss->base_address, cppc_ss->length);

		if (!pcc_data[pcc_ss_idx]->pcc_comm_addr) {

			pr_err("Failed to ioremap PCC comm region mem\n");

			pr_err("Failed to ioremap PCC comm region mem for %d\n",

			       pcc_ss_idx);

			return -ENOMEM;

		}
@@ -973,8 +978,8 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val) 
			*val = readq_relaxed(vaddr);

			break;

		default:

			pr_debug("Error: Cannot read %u bit width from PCC\n",

					reg->bit_width);

			pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",

				 reg->bit_width, pcc_ss_id);

			ret_val = -EFAULT;

	}
@@ -1012,8 +1017,8 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
			writeq_relaxed(val, vaddr);

			break;

		default:

			pr_debug("Error: Cannot write %u bit width to PCC\n",

					reg->bit_width);

			pr_debug("Error: Cannot write %u bit width to PCC for ss: %d\n",

				 reg->bit_width, pcc_ss_id);

			ret_val = -EFAULT;

			break;

	}

drivers/acpi/pci_link.c

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ static int acpi_pci_link_get_possible(struct acpi_pci_link *link) 
	status = acpi_walk_resources(link->device->handle, METHOD_NAME__PRS,

				     acpi_pci_link_check_possible, link);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRS"));

		return -ENODEV;

		acpi_handle_debug(link->device->handle, "_PRS not present or invalid");

		return 0;

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

drivers/acpi/tables.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static const char * const table_sigs[] = { 
	ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,

	ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,

	ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT, ACPI_SIG_IORT,

	NULL };

	ACPI_SIG_NFIT, ACPI_SIG_HMAT, NULL };



#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)