From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Cc: Bob Moore <robert.moore@intel.com>,
Lin Ming <ming.m.lin@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 13/50] ACPI 5.0: Support for GeneralPurposeIo and GenericSerialBus operation region
Date: Tue, 17 Jan 2012 07:21:05 -0500 [thread overview]
Message-ID: <2da120b6847f85c406f9afa13853e2755684389e.1326802229.git.len.brown@intel.com> (raw)
In-Reply-To: <1326802902-21583-1-git-send-email-lenb@kernel.org>
In-Reply-To: <553575f1ae048aa44682b46b3c51929a0b3ad337.1326802228.git.len.brown@intel.com>
From: Bob Moore <robert.moore@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/acpica/acconfig.h | 3 ++-
drivers/acpi/acpica/amlcode.h | 17 ++++++++++-------
drivers/acpi/acpica/exfield.c | 28 +++++++++++++++++++++-------
drivers/acpi/acpica/exfldio.c | 3 ++-
drivers/acpi/acpica/utdecode.c | 4 +++-
include/acpi/actypes.h | 4 +++-
6 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index f895a24..f467d49 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -202,9 +202,10 @@
#define ACPI_RSDP_CHECKSUM_LENGTH 20
#define ACPI_RSDP_XCHECKSUM_LENGTH 36
-/* SMBus and IPMI bidirectional buffer size */
+/* SMBus, GSBus and IPMI bidirectional buffer size */
#define ACPI_SMBUS_BUFFER_SIZE 34
+#define ACPI_GSBUS_BUFFER_SIZE 34
#define ACPI_IPMI_BUFFER_SIZE 66
/* _sx_d and _sx_w control methods */
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index adf7a71..c7db80e 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -466,13 +466,16 @@ typedef enum {
* access_as keyword
*/
typedef enum {
- AML_FIELD_ATTRIB_SMB_QUICK = 0x02,
- AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04,
- AML_FIELD_ATTRIB_SMB_BYTE = 0x06,
- AML_FIELD_ATTRIB_SMB_WORD = 0x08,
- AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A,
- AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C,
- AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
+ AML_FIELD_ATTRIB_QUICK = 0x02,
+ AML_FIELD_ATTRIB_SEND_RCV = 0x04,
+ AML_FIELD_ATTRIB_BYTE = 0x06,
+ AML_FIELD_ATTRIB_WORD = 0x08,
+ AML_FIELD_ATTRIB_BLOCK = 0x0A,
+ AML_FIELD_ATTRIB_MULTIBYTE = 0x0B,
+ AML_FIELD_ATTRIB_WORD_CALL = 0x0C,
+ AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D,
+ AML_FIELD_ATTRIB_RAW_BYTES = 0x0E,
+ AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F
} AML_ACCESS_ATTRIBUTE;
/* Bit fields in the AML method_flags byte */
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 0bde223..3aeec02 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -100,18 +100,25 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
(obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_SMBUS
|| obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_GSBUS
+ || obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_IPMI)) {
/*
- * This is an SMBus or IPMI read. We must create a buffer to hold
+ * This is an SMBus, GSBus or IPMI read. We must create a buffer to hold
* the data and then directly access the region handler.
*
- * Note: Smbus protocol value is passed in upper 16-bits of Function
+ * Note: SMBus and GSBus protocol value is passed in upper 16-bits of Function
*/
if (obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_SMBUS) {
length = ACPI_SMBUS_BUFFER_SIZE;
function =
ACPI_READ | (obj_desc->field.attribute << 16);
+ } else if (obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_GSBUS) {
+ length = ACPI_GSBUS_BUFFER_SIZE;
+ function =
+ ACPI_READ | (obj_desc->field.attribute << 16);
} else { /* IPMI */
length = ACPI_IPMI_BUFFER_SIZE;
@@ -248,21 +255,23 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
(obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_SMBUS
|| obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_GSBUS
+ || obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_IPMI)) {
/*
- * This is an SMBus or IPMI write. We will bypass the entire field
+ * This is an SMBus, GSBus or IPMI write. We will bypass the entire field
* mechanism and handoff the buffer directly to the handler. For
* these address spaces, the buffer is bi-directional; on a write,
* return data is returned in the same buffer.
*
* Source must be a buffer of sufficient size:
- * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE.
+ * ACPI_SMBUS_BUFFER_SIZE, ACPI_GSBUS_BUFFER_SIZE, or ACPI_IPMI_BUFFER_SIZE.
*
- * Note: SMBus protocol type is passed in upper 16-bits of Function
+ * Note: SMBus and GSBus protocol type is passed in upper 16-bits of Function
*/
if (source_desc->common.type != ACPI_TYPE_BUFFER) {
ACPI_ERROR((AE_INFO,
- "SMBus or IPMI write requires Buffer, found type %s",
+ "SMBus/IPMI/GenericSerialBus write requires Buffer, found type %s",
acpi_ut_get_object_type_name(source_desc)));
return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
@@ -273,6 +282,11 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
length = ACPI_SMBUS_BUFFER_SIZE;
function =
ACPI_WRITE | (obj_desc->field.attribute << 16);
+ } else if (obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_GSBUS) {
+ length = ACPI_GSBUS_BUFFER_SIZE;
+ function =
+ ACPI_WRITE | (obj_desc->field.attribute << 16);
} else { /* IPMI */
length = ACPI_IPMI_BUFFER_SIZE;
@@ -281,7 +295,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
if (source_desc->buffer.length < length) {
ACPI_ERROR((AE_INFO,
- "SMBus or IPMI write requires Buffer of length %u, found length %u",
+ "SMBus/IPMI/GenericSerialBus write requires Buffer of length %u, found length %u",
length, source_desc->buffer.length));
return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index cc9c5df..5b76c11 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -131,10 +131,11 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
}
/*
- * Exit now for SMBus or IPMI address space, it has a non-linear
+ * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear
* address space and the request cannot be directly validated
*/
if (space_id == ACPI_ADR_SPACE_SMBUS ||
+ space_id == ACPI_ADR_SPACE_GSBUS ||
space_id == ACPI_ADR_SPACE_IPMI) {
/* SMBus or IPMI has a non-linear address space */
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 8b087e2..6fd56d5 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -171,7 +171,9 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
"SMBus",
"SystemCMOS",
"PCIBARTarget",
- "IPMI"
+ "IPMI",
+ "GeneralPurposeIo",
+ "GenericSerialBus"
};
char *acpi_ut_get_region_name(u8 space_id)
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index d088c90..d5dee7c 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -712,8 +712,10 @@ typedef u8 acpi_adr_space_type;
#define ACPI_ADR_SPACE_CMOS (acpi_adr_space_type) 5
#define ACPI_ADR_SPACE_PCI_BAR_TARGET (acpi_adr_space_type) 6
#define ACPI_ADR_SPACE_IPMI (acpi_adr_space_type) 7
+#define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8
+#define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9
-#define ACPI_NUM_PREDEFINED_REGIONS 8
+#define ACPI_NUM_PREDEFINED_REGIONS 10
/*
* Special Address Spaces
--
1.7.9.rc1
next prev parent reply other threads:[~2012-01-17 12:22 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-17 12:20 ACPI & Power Management Patches for 3.3 Len Brown
2012-01-17 12:20 ` [PATCH 01/50] tools turbostat: recognize and run properly on IVB Len Brown
2012-01-17 12:20 ` [PATCH 02/50] ACPICA: Put back the call to acpi_os_validate_address Len Brown
2012-01-17 12:20 ` [PATCH 03/50] ACPICA: Update for GCC 4 Len Brown
2012-01-17 12:20 ` [PATCH 04/50] ACPICA: Fix to allow region arguments to reference other scopes Len Brown
2012-03-01 15:27 ` Jonathan Nieder
2012-01-17 12:20 ` [PATCH 05/50] ACPICA: Add error msg for unsupported I/O requests (not 8/16/32 bit length) Len Brown
2012-01-17 12:20 ` [PATCH 06/50] ACPICA: Add error msg for Index/Bank field registers out-of-range Len Brown
2012-01-17 12:20 ` [PATCH 07/50] ACPICA: Do not abort table load on invalid space ID Len Brown
2012-01-17 12:21 ` [PATCH 08/50] ACPI 5.0: Basic support for FADT version 5 Len Brown
2012-01-17 12:21 ` [PATCH 09/50] ACPI 5.0: Implement hardware-reduced option Len Brown
2012-01-17 12:21 ` [PATCH 10/50] ACPI 5.0: Add new/changed tables to headers Len Brown
2012-01-17 12:21 ` [PATCH 11/50] ACPI 5.0: New interfaces to allow driver access to AML mutex objects Len Brown
2012-01-17 12:21 ` [PATCH 12/50] ACPI 5.0: Implement Connection() and AccessAs() changes Len Brown
2012-01-17 12:21 ` Len Brown [this message]
2012-01-17 12:21 ` [PATCH 14/50] ACPI 5.0: Support for all new resource descriptors Len Brown
2012-01-17 12:21 ` [PATCH 15/50] ACPI 5.0: New interface, acpi_get_event_resources Len Brown
2012-01-17 12:21 ` [PATCH 16/50] ACPI 5.0: New interface, acpi_buffer_to_resource Len Brown
2012-01-17 12:21 ` [PATCH 17/50] ACPI 5.0: Add new predefined names Len Brown
2012-01-17 12:21 ` [PATCH 18/50] ACPI 5.0: Allow _AEI method in walk resources Len Brown
2012-01-17 12:21 ` [PATCH 19/50] ACPICA: Clean up Makefile Len Brown
2012-01-17 12:21 ` [PATCH 20/50] ACPICA: Update to version 20111123 Len Brown
2012-01-17 12:21 ` [PATCH 21/50] ACPICA: Update for larger ACPI 5 FADT size Len Brown
2012-01-17 12:21 ` [PATCH 22/50] ACPICA: Add support for region address conflict checking Len Brown
2012-01-17 12:21 ` [PATCH 23/50] ACPICA: Update all copyrights to 2012 Len Brown
2012-01-17 12:21 ` [PATCH 24/50] ACPICA: Update to version 20120111 Len Brown
2012-01-17 12:21 ` [PATCH 25/50] ACPI, Add 64bit read/write support to atomicio on i386 Len Brown
2012-01-17 12:21 ` [PATCH 26/50] ACPI, APEI, GHES: Add PCIe AER recovery support Len Brown
2012-01-17 12:21 ` [PATCH 27/50] ACPI, APEI, Print resource errors in conventional format Len Brown
2012-01-17 12:21 ` [PATCH 28/50] ACPI, APEI, Remove table not found message Len Brown
2012-01-17 12:21 ` [PATCH 29/50] ACPI, APEI, GHES, Distinguish interleaved error report in kernel log Len Brown
2012-01-17 12:21 ` [PATCH 30/50] ACPI, APEI, Printk queued error record before panic Len Brown
2012-01-17 12:21 ` [PATCH 31/50] ACPI, Add RAM mapping support to ACPI atomic IO support Len Brown
2012-01-17 12:21 ` [PATCH 32/50] ACPI, APEI, EINJ, Fix resource conflict on some machine Len Brown
2012-01-17 12:21 ` [PATCH 33/50] ACPI, APEI, EINJ, Refine the fix of resource conflict Len Brown
2012-01-17 12:21 ` [PATCH 34/50] ACPI, Record ACPI NVS regions Len Brown
2012-01-17 12:21 ` [PATCH 35/50] ACPI, APEI, Resolve false conflict between ACPI NVS and APEI Len Brown
2012-01-17 12:21 ` [PATCH 36/50] ACPI: Store SRAT table revision Len Brown
2012-01-17 12:21 ` [PATCH 37/50] ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) Len Brown
2012-01-17 12:21 ` [PATCH 38/50] ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64) Len Brown
2012-01-17 12:21 ` [PATCH 39/50] ACPI: Fix possible alignment issues with GAS 'address' references Len Brown
2012-01-17 12:21 ` [PATCH 40/50] ACPI: Export interfaces for ioremapping/iounmapping ACPI registers Len Brown
2012-01-17 12:21 ` [PATCH 41/50] ACPI APEI: Convert atomicio routines Len Brown
2012-01-17 12:21 ` [PATCH 42/50] acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec Len Brown
2012-01-17 12:21 ` [PATCH 43/50] intel_idle: fix API misuse Len Brown
2012-01-17 12:21 ` [PATCH 44/50] intel_idle: disable auto_demotion for hotplugged CPUs Len Brown
2012-01-17 12:21 ` [PATCH 45/50] intel_idle: remove redundant local_irq_disable() call Len Brown
2012-01-17 12:21 ` [PATCH 46/50] ACPI: kernel-parameters.txt : Add intel_idle.max_cstate Len Brown
2012-01-17 12:21 ` [PATCH 47/50] ACPI: processor: fix acpi_get_cpuid for UP processor Len Brown
2012-01-17 12:21 ` [PATCH 48/50] intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle Len Brown
2012-01-17 12:21 ` [PATCH 49/50] intel idle: Make idle driver more robust Len Brown
2012-01-17 12:21 ` [PATCH 50/50] ACPI processor: Fix error path, also remove sysdev link Len Brown
2012-01-17 22:17 ` ACPI & Power Management Patches for 3.3 Holger Macht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2da120b6847f85c406f9afa13853e2755684389e.1326802229.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=ming.m.lin@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®