{"id":815760,"url":"http://patchwork.ozlabs.org/api/patches/815760/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919174654.2122-3-f.fainelli@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919174654.2122-3-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-19T17:46:44","name":"[net-next,v3,02/12] net: dsa: b53: Make b53_enable_cpu_port() take a port argument","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"c399d08f0259532527b5454ea01fa4da6fb2e9ac","submitter":{"id":2800,"url":"http://patchwork.ozlabs.org/api/people/2800/?format=json","name":"Florian Fainelli","email":"f.fainelli@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170919174654.2122-3-f.fainelli@gmail.com/mbox/","series":[{"id":3941,"url":"http://patchwork.ozlabs.org/api/series/3941/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3941","date":"2017-09-19T17:46:42","name":"net: dsa: b53/bcm_sf2 cleanups","version":3,"mbox":"http://patchwork.ozlabs.org/series/3941/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815760/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815760/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"n9OaIEsD\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxVhh5X6Bz9rvt\n\tfor ;\n\tWed, 20 Sep 2017 03:48:04 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751799AbdISRrM (ORCPT );\n\tTue, 19 Sep 2017 13:47:12 -0400","from mail-wr0-f196.google.com ([209.85.128.196]:33068 \"EHLO\n\tmail-wr0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751778AbdISRrJ (ORCPT\n\t); Tue, 19 Sep 2017 13:47:09 -0400","by mail-wr0-f196.google.com with SMTP id b9so192236wra.0\n\tfor ; Tue, 19 Sep 2017 10:47:08 -0700 (PDT)","from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\tq19sm11543124wrb.17.2017.09.19.10.47.05\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 19 Sep 2017 10:47:06 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=aCbNXxhUKoLA5L2hW2eEKrZj9AJEhNmFr9u8aLA/d/E=;\n\tb=n9OaIEsDnMlFQQpE/Os5cbbXXFjqRdoR2ejRAdU/yEEppRQV5aYphWbeyPXNxogC/I\n\tROfItYiIRK0YcScaAmtdgPkdjbkDR9bFv5MUIvptgYx6k/5HHWbbaDWlFm8t5z4xxEz/\n\tbSHD8jY8+zqyyGOH6BuJH1ox07q0h6zD9uT3zaW3yCssxt9m9YdYjusTTh6gK9whAgmk\n\tKELOJspeD2TLiKyER5AQHdGDjewp0J+TsOEghKlh6DHQOJ5f9OurOj7dlqzEYSJDTbTU\n\tJzsatAbXnaZEb833bn8VKANMq0lBttPYsc+L260ES6/gJkaayIDx+NhPpIJLKUlwnLXU\n\tTg8w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=aCbNXxhUKoLA5L2hW2eEKrZj9AJEhNmFr9u8aLA/d/E=;\n\tb=i1vcXL0/cLQKy7RFYjvYgS1hxHE69SJjnuhlANp2ChbXJMQx0URrWDRmsjbpOikFUf\n\t2LoMt63ambP8swWM8+2uaiHQZfvJMVq7IsxApDvRymJeUxrRIfWHT+8SDX2snt4Kd+hn\n\tStkalG92JIs0ejXQmLtC0fmCBYSYZDxtCRFnMEZ5ruvftQasuYc4UdTt4WlQVsC8D3z1\n\tbaRkIV+bsdbzECljcL3WnJnGZC1qtsVBgotaOGY/yroLAMw1xZQNNnqkS+sDLoT5sRJ7\n\tXYqjWypTSHI46LElCA8qe4P5Ht45aUXeZChpHmSoaeE5OrwVOFC0AxlSl1QHbNSlCn3I\n\t9PAg==","X-Gm-Message-State":"AHPjjUjrgNiZI1Q8uWcbe3KmzzdSVCc6MPQhueyCJP0pa+tyPDBjKyS/\n\t0ZuUzwkhRRG+j+piipyPP+sWubMm","X-Google-Smtp-Source":"AOwi7QCOMy2g9PJSGzzblHzFlnMv90H9nrX/HZkw8Uqyy98gTqJyjjgXtngnZSKqqELGYoNiLGQ5xQ==","X-Received":"by 10.223.161.23 with SMTP id o23mr2313927wro.103.1505843227731; \n\tTue, 19 Sep 2017 10:47:07 -0700 (PDT)","From":"Florian Fainelli ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com,\n\tFlorian Fainelli ","Subject":"[PATCH net-next v3 02/12] net: dsa: b53: Make b53_enable_cpu_port()\n\ttake a port argument","Date":"Tue, 19 Sep 2017 10:46:44 -0700","Message-Id":"<20170919174654.2122-3-f.fainelli@gmail.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170919174654.2122-1-f.fainelli@gmail.com>","References":"<20170919174654.2122-1-f.fainelli@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"In preparation for future changes allowing the configuring of multiple\nCPU ports, make b53_enable_cpu_port() take a port argument.\n\nReviewed-by: Vivien Didelot \nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/b53/b53_common.c | 11 +++++------\n 1 file changed, 5 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex 274f3679f33d..d8bc54cfcfbe 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -538,19 +538,18 @@ static void b53_disable_port(struct dsa_switch *ds, int port,\n \tb53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);\n }\n \n-static void b53_enable_cpu_port(struct b53_device *dev)\n+static void b53_enable_cpu_port(struct b53_device *dev, int port)\n {\n-\tunsigned int cpu_port = dev->cpu_port;\n \tu8 port_ctrl;\n \n \t/* BCM5325 CPU port is at 8 */\n-\tif ((is5325(dev) || is5365(dev)) && cpu_port == B53_CPU_PORT_25)\n-\t\tcpu_port = B53_CPU_PORT;\n+\tif ((is5325(dev) || is5365(dev)) && port == B53_CPU_PORT_25)\n+\t\tport = B53_CPU_PORT;\n \n \tport_ctrl = PORT_CTRL_RX_BCST_EN |\n \t\t PORT_CTRL_RX_MCST_EN |\n \t\t PORT_CTRL_RX_UCST_EN;\n-\tb53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(cpu_port), port_ctrl);\n+\tb53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), port_ctrl);\n }\n \n static void b53_enable_mib(struct b53_device *dev)\n@@ -820,7 +819,7 @@ static int b53_setup(struct dsa_switch *ds)\n \t\tif (BIT(port) & ds->enabled_port_mask)\n \t\t\tb53_enable_port(ds, port, NULL);\n \t\telse if (dsa_is_cpu_port(ds, port))\n-\t\t\tb53_enable_cpu_port(dev);\n+\t\t\tb53_enable_cpu_port(dev, port);\n \t\telse\n \t\t\tb53_disable_port(ds, port, NULL);\n \t}\n","prefixes":["net-next","v3","02/12"]}