Commit 9d6e681d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix issues introduced during this merge window (ACPI/PCI, device
  enumeration and documentation) and some other ones found recently.

  Specifics:

   - Add missing device reference counting to acpi_get_pci_dev() after
     changing it recently (Rafael Wysocki)

   - Fix resource list walk in acpi_dma_get_range() (Robin Murphy)

   - Add IRQ override quirk for LENOVO IdeaPad and extend the IRQ
     override warning message (Jiri Slaby)

   - Fix integer overflow in ghes_estatus_pool_init() (Ashish Kalra)

   - Fix multiple error records handling in one of the ACPI extlog
     driver code paths (Tony Luck)

   - Prune DSDT override documentation from index after dropping it
     (Bagas Sanjaya)"

* tag 'acpi-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: scan: Fix DMA range assignment
  ACPI: PCI: Fix device reference counting in acpi_get_pci_dev()
  ACPI: resource: note more about IRQ override
  ACPI: resource: do IRQ override on LENOVO IdeaPad
  ACPI: extlog: Handle multiple records
  ACPI: APEI: Fix integer overflow in ghes_estatus_pool_init()
  Documentation: ACPI: Prune DSDT override documentation from index
parents ec4cf5db 3f8deab6

Documentation/admin-guide/acpi/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ the Linux ACPI support. 
   :maxdepth: 1



   initrd_table_override

   dsdt-override

   ssdt-overlays

   cppc_sysfs

   fan_performance_states

drivers/acpi/acpi_extlog.c

+20 −13
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/ratelimit.h>

#include <linux/edac.h>

#include <linux/ras.h>

#include <acpi/ghes.h>

#include <asm/cpu.h>

#include <asm/mce.h>
@@ -138,8 +139,8 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, 
	int	cpu = mce->extcpu;

	struct acpi_hest_generic_status *estatus, *tmp;

	struct acpi_hest_generic_data *gdata;

	const guid_t *fru_id = &guid_null;

	char *fru_text = "";

	const guid_t *fru_id;

	char *fru_text;

	guid_t *sec_type;

	static u32 err_seq;
@@ -160,18 +161,24 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, 


	/* log event via trace */

	err_seq++;

	gdata = (struct acpi_hest_generic_data *)(tmp + 1);

	apei_estatus_for_each_section(tmp, gdata) {

		if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)

			fru_id = (guid_t *)gdata->fru_id;

		else

			fru_id = &guid_null;

		if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)

			fru_text = gdata->fru_text;

		else

			fru_text = "";

		sec_type = (guid_t *)gdata->section_type;

		if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {

			struct cper_sec_mem_err *mem = (void *)(gdata + 1);



			if (gdata->error_data_length >= sizeof(*mem))

				trace_extlog_mem_event(mem, err_seq, fru_id, fru_text,

						       (u8)gdata->error_severity);

		}

	}



out:

	mce->kflags |= MCE_HANDLED_EXTLOG;

drivers/acpi/apei/ghes.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void ghes_unmap(void __iomem *vaddr, enum fixed_addresses fixmap_idx) 
	clear_fixmap(fixmap_idx);

}



int ghes_estatus_pool_init(int num_ghes)

int ghes_estatus_pool_init(unsigned int num_ghes)

{

	unsigned long addr, len;

	int rc;

drivers/acpi/pci_root.c

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle) 


	list_for_each_entry(pn, &adev->physical_node_list, node) {

		if (dev_is_pci(pn->dev)) {

			get_device(pn->dev);

			pci_dev = to_pci_dev(pn->dev);

			break;

		}

drivers/acpi/resource.c

+33 −16
Original line number Diff line number Diff line
@@ -428,17 +428,31 @@ static const struct dmi_system_id asus_laptop[] = { 
	{ }

};



static const struct dmi_system_id lenovo_82ra[] = {

	{

		.ident = "LENOVO IdeaPad Flex 5 16ALC7",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82RA"),

		},

	},

	{ }

};



struct irq_override_cmp {

	const struct dmi_system_id *system;

	unsigned char irq;

	unsigned char triggering;

	unsigned char polarity;

	unsigned char shareable;

	bool override;

};



static const struct irq_override_cmp skip_override_table[] = {

	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },

	{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },

static const struct irq_override_cmp override_table[] = {

	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },

	{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },

	{ lenovo_82ra, 6, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ lenovo_82ra, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

};



static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
@@ -446,6 +460,17 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, 
{

	int i;



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

		const struct irq_override_cmp *entry = &override_table[i];



		if (dmi_check_system(entry->system) &&

		    entry->irq == gsi &&

		    entry->triggering == triggering &&

		    entry->polarity == polarity &&

		    entry->shareable == shareable)

			return entry->override;

	}



#ifdef CONFIG_X86

	/*

	 * IRQ override isn't needed on modern AMD Zen systems and
@@ -456,17 +481,6 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, 
		return false;

#endif



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

		const struct irq_override_cmp *entry = &skip_override_table[i];



		if (dmi_check_system(entry->system) &&

		    entry->irq == gsi &&

		    entry->triggering == triggering &&

		    entry->polarity == polarity &&

		    entry->shareable == shareable)

			return false;

	}



	return true;

}
@@ -498,8 +512,11 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, 
		u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;



		if (triggering != trig || polarity != pol) {

			pr_warn("ACPI: IRQ %d override to %s, %s\n", gsi,

				t ? "level" : "edge", p ? "low" : "high");

			pr_warn("ACPI: IRQ %d override to %s%s, %s%s\n", gsi,

				t ? "level" : "edge",

				trig == triggering ? "" : "(!)",

				p ? "low" : "high",

				pol == polarity ? "" : "(!)");

			triggering = trig;

			polarity = pol;

		}