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

Merge branches 'acpica-fixes', 'acpi-cppc-fixes' and 'acpi-tools-fixes' 

* acpica-fixes:
  Revert "ACPICA: FADT support cleanup"

* acpi-cppc-fixes:
  mailbox: PCC: Fix lockdep warning when request PCC channel

* acpi-tools-fixes:
  tools/power/acpi: Remove direct kernel source include reference
parents e2174b0c 6ca595a7 d5a4b1a5

drivers/mailbox/pcc.c

+7 −6
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include <linux/mailbox_controller.h>

#include <linux/mailbox_client.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <acpi/pcc.h>



#include "mailbox.h"
@@ -267,6 +268,8 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, 
	if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone)

		chan->txdone_method |= TXDONE_BY_ACK;



	spin_unlock_irqrestore(&chan->lock, flags);



	if (pcc_doorbell_irq[subspace_id] > 0) {

		int rc;
@@ -275,12 +278,11 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, 
		if (unlikely(rc)) {

			dev_err(dev, "failed to register PCC interrupt %d\n",

				pcc_doorbell_irq[subspace_id]);

			pcc_mbox_free_channel(chan);

			chan = ERR_PTR(rc);

		}

	}



	spin_unlock_irqrestore(&chan->lock, flags);



	return chan;

}

EXPORT_SYMBOL_GPL(pcc_mbox_request_channel);
@@ -304,20 +306,19 @@ void pcc_mbox_free_channel(struct mbox_chan *chan) 
		return;

	}



	if (pcc_doorbell_irq[id] > 0)

		devm_free_irq(chan->mbox->dev, pcc_doorbell_irq[id], chan);



	spin_lock_irqsave(&chan->lock, flags);

	chan->cl = NULL;

	chan->active_req = NULL;

	if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK))

		chan->txdone_method = TXDONE_BY_POLL;



	if (pcc_doorbell_irq[id] > 0)

		devm_free_irq(chan->mbox->dev, pcc_doorbell_irq[id], chan);



	spin_unlock_irqrestore(&chan->lock, flags);

}

EXPORT_SYMBOL_GPL(pcc_mbox_free_channel);





/**

 * pcc_send_data - Called from Mailbox Controller code. Used

 *		here only to ring the channel doorbell. The PCC client

include/acpi/platform/aclinux.h

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ 
#ifndef __init

#define __init

#endif

#ifndef __iomem

#define __iomem

#endif



/* Host-dependent types and defines for user-space ACPICA */

tools/power/acpi/Makefile.config

+12 −11
Original line number Diff line number Diff line
@@ -8,18 +8,19 @@ 
# as published by the Free Software Foundation; version 2

# of the License.



include ../../../../scripts/Makefile.include



OUTPUT=./

ifeq ("$(origin O)", "command line")

	OUTPUT := $(O)/

ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(shell pwd)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

#$(info Determined 'srctree' to be $(srctree))

endif



ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

include $(srctree)/../../scripts/Makefile.include



OUTPUT=$(srctree)/

ifeq ("$(origin O)", "command line")

	OUTPUT := $(O)/power/acpi/

endif

#$(info Determined 'OUTPUT' to be $(OUTPUT))



# --- CONFIGURATION BEGIN ---
@@ -70,8 +71,8 @@ WARNINGS := -Wall 
WARNINGS += $(call cc-supports,-Wstrict-prototypes)

WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)



KERNEL_INCLUDE := ../../../include

ACPICA_INCLUDE := ../../../drivers/acpi/acpica

KERNEL_INCLUDE := $(OUTPUT)include

ACPICA_INCLUDE := $(srctree)/../../../drivers/acpi/acpica

CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)

CFLAGS += $(WARNINGS)

tools/power/acpi/Makefile.rules

+27 −13
Original line number Diff line number Diff line
@@ -8,28 +8,42 @@ 
# as published by the Free Software Foundation; version 2

# of the License.



$(OUTPUT)$(TOOL): $(TOOL_OBJS) FORCE

	$(ECHO) "  LD      " $@

	$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(TOOL_OBJS) -L$(OUTPUT) -o $@

objdir := $(OUTPUT)tools/$(TOOL)/

toolobjs := $(addprefix $(objdir),$(TOOL_OBJS))

$(OUTPUT)$(TOOL): $(toolobjs) FORCE

	$(ECHO) "  LD      " $(subst $(OUTPUT),,$@)

	$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(toolobjs) -L$(OUTPUT) -o $@

	$(ECHO) "  STRIP   " $(subst $(OUTPUT),,$@)

	$(QUIET) $(STRIPCMD) $@



$(OUTPUT)%.o: %.c

	$(ECHO) "  CC      " $@

$(KERNEL_INCLUDE):

	$(ECHO) "  MKDIR   " $(subst $(OUTPUT),,$@)

	$(QUIET) mkdir -p $(KERNEL_INCLUDE)

	$(ECHO) "  CP      " $(subst $(OUTPUT),,$@)

	$(QUIET) cp -rf $(srctree)/../../../include/acpi $(KERNEL_INCLUDE)/



$(objdir)%.o: %.c $(KERNEL_INCLUDE)

	$(ECHO) "  CC      " $(subst $(OUTPUT),,$@)

	$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<



all: $(OUTPUT)$(TOOL)

clean:

	-find $(OUTPUT) \( -not -type d \) \

	$(ECHO) "  RMOBJ   " $(subst $(OUTPUT),,$(objdir))

	$(QUIET) find $(objdir) \( -not -type d \)\

		 -and \( -name '*~' -o -name '*.[oas]' \)\

	-type f -print \

	 | xargs rm -f

	-rm -f $(OUTPUT)$(TOOL)

		 -type f -print | xargs rm -f

	$(ECHO) "  RM      " $(TOOL)

	$(QUIET) rm -f $(OUTPUT)$(TOOL)

	$(ECHO) "  RMINC   " $(subst $(OUTPUT),,$(KERNEL_INCLUDE))

	$(QUIET) rm -rf $(KERNEL_INCLUDE)



install-tools:

	$(INSTALL) -d $(DESTDIR)${sbindir}

	$(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)${sbindir}

	$(ECHO) "  INST    " $(TOOL)

	$(QUIET) $(INSTALL) -d $(DESTDIR)$(sbindir)

	$(QUIET) $(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)$(sbindir)

uninstall-tools:

	- rm -f $(DESTDIR)${sbindir}/$(TOOL)

	$(ECHO) "  UNINST  " $(TOOL)

	$(QUIET) rm -f $(DESTDIR)$(sbindir)/$(TOOL)



install: all install-tools $(EXTRA_INSTALL)

uninstall: uninstall-tools $(EXTRA_UNINSTALL)

tools/power/acpi/tools/acpidbg/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ vpath %.c \ 
	../../os_specific/service_layers\

	.

CFLAGS += -DACPI_APPLICATION -DACPI_SINGLE_THREAD -DACPI_DEBUGGER\

	-I.\

	-I../../../../../drivers/acpi/acpica\

	-I../../../../../include

	-I.

LDFLAGS += -lpthread

TOOL_OBJS = \

	acpidbg.o