From patchwork Sun May 17 21:35:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Herbszt X-Patchwork-Id: 6425361 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F2D49F38D for ; Sun, 17 May 2015 21:35:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53B16205EE for ; Sun, 17 May 2015 21:35:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78C60205B8 for ; Sun, 17 May 2015 21:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751815AbbEQVfO (ORCPT ); Sun, 17 May 2015 17:35:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:57399 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751306AbbEQVfN (ORCPT ); Sun, 17 May 2015 17:35:13 -0400 Received: from localhost ([92.208.113.66]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Lt1yI-1ZJ57b1JAw-012V87; Sun, 17 May 2015 23:35:05 +0200 Date: Sun, 17 May 2015 23:35:06 +0200 From: Sebastian Herbszt To: linux-scsi@vger.kernel.org Cc: qla2xxx-upstream@qlogic.com, Sebastian Herbszt Subject: [PATCH] qla2xxx: use t10_pi_tuple Message-ID: <20150517233506.00000268@localhost> X-Mailer: Claws Mail 3.9.2-55-g74b05b (GTK+ 2.16.6; i586-pc-mingw32msvc) MIME-Version: 1.0 X-Provags-ID: V03:K0:LXEorBLS7SYUaRbcScglwnTH99FErVJFz68pwvkbOZktf+Lw0ZC RiCBU2bBd8yoFUCFmGXP2NBptQwLKbidwDNTAOMvdqhF2sFaDZ8go125p9nAoBKZNUhA4yp FkZmPtR/EZOQGKrUurE9Ba2eepCI/bOzDNOyQQqiK5BC3LPrIPKps2ruSDbny6RSdCBAwGu E5OyAvCgAhOUWAfXEpNgw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drop unused scsi_dif_tuple and use t10_pi_tuple instead of own sd_dif_tuple copy. Signed-off-by: Sebastian Herbszt --- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -up linux/drivers/scsi/qla2xxx-orig/qla_def.h linux/drivers/scsi/qla2xxx/qla_def.h --- linux/drivers/scsi/qla2xxx-orig/qla_def.h 2015-04-15 06:18:24.681045138 +0200 +++ linux/drivers/scsi/qla2xxx/qla_def.h 2015-05-17 20:17:20.308810956 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -276,16 +277,6 @@ struct req_que; /* - * (sd.h is not exported, hence local inclusion) - * Data Integrity Field tuple. - */ -struct sd_dif_tuple { - __be16 guard_tag; /* Checksum */ - __be16 app_tag; /* Opaque storage */ - __be32 ref_tag; /* Target LBA or indirect LBA */ -}; - -/* * SCSI Request Block */ struct srb_cmd { diff -up linux/drivers/scsi/qla2xxx-orig/qla_isr.c linux/drivers/scsi/qla2xxx/qla_isr.c --- linux/drivers/scsi/qla2xxx-orig/qla_isr.c 2015-04-15 06:18:24.685045138 +0200 +++ linux/drivers/scsi/qla2xxx/qla_isr.c 2015-05-17 20:18:32.768814260 +0200 @@ -1711,12 +1711,6 @@ qla2x00_handle_sense(srb_t *sp, uint8_t } } -struct scsi_dif_tuple { - __be16 guard; /* Checksum */ - __be16 app_tag; /* APPL identifier */ - __be32 ref_tag; /* Target LBA or indirect LBA */ -}; - /* * Checks the guard or meta-data for the type of error * detected by the HBA. In case of errors, we set the @@ -1779,7 +1773,7 @@ qla2x00_handle_dif_error(srb_t *sp, stru if (scsi_prot_sg_count(cmd)) { uint32_t i, j = 0, k = 0, num_ent; struct scatterlist *sg; - struct sd_dif_tuple *spt; + struct t10_pi_tuple *pi; /* Patch the corresponding protection tags */ scsi_for_each_prot_sg(cmd, sg, @@ -1801,12 +1795,12 @@ qla2x00_handle_dif_error(srb_t *sp, stru return 1; } - spt = page_address(sg_page(sg)) + sg->offset; - spt += j; + pi = page_address(sg_page(sg)) + sg->offset; + pi += j; - spt->app_tag = 0xffff; + pi->app_tag = 0xffff; if (scsi_get_prot_type(cmd) == SCSI_PROT_DIF_TYPE3) - spt->ref_tag = 0xffffffff; + pi->ref_tag = 0xffffffff; } return 0; diff -up linux/drivers/scsi/qla2xxx-orig/qla_target.c linux/drivers/scsi/qla2xxx/qla_target.c --- linux/drivers/scsi/qla2xxx-orig/qla_target.c 2015-04-24 22:55:32.801528872 +0200 +++ linux/drivers/scsi/qla2xxx/qla_target.c 2015-05-17 20:20:16.440818988 +0200 @@ -2591,17 +2591,17 @@ qlt_handle_dif_error(struct scsi_qla_hos } #if 0 - struct sd_dif_tuple *spt; + struct t10_pi_tuple *pi; /* TODO: * This section came from initiator. Is it valid here? * should ulp be override with actual val??? */ - spt = page_address(sg_page(sg)) + sg->offset; - spt += j; + pi = page_address(sg_page(sg)) + sg->offset; + pi += j; - spt->app_tag = 0xffff; + pi->app_tag = 0xffff; if (cmd->se_cmd.prot_type == SCSI_PROT_DIF_TYPE3) - spt->ref_tag = 0xffffffff; + pi->ref_tag = 0xffffffff; #endif }