From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbdAaMUT (ORCPT ); Tue, 31 Jan 2017 07:20:19 -0500 Received: from mail-bn3nam01on0058.outbound.protection.outlook.com ([104.47.33.58]:53760 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751990AbdAaMSJ (ORCPT ); Tue, 31 Jan 2017 07:18:09 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matias@cnexlabs.com; From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: CC: , , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 06/12] lightnvm: cleanup nvm transformation functions Date: Tue, 31 Jan 2017 13:17:14 +0100 Message-ID: <20170131121720.10971-7-matias@cnexlabs.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170131121720.10971-1-matias@cnexlabs.com> References: <20170131121720.10971-1-matias@cnexlabs.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [193.106.164.211] X-ClientProxiedBy: DB6PR0601CA0024.eurprd06.prod.outlook.com (10.168.88.162) To DM5PR06MB2777.namprd06.prod.outlook.com (10.175.107.139) X-MS-Office365-Filtering-Correlation-Id: 26f36e48-8f41-406c-318c-08d449d32f7d X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR06MB2777; X-Microsoft-Exchange-Diagnostics: 1;DM5PR06MB2777;3:J8rmg92thN2DC6KIV4GMgeZNTwu7hFX5+79A+ITP/UPfBfNKnfkJY5g2Ir3YCmDG17kBAoMic+A8cjsXe6p1HpVmCL2O0udv9x98F8LtLvGphz0eB3OyAMlwkO4hE27b5wSV0dbnn4CGnHzcbKqYwiTZNn6P3xXi8Tkk0zK3bm76PRnLdNHpPnOf23Mzb3BgjtH+Jt4xJfrbTNiG4234+MlB5nkuR/lee0rKPxM1DLFplwzJUpgI3WbAL1UY2v/N0SGV74SaokkYM9Y+OivkBg==;25:EK6Fm4rvHbgihg4cvO+O0PtoickrBjk7sfLSqXgicw2fcq/QqM74WGKwoIOiCeu9tI/HeFmf6q664ZXhUhhrL/i5IqBz9nPKjd7Kud2TG4yCQTQhpTdj/aia2E0bkivTJXTvFHEivscdki9Q0xsEsWPU0d9P2uA0hR3IDPv8i8hYokohp123hw2oPmiwuBD6O2JMlVznsJCqJtGwGAeKqk8j8f6cXSzhVB7izD1oDC8KZsgF4Bo04O/AsKBKMf2MycrJQLCYYq9dXHIY1iTdQB3oAwKPx/zsPqS2GtT7Ub+W+nIHgzEshN3GLJAkmZq2iPVS3ax0zG8p/KNfySxA8FAJALMXDwjde6U4S9Yax9E8hZUdNL+Vbj+gDBi3B1IdkFfYx356CjTXiSfIY77boNVMtR2BLxt+EIUR3f2QHd3wq9Lxg5jWvsRkSkNxia/628KKBxTArVIlbiL0G8/jbw== X-Microsoft-Exchange-Diagnostics: 1;DM5PR06MB2777;31:X2XPNGYsUfLWgXYxox9vYfdPy18zfw4NI97wgjDhQ7DRNogWfRWA0D/SuJFWWHPJ5kOTkMIX6/Ou96L4r5gSA5sQpLQLguqFAOfQEMxR5gRldR1hOGTumHlu5+E0U4Ce+nxXalJxYYMgKRe4cgLWYV5vxnNQZmzvf3q4zILrTIqnUxTgk+84oXXs0v/vj2J5mx1ARm7/5RIKgfiz4ycSe8sro/iWmB7Zs618tLlLm34RkuR4k3GmXADn/yY1gbYduGKlrwHsBPkMDPb4gyvzLQ6d1MO4cq5bL/8Qd9JJhHk=;20:BqfALuN79uA71BY2Y9JXp6/RmXddNjxprGnwnrY2NlRGlOlDgy8WN7QtPsK5j+ZGa+4e8zNr2iNdM+02TohnRQgtbKC7mbkx1zxAGoFbGYPeShEVoAJWPLbLWokoyY6dniVJq1l4Cx/bVZQH6aqeRRiotpKO0412FQ65smZZY1M= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6042181)(6072148);SRVR:DM5PR06MB2777;BCL:0;PCL:0;RULEID:;SRVR:DM5PR06MB2777; X-Microsoft-Exchange-Diagnostics: 1;DM5PR06MB2777;4:uyFR7+7nGXa7kYHaPqfkkuZ9Ft1VQGxLw4k1PctBwCHBSvzCKwkTUQC3xJjAJhOZFablOKknDa/h+SlO6lwdmScGWbif0TYKhpxqiIEeLzUdUsfUn2YIm0OrhbX6ieXBZKhMc5itp5YV1jUL4N0q979xiYJamJMOEqlE07ZLQuGj2YDL/4wY8cLbbUj8OlwI6zm8PQs3GTYQph/Q/siQ1VqKNE6V6UsPs3V+LlIYsDIxRKb7Mk7oZbFFqTHga3x8rESSPsUidY5lL/bVd7bWPwWfQICJIh/YVFqnsb4uU3AhP5i+5HQxWX8ocgWjDa9Kx3yfzU0fudihGHu1KOzIkoS0WUe8TYsS902GjMEJLPlwoZ9S9oQ4pxvn/bkkyciZX9pw2t6A8qHNZ/sZ51YduKDUZakAgaErCLQlvL7wQXM3SO7MCvi/mdSOMPxcc3k29OlWXbZ/yx+EjuhTDWOAHkxjMiwTPngslpxsilb67aTHIJyHqtXis6DRJlHn0ayBGyxC/rxn1rBbWCb/qVrtl/BEk72rd8jKlIKxLuCv2uCG6ttdHnK1Gl4VSDPBKiN5J0DMNa4opjaOca0HPMN18A== X-Forefront-PRVS: 0204F0BDE2 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(42186005)(66066001)(50466002)(6486002)(47776003)(38730400001)(105586002)(54906002)(25786008)(106356001)(2351001)(36756003)(68736007)(4001430100002)(53416004)(50986999)(107886002)(7736002)(2906002)(305945005)(4326007)(110136003)(23676002)(575784001)(2870700001)(189998001)(5660300001)(92566002)(86362001)(1076002)(6116002)(3846002)(33646002)(6916009)(97736004)(2950100002)(5820100001)(6666003)(76176999)(101416001)(53936002)(81166006)(81156014)(8676002)(50226002)(69596002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR06MB2777;H:skyninja.cnexlabs.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjA2TUIyNzc3OzIzOlBURm9mVDNoUm9TS3BrbG1KS3N2V0xpa1dC?= =?utf-8?B?dDVGeG10U0RYaEZwZGpiQmkrbXk0VHc1WjNncC9tVjQ4NUpRK0hlUzJySHlx?= =?utf-8?B?Qm80Zlp2RkNmUFlQTTU0cXM2TTlaZzhvSHJCU1RWUWZFYjJ2U1RocWxVZXZl?= =?utf-8?B?YTRtQ3dSNVJaRFJJaXM2eUlkOGxyUEgwYnNZTXJxVjl2ajFJVGRLT1czay9u?= =?utf-8?B?NFhpdkhZT0VJMkMwMDdZQWNkLzhzQ0xDcnBKTWlkeEdNVTJmZmN1d0lybXhY?= =?utf-8?B?Y0NocFZzY2Qzanlab1Qvc0N5QUNQdkFMamZPanM0UVZNMytzZ3QyVUd0ZXFl?= =?utf-8?B?SUo5Y0pvRzA4SGdVTEtxU2NyQXppMXQ0QktFY3FmMk0xV3VKb2FhTkFuR1Jr?= =?utf-8?B?YjI0OVVCRmxrVWRiRDNZaStnWmgxSzhEbjRRTHhCNXdHZkljckRxcm9yMjU4?= =?utf-8?B?NCs4ZmxSSEJmd2xJTys4VGZPdWpEaHBGMGtXR1hCSnlGeUp5SHZUZVV6M0Rp?= =?utf-8?B?VTc1a1VvNVh1K2Y0WW9VdUI0NUEyMTJFK2loZmtIaDNlR3ozNGJsUElmcnJ1?= =?utf-8?B?ODJmR242L1ZZdUlnbStsSmdnL1hSUG9qTFdDWEdFc0pTcm9qNzJFWHVVbzhh?= =?utf-8?B?bzVYRCtMdUlrR09yZjJPaW9CMjYvYy80TjZNVGRSd2h5Qy84SE9jcGxJQUNX?= =?utf-8?B?NDBrWWFrMHg2enRLaStrR2g3bnJndEh6MXhTNC9hSTFxb2xKbEJJTDZqTm02?= =?utf-8?B?MnY4cEtIZU5zMHFOR0lkVVlyWDBwdmdzV1U5bzJodzlCeE0yR3dyd1pHZW0v?= =?utf-8?B?Z05qMzlZUlZwTjIwdFJTRUV6d21HQWFxY21CSmJhRW0rdmNBd0xJRkhjVkpP?= =?utf-8?B?OWc0MHNDZTg5aXlNTHVpMVRjZlhkZmR5WnVUMFVSbVJxdjVzTnRkbmNONi8x?= =?utf-8?B?bE1veDBaUFRKd2luUmJ1eHB0bGdZaStNd0JLOTVlbTNMUzF4dFZRdHNiUWxY?= =?utf-8?B?MUJIampWczVLWjVDV2tkMTdNWGovTjh0K0NZWXc2RC9KMTQrdjl1UDFURkx4?= =?utf-8?B?ZEZoS3lqa0RmQWVISjBYYXRSa01RalZTNTdXdFN4VG55SUxkUmZlRXdTeHlW?= =?utf-8?B?emp2aXJKZ0pZQ3N3U3VFVGo1MnpTR3ZoWEZzc09tQkdrcTZVU095SkFVaEJH?= =?utf-8?B?Rmw2OUx1WGhNNmlveExDR1R6cXM0YitMeEdNb0NBc3EzNlZETkZiVjNPaHFh?= =?utf-8?B?Tld4OW9oMFR3SEVIbnJRdkFDZ3Z4Q1d3K1dSbUZZQ01NZ1ZXc3FiV053Zmg0?= =?utf-8?B?b0Q4alZXZE50MDlrVkM2Qmx3dFZRWFhrb0lIdTdQZ3UwZS9RR2xkUElPWWEv?= =?utf-8?B?QnRYcWMwK1JGOWIxK0JFeXk5MkpxNlkySVRFVVZEUlJQamNHcGovL3lBVzhT?= =?utf-8?B?NktMNzhkb1MvTm1aNTlxZXMzRXM0MTY1ei9HOUkySHEzWHVGQjNadjlnSGRW?= =?utf-8?B?SzR4bUkwKzVGbFN0dXYvNXpDVEE3ZjBXMkI5MlE2QWZTZUZBL3krVFAzVnpq?= =?utf-8?B?NUJpS3ZYNFVldmxOWUdsbEdxKzI5dVpMZTNXRHJXSlZXU1Ewc0R4RlVETUJl?= =?utf-8?B?YW5BMDhtYkRRdG10UFB3cGJQbjVRRjhRNE9lZi8yR1JoL1JjUVVjQzRRPT0=?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR06MB2777;6:Sjrv1ma3uPquKMjNKDQQeuLh7HLlePSqnQeka8j2Ofr8pgbYb5WEppRIW0p3yo55glzxujmh9GUr6cTtN3vRcX9CjNXGKtWidcEn5p6KKVKBoJSsVuoYMVLB/7bzYIAgtCCSytDYuSYKYVdTbb1cKf01a6x4z4p9fSUPx0We7CZ1dtOKVjkJ5ywlEcuyCmHTVQo9Ee+Bq2sKhAqGZtGTdD3t/PUw03LLWojEn05PsqP2OijiKfbQA90D3v6W1KBmYoYYXeDbbZDxrDiRT4UQ65Pn8E0rZbG0VW6DcXWbtaCNy7L8ay0R9bF2Ih7mFwTXrlPRyzi5yWD2a3wzOnHidFLUImlKmFEnLVVdW8TofiW6XMrhOe3liAF9RStUNt24/T7kyoU92BQLYn3V8E9jY/GvKhbkSA/xYjIXohxPwE0=;5:aYAuDe6y2lN1bloD1qrBoWJWRKtzL/gqtspYKmlWn3aFgnGh+s1oYq7d7JhaD+7b+n+hAdZ53FZK/pHqqYeNLP/jPFKLLvaLqkNu3webxJ03gj3/aJ6jRfU76KPnMT8DB0gkikqTwdhBiE8czy548w==;24:MVoKCI2xP2oryJ///FluFMfjPs/Hx/YcMIQnoaVuWzcK9aZc6C8BESTpvy6Nrfc/rn74XJJKlilMplRLrD2XrlIhopbKCadDV2cdSlX1Kz4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR06MB2777;7:U/TDSRmTYS0D4n+Z3w080HsEiZwXuWZxfdsa1jnttKk5rIbw6qcF+Br6i4hYt/v8a69kfpr2iDx0Qd3X3l+ap+KT0YuHnxRx2elOOgXVEl9tuvUIBEG/xF20nms0t6Q2TQy7sCpuRkYv/jNRJ1sj15HqIYZ5A53qSX4ZNNGlXLg1+WC3O08HAkWWkEdR3BkFz6+1Ii+RFQORDZgI/Yem8rJBZJQeryQEA09sXN+nJNY6et2vmZuv1P7Kh9aewK2WM5E2FgcQZL4+HJI6PMRND+fsjEeld4MCm5rrlSYLJoFH7qYTunWwQySGXaZYj2OHDXGr53Vg3J/nLZmF+SVOFW2UBGHMtdwoK82y3rpPPGMPWqBOi+UNgVYvT3IUFnFRcKZ5bIiDfL5Vt5gTEa57JxzoRLeGufuw5Ou6KBZx5xwULDbkmklu4a2Npkl0GDg0Nq0+2udp1KruerxeVBcNou7pE4AIOQnmIutsRxD2OlPHN8OBaOfHccRtob8kvH88xHR8t0XkKM/lQrMnxB/BcgiRcZHSSio5nld4wFEFRDVmkIc5HTBho0ARBUo44v3B X-OriginatorOrg: cnexlabs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2017 12:17:54.1466 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR06MB2777 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Going from target specific ppa addresses to device was accomplished by first converting target to generic ppa addresses and generic to device addresses. The conversion was either open-coded or used the built-in nvm_trans_* and nvm_map_* functions for conversion. Simplify the interface and cleanup the calls to provide clean functions that now either take a list of ppas or a nvm_rq, and is exposed through: void nvm_ppa_* - target to/from device with a list of PPAs, void nvm_rq_* - target to/from device with a nvm_rq. Signed-off-by: Matias Bjørling --- drivers/lightnvm/core.c | 115 ++++++++++++++--------------------------------- include/linux/lightnvm.h | 14 +++--- 2 files changed, 40 insertions(+), 89 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index a1a7a5a..0842c85 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -50,11 +50,6 @@ struct nvm_area { sector_t end; /* end is excluded */ }; -enum { - TRANS_TGT_TO_DEV = 0x0, - TRANS_DEV_TO_TGT = 0x1, -}; - static struct nvm_target *nvm_find_target(struct nvm_dev *dev, const char *name) { struct nvm_target *tgt; @@ -428,38 +423,46 @@ static void nvm_map_to_tgt(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p) p->g.lun -= lun_roff; } -static void nvm_trans_rq(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd, - int flag) +static void nvm_ppa_tgt_to_dev(struct nvm_tgt_dev *tgt_dev, + struct ppa_addr *ppa_list, int nr_ppas) { int i; - if (rqd->nr_ppas == 1) { - if (flag == TRANS_TGT_TO_DEV) - nvm_map_to_dev(tgt_dev, &rqd->ppa_addr); - else - nvm_map_to_tgt(tgt_dev, &rqd->ppa_addr); - return; + for (i = 0; i < nr_ppas; i++) { + nvm_map_to_dev(tgt_dev, &ppa_list[i]); + ppa_list[i] = generic_to_dev_addr(tgt_dev, ppa_list[i]); } +} + +static void nvm_ppa_dev_to_tgt(struct nvm_tgt_dev *tgt_dev, + struct ppa_addr *ppa_list, int nr_ppas) +{ + int i; - for (i = 0; i < rqd->nr_ppas; i++) { - if (flag == TRANS_TGT_TO_DEV) - nvm_map_to_dev(tgt_dev, &rqd->ppa_list[i]); - else - nvm_map_to_tgt(tgt_dev, &rqd->ppa_list[i]); + for (i = 0; i < nr_ppas; i++) { + ppa_list[i] = dev_to_generic_addr(tgt_dev, ppa_list[i]); + nvm_map_to_tgt(tgt_dev, &ppa_list[i]); } } -static struct ppa_addr nvm_trans_ppa(struct nvm_tgt_dev *tgt_dev, - struct ppa_addr p, int dir) +static void nvm_rq_tgt_to_dev(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd) { - struct ppa_addr ppa = p; + if (rqd->nr_ppas == 1) { + nvm_ppa_tgt_to_dev(tgt_dev, &rqd->ppa_addr, 1); + return; + } + + nvm_ppa_tgt_to_dev(tgt_dev, rqd->ppa_list, rqd->nr_ppas); +} - if (dir == TRANS_TGT_TO_DEV) - nvm_map_to_dev(tgt_dev, &ppa); - else - nvm_map_to_tgt(tgt_dev, &ppa); +static void nvm_rq_dev_to_tgt(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd) +{ + if (rqd->nr_ppas == 1) { + nvm_ppa_dev_to_tgt(tgt_dev, &rqd->ppa_addr, 1); + return; + } - return ppa; + nvm_ppa_dev_to_tgt(tgt_dev, rqd->ppa_list, rqd->nr_ppas); } void nvm_part_to_tgt(struct nvm_dev *dev, sector_t *entries, @@ -564,26 +567,6 @@ static struct nvm_dev *nvm_find_nvm_dev(const char *name) return NULL; } -static void nvm_tgt_generic_to_addr_mode(struct nvm_tgt_dev *tgt_dev, - struct nvm_rq *rqd) -{ - struct nvm_dev *dev = tgt_dev->parent; - int i; - - if (rqd->nr_ppas > 1) { - for (i = 0; i < rqd->nr_ppas; i++) { - rqd->ppa_list[i] = nvm_trans_ppa(tgt_dev, - rqd->ppa_list[i], TRANS_TGT_TO_DEV); - rqd->ppa_list[i] = generic_to_dev_addr(dev, - rqd->ppa_list[i]); - } - } else { - rqd->ppa_addr = nvm_trans_ppa(tgt_dev, rqd->ppa_addr, - TRANS_TGT_TO_DEV); - rqd->ppa_addr = generic_to_dev_addr(dev, rqd->ppa_addr); - } -} - int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas, int nr_ppas, int type) { @@ -599,7 +582,7 @@ int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas, memset(&rqd, 0, sizeof(struct nvm_rq)); nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1); - nvm_tgt_generic_to_addr_mode(tgt_dev, &rqd); + nvm_rq_tgt_to_dev(tgt_dev, &rqd); ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type); nvm_free_rqd_ppalist(dev, &rqd); @@ -627,8 +610,7 @@ int nvm_submit_io(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd) if (!dev->ops->submit_io) return -ENODEV; - /* Convert address space */ - nvm_generic_to_addr_mode(dev, rqd); + nvm_rq_tgt_to_dev(tgt_dev, rqd); rqd->dev = tgt_dev; return dev->ops->submit_io(dev, rqd); @@ -652,7 +634,7 @@ int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas, int flags) if (ret) return ret; - nvm_generic_to_addr_mode(dev, &rqd); + nvm_rq_tgt_to_dev(tgt_dev, &rqd); rqd.flags = flags; @@ -741,34 +723,6 @@ void nvm_put_area(struct nvm_tgt_dev *tgt_dev, sector_t begin) } EXPORT_SYMBOL(nvm_put_area); -void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd) -{ - int i; - - if (rqd->nr_ppas > 1) { - for (i = 0; i < rqd->nr_ppas; i++) - rqd->ppa_list[i] = dev_to_generic_addr(dev, - rqd->ppa_list[i]); - } else { - rqd->ppa_addr = dev_to_generic_addr(dev, rqd->ppa_addr); - } -} -EXPORT_SYMBOL(nvm_addr_to_generic_mode); - -void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd) -{ - int i; - - if (rqd->nr_ppas > 1) { - for (i = 0; i < rqd->nr_ppas; i++) - rqd->ppa_list[i] = generic_to_dev_addr(dev, - rqd->ppa_list[i]); - } else { - rqd->ppa_addr = generic_to_dev_addr(dev, rqd->ppa_addr); - } -} -EXPORT_SYMBOL(nvm_generic_to_addr_mode); - int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd, const struct ppa_addr *ppas, int nr_ppas, int vblk) { @@ -826,7 +780,7 @@ void nvm_end_io(struct nvm_rq *rqd, int error) /* Convert address space */ if (tgt_dev) - nvm_trans_rq(tgt_dev, rqd, TRANS_DEV_TO_TGT); + nvm_rq_dev_to_tgt(tgt_dev, rqd); rqd->error = error; ins->tt->end_io(rqd); @@ -874,8 +828,7 @@ int nvm_get_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr ppa, { struct nvm_dev *dev = tgt_dev->parent; - ppa = nvm_trans_ppa(tgt_dev, ppa, TRANS_TGT_TO_DEV); - ppa = generic_to_dev_addr(dev, ppa); + nvm_ppa_tgt_to_dev(tgt_dev, &ppa, 1); return dev->ops->get_bb_tbl(dev, ppa, blks); } diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index cad1e1c..faa0fbf 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -378,10 +378,10 @@ static inline struct ppa_addr linear_to_generic_addr(struct nvm_geo *geo, return l; } -static inline struct ppa_addr generic_to_dev_addr(struct nvm_dev *dev, - struct ppa_addr r) +static inline struct ppa_addr generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev, + struct ppa_addr r) { - struct nvm_geo *geo = &dev->geo; + struct nvm_geo *geo = &tgt_dev->geo; struct ppa_addr l; l.ppa = ((u64)r.g.blk) << geo->ppaf.blk_offset; @@ -394,10 +394,10 @@ static inline struct ppa_addr generic_to_dev_addr(struct nvm_dev *dev, return l; } -static inline struct ppa_addr dev_to_generic_addr(struct nvm_dev *dev, - struct ppa_addr r) +static inline struct ppa_addr dev_to_generic_addr(struct nvm_tgt_dev *tgt_dev, + struct ppa_addr r) { - struct nvm_geo *geo = &dev->geo; + struct nvm_geo *geo = &tgt_dev->geo; struct ppa_addr l; l.ppa = 0; @@ -477,8 +477,6 @@ extern int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *, struct ppa_addr *, int, int); extern int nvm_max_phys_sects(struct nvm_tgt_dev *); extern int nvm_submit_io(struct nvm_tgt_dev *, struct nvm_rq *); -extern void nvm_generic_to_addr_mode(struct nvm_dev *, struct nvm_rq *); -extern void nvm_addr_to_generic_mode(struct nvm_dev *, struct nvm_rq *); extern int nvm_set_rqd_ppalist(struct nvm_dev *, struct nvm_rq *, const struct ppa_addr *, int, int); extern void nvm_free_rqd_ppalist(struct nvm_dev *, struct nvm_rq *); -- 2.9.3