From patchwork Tue Oct 1 16:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 174891 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp8755577ill; Tue, 1 Oct 2019 09:07:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCWEqTljiDrP6bQ/p976Csqeclx9QEc5G8f9AadehDCG7tEZk5mpwYRMMndPgJ/rfKE7a2 X-Received: by 2002:a17:906:3281:: with SMTP id 1mr24957116ejw.181.1569946073427; Tue, 01 Oct 2019 09:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569946073; cv=none; d=google.com; s=arc-20160816; b=dbmu5zUlGXsQNKaGF+qWFRxRjEVdldJ3iLlqY61gOa7BGCkGdp3ksSCWTJN+O5aqJx XP/n+xonqwdckvRWqrOYkXAvlgGaWdLT74I3v4yWLuR5xKptDV8bgqWLuqI1IxfisM08 GsXryb0qIQwByQQjfek2yWddV3o1e8QAXAY4w4XhPOhsD9gkcnp2nxDERV5i1TQ2AnUX bXIubiZbJwxqsS1VR49Qt4zY3oWz27eP4e/w4kVSC0Keu69s6ahtjB0PE4kI6z+1bBBw uoOSknXANDVWmLYXnjT9E5C8WKIG4y10SRhVtCxDsnUnZ7vDI4+qk9hmq3EGA42oCQIE A0pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=RIE+EgOtTrp9Aw3k4CsYN7GGPkAgexAC1RqFRA/UgKU=; b=QbRW9QBHN1voZpwta1yPP9ML8V0aPe5R0Yy7A8p5ZayIW54+5aPpuQ7VRof+h2ZJec wVutXN2PtKbxT7ujPoYQtEBGpp/OQaD2Wbpur5zCbcTy26FmYeKt7wsEE1+OvJTSsStA mxz86bs/AXdEA4CnTmNzJ4P32QoJRNuAmw7+E/Cg2dM+J7VYgEvCOOqMOVOEpWELRKQ0 Du98TrzneTfPjCi5GM0U9sY7Ihp3Dng2QzH/OnUEPxIQDAbLZzmuoK/aa9IrfnQqh5LO 8VRFZbwL6kC/Yjw/YsT09Svbw+q4tBjtfGpi+t/Y3Z7LvBEQ29Im6Hkl8UaYxp/3p2Ye Amzw== 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 q30si10204449eda.5.2019.10.01.09.07.53; Tue, 01 Oct 2019 09:07:53 -0700 (PDT) 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 S1730540AbfJAQHw (ORCPT + 27 others); Tue, 1 Oct 2019 12:07:52 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:44564 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1733278AbfJAQHs (ORCPT ); Tue, 1 Oct 2019 12:07:48 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 67E1F4656D2A73744456; Wed, 2 Oct 2019 00:07:45 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.439.0; Wed, 2 Oct 2019 00:07:15 +0800 From: John Garry To: CC: , , , , , John Garry Subject: [PATCH 1/3] lib: logic_pio: Enforce LOGIC_PIO_INDIRECT region ops are set at registration Date: Wed, 2 Oct 2019 00:04:25 +0800 Message-ID: <1569945867-82243-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1569945867-82243-1-git-send-email-john.garry@huawei.com> References: <1569945867-82243-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the only LOGIC_PIO_INDIRECT host (hisi-lpc) now sets the ops prior to registration, enforce this check for accessors ops at registration instead of in the IO port accessors to simplify and marginally optimise the code. A slight misalignment is also tidied. Also add myself as an author. Suggested-by: Bjorn Helgaas Signed-off-by: John Garry --- lib/logic_pio.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/lib/logic_pio.c b/lib/logic_pio.c index 905027574e5d..f511a99bb389 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 HiSilicon Limited, All Rights Reserved. * Author: Gabriele Paoloni * Author: Zhichang Yuan + * Author: John Garry */ #define pr_fmt(fmt) "LOGIC PIO: " fmt @@ -39,7 +40,8 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range) resource_size_t iio_sz = MMIO_UPPER_LIMIT; int ret = 0; - if (!new_range || !new_range->fwnode || !new_range->size) + if (!new_range || !new_range->fwnode || !new_range->size || + (new_range->flags == LOGIC_PIO_INDIRECT && !new_range->ops)) return -EINVAL; start = new_range->hw_start; @@ -237,7 +239,7 @@ type logic_in##bw(unsigned long addr) \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ ret = entry->ops->in(entry->hostdata, \ addr, sizeof(type)); \ else \ @@ -253,7 +255,7 @@ void logic_out##bw(type value, unsigned long addr) \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->out(entry->hostdata, \ addr, value, sizeof(type)); \ else \ @@ -261,7 +263,7 @@ void logic_out##bw(type value, unsigned long addr) \ } \ } \ \ -void logic_ins##bw(unsigned long addr, void *buffer, \ +void logic_ins##bw(unsigned long addr, void *buffer, \ unsigned int count) \ { \ if (addr < MMIO_UPPER_LIMIT) { \ @@ -269,7 +271,7 @@ void logic_ins##bw(unsigned long addr, void *buffer, \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->ins(entry->hostdata, \ addr, buffer, sizeof(type), count); \ else \ @@ -286,7 +288,7 @@ void logic_outs##bw(unsigned long addr, const void *buffer, \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->outs(entry->hostdata, \ addr, buffer, sizeof(type), count); \ else \