iwlwifi: acpi: add common code to read from ACPI (813df5ce) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ iwlwifi-objs += iwl-trans.o
		iwlwifi-objs += fw/notif-wait.o
		iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o
		iwlwifi-$(CONFIG_IWLMVM) += fw/common_rx.o fw/nvm.o
		iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

		iwlwifi-objs += $(iwlwifi-m)

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program;
		*
		* The full GNU General Public License is included in this distribution
		* in the file called COPYING.
		*
		* Contact Information:
		* Intel Linux Wireless <linuxwifi@intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		* BSD LICENSE
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*****************************************************************************/

		#include "iwl-drv.h"
		#include "iwl-debug.h"
		#include "acpi.h"

		void iwl_acpi_get_object(struct device dev, acpi_string method)
		{
		acpi_handle root_handle;
		acpi_handle handle;
		struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
		acpi_status status;

		root_handle = ACPI_HANDLE(dev);
		if (!root_handle) {
		IWL_DEBUG_DEV_RADIO(dev,
		"Could not retrieve root port ACPI handle\n");
		return ERR_PTR(-ENOENT);
		}

		/* Get the method's handle */
		status = acpi_get_handle(root_handle, method, &handle);
		if (ACPI_FAILURE(status)) {
		IWL_DEBUG_DEV_RADIO(dev, "%s method not found\n", method);
		return ERR_PTR(-ENOENT);
		}

		/* Call the method with no arguments */
		status = acpi_evaluate_object(handle, NULL, NULL, &buf);
		if (ACPI_FAILURE(status)) {
		IWL_DEBUG_DEV_RADIO(dev, "%s invocation failed (0x%x)\n",
		method, status);
		return ERR_PTR(-ENOENT);
		}

		return buf.pointer;
		}
		IWL_EXPORT_SYMBOL(iwl_acpi_get_object);

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program;
		*
		* The full GNU General Public License is included in this distribution
		* in the file called COPYING.
		*
		* Contact Information:
		* Intel Linux Wireless <linuxwifi@intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		* BSD LICENSE
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*****************************************************************************/
		#ifndef __iwl_fw_acpi__
		#define __iwl_fw_acpi__

		#include <linux/acpi.h>

		#ifdef CONFIG_ACPI

		void iwl_acpi_get_object(struct device dev, acpi_string method);

		#else /* CONFIG_ACPI */

		static inline void iwl_acpi_get_object(struct device dev, acpi_string method)
		{
		return ERR_PTR(-ENOENT);
		}

		#endif /* CONFIG_ACPI */
		#endif /* __iwl_fw_acpi__ */

drivers/net/wireless/intel/iwlwifi/iwl-debug.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@ do { \
		#define IWL_DEBUG_TX_REPLY(p, f, a...) IWL_DEBUG(p, IWL_DL_TX_REPLY, f, ## a)
		#define IWL_DEBUG_TX_QUEUES(p, f, a...) IWL_DEBUG(p, IWL_DL_TX_QUEUES, f, ## a)
		#define IWL_DEBUG_RADIO(p, f, a...) IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)
		#define IWL_DEBUG_DEV_RADIO(p, f, a...) IWL_DEBUG_DEV(p, IWL_DL_RADIO, f, ## a)
		#define IWL_DEBUG_POWER(p, f, a...) IWL_DEBUG(p, IWL_DL_POWER, f, ## a)
		#define IWL_DEBUG_11H(p, f, a...) IWL_DEBUG(p, IWL_DL_11H, f, ## a)
		#define IWL_DEBUG_RPM(p, f, a...) IWL_DEBUG(p, IWL_DL_RPM, f, ## a)

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+8 −29

Original line number	Diff line number	Diff line
		@@ -68,13 +68,14 @@
		#include <linux/export.h>
		#include <linux/etherdevice.h>
		#include <linux/pci.h>
		#include <linux/acpi.h>

		#include "iwl-drv.h"
		#include "iwl-modparams.h"
		#include "iwl-nvm-parse.h"
		#include "iwl-prph.h"
		#include "iwl-io.h"
		#include "iwl-csr.h"
		#include "fw/acpi.h"

		/* NVM offsets (in words) definitions */
		enum wkp_nvm_offsets {
		@@ -990,37 +991,15 @@ static u32 iwl_wrdd_get_mcc(struct device dev, union acpi_object wrdd)

		int iwl_get_bios_mcc(struct device dev, char mcc)
		{
		acpi_handle root_handle;
		acpi_handle handle;
		struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL};
		acpi_status status;
		union acpi_object *data;
		u32 mcc_val;

		root_handle = ACPI_HANDLE(dev);
		if (!root_handle) {
		IWL_DEBUG_EEPROM(dev,
		"Could not retrieve root port ACPI handle\n");
		return -ENOENT;
		}
		data = iwl_acpi_get_object(dev, WRDD_METHOD);
		if (IS_ERR(data))
		return PTR_ERR(data);

		/* Get the method's handle */
		status = acpi_get_handle(root_handle, (acpi_string)WRDD_METHOD,
		&handle);
		if (ACPI_FAILURE(status)) {
		IWL_DEBUG_EEPROM(dev, "WRD method not found\n");
		return -ENOENT;
		}

		/* Call WRDD with no arguments */
		status = acpi_evaluate_object(handle, NULL, NULL, &wrdd);
		if (ACPI_FAILURE(status)) {
		IWL_DEBUG_EEPROM(dev, "WRDC invocation failed (0x%x)\n",
		status);
		return -ENOENT;
		}

		mcc_val = iwl_wrdd_get_mcc(dev, wrdd.pointer);
		kfree(wrdd.pointer);
		mcc_val = iwl_wrdd_get_mcc(dev, data);
		kfree(data);
		if (!mcc_val)
		return -ENOENT;

Admin message