Merge back 'acpi-processor' material for v5.13. (1c29f6a0) · Commits · EulixOS / Software / Kernel

Documentation/firmware-guide/acpi/debug.rst

+0 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ shows the supported mask values, currently these::
		ACPI_CONTAINER_COMPONENT 0x01000000
		ACPI_SYSTEM_COMPONENT 0x02000000
		ACPI_MEMORY_DEVICE_COMPONENT 0x08000000
		ACPI_PROCESSOR_COMPONENT 0x20000000

		debug_level
		===========

drivers/acpi/acpi_processor.c

+12 −21

Original line number	Diff line number	Diff line
		@@ -22,10 +22,6 @@

		#include "internal.h"

		#define _COMPONENT ACPI_PROCESSOR_COMPONENT

		ACPI_MODULE_NAME("processor");

		DEFINE_PER_CPU(struct acpi_processor *, processors);
		EXPORT_PER_CPU_SYMBOL(processors);

		@@ -51,19 +47,19 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)

		switch (dev->revision) {
		case 0:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 A-step\n"));
		dev_dbg(&dev->dev, "Found PIIX4 A-step\n");
		break;
		case 1:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 B-step\n"));
		dev_dbg(&dev->dev, "Found PIIX4 B-step\n");
		break;
		case 2:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4E\n"));
		dev_dbg(&dev->dev, "Found PIIX4E\n");
		break;
		case 3:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4M\n"));
		dev_dbg(&dev->dev, "Found PIIX4M\n");
		break;
		default:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found unknown PIIX4\n"));
		dev_dbg(&dev->dev, "Found unknown PIIX4\n");
		break;
		}

		@@ -129,11 +125,9 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
		}

		if (errata.piix4.bmisx)
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Bus master activity detection (BM-IDE) erratum enabled\n"));
		dev_dbg(&dev->dev, "Bus master activity detection (BM-IDE) erratum enabled\n");
		if (errata.piix4.fdma)
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Type-F DMA livelock erratum (C3 disabled)\n"));
		dev_dbg(&dev->dev, "Type-F DMA livelock erratum (C3 disabled)\n");

		return 0;
		}
		@@ -244,11 +238,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
		*/
		if (acpi_gbl_FADT.pm2_control_block && acpi_gbl_FADT.pm2_control_length) {
		pr->flags.bm_control = 1;
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Bus mastering arbitration control present\n"));
		dev_dbg(&device->dev, "Bus mastering arbitration control present\n");
		} else
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"No bus mastering arbitration control\n"));
		dev_dbg(&device->dev, "No bus mastering arbitration control\n");

		if (!strcmp(acpi_device_hid(device), ACPI_PROCESSOR_OBJECT_HID)) {
		/* Declared with "Processor" statement; match ProcessorID */
		@@ -291,7 +283,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
		pr->phys_id = acpi_get_phys_id(pr->handle, device_declaration,
		pr->acpi_id);
		if (invalid_phys_cpuid(pr->phys_id))
		acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");
		dev_dbg(&device->dev, "Failed to get CPU physical ID.\n");

		pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id);
		if (!cpu0_initialized && !acpi_has_cpu_in_madt()) {
		@@ -328,11 +320,10 @@ static int acpi_processor_get_info(struct acpi_device *device)
		* CPU+CPU ID.
		*/
		sprintf(acpi_device_bid(device), "CPU%X", pr->id);
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id,
		pr->acpi_id));
		dev_dbg(&device->dev, "Processor [%d:%d]\n", pr->id, pr->acpi_id);

		if (!object.processor.pblk_address)
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
		dev_dbg(&device->dev, "No PBLK (NULL address)\n");
		else if (object.processor.pblk_length != 6)
		dev_err(&device->dev, "Invalid PBLK length [%d]\n",
		object.processor.pblk_length);

drivers/acpi/processor_driver.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -28,9 +28,6 @@
		#define ACPI_PROCESSOR_NOTIFY_POWER 0x81
		#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82

		#define _COMPONENT ACPI_PROCESSOR_COMPONENT
		ACPI_MODULE_NAME("processor_driver");

		MODULE_AUTHOR("Paul Diefenbaugh");
		MODULE_DESCRIPTION("ACPI Processor Driver");
		MODULE_LICENSE("GPL");
		@@ -87,8 +84,7 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
		dev_name(&device->dev), event, 0);
		break;
		default:
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Unsupported event [0x%x]\n", event));
		acpi_handle_debug(handle, "Unsupported event [0x%x]\n", event);
		break;
		}

drivers/acpi/processor_idle.c

+17 −21

Original line number	Diff line number	Diff line
		@@ -32,9 +32,6 @@
		#include <asm/cpu.h>
		#endif

		#define _COMPONENT ACPI_PROCESSOR_COMPONENT
		ACPI_MODULE_NAME("processor_idle");

		#define ACPI_IDLE_STATE_START (IS_ENABLED(CONFIG_ARCH_HAS_CPU_RELAX) ? 1 : 0)

		static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
		@@ -240,8 +237,8 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
		* 100 microseconds.
		*/
		if (acpi_gbl_FADT.c2_latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C2 latency too large [%d]\n", acpi_gbl_FADT.c2_latency));
		acpi_handle_debug(pr->handle, "C2 latency too large [%d]\n",
		acpi_gbl_FADT.c2_latency);
		/* invalidate C2 */
		pr->power.states[ACPI_STATE_C2].address = 0;
		}
		@@ -251,16 +248,15 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
		* 1000 microseconds.
		*/
		if (acpi_gbl_FADT.c3_latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 latency too large [%d]\n", acpi_gbl_FADT.c3_latency));
		acpi_handle_debug(pr->handle, "C3 latency too large [%d]\n",
		acpi_gbl_FADT.c3_latency);
		/* invalidate C3 */
		pr->power.states[ACPI_STATE_C3].address = 0;
		}

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"lvl2[0x%08x] lvl3[0x%08x]\n",
		acpi_handle_debug(pr->handle, "lvl2[0x%08x] lvl3[0x%08x]\n",
		pr->power.states[ACPI_STATE_C2].address,
		pr->power.states[ACPI_STATE_C3].address));
		pr->power.states[ACPI_STATE_C3].address);

		snprintf(pr->power.states[ACPI_STATE_C2].desc,
		ACPI_CX_DESC_LEN, "ACPI P_LVL2 IOPORT 0x%x",
		@@ -325,8 +321,8 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
		* devices thus we take the conservative approach.
		*/
		else if (errata.piix4.fdma) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 not supported on PIIX4 with Type-F DMA\n"));
		acpi_handle_debug(pr->handle,
		"C3 not supported on PIIX4 with Type-F DMA\n");
		return;
		}

		@@ -345,13 +341,13 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
		if (!pr->flags.bm_control) {
		if (pr->flags.has_cst != 1) {
		/* bus mastering control is necessary */
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 support requires BM control\n"));
		acpi_handle_debug(pr->handle,
		"C3 support requires BM control\n");
		return;
		} else {
		/* Here we enter C3 without bus mastering */
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 support without BM control\n"));
		acpi_handle_debug(pr->handle,
		"C3 support without BM control\n");
		}
		}
		} else {
		@@ -360,9 +356,9 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
		* supported on when bm_check is not required.
		*/
		if (!(acpi_gbl_FADT.flags & ACPI_FADT_WBINVD)) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		acpi_handle_debug(pr->handle,
		"Cache invalidation should work properly"
		" for C3 to be enabled on SMP systems\n"));
		" for C3 to be enabled on SMP systems\n");
		return;
		}
		}
		@@ -791,8 +787,8 @@ static inline void acpi_processor_cstate_first_run_checks(void)
		dmi_check_system(processor_power_dmi_table);
		max_cstate = acpi_processor_cstate_check(max_cstate);
		if (max_cstate < ACPI_C_STATES_MAX)
		pr_notice("ACPI: processor limited to max C-state %d\n",
		max_cstate);
		pr_notice("processor limited to max C-state %d\n", max_cstate);

		first_run++;

		if (nocst)
		@@ -850,7 +846,7 @@ static int acpi_processor_evaluate_lpi(acpi_handle handle,

		status = acpi_evaluate_object(handle, "_LPI", NULL, &buffer);
		if (ACPI_FAILURE(status)) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _LPI, giving up\n"));
		acpi_handle_debug(handle, "No _LPI, giving up\n");
		return -ENODEV;
		}

drivers/acpi/processor_pdc.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		#include "internal.h"

		#define _COMPONENT ACPI_PROCESSOR_COMPONENT
		ACPI_MODULE_NAME("processor_pdc");

		static bool __init processor_physically_present(acpi_handle handle)
		{
		int cpuid, type;
		@@ -132,8 +129,8 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
		status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL);

		if (ACPI_FAILURE(status))
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Could not evaluate _PDC, using legacy perf. control.\n"));
		acpi_handle_debug(handle,
		"Could not evaluate _PDC, using legacy perf control\n");

		return status;
		}