From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Michael Schmitz <schmitzmic@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
b.zolnierkie@samsung.com
Subject: [PATCH 21/28] ata: move ata_qc_complete_multiple() to libata-core-sata.c
Date: Tue, 28 Jan 2020 14:33:36 +0100 [thread overview]
Message-ID: <20200128133343.29905-22-b.zolnierkie@samsung.com> (raw)
In-Reply-To: <20200128133343.29905-1-b.zolnierkie@samsung.com>
* move ata_qc_complete_multiple() to libata-core-sata.c
Code size savings on m68k arch using atari_defconfig:
text data bss dec hex filename
before:
33212 572 40 33824 8420 drivers/ata/libata-core.o
after:
32815 572 40 33427 8293 drivers/ata/libata-core.o
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
drivers/ata/libata-core-sata.c | 59 ++++++++++++++++++++++++++++++++++
drivers/ata/libata-core.c | 59 ----------------------------------
include/linux/libata.h | 2 +-
3 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/drivers/ata/libata-core-sata.c b/drivers/ata/libata-core-sata.c
index 8c6ed82dc166..5749aa57c352 100644
--- a/drivers/ata/libata-core-sata.c
+++ b/drivers/ata/libata-core-sata.c
@@ -772,6 +772,65 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
}
EXPORT_SYMBOL_GPL(sata_link_hardreset);
+/**
+ * ata_qc_complete_multiple - Complete multiple qcs successfully
+ * @ap: port in question
+ * @qc_active: new qc_active mask
+ *
+ * Complete in-flight commands. This functions is meant to be
+ * called from low-level driver's interrupt routine to complete
+ * requests normally. ap->qc_active and @qc_active is compared
+ * and commands are completed accordingly.
+ *
+ * Always use this function when completing multiple NCQ commands
+ * from IRQ handlers instead of calling ata_qc_complete()
+ * multiple times to keep IRQ expect status properly in sync.
+ *
+ * LOCKING:
+ * spin_lock_irqsave(host lock)
+ *
+ * RETURNS:
+ * Number of completed commands on success, -errno otherwise.
+ */
+int ata_qc_complete_multiple(struct ata_port *ap, u64 qc_active)
+{
+ u64 done_mask, ap_qc_active = ap->qc_active;
+ int nr_done = 0;
+
+ /*
+ * If the internal tag is set on ap->qc_active, then we care about
+ * bit0 on the passed in qc_active mask. Move that bit up to match
+ * the internal tag.
+ */
+ if (ap_qc_active & (1ULL << ATA_TAG_INTERNAL)) {
+ qc_active |= (qc_active & 0x01) << ATA_TAG_INTERNAL;
+ qc_active ^= qc_active & 0x01;
+ }
+
+ done_mask = ap_qc_active ^ qc_active;
+
+ if (unlikely(done_mask & qc_active)) {
+ ata_port_err(ap, "illegal qc_active transition (%08llx->%08llx)\n",
+ ap->qc_active, qc_active);
+ return -EINVAL;
+ }
+
+ while (done_mask) {
+ struct ata_queued_cmd *qc;
+ unsigned int tag = __ffs64(done_mask);
+
+ qc = ata_qc_from_tag(ap, tag);
+ if (qc) {
+ ata_qc_complete(qc);
+ nr_done++;
+ }
+ done_mask &= ~(1ULL << tag);
+ }
+
+ return nr_done;
+}
+EXPORT_SYMBOL_GPL(ata_qc_complete_multiple);
+
/**
* sata_link_init_spd - Initialize link->sata_spd_limit
* @link: Link to configure sata_spd_limit for
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 17f1d98eab71..204e64ff4b93 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4456,65 +4456,6 @@ u64 ata_qc_get_active(struct ata_port *ap)
}
EXPORT_SYMBOL_GPL(ata_qc_get_active);
-/**
- * ata_qc_complete_multiple - Complete multiple qcs successfully
- * @ap: port in question
- * @qc_active: new qc_active mask
- *
- * Complete in-flight commands. This functions is meant to be
- * called from low-level driver's interrupt routine to complete
- * requests normally. ap->qc_active and @qc_active is compared
- * and commands are completed accordingly.
- *
- * Always use this function when completing multiple NCQ commands
- * from IRQ handlers instead of calling ata_qc_complete()
- * multiple times to keep IRQ expect status properly in sync.
- *
- * LOCKING:
- * spin_lock_irqsave(host lock)
- *
- * RETURNS:
- * Number of completed commands on success, -errno otherwise.
- */
-int ata_qc_complete_multiple(struct ata_port *ap, u64 qc_active)
-{
- u64 done_mask, ap_qc_active = ap->qc_active;
- int nr_done = 0;
-
- /*
- * If the internal tag is set on ap->qc_active, then we care about
- * bit0 on the passed in qc_active mask. Move that bit up to match
- * the internal tag.
- */
- if (ap_qc_active & (1ULL << ATA_TAG_INTERNAL)) {
- qc_active |= (qc_active & 0x01) << ATA_TAG_INTERNAL;
- qc_active ^= qc_active & 0x01;
- }
-
- done_mask = ap_qc_active ^ qc_active;
-
- if (unlikely(done_mask & qc_active)) {
- ata_port_err(ap, "illegal qc_active transition (%08llx->%08llx)\n",
- ap->qc_active, qc_active);
- return -EINVAL;
- }
-
- while (done_mask) {
- struct ata_queued_cmd *qc;
- unsigned int tag = __ffs64(done_mask);
-
- qc = ata_qc_from_tag(ap, tag);
- if (qc) {
- ata_qc_complete(qc);
- nr_done++;
- }
- done_mask &= ~(1ULL << tag);
- }
-
- return nr_done;
-}
-EXPORT_SYMBOL_GPL(ata_qc_complete_multiple);
-
/**
* ata_qc_issue - issue taskfile to device
* @qc: command to issue to device
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 453322cdf64a..62e962b62c5d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1166,7 +1166,6 @@ extern void ata_id_c_string(const u16 *id, unsigned char *s,
extern unsigned int ata_do_dev_read_id(struct ata_device *dev,
struct ata_taskfile *tf, u16 *id);
extern void ata_qc_complete(struct ata_queued_cmd *qc);
-extern int ata_qc_complete_multiple(struct ata_port *ap, u64 qc_active);
extern u64 ata_qc_get_active(struct ata_port *ap);
extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd);
extern int ata_std_bios_param(struct scsi_device *sdev,
@@ -1202,6 +1201,7 @@ extern int ata_slave_link_init(struct ata_port *ap);
extern void ata_tf_to_fis(const struct ata_taskfile *tf,
u8 pmp, int is_cmd, u8 *fis);
extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf);
+extern int ata_qc_complete_multiple(struct ata_port *ap, u64 qc_active);
extern bool sata_lpm_ignore_phy_events(struct ata_link *link);
#else
static inline int sata_set_spd(struct ata_link *link) { return -EOPNOTSUPP; }
--
2.24.1
next prev parent reply other threads:[~2020-01-28 13:34 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200128133410eucas1p19fb97c9696596da07181e0c630fb6c6b@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 00/28] ata: optimize core code size on PATA only setups Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133410eucas1p271284329b9b63c2c48167308809c569c@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 01/28] ata: remove stale maintainership information from core code Bartlomiej Zolnierkiewicz
2020-01-28 14:28 ` Tejun Heo
[not found] ` <CGME20200128133411eucas1p2db496c50fea321b621b1a07b4b8a8cc2@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 02/28] ata: expose ncq_enable_prio sysfs attribute only on NCQ capable hosts Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133411eucas1p1671c280eb6f5d2ca2d10743eea6c96e5@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 03/28] ata: make SATA_PMP option selectable only if any SATA host driver is enabled Bartlomiej Zolnierkiewicz
2020-01-29 2:35 ` Martin K. Petersen
[not found] ` <CGME20200128133412eucas1p2c79626824fcadc63c133548cd2e7d8cf@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 04/28] sata_promise: use ata_cable_sata() Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133412eucas1p258499338146481964e4c26ad3f1cbf14@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 05/28] ata: simplify ata_scsiop_inq_89() Bartlomiej Zolnierkiewicz
2020-01-29 17:15 ` Christoph Hellwig
[not found] ` <CGME20200128133412eucas1p2e5e3e29ea554bf57c1f2cc05b3d2d3a8@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 06/28] ata: use COMMAND_LINE_SIZE for ata_force_param_buf[] size Bartlomiej Zolnierkiewicz
2020-01-29 17:18 ` Christoph Hellwig
2020-02-07 14:17 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133412eucas1p1b1b4f025e4c0e6ae6e7a95e9832880dd@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 07/28] ata: optimize struct ata_force_param size Bartlomiej Zolnierkiewicz
2020-01-29 17:18 ` Christoph Hellwig
[not found] ` <CGME20200128133413eucas1p195d291f69413cbb3bb86da9571942259@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 08/28] ata: move EXPORT_SYMBOL_GPL()s close to exported code Bartlomiej Zolnierkiewicz
2020-01-29 17:18 ` Christoph Hellwig
[not found] ` <CGME20200128133413eucas1p1725ccae03fb5aba49f0e0cef798da9d6@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 09/28] ata: remove EXPORT_SYMBOL_GPL()s not used by modules Bartlomiej Zolnierkiewicz
2020-01-29 17:19 ` Christoph Hellwig
[not found] ` <CGME20200128133414eucas1p14b041a2d58ca70817f3007c0f405ee73@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 10/28] ata: separate PATA timings code from libata-core.c Bartlomiej Zolnierkiewicz
2020-01-29 17:23 ` Christoph Hellwig
2020-02-07 14:20 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133414eucas1p1c69ee66d4799a5aea22561b42ab73e11@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 11/28] ata: add CONFIG_SATA_HOST=n version of ata_ncq_enabled() Bartlomiej Zolnierkiewicz
2020-01-29 17:24 ` Christoph Hellwig
2020-02-07 14:21 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133414eucas1p2baefeb1a492375b18bdf6cdfbd0db796@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 12/28] ata: start separating SATA specific code from libata-core.c Bartlomiej Zolnierkiewicz
2020-01-29 17:26 ` Christoph Hellwig
2020-02-07 14:22 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133415eucas1p258c0d5c313e2ae42a05508b67eec16ef@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 13/28] ata: move ata_do_link_spd_horkage() to libata-core-sata.c Bartlomiej Zolnierkiewicz
2020-01-29 17:28 ` Christoph Hellwig
2020-02-07 14:23 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133415eucas1p1cd35ec3ee9783b76c1a32de63796ce30@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 14/28] ata: move ata_dev_config_ncq*() " Bartlomiej Zolnierkiewicz
2020-01-29 17:29 ` Christoph Hellwig
2020-02-07 14:23 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133415eucas1p12cc620dd5f19e6a26f1deeba083ea82f@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 15/28] ata: move sata_print_link_status() " Bartlomiej Zolnierkiewicz
2020-01-29 17:30 ` Christoph Hellwig
2020-02-07 14:24 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133416eucas1p1eb121384be2323aed1fc63a6d1ebe14f@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 16/28] ata: move sata_down_spd_limit() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133416eucas1p240f8fc15b334e0608cce30f2b6f0fbe1@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 17/28] ata: move *sata_set_spd*() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133416eucas1p172512260c12e8cce9516dd194c467134@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 18/28] ata: move sata_link_{debounce,resume}() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133417eucas1p1b907d220ad2b809cdf628fb47a14589c@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 19/28] ata: move sata_link_hardreset() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133417eucas1p28b1e3fbb20c686bd75997f5339993071@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 20/28] ata: move sata_link_init_spd() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133417eucas1p27f91558f4b86f6951d2f9f1ed19d84b5@eucas1p2.samsung.com>
2020-01-28 13:33 ` Bartlomiej Zolnierkiewicz [this message]
[not found] ` <CGME20200128133418eucas1p1b28eb901c4d21446376c1028b2977017@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 22/28] ata: move sata_scr_*() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133418eucas1p1fd63b12146a2848ab61db768fde77857@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 23/28] ata: move sata_deb_timing_*() " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133418eucas1p157933935f14f9c83c604bc5dc38bcbae@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 24/28] ata: start separating SATA specific code from libata-scsi.c Bartlomiej Zolnierkiewicz
2020-01-29 11:13 ` Bartlomiej Zolnierkiewicz
2020-01-29 17:31 ` Christoph Hellwig
2020-01-29 17:46 ` Martin K. Petersen
2020-02-07 14:25 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133419eucas1p14f7ed619db42aba72e83b7814f45a3bc@eucas1p1.samsung.com>
2020-01-28 13:33 ` [PATCH 25/28] ata: move ata_sas_*() to libata-scsi-sata.c Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133419eucas1p293e7f2e62e74c9208a30fd83650e8615@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 26/28] ata: start separating SATA specific code from libata-eh.c Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133420eucas1p294e2d41ec0eb0457ff781c69a5bcc489@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 27/28] ata: move ata_eh_analyze_ncq_error() & co. to libata-core-sata.c Bartlomiej Zolnierkiewicz
[not found] ` <CGME20200128133420eucas1p23e99a72e7735412f93dc015b8cb25d4b@eucas1p2.samsung.com>
2020-01-28 13:33 ` [PATCH 28/28] ata: move ata_eh_set_lpm() " Bartlomiej Zolnierkiewicz
2020-01-28 14:00 ` [PATCH 00/28] ata: optimize core code size on PATA only setups Geert Uytterhoeven
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=20200128133343.29905-22-b.zolnierkie@samsung.com \
--to=b.zolnierkie@samsung.com \
--cc=axboe@kernel.dk \
--cc=geert@linux-m68k.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=schmitzmic@gmail.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;
as well as URLs for NNTP newsgroup(s).