From: Randy Dunlap <randy_d_dunlap@linux.intel.com>
To: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Cc: linux-ide@vger.kernel.org, jgarzik@pobox.com, axboe <axboe@suse.de>
Subject: [PATCH 2/5] SATA/ACPI Make/Kconfig/docs
Date: Tue, 27 Dec 2005 15:29:41 -0800 [thread overview]
Message-ID: <20051227152941.44652c9d.randy_d_dunlap@linux.intel.com> (raw)
In-Reply-To: <20051227152613.25d580ff.randy_d_dunlap@linux.intel.com>
From: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Add ata_acpi in Makefile and Kconfig.
Add ACPI obj_handle.
Add ata_acpi.c to libata kernel-doc template file.
Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
---
Documentation/DocBook/libata.tmpl | 6 ++++++
drivers/scsi/Kconfig | 5 +++++
drivers/scsi/Makefile | 3 +++
include/linux/libata.h | 6 ++++++
4 files changed, 20 insertions(+)
--- linux-2615-rc7-sat.orig/drivers/scsi/Makefile
+++ linux-2615-rc7-sat/drivers/scsi/Makefile
@@ -164,6 +164,9 @@ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-
zalon7xx-objs := zalon.o ncr53c8xx.o
NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o
libata-objs := libata-core.o libata-scsi.o
+ifeq ($(CONFIG_SCSI_SATA_ACPI),y)
+ libata-objs += libata-acpi.o
+endif
# Files generated that shall be removed upon make clean
clean-files := 53c7xx_d.h 53c700_d.h \
--- linux-2615-rc7-sat.orig/drivers/scsi/Kconfig
+++ linux-2615-rc7-sat/drivers/scsi/Kconfig
@@ -598,6 +598,11 @@ config SCSI_SATA_INTEL_COMBINED
depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
default y
+config SCSI_SATA_ACPI
+ bool
+ depends on SCSI_SATA && ACPI
+ default y
+
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
--- linux-2615-rc7-sat.orig/include/linux/libata.h
+++ linux-2615-rc7-sat/include/linux/libata.h
@@ -33,6 +33,7 @@
#include <asm/io.h>
#include <linux/ata.h>
#include <linux/workqueue.h>
+#include <acpi/acpi.h>
/*
* compile-time options
@@ -312,6 +313,11 @@ struct ata_device {
u16 cylinders; /* Number of cylinders */
u16 heads; /* Number of heads */
u16 sectors; /* Number of sectors per track */
+
+#ifdef CONFIG_SCSI_SATA_ACPI
+ /* ACPI objects info */
+ acpi_handle obj_handle;
+#endif
};
struct ata_port {
--- linux-2615-rc7-sat.orig/Documentation/DocBook/libata.tmpl
+++ linux-2615-rc7-sat/Documentation/DocBook/libata.tmpl
@@ -787,6 +787,12 @@ and other resources, etc.
!Idrivers/scsi/libata-scsi.c
</chapter>
+ <chapter id="libataAcpi">
+ <title>libata ACPI interfaces/methods</title>
+!Edrivers/scsi/ata_acpi.c
+!Idrivers/scsi/ata_acpi.c
+ </chapter>
+
<chapter id="ataExceptions">
<title>ATA errors & exceptions</title>
---
next prev parent reply other threads:[~2005-12-27 23:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20051227152613.25d580ff.randy_d_dunlap@linux.intel.com>
2005-12-27 23:28 ` [PATCH 1/5] libata suspend/resume support (Jens) Randy Dunlap
2005-12-27 23:29 ` Randy Dunlap [this message]
2005-12-27 23:30 ` [PATCH 3/5] libata debugging macros support Randy Dunlap
2005-12-27 23:32 ` [PATCH 4/5] SATA/ACPI functions Randy Dunlap
2005-12-27 23:33 ` [PATCH 5/5] libata: more module parameters Randy Dunlap
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=20051227152941.44652c9d.randy_d_dunlap@linux.intel.com \
--to=randy_d_dunlap@linux.intel.com \
--cc=axboe@suse.de \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).