From patchwork Thu Mar 1 10:31:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 130133 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2646349edc; Thu, 1 Mar 2018 02:57:07 -0800 (PST) X-Google-Smtp-Source: AG47ELuTQwq6Mm1fTMTVVb16NplckmvSwgpeTPxqqeAbuzHHYE4DcK72SPHyDhxFr9FAVU+XG3DM X-Received: by 2002:a17:902:b416:: with SMTP id x22-v6mr1514901plr.279.1519901827344; Thu, 01 Mar 2018 02:57:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519901827; cv=none; d=google.com; s=arc-20160816; b=l2hbd7vlCUw7lVd9gUuArOEqWh3Dg0NZ5UQ2YhwuZ74ix6htxcCctZ5hdBAz1Vq9+/ 8ljUQogCKxTRtBBGUdCm6lB6c8aeRvdquVz+SR+5dOYjrj5sB/dzIUob5HURcBaG19Ma mvl6/qYwqwhZ3NNQTWFwLEXxKVZS6hV80oNI+hnXgh/ot6FnHj/P5Q4qmG6AOMy309VO /4zzTygYH6hcgMm0+KM23hr/9xdnMB6aezTvmEZUB1/ApkQ1ZtuVTVm84SEVmK6Cqdm0 vX0OBhM+01xvHrRbHglPKVV6loSD7dIzBhcgaQcdG6fuQuKjnYWITe9f3dFovLanP7O1 fs/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=I9ECEjdt3SWr+cFyjFug/3XPldKws9lNh5s5bFEGMeA=; b=vhqQGGpVDPQqc2tyba9zPDXwfQfsv9xT7KdFTshaG4cTtyw7yChy/TPR925TUVCtiD QlP2qzwnx8mNmkRF9fSPk+0RN0Gi7Wr6zbmoJ7pslP4b4UNjgHT6cLASAuc4ZFcaQHDE 8CABIRv7Z8vyVRXHYg8ZYaPsDmBV6pUBUtGc3c52xtAcorHcKI2GPIyUCydBNijXRaMh wdtLk1k5yO0MVWIzUyWtmXzGc/TQMOACRJzbO1DK2OO8co8XdML4TF7mwk3Y+Gx7pOv4 47MzExKz5+3j4iTdeRBGIryjAG2LYp9OE2o8HQs68hgp22oI3jYiXI3aQw1aSFmy3xnw VHJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r69si2310193pgr.678.2018.03.01.02.57.07; Thu, 01 Mar 2018 02:57:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967698AbeCAK5B (ORCPT + 28 others); Thu, 1 Mar 2018 05:57:01 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:39897 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967606AbeCAK4z (ORCPT ); Thu, 1 Mar 2018 05:56:55 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lq1ku-1eDbIL3saO-00dmmz; Thu, 01 Mar 2018 11:56:46 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Anshuman Khandual , Jens Axboe , Lee Jones , Rui Feng , Steven Feng , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] misc: rtsx: rename SG_END macro Date: Thu, 1 Mar 2018 11:31:28 +0100 Message-Id: <20180301105641.1650792-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Z5KlDs0JfBf+xO879qZHgV5tOAXFu3eLm8/5rOHqjtMDQqMNyfd +T+V0YgoHeqtXtHYnKS7ZG50eTQnruzmYIQGH+A7z61QWi+ngaR3TP/oGoE8hFJCFgKL9qS aHiwG7dHE8rD8I1Rnpv7hsbZM6H9k0WEzfpNovUSs3M8HLIm8QAgP4eGE3PQJZCwFDhMWJn Ig4vdsFHHR8EAwIJaWcUw== X-UI-Out-Filterresults: notjunk:1; V01:K0:pOWymXtEOJY=:olu9gmPUYnmY3W8seI9mZo 0WuhjZOkmx5n2nUJMLWh98Bo6HSyK2p+SfhG0iqkJc13QB2/phB2vOUpijpg4utnjTs3mfY4W OzMSzU8PHT6VSZGVgS8af/sS9BUD090XG+u5UJyfqNK/dQShfIe7QBoe3lrOjGXobNidvyKAM 1JcZuFcJm59nyk9frV17GW5aQp4u0wUFzIY6M3Fd7A3qmfmtPBtCtVyGPq7s0jaNORD5oxq4e yWZUuK54iG1ZrrqpTdjooHuv5U133qGbCdwThki3+w7Tk0TRIFoA8qnM6bL+2xabeLlbZV3ux 0fGl0W3a0HhW0gMnRLrsU8zccaToYuB/qH6LT506hN4GhI6W6rpOou4qs2XaNG/Yw9PO6Hlxq gothjvo0ok7r3D1j5tzZ+ZAVL3wRxrp9JODPMhj/y0lgwCsWEpDcHGRc2caR+0yZwMUjdm7KN 8Nh9YRGR44IxZW/V2oi5+3jtyXmQQ9wdtefkOcBT20p01elQZYWv7w12G6GJk/RVW6jWMKkWN 8zc1eEwThN1ECfXORVr3U3/UbdUn7dCGYjez2jDtEVvNo0FyUCGuZcYUf60DLhbEPeQPFp/Xj CEfOb+8y1zS/PA9twdrvp8xe9qFdsKVKpEWWLUJT7HuOGnQHaOkdw36NEnqMP1REf9c3hI6ZY 4cVwKtDTwOvIsrPmECLHcjBAbRwzcKac/I7J4kwRbIOZA+babDsyM2fWrTvyLbBkjuYkqzXyp G0VgFPk603N+h8zZNkqXZrY2zqZfs54AUe6RNg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A change to the generic scatterlist code caused a conflict with the rtsx card reader driver: In file included from drivers/misc/cardreader/rtsx_pcr.c:32: include/linux/rtsx_pci.h:40: error: "SG_END" redefined [-Werror] This changes one instance of the driver to prefix SG_END and related constants. Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings") Cc: Anshuman Khandual Cc: Jens Axboe Signed-off-by: Arnd Bergmann --- drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- include/linux/rtsx_pci.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index fd09b0960097..e8f1d4bb806a 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -444,12 +444,12 @@ static void rtsx_pci_add_sg_tbl(struct rtsx_pcr *pcr, { u64 *ptr = (u64 *)(pcr->host_sg_tbl_ptr) + pcr->sgi; u64 val; - u8 option = SG_VALID | SG_TRANS_DATA; + u8 option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; pcr_dbg(pcr, "DMA addr: 0x%x, Len: 0x%x\n", (unsigned int)addr, len); if (end) - option |= SG_END; + option |= RTSX_SG_END; val = ((u64)addr << 32) | ((u64)len << 12) | option; put_unaligned_le64(val, ptr); diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h index 478acf6efac6..e964bbd03fc2 100644 --- a/include/linux/rtsx_pci.h +++ b/include/linux/rtsx_pci.h @@ -36,12 +36,12 @@ #define CHECK_REG_CMD 2 #define RTSX_HDBAR 0x08 -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4) #define RTSX_HDBCTLR 0x0C #define SDMA_MODE 0x00 #define ADMA_MODE (0x02 << 26) From patchwork Thu Mar 1 10:31:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 130134 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2647471edc; Thu, 1 Mar 2018 02:58:25 -0800 (PST) X-Google-Smtp-Source: AG47ELvboXhvN8sgFfneim5ZtPVN7VabTXe4WWW6QyhuQM7s2tSSXA1jn15hEArK7PCoUnzfrZ8m X-Received: by 10.99.49.198 with SMTP id x189mr1203119pgx.135.1519901905737; Thu, 01 Mar 2018 02:58:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519901905; cv=none; d=google.com; s=arc-20160816; b=LJyOHg39xzbKJU2CsZY/xIxg3e1SFmldWcJRiO5yvz7qsGD1bhXZy+fWo1dLDB/9Xn IwjGLj6yQSrRL+XxGTkvsG6IduEUwmf4EuNDJvx1IhkAnMfPw6ukegDE3bNH3d9/Ry/e npB6rV9rudVyeIZq5/5lLnmzdpTJNdWwi+XHLnxspRCTDpyyqfHVjfKjFdZ9Vaux/TqR UKkNBBNvMaNIKZWNWuVgonS+XUIlwZSuQ4oLcRzhdJN0gk1tS86lF6pyBt4lEHChTQ0B DYjNcmKjOZg45IFs59u+9RGsJjREAMAnjP4FdYteydBjFsFxCIkVWwY9Yg9MgEL4BiFi w5RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=tQcJCeJtipdOWji3wF31asFzrAWdosv0W9U/2wqi0ms=; b=jzx8yE9Kmi/mRtwmMg3jcMxrKAL3FGhcoDqJ0AlWXDK2qE1TqnR/J6kGCIUfBDsIaa 9A4Ldc9J/GEMqQY1xfCnuZvmVnQg+5dAA2+APf7lHS5LhuruvHAxSBkK9o15jn+bMwY9 c6Q9kT1wVW85bVs/Ujr23EC7KkUXU1fzICydHgeR/1SDkAU6fHHdRzcI/8ZUINL9kTQi C7ufBMPFq2mIbzUg7eDfnxk+xE0UCAWyQvKrA6zzXIPqUROQ4R3CkoTjxmBQfn5TY7vZ +ra2Aj4Jw07VrUhsZX9hiAE8xExalf+3ZVk5y6H7kRnkC3cLhE6fP56FVUvD6N+9tw0q 5EhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y25si1488183pfe.206.2018.03.01.02.58.25; Thu, 01 Mar 2018 02:58:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967691AbeCAK6T (ORCPT + 28 others); Thu, 1 Mar 2018 05:58:19 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:34829 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967497AbeCAK6Q (ORCPT ); Thu, 1 Mar 2018 05:58:16 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MA0VM-1f2NSJ3v5c-00B0Xt; Thu, 01 Mar 2018 11:58:08 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Anshuman Khandual , Jens Axboe , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rts5208: rename SG_END macro Date: Thu, 1 Mar 2018 11:31:29 +0100 Message-Id: <20180301105641.1650792-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180301105641.1650792-1-arnd@arndb.de> References: <20180301105641.1650792-1-arnd@arndb.de> X-Provags-ID: V03:K0:cI0d93eubJLITURSOemRuh3Nu/D6iqsMGATXWmFCSnyjTxEttgE ojHsP7ZVE1AmD5f2QYQQBe6dv81rFbb4mVHcNyKAwY5QdRm59wuuIg2e/P88A36qCXR8zh7 MoCiKaOGayL6V6YYFofE38eMQWoI3tyPbuJNr5ER/bgykm+0Y4L0pTm8/kubYYbZnjLgc9j gKCsf2/LRj2ORJ7h9IkSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:GKdY7W6/UtA=:y6s/qeB9Lg+msubeMzhdy/ MBIyoCMa+/FDqLY8k7vtV6LQd1eM+xXc/i6iq3MIxVoziFs0J183CwDXnbRuWadQwAK1Xy2Py aH2HcSCVqeVerAjJrbhTiMHVeWgNvdMfkwcCatCtIYSWrkaGJRlLMxZWOSwyoJDrIoGI52Eav V8xqASMF9fN9yfn78Iort7Ag9vmloSpYWRPLXOfesvHda9TTMDcWhBrp1/VlR7UMnQXXwp+9e oZem7X/m7ljysX83873HDZAG3n1mzum7tegxBskkRPUBCpTfvMuZJDRQh1npy1wy2wnxYcI5F z7e8Byk7qaCeL40BCI4mnkhSU0LSZ8866HEPRX4vJDE6o1TW7qPgmmUD2n7NrL/sZhbfiItvT O5AeurPvUemnM/pN6LhyOM3FAr5BYvP8tALqHQiFpiBKemDVrGDtPstSzPrL8YXNLOJfXTAfc DhqPTcekcqnE5cIqzPGM4Qa81+1JkvswoNzGyIilW280Xd2nWeNiB5kR9+N40pfSHN4j+2SxV oTq4Px6uSoiRWsXjL068IXXX0fnzhbMA0SXxR50CgSetZ77RUMkeIuPvZtbfpdcwI/yOxw84z d13/9GLPGwnmde67ESXHFR+jHETVOI8pfSmBDVZg33Jq5FC4bqVVBbPxR9zWBWwH3YriyRMD3 6pxEjqLW+LDLIBqfRD90+CuR/+EBCiGXGVfo8cAgrwBdb1SyIIpuMHGFE37U2E7htKuDmCt8v fkkp+VMsZXEPdUAqQHKXo6WlRovfjU7F0dZ6pA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A change to the generic scatterlist code caused a conflict with the rtsx card reader driver: In file included from drivers/staging/rts5208/rtsx.h:180, from drivers/staging/rts5208/rtsx.c:28: drivers/staging/rts5208/rtsx_chip.h:343: error: "SG_END" redefined [-Werror] This changes one instance of the driver to prefix SG_END and related constants. Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings") Cc: Anshuman Khandual Cc: Jens Axboe Signed-off-by: Arnd Bergmann --- drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.9.0 Reviewed-by: Andy Shevchenko diff --git a/drivers/staging/rts5208/rtsx_chip.h b/drivers/staging/rts5208/rtsx_chip.h index 4f6e3c1c4621..8a8cd5d3cf7e 100644 --- a/drivers/staging/rts5208/rtsx_chip.h +++ b/drivers/staging/rts5208/rtsx_chip.h @@ -339,13 +339,13 @@ struct sense_data_t { #define CHK_BIT(data, idx) ((data) & (1 << (idx))) /* SG descriptor */ -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4) struct rtsx_chip; diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c index 8b57e17ee6d3..716cce2bd7f0 100644 --- a/drivers/staging/rts5208/rtsx_transport.c +++ b/drivers/staging/rts5208/rtsx_transport.c @@ -308,7 +308,7 @@ static inline void rtsx_add_sg_tbl( do { if (len > 0x80000) { temp_len = 0x80000; - temp_opt = option & (~SG_END); + temp_opt = option & (~RTSX_SG_END); } else { temp_len = len; temp_opt = option; @@ -407,9 +407,9 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *index = *index + 1; } if ((i == (sg_cnt - 1)) || !resid) - option = SG_VALID | SG_END | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; else - option = SG_VALID | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option); @@ -555,9 +555,9 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, (unsigned int)addr, len); if (j == (sg_cnt - 1)) - option = SG_VALID | SG_END | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; else - option = SG_VALID | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option);