From patchwork Thu Dec 12 07:55:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loc Ho X-Patchwork-Id: 300543 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D52522C00A2 for ; Thu, 12 Dec 2013 18:56:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892Ab3LLHz6 (ORCPT ); Thu, 12 Dec 2013 02:55:58 -0500 Received: from exprod5og110.obsmtp.com ([64.18.0.20]:33448 "HELO exprod5og110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751864Ab3LLHz4 (ORCPT ); Thu, 12 Dec 2013 02:55:56 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]) (using TLSv1) by exprod5ob110.postini.com ([64.18.4.12]) with SMTP ID DSNKUqlsC0GzlFOvxr4N/c9onnxw4t+mR88A@postini.com; Wed, 11 Dec 2013 23:55:56 PST Received: by mail-pd0-f181.google.com with SMTP id p10so56140pdj.40 for ; Wed, 11 Dec 2013 23:55:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RSQMD780geN/g+0aZflinbuJm5ZVToMcVMtRo6Ngfkg=; b=gEzL2OuS9gvEz8XMhz3cNuH/Zbi6jRygSIMLj/F+ZvVYh7k9paZ/YAp+ky5qfzuK9s mAyIy5RX/ovHpNmGpHB2E0EL9kGIIBvhrci+iyyHjSZc00QStNq68KYDSFD9QNxtY7NS jiyha5rrEZ7qQM+1U1PPfp58aQ/xw2K9Et9ECLL+4EgSc+SLs4bT6IuJ4fMXeO/ISKzs WJwzTA+SXFOxmW6oNmmpwqOdh+JxROfdbSiJg/ZgHYldarJA8GMKReU7+4iaES9STT1T WUPkHcMhf8XVv/gqQws2CfbugPimkfWeh18S3vuHmZ6Xd8p7StPko8hIiJcpuS9djWWE d8VQ== X-Gm-Message-State: ALoCoQm+Ja1qQX+0Gwp05KZqGjky7/fI2qGWGSpqFnDmJrXZFygXrh9hlbs0/d/ghcZgjCfDhvxBeAtcf+6OzZUDD4kfK2LySraw5PByJO+2fJPl5oJQnmMd/9eh5Znnc200dgwoeJbUjPo493qW7r/EGTZ1xUMoeRrDE26F5FjSQ6vk9otTwLU= X-Received: by 10.68.113.130 with SMTP id iy2mr9531867pbb.2.1386834955324; Wed, 11 Dec 2013 23:55:55 -0800 (PST) X-Received: by 10.68.113.130 with SMTP id iy2mr9531834pbb.2.1386834955089; Wed, 11 Dec 2013 23:55:55 -0800 (PST) Received: from localhost ([198.137.200.11]) by mx.google.com with ESMTPSA id qf7sm52468619pac.14.2013.12.11.23.55.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Dec 2013 23:55:54 -0800 (PST) From: Loc Ho To: olof@lixom.net, tj@kernel.org, arnd@arndb.de Cc: linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jcm@redhat.com, patches@apm.com, Loc Ho , Tuan Phan , Suman Tripathi Subject: [PATCH v6 1/4] ata: Export required functions by APM X-Gene SATA driver Date: Thu, 12 Dec 2013 00:55:37 -0700 Message-Id: <1386834940-30875-2-git-send-email-lho@apm.com> X-Mailer: git-send-email 1.5.5 In-Reply-To: <1386834940-30875-1-git-send-email-lho@apm.com> References: <1386834940-30875-1-git-send-email-lho@apm.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This patch exports functions required by APM X-Gene SoC SATA host controller driver to avoid duplication of code. Signed-off-by: Loc Ho Signed-off-by: Tuan Phan Signed-off-by: Suman Tripathi --- drivers/ata/ahci.h | 9 +++++++++ drivers/ata/libahci.c | 16 ++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) -- 1.5.5 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 2289efd..8163b59 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -370,6 +370,15 @@ irqreturn_t ahci_thread_fn(int irq, void *dev_instance); void ahci_print_info(struct ata_host *host, const char *scc_s); int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis); void ahci_error_handler(struct ata_port *ap); +void ahci_sw_activity(struct ata_link *link); +int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); +void ahci_error_intr(struct ata_port *ap, u32 irq_stat); +int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, + struct ata_taskfile *tf, int is_cmd, u16 flags, + unsigned long timeout_msec); +void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, + u32 opts); +unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl); static inline void __iomem *__ahci_port_base(struct ata_host *host, unsigned int port_no) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index c482f8c..1d24bf5 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -68,7 +68,6 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val); -static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc); static int ahci_port_start(struct ata_port *ap); @@ -553,7 +552,7 @@ static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val) return -EINVAL; } -static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) +int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) { void __iomem *port_mmio = ahci_port_base(link->ap); int offset = ahci_scr_offset(link->ap, sc_reg); @@ -564,6 +563,7 @@ static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) } return -EINVAL; } +EXPORT_SYMBOL_GPL(ahci_scr_write); void ahci_start_engine(struct ata_port *ap) { @@ -869,7 +869,7 @@ int ahci_reset_controller(struct ata_host *host) } EXPORT_SYMBOL_GPL(ahci_reset_controller); -static void ahci_sw_activity(struct ata_link *link) +void ahci_sw_activity(struct ata_link *link) { struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -882,6 +882,7 @@ static void ahci_sw_activity(struct ata_link *link) if (!timer_pending(&emp->timer)) mod_timer(&emp->timer, jiffies + msecs_to_jiffies(10)); } +EXPORT_SYMBOL_GPL(ahci_sw_activity); static void ahci_sw_activity_blink(unsigned long arg) { @@ -1239,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap) } EXPORT_SYMBOL_GPL(ahci_kick_engine); -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, +int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, struct ata_taskfile *tf, int is_cmd, u16 flags, unsigned long timeout_msec) { @@ -1268,6 +1269,7 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, return 0; } +EXPORT_SYMBOL_GPL(ahci_exec_polled_cmd); int ahci_do_softreset(struct ata_link *link, unsigned int *class, int pmp, unsigned long deadline, @@ -1472,7 +1474,7 @@ static void ahci_postreset(struct ata_link *link, unsigned int *class) } } -static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl) +unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl) { struct scatterlist *sg; struct ahci_sg *ahci_sg = cmd_tbl + AHCI_CMD_TBL_HDR_SZ; @@ -1494,6 +1496,7 @@ static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl) return si; } +EXPORT_SYMBOL_GPL(ahci_fill_sg); static int ahci_pmp_qc_defer(struct ata_queued_cmd *qc) { @@ -1568,7 +1571,7 @@ static void ahci_fbs_dec_intr(struct ata_port *ap) dev_err(ap->host->dev, "failed to clear device error\n"); } -static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) +void ahci_error_intr(struct ata_port *ap, u32 irq_stat) { struct ahci_host_priv *hpriv = ap->host->private_data; struct ahci_port_priv *pp = ap->private_data; @@ -1678,6 +1681,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) } else ata_port_abort(ap); } +EXPORT_SYMBOL_GPL(ahci_error_intr); static void ahci_handle_port_interrupt(struct ata_port *ap, void __iomem *port_mmio, u32 status)